--- a/mercurial/dispatch.py	Thu Oct 07 13:44:17 2010 -0700
+++ b/mercurial/dispatch.py	Sun Oct 17 13:24:37 2010 -0400
@@ -433,7 +433,11 @@
     cwd = os.getcwd()
     norepo = commands.norepo
     options = {}
-    args = fancyopts.fancyopts(args, commands.globalopts, options)
+
+    try:
+        args = fancyopts.fancyopts(args, commands.globalopts, options)
+    except fancyopts.getopt.GetoptError:
+        return
 
     if not args:
         return