'git try': a) Give users help when they ask for it, b) Don't start try job if...

trychange.py

Index: trychange.py
===================================================================
--- trychange.py	(revision 54207)
+++ trychange.py	(working copy)
@@ -600,9 +600,25 @@
   parser.add_option_group(group)
 
   options, args = parser.parse_args(argv)
-  if len(args) == 1 and args[0] == 'help':
+
+  # Note that the args array includes the script name, so
+  # a single argument results in len(args) == 2.

[Evan Martin, 2010/07/29 23:36:19]

Wow, I have probably written the same bug a million times then!  :(

I knew that argv included the script name, but it seems totally busted to me
that optparse also gives it to you.  :(

+
+  # If they've asked for help, give it to them
+  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 len(args) > 1:
+    plural = ""
+    if len(args) > 2:
+      plural = "s"
+    print "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:
     if options.verbose == 0: