changeset 2717:14ebe97542a7

merge with tonfa
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 28 Jul 2006 09:01:13 +0200
parents 79c31b6b9c83 (current diff) 4af4e1870fa0 (diff)
children a593813241e5 532809ba1db5
files mercurial/commands.py
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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