Submitter:	Marc Hedlund	Reviewers
Branch:		Groups:	reviewboard
Bugs:		People:
Change Number:	None	Repository:	Review Board SVN

Description:

This adds a set of configuration variables to the top of post-review, one for each of the command-line switches where it would make sense, so that sites can easily set site-wide defaults.

I also made the command-line option definitions more consistent, and added '-n' as a short flag for the '--output-diff' option (since '-n' usually means "tell me what you're going to do without actually doing it," which seems appropriate here and is how I use that option).

Finally, I updated the usage string.

Testing Done:

I've done basic sanity-checking on each of the configuration variables.

Diff revision 1 (Latest)

Files Changed:

/trunk/reviewboard/contrib/tools/post-review: 21 changes [ 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 ]

Expand changes

 import urllib2
 from optparse import OptionParser
 from tempfile import mkstemp
 from urlparse import urljoin
 ###
 # Default configuration -- user-settable variables follow.
 ###
 # The following settings aren't ever needed, but if your Review
 # Board crew has specific preferences and doesn't want to express
 # them with command line switches, set them here and you're done.
 # In particular, setting the REVIEWBOARD_URL variable will allow
 # you to make it easy for people to submit reviews regardless of
 # their SCM setup.
 # Reviewboard URL.  This is a required setting, but you can set it
 # one of several ways.  You can set it via your SCM system (for
 # instance, using Subversion properties, such as:
 #   svn setprop reviewboard:url=http://reviewboard.example.com
 # ), or you can set it from the command line, or you can set it
 # below. While the SCM property method is better, since it allows
 # you to support multiple Review Board servers based on your
 # current source tree, setting it here is easier and will let you
 # get started quickly.
 REVIEWBOARD_URL = None
 # Default submission arguments.  These are all optional; run this
 # script with --help for descriptions of each argument.
 TARGET_GROUPS   = None
 TARGET_PEOPLE   = None
 SUBMIT_AS       = None
 PUBLISH         = False
 OPEN_BROWSER    = False
 # Debugging.  For development...
 DEBUG           = False
 ###
 # End user-settable variables.
 ###
 VERSION = "0.6"
 # Who stole the cookies from the cookie jar?
 # Was it you?
 # >:(
     return review_url
 def parse_options(tool, repository_info, args):
-    parser = OptionParser(usage="%prog [-p] [-o] changenum",
+    parser = OptionParser(usage="%prog [-pond] [-r review_id] [changenum]",
                           version="%prog " + VERSION)
     parser.add_option("-p", "--publish",
-                      action="store_true", dest="publish", default=False,
+                      dest="publish", action="store_true", default=PUBLISH,
                       help="publish the review request immediately after " +
                            "submitting")
     parser.add_option("-r", "--review-request-id",
                       dest="rid", metavar="ID", default=None,
                       help="existing review request ID to update")
     parser.add_option("-o", "--open",
-                      action="store_true", dest="open_browser", default=False,
+                      dest="open_browser", action="store_true",
                       default=OPEN_BROWSER,
                       help="open a web browser to the review request page")
-    parser.add_option("--output-diff",
+    parser.add_option("-n", "--output-diff",
-                      action="store_true", dest="output_diff_only",
+                      dest="output_diff_only", action="store_true",
                       default=False,
                       help="outputs a diff to the console and exits. " +
                            "Does not post")
-    parser.add_option("--server", dest="server",
+    parser.add_option("--server",
                       dest="server", default=REVIEWBOARD_URL,
                       metavar="SERVER",
                       help="specify a different Review Board server " +
                            "to use")
-    parser.add_option("--diff-only", dest="diff_only",
+    parser.add_option("--diff-only",
-                      action="store_true", default=False,
+                      dest="diff_only", action="store_true", default=False,
                       help="uploads a new diff, but does not update " +
                            "info from changelist")
-    parser.add_option("--target-groups", dest="target_groups",
+    parser.add_option("--target-groups",
-                      default=None,
+                      dest="target_groups", default=TARGET_GROUPS,
                       help="names of the groups who will perform " +
                            "the review")
-    parser.add_option("--target-people", dest="target_people",
+    parser.add_option("--target-people",
-                      default=None,
+                      dest="target_people", default=TARGET_PEOPLE,
                       help="names of the people who will perform " +
                            "the review")
-    parser.add_option("--summary", dest="summary",
+    parser.add_option("--summary",
-                      default=None,
+                      dest="summary", default=None,
                       help="summary of the review ")
-    parser.add_option("--description", dest="description",
+    parser.add_option("--description",
-                      default=None,
+                      dest="description", default=None,
                       help="description of the review ")
-    parser.add_option("--revision-range", dest="revision_range",
+    parser.add_option("--revision-range",
-                      default=None,
+                      dest="revision_range", default=None,
                       help="generate the diff for review based on given " +
                            "revision range")
-    parser.add_option("-r", "--review-request-id", dest="rid", metavar="ID",
+    parser.add_option("--submit-as",
-                      default=None,
+                      dest="submit_as", default=SUBMIT_AS, metavar="USERNAME",
-                      help="existing review request ID to update")
-    parser.add_option("--submit-as", dest="submit_as", metavar="USERNAME",
-                      default=None,
                       help="user name to be recorded as the author of the "
                            "review request, instead of the logged in user")
     if repository_info:
         if repository_info.supports_changesets:
-            parser.add_option("--change-only", dest="change_only",
+            parser.add_option("--change-only",
-                              action="store_true", default=False,
+                              dest="change_only", action="store_true",
                               default=False,
                               help="updates info from changelist, but does " +
                                    "not upload a new diff")
         tool.add_options(parser)
-    parser.add_option("-d", "--debug", action="store_true",
+    parser.add_option("-d", "--debug",
-                      dest="debug", default=False, help="display debug output")
+                      action="store_true", dest="debug", default=DEBUG,
                       help="display debug output")
     (globals()["options"], args) = parser.parse_args(args)
     return args

/trunk/reviewboard/contrib/tools/post-review: 21 changes [ 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 ]

Review Board

beta

This change has been marked as submitted.

Add configuration variables to the top of post-review for site-wide defaults

Diff revision 1 (Latest)

Other reviews

Your comment