Allow git-try to try rietveld changes directly.

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 375 matching lines @@
   except gclient_utils.CheckCallError, e:
     if e.retcode != errno.ENOENT and e.retcode != 128:
       # ENOENT == 2 = they don't have git installed.
       # 128 = git error code when not in a repo.
       logging.warn(e.retcode)
       raise
   raise NoTryServerAccess("Could not guess version control system. "
                           "Are you in a working copy directory?")
 
 
+def GetMungedDiff(path_diff, diff):
+  # Munge paths to match svn.
+  for i in range(len(diff)):
+    if diff[i].startswith('--- ') or diff[i].startswith('+++ '):
+      new_file = posixpath.join(path_diff, diff[i][4:]).replace('\\', '/')
+      diff[i] = diff[i][0:4] + new_file
+  return diff
+
+
 def TryChange(argv,
               file_list,
               swallow_exception,
               prog=None):
   """
   Args:
     argv: Arguments and options.
     file_list: Default value to pass to --file.
     swallow_exception: Whether we raise or swallow exceptions.
   """
@@ skipping 14 matching lines @@
                         "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")
   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.")
   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 111 matching lines @@
 
     # Convert options.diff into the content of the diff.
     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:
+      # Retrieve the patch from rietveld when the diff is not specified.
+      try:
+        import simplejson
+      except ImportError:
+        parser.error('simplejson library is missing, please install.')
+      api_url = 'http://%s/api/%d' % (options.rietveld_url, options.issue)
+      contents = simplejson.loads(urllib.urlopen(api_url).read())
+      diff_url = ('http://%s/download/issue%d_%d.diff' %

[Nico, 2010/01/10 04:55:49]

…then this branch is taken and api_url is http://None/api... 'cause rietveld_url
is set only in the other branch in git-try

+          (options.rietveld_url,  options.issue, contents['patchsets'][-1]))
+      diff = GetMungedDiff('', urllib.urlopen(diff_url).readlines())

[Nico, 2010/01/10 05:02:44]

wait, do i read this right? does this mean that this (once rietveld_urls is set)
will make `git try` try the latest version that i uploaded to rietveld instead
of the latest version in my local branch if i uploaded my branch at some time in
the past?

if so, that would be bad.

+      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.
-        path_diff = gclient_utils.PathDifference(root, checkout.checkout_root)
-        for i in range(len(diff)):
-          if diff[i].startswith('--- ') or diff[i].startswith('+++ '):
-            new_file = posixpath.join(path_diff, diff[i][4:]).replace('\\', '/')
-            diff[i] = diff[i][0:4] + new_file
-        diffs.extend(diff)
+        diffs.extend(GetMungedDiff(path_diff, diff))
       options.diff = ''.join(diffs)
 
     if not options.bot:
       # Get try slaves from PRESUBMIT.py files if not specified.
       # Even if the diff comes from options.url, use the local checkout for bot
       # selection.
       try:
         import presubmit_support
         root_presubmit = checkouts[0].ReadRootFile('PRESUBMIT.py')
         options.bot = presubmit_support.DoGetTrySlaves(
@@ skipping 39 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))