mercurial/dispatch.py
branchstable
changeset 32383 f928d53b687c
parent 32054 616e788321cc
child 32652 9929af2b09b4
--- a/mercurial/dispatch.py	Wed May 17 15:39:37 2017 +0200
+++ b/mercurial/dispatch.py	Tue May 23 03:29:23 2017 +0900
@@ -833,22 +833,23 @@
             for ui_ in uis:
                 ui_.setconfig('ui', 'interactive', 'off', '-y')
 
-        if util.parsebool(options['pager']):
-            ui.pager('internal-always-' + cmd)
-        elif options['pager'] != 'auto':
-            ui.disablepager()
-
         if cmdoptions.get('insecure', False):
             for ui_ in uis:
                 ui_.insecureconnections = True
 
-        # setup color handling
+        # setup color handling before pager, because setting up pager
+        # might cause incorrect console information
         coloropt = options['color']
         for ui_ in uis:
             if coloropt:
                 ui_.setconfig('ui', 'color', coloropt, '--color')
             color.setup(ui_)
 
+        if util.parsebool(options['pager']):
+            ui.pager('internal-always-' + cmd)
+        elif options['pager'] != 'auto':
+            ui.disablepager()
+
         if options['version']:
             return commands.version_(ui)
         if options['help']: