Fix a typo in scm.GIT.GetBranch() and add --dry_run to trychange.py to ease testing.

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 183 matching lines @@
   values['patch'] = options.diff
 
   url = 'http://%s:%s/send_try_patch' % (options.host, options.port)
   proxies = None
   if options.proxy:
     if options.proxy.lower() == 'none':
       # Effectively disable HTTP_PROXY or Internet settings proxy setup.
       proxies = {}
     else:
       proxies = {'http': options.proxy, 'https': options.proxy}
+
+  if options.dry_run:
+    # Last minute fake.
+    for (k,v) in values.iteritems():
+      if k != 'patch':
+        print("%s=%s" % (k,v))
+    print values['patch']
+    return
+
   try:
     connection = urllib.urlopen(url, urllib.urlencode(values), proxies=proxies)
   except IOError, e:
     if (values.get('bot') and len(e.args) > 2 and
         e.args[2] == 'got a bad status line'):
       raise NoTryServerAccess('%s is unaccessible. Bad --bot argument?' % url)
     else:
       raise NoTryServerAccess('%s is unaccessible. Reason: %s' % (url,
                                                                   str(e.args)))
   if not connection:
     raise NoTryServerAccess('%s is unaccessible.' % url)
   if connection.read() != 'OK':
     raise NoTryServerAccess('%s is unaccessible.' % url)
 
 
 def _SendChangeSVN(options):
   """Send a change to the try server by committing a diff file on a subversion
   server."""
   if not options.svn_repo:
     raise NoTryServerAccess('Please use the --svn_repo option to specify the'
                             ' try server svn repository to connect to.')
 
   values = _ParseSendChangeOptions(options)
   description = ''
   for (k,v) in values.iteritems():
     description += "%s=%s\n" % (k,v)
 
+  if options.dry_run:
+    # Last minute fake.
+    print str(descriptions)
+    print diff
+    return
+
   # Do an empty checkout.
   temp_dir = tempfile.mkdtemp()
   temp_file = tempfile.NamedTemporaryFile()
   try:
     try:
       command = ['svn', 'checkout', '--depth', 'empty', '-q',
                  options.svn_repo, temp_dir]
       if options.email:
         command.extend(['--username', options.email])
       gclient_utils.CheckCall(command)
@@ skipping 89 matching lines @@
                    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")
+  group.add_option("--dry_run", action='store_true',
+                   help="Just prints the diff and quits")
   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 "
                          "its waterfall for more info")
   group.add_option("-c", "--clobber", action="store_true",
                     help="Force a clobber before building; e.g. don't do an "
                          "incremental build")
   # TODO(maruel): help="Select a specific configuration, usually 'debug' or "
   #                    "'release'"
   group.add_option("--target", help=optparse.SUPPRESS_HELP)
 
   group.add_option("--project",
-                   help="Override which project to use")
+                   help="Override which project to use. Projects are defined "
+                        "server-side to define what default bot set to use")
 
   # Override the list of tests to run, use multiple times to list many tests
   # (or comma separated)
   group.add_option("-t", "--tests", action="append",
                    help=optparse.SUPPRESS_HELP)
   parser.add_option_group(group)
 
   group = optparse.OptionGroup(parser, "Patch to run")
   group.add_option("-f", "--file", default=file_list, dest="files",
                    metavar="FILE", action="append",
@@ skipping 96 matching lines @@
         options.name = 'Unnamed'
         print('Note: use --name NAME to change the try job name.')
     if not options.email:
       print('Warning: TRYBOT_RESULTS_EMAIL_ADDRESS is not set. Try server '
             'results might\ngo to: %s@google.com.\n' % options.user)
     else:
       print('Results will be emailed to: ' + options.email)
 
     # Send the patch.
     options.send_patch(options)
-    print 'Patch \'%s\' sent to try server: %s' % (options.name,
-                                                   ', '.join(options.bot))
+    if not options.dry_run:

[bradn, 2009/12/22 18:05:54]

Might be worth moving this up into the http/svn handlers, that way you could say
which method for upload is being used?

+      print 'Patch \'%s\' sent to try server: %s' % (options.name,
+                                                     ', '.join(options.bot))
   except (InvalidScript, NoTryServerAccess), e:
     if swallow_exception:
       return 1
     print e
     return 1
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(TryChange(None, [], False))