merge with tonfa
authorThomas Arendsen Hein <thomas@intevation.de>
Fri, 28 Jul 2006 09:01:13 +0200
changeset 2717 14ebe97542a7
parent 2715 79c31b6b9c83 (current diff)
parent 2716 4af4e1870fa0 (diff)
child 2718 a593813241e5
child 2719 532809ba1db5
merge with tonfa
mercurial/commands.py
--- a/mercurial/commands.py	Fri Jul 28 09:00:59 2006 +0200
+++ b/mercurial/commands.py	Fri Jul 28 09:01:13 2006 +0200
@@ -3440,6 +3440,11 @@
             else:
                 d = lambda: func(u, *args, **cmdoptions)
 
+            # reupdate the options, repo/.hg/hgrc may have changed them
+            u.updateopts(options["verbose"], options["debug"], options["quiet"],
+                         not options["noninteractive"], options["traceback"],
+                         options["config"])
+
             try:
                 if options['profile']:
                     import hotshot, hotshot.stats