Mercurial > public > mercurial-scm > hg-stable
diff mercurial/dispatch.py @ 32674:9929af2b09b4
merge with stable
author | Augie Fackler <augie@google.com> |
---|---|
date | Sat, 03 Jun 2017 16:33:28 -0400 |
parents | 3ce53a499334 f928d53b687c |
children | 12941a782928 |
line wrap: on
line diff
--- a/mercurial/dispatch.py Thu Jun 01 08:31:21 2017 -0700 +++ b/mercurial/dispatch.py Sat Jun 03 16:33:28 2017 -0400 @@ -844,22 +844,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']: