diff -r e7d3b509af8b -r 08a0f04b56bd mercurial/fancyopts.py
--- a/mercurial/fancyopts.py	Mon Jan 25 00:05:22 2010 -0600
+++ b/mercurial/fancyopts.py	Mon Jan 25 00:05:27 2010 -0600
@@ -16,7 +16,7 @@
     extraargs = []
     if '--' in args:
         stopindex = args.index('--')
-        extraargs = args[stopindex+1:]
+        extraargs = args[stopindex + 1:]
         args = args[:stopindex]
     opts, parseargs = getopt.getopt(args, options, longoptions)
     args = []
@@ -77,8 +77,10 @@
 
         # does it take a parameter?
         if not (default is None or default is True or default is False):
-            if short: short += ':'
-            if oname: oname += '='
+            if short:
+                short += ':'
+            if oname:
+                oname += '='
         if short:
             shortlist += short
         if name: