Simplify submitting try jobs directly from rietveld.

trychange.py

 #!/usr/bin/python
 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 """Client-side script to send a try job to the try server. It communicates to
 the try server by either writting to a svn repository or by directly connecting
 to the server by HTTP.
 """
 
 import datetime
@@ skipping 23 matching lines @@
 # Constants
 HELP_STRING = "Sorry, Tryserver is not available."
 USAGE = r"""%prog [options]
 
 Client-side script to send a try job to the try server. It communicates to
 the try server by either writting to a svn repository or by directly connecting
 to the server by HTTP.
 
 Examples:
   Try a change against a particular revision:
-    %prog change_name -r 123
+    %prog -r 123
 
   A git patch off a web site (git inserts a/ and b/) and fix the base dir:
     %prog --url http://url/to/patch.diff --patchlevel 1 --root src
 
+  Or from rietveld:
+    %prog -R codereview.chromium.org/1337 --email me@example.com --root src
+
   Use svn to store the try job, specify an alternate email address and use a
   premade diff file on the local drive:
     %prog --email user@example.com
             --svn_repo svn://svn.chromium.org/chrome-try/try --diff foo.diff
 
   Running only on a 'mac' slave with revision 123 and clobber first; specify
   manually the 3 source files to use for the try job:
     %prog --bot mac --revision 123 --clobber -f src/a.cc -f src/a.h
             -f include/b.h
 
@@ skipping 388 matching lines @@
                         os.environ.get('EMAIL_ADDRESS')),
                    help="Email address where to send the results. Use either "
                         "the TRYBOT_RESULTS_EMAIL_ADDRESS environment "
                         "variable or EMAIL_ADDRESS to set the email address "
                         "the try bots report results to [default: %default]")
   group.add_option("-n", "--name",
                    help="Descriptive name of the try job")
   group.add_option("--issue", type='int',
                    help="Update rietveld issue try job status")
   group.add_option("--patchset", type='int',
-                   help="Update rietveld issue try job status")
+                   help="Update rietveld issue try job status. This is "
+                        "optional if --issue is used, In that case, the "
+                        "latest patchset will be used.")
   group.add_option("--dry_run", action='store_true',
                    help="Just prints the diff and quits")
-  group.add_option("--rietveld_url",
-                   help="The code review url.")
+  group.add_option("-R", "--rietveld_url", default="codereview.appspot.com",
+                   metavar="URL",
+                   help="The root code review url. Default:%default")
   parser.add_option_group(group)
 
   group = optparse.OptionGroup(parser, "Try job options")
   group.add_option("-b", "--bot", action="append",
                     help="Only use specifics build slaves, ex: '--bot win' to "
                          "run the try job only on the 'win' slave; see the try "
                          "server waterfall for the slave's name")
   group.add_option("-r", "--revision",
                     help="Revision to use for the try job; default: the "
                          "revision will be determined by the try server; see "
@@ skipping 85 matching lines @@
       logging.basicConfig(level=logging.ERROR)
     elif options.verbose == 1:
       logging.basicConfig(level=logging.WARNING)
     elif options.verbose == 2:
       logging.basicConfig(level=logging.INFO)
     elif options.verbose > 2:
       logging.basicConfig(level=logging.DEBUG)
 
   logging.debug(argv)
 
+  if options.rietveld_url:
+    # Try to extract the review number if possible and fix the protocol.
+    if not '://' in options.rietveld_url:
+      options.rietveld_url = 'http://' + options.rietveld_url
+    match = re.match(r'^(.*)/(\d+)$', options.rietveld_url)
+    if match:
+      if options.issue or options.patchset:
+        parser.error('Cannot use both --issue and use a review number url')
+      options.issue = int(match.group(2))
+      options.rietveld_url = match.group(1)
+
   try:
     # Always include os.getcwd() in the checkout settings.
     checkouts = []
     checkouts.append(GuessVCS(options, os.getcwd()))
     checkouts[0].AutomagicalSettings()
     for item in options.sub_rep:
       checkout = GuessVCS(options, os.path.join(checkouts[0].checkout_root,
                                                 item))
       if checkout.checkout_root in [c.checkout_root for c in checkouts]:
         parser.error('Specified the root %s two times.' %
@@ skipping 11 matching lines @@
     if options.url:
       if options.files:
         parser.error('You cannot specify files and --url at the same time.')
       options.diff = urllib.urlopen(options.url).read()
     elif options.diff:
       if options.files:
         parser.error('You cannot specify files and --diff at the same time.')
       options.diff = gclient_utils.FileRead(options.diff, 'rb')
     elif options.issue and options.patchset is None:
       # Retrieve the patch from rietveld when the diff is not specified.
+      # When patchset is specified, it's because it's done by gcl/git-try.
       try:
         import simplejson
       except ImportError:
         parser.error('simplejson library is missing, please install.')
-      api_url = 'http://%s/api/%d' % (options.rietveld_url, options.issue)
+      api_url = '%s/api/%d' % (options.rietveld_url, options.issue)
+      logging.debug(api_url)
       contents = simplejson.loads(urllib.urlopen(api_url).read())
-      diff_url = ('http://%s/download/issue%d_%d.diff' %
-          (options.rietveld_url,  options.issue, contents['patchsets'][-1]))
+      options.patchset = contents['patchsets'][-1]
+      diff_url = ('%s/download/issue%d_%d.diff' %
+          (options.rietveld_url,  options.issue, options.patchset))
       diff = GetMungedDiff('', urllib.urlopen(diff_url).readlines())
       options.diff = ''.join(diff)
     else:
       # Use this as the base.
       root = checkouts[0].checkout_root
       diffs = []
       for checkout in checkouts:
         diff = checkout.GenerateDiff().splitlines(True)
         path_diff = gclient_utils.PathDifference(root, checkout.checkout_root)
         # Munge it.
@@ skipping 50 matching lines @@
   except (InvalidScript, NoTryServerAccess), e:
     if swallow_exception:
       return 1
     print e
     return 1
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(TryChange(None, [], False))