changeset 1526:c230939283c3

fix a bug where command defaults suppress global options
author TK Soh <teekaysoh@yahoo.com>
date Fri, 11 Nov 2005 15:32:28 -0800
parents c85e5bbfd141
children c13fce7167c2
files mercurial/commands.py
diffstat 1 files changed, 1 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Wed Nov 09 13:42:16 2005 -0800
+++ b/mercurial/commands.py	Fri Nov 11 15:32:28 2005 -0800
@@ -2429,14 +2429,7 @@
         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]