Mercurial > public > mercurial-scm > hg
comparison mercurial/ui.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 | d90f9e4704de |
children | c2c6a0f7408b |
comparison
equal
deleted
inserted
replaced
33618:76b171209151 | 33620:cc047a733f69 |
---|---|
943 Args: | 943 Args: |
944 command: The full, non-aliased name of the command. That is, "log" | 944 command: The full, non-aliased name of the command. That is, "log" |
945 not "history, "summary" not "summ", etc. | 945 not "history, "summary" not "summ", etc. |
946 """ | 946 """ |
947 if (self._disablepager | 947 if (self._disablepager |
948 or self.pageractive | 948 or self.pageractive): |
949 or command in self.configlist('pager', 'ignore') | 949 # how pager should do is already determined |
950 return | |
951 | |
952 if not command.startswith('internal-always-') and ( | |
953 # explicit --pager=on (= 'internal-always-' prefix) should | |
954 # take precedence over disabling factors below | |
955 command in self.configlist('pager', 'ignore') | |
950 or not self.configbool('ui', 'paginate') | 956 or not self.configbool('ui', 'paginate') |
951 or not self.configbool('pager', 'attend-' + command, True) | 957 or not self.configbool('pager', 'attend-' + command, True) |
952 # TODO: if we want to allow HGPLAINEXCEPT=pager, | 958 # TODO: if we want to allow HGPLAINEXCEPT=pager, |
953 # formatted() will need some adjustment. | 959 # formatted() will need some adjustment. |
954 or not self.formatted() | 960 or not self.formatted() |