Mercurial > public > mercurial-scm > hg
comparison mercurial/dispatch.py @ 33620:cc047a733f69 stable
ui: enable pager always for explicit --pager=on (issue5580)
Before this patch, explicit --pager=on is unintentionally ignored by
any disabling factor, even if priority of it is less than --pager=on
(e.g. "[ui] paginate = off").
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Tue, 01 Aug 2017 18:52:52 +0900 |
parents | 0407a51b9d8c |
children | d5b2beca16c0 |
comparison
equal
deleted
inserted
replaced
33618:76b171209151 | 33620:cc047a733f69 |
---|---|
826 if coloropt: | 826 if coloropt: |
827 ui_.setconfig('ui', 'color', coloropt, '--color') | 827 ui_.setconfig('ui', 'color', coloropt, '--color') |
828 color.setup(ui_) | 828 color.setup(ui_) |
829 | 829 |
830 if util.parsebool(options['pager']): | 830 if util.parsebool(options['pager']): |
831 # ui.pager() expects 'internal-always-' prefix in this case | |
831 ui.pager('internal-always-' + cmd) | 832 ui.pager('internal-always-' + cmd) |
832 elif options['pager'] != 'auto': | 833 elif options['pager'] != 'auto': |
833 ui.disablepager() | 834 ui.disablepager() |
834 | 835 |
835 if options['version']: | 836 if options['version']: |