Reland 77470: Don't ignore first argument in TryChange

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 312 matching lines @@
   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}
 
   logging.info('Sending by HTTP')
   logging.info(description)
   logging.info(url)
+  logging.info(options.diff)
   if options.dry_run:
-    print options.diff
     return
-  logging.info(options.diff)
 
   try:
     logging.info('Opening connection...')
     connection = urllib.urlopen(url, urllib.urlencode(values), proxies=proxies)
     logging.info('Done')
   except IOError, e:
     logging.info(str(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)
@@ skipping 156 matching lines @@
                         "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. 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")
+                   help="Don't send the try job. This implies --verbose, so "
+                        "it will print the diff.")
   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,layout_mac'; 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 80 matching lines @@
                    dest="send_patch",
                    help="Use SVN to talk to the try server")
   group.add_option("-S", "--svn_repo",
                    metavar="SVN_URL",
                    help="SVN url to use to write the changes in; --use_svn is "
                         "implied when using --svn_repo")
   parser.add_option_group(group)
 
   options, args = parser.parse_args(argv)
 
-  # Note that the args array includes the script name, so
-  # a single argument results in len(args) == 2.
-
   # If they've asked for help, give it to them
-  if len(args) == 2 and args[1] == 'help':
+  if len(args) == 1 and args[0] == 'help':
     parser.print_help()
     return 0
 
   # If they've said something confusing, don't spawn a try job until you
   # understand what they want.
-  if len(args) > 1:
-    plural = ""
-    if len(args) > 2:
-      plural = "s"
-    print >> sys.stderr, (
-        'Argument%s \"%s\" not understood' % (plural, ' '.join(args[1:])))
-    parser.print_help()
-    return 1
+  if args:
+    parser.error('Extra argument(s) "%s" not understood' % ' '.join(args))
+
+  if options.dry_run:
+    options.verbose += 1
 
   LOG_FORMAT = '%(levelname)s %(filename)s(%(lineno)d): %(message)s'
   if not swallow_exception:
     if options.verbose == 0:
       logging.basicConfig(level=logging.WARNING, format=LOG_FORMAT)
     elif options.verbose == 1:
       logging.basicConfig(level=logging.INFO, format=LOG_FORMAT)
     elif options.verbose > 1:
       logging.basicConfig(level=logging.DEBUG, format=LOG_FORMAT)
 
@@ skipping 127 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))