Add support for an --upstream_branch argument to make diffing against...

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.
 """
 
@@ skipping 556 matching lines @@
                         "@branch to specify the "
                         "revision/branch to diff against. If no @branch is "
                         "given the diff will be against the upstream branch. "
                         "If @branch then the diff is branch..HEAD. "
                         "All edits must be checked in.")
   group.add_option("--no_gclient", action="store_true",
                    help="Disable automatic search for gclient checkout.")
   group.add_option("-E", "--exclude", action="append",
                    default=['ChangeLog'], metavar='REGEXP',
                    help="Regexp patterns to exclude files. Default: %default")
+  group.add_option("--upstream_branch", action="store",
+                   help="specify the upstream branch to diff against in the "
+                   "main checkout")

[M-A Ruel, 2010/12/15 20:01:21]

can you align with the = ?

   parser.add_option_group(group)
 
   group = optparse.OptionGroup(parser, "Access the try server by HTTP")
   group.add_option("--use_http",
                    action="store_const",
                    const=_SendChangeHTTP,
                    dest="send_patch",
                    help="Use HTTP to talk to the try server [default]")
   group.add_option("-H", "--host",
                    help="Host address")
@@ skipping 57 matching lines @@
     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()))
+    path = os.getcwd()
+    if options.upstream_branch:
+        path += '@' + options.upstream_branch
+    checkouts.append(GuessVCS(options, path))
     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.' %
                      checkout.checkout_root)
       checkouts.append(checkout)
 
     can_http = options.port and options.host
@@ skipping 94 matching lines @@
     print >> sys.stderr, e
     return 1
   except gclient_utils.Error, e:
     print >> sys.stderr, e
     return 1
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(TryChange(None, [], False))