dispatch: set global options on the request repo.ui stable
authorIdan Kamara <idankk86@gmail.com>
Fri, 24 Jun 2011 19:44:58 +0300
branchstable
changeset 14752 99ace3cb7352
parent 14751 712954a67be3
child 14753 10dcb3e7cb55
dispatch: set global options on the request repo.ui If the request has a repo, and global options such as --verbose are passed, we need to set those explicitly on the repo.ui.
mercurial/dispatch.py
--- a/mercurial/dispatch.py	Fri Jun 24 19:44:17 2011 +0300
+++ b/mercurial/dispatch.py	Fri Jun 24 19:44:58 2011 +0300
@@ -592,18 +592,23 @@
                 (t[4]-s[4], t[0]-s[0], t[2]-s[2], t[1]-s[1], t[3]-s[3]))
         atexit.register(print_time)
 
+    uis = set([ui, lui])
+
+    if req.repo:
+        uis.add(req.repo.ui)
+
     for opt in ('verbose', 'debug', 'quiet', 'traceback'):
         val = bool(options[opt])
         if val:
-            for ui_ in (ui, lui):
+            for ui_ in uis:
                 ui_.setconfig('ui', opt, str(val))
 
     if options['noninteractive']:
-        for ui_ in (ui, lui):
+        for ui_ in uis:
             ui_.setconfig('ui', 'interactive', 'off')
 
     if cmdoptions.get('insecure', False):
-        for ui_ in (ui, lui):
+        for ui_ in uis:
             ui_.setconfig('web', 'cacerts', '')
 
     if options['help']: