diff mercurial/commands.py @ 1538:482b4efdf013

Merge with upstream
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 13 Nov 2005 02:08:39 +0100
parents b4ed825282fe c230939283c3
children 93a9298367e0
line wrap: on
line diff
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -2429,14 +2429,7 @@ def parse(ui, args):
         cmd, args = args[0], args[1:]
         defaults = ui.config("defaults", cmd)
         if defaults:
-            # reparse with command defaults added
-            args = [cmd] + defaults.split() + args
-            try:
-                args = fancyopts.fancyopts(args, globalopts, options)
-            except fancyopts.getopt.GetoptError, inst:
-                raise ParseError(None, inst)
-
-            cmd, args = args[0], args[1:]
+            args = defaults.split() + args
 
         aliases, i = find(cmd)
         cmd = aliases[0]