From b88c38bc4baf0d1f0c34df045908b0756ec712a5 Mon Sep 17 00:00:00 2001
From: "bauerb@chromium.org"
 <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 9 Mar 2011 16:26:58 +0000
Subject: [PATCH] Revert "Don't ignore first argument in TryChange."

This reverts commit 39d5bf3d5fe78b3dc532c727ba86604da799a299.

TBR=maruel

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@77475 0039d316-1c4b-4281-b951-d872f2087c98
---
 gcl.py       |  3 ++-
 trychange.py | 24 +++++++++++++++---------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/gcl.py b/gcl.py
index b394e4d6a..2e68617fa 100755
--- a/gcl.py
+++ b/gcl.py
@@ -916,10 +916,11 @@ def TryChange(change_info, args, swallow_exception):
       trychange_args.extend(["--issue", str(change_info.issue)])
     if change_info.patchset:
       trychange_args.extend(["--patchset", str(change_info.patchset)])
+    trychange_args.extend(args)
     file_list = change_info.GetFileNames()
   else:
+    trychange_args.extend(args)
     file_list = []
-  trychange_args.extend(args)
   return trychange.TryChange(
       trychange_args,
       file_list=file_list,
diff --git a/trychange.py b/trychange.py
index 74174bc2c..b1b328ff2 100755
--- a/trychange.py
+++ b/trychange.py
@@ -330,9 +330,10 @@ def _SendChangeHTTP(options):
   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...')
@@ -509,8 +510,7 @@ def TryChange(argv,
                         "optional if --issue is used, In that case, the "
                         "latest patchset will be used.")
   group.add_option("--dry_run", action='store_true',
-                   help="Don't send the try job. This implies --verbose, so "
-                        "it will print the diff.")
+                   help="Just prints the diff and quits")
   parser.add_option_group(group)
 
   group = optparse.OptionGroup(parser, "Try job options")
@@ -611,18 +611,24 @@ def TryChange(argv,
 
   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) == 1 and args[0] == 'help':
+  if len(args) == 2 and args[1] == '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 args:
-    parser.error('Extra argument(s) "%s" not understood' % ' '.join(args))
-
-  if options.dry_run:
-    options.verbose++
+  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
 
   LOG_FORMAT = '%(levelname)s %(filename)s(%(lineno)d): %(message)s'
   if not swallow_exception: