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 352 matching lines @@
     raise NoTryServerAccess('Please use the --svn_repo option to specify the'
                             ' try server svn repository to connect to.')
 
   values = _ParseSendChangeOptions(options)
   description = ''.join("%s=%s\n" % (k, v) for (k, v) in values.iteritems())
   logging.info('Sending by SVN')
   logging.info(description)
   logging.info(options.svn_repo)
   logging.info(options.diff)
   if options.dry_run:
+    print options.diff

[M-A Ruel, 2011/03/09 15:30:34]

It's assumed that --dry-run is used with --verbose. If you want to print it, do
it only with:
if not logging.getLogger().isEnabledFor(logging.INFO):
  print options.diff

otherwise it would be printed two times in a row.

[Bernhard Bauer, 2011/03/09 15:55:11]

I see. I wanted to make it analog to _SendChangeHTTP, but there the log
statement comes after the dry_run check.

I guess we should make --dry_run fully imply --verbose then?

     return
 
   # Create a temporary directory, put a uniquely named file in it with the diff
   # content and svn import that.
   temp_dir = tempfile.mkdtemp()
   temp_file = tempfile.NamedTemporaryFile()
   try:
     try:
       # Description
       temp_file.write(description)
@@ skipping 221 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:
+  if len(args) > 0:

[M-A Ruel, 2011/03/09 15:30:34]

Ugh, this code is ugly. Since you're touching it anyway, replace lines 622-629
with:
if args:
  parser.error('Extra argument(s) "%s" not understood' % ' '.join(args))

[Bernhard Bauer, 2011/03/09 15:55:11]

Done.

     plural = ""
-    if len(args) > 2:
+    if len(args) > 1:
       plural = "s"
     print >> sys.stderr, (
-        'Argument%s \"%s\" not understood' % (plural, ' '.join(args[1:])))
+        'Argument%s \"%s\" not understood' % (plural, ' '.join(args)))
     parser.print_help()
     return 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:
@@ skipping 129 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))