Mercurial > hg-stable
changeset 31046:9c827087df38
ui: rename neverpager to disablepager
I agree this is a clearer name for this method.
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Sun, 19 Feb 2017 20:12:52 -0500 |
| parents | 6cf2857526c7 |
| children | 04344226b3ce |
| files | mercurial/dispatch.py mercurial/ui.py |
| diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/dispatch.py Sun Feb 19 20:00:18 2017 +0900 +++ b/mercurial/dispatch.py Sun Feb 19 20:12:52 2017 -0500 @@ -750,7 +750,7 @@ ui_.setconfig('ui', 'interactive', 'off', '-y') if options['pager'] != 'auto' and not util.parsebool(options['pager']): - ui.neverpager() + ui.disablepager() if cmdoptions.get('insecure', False): for ui_ in uis:
--- a/mercurial/ui.py Sun Feb 19 20:00:18 2017 +0900 +++ b/mercurial/ui.py Sun Feb 19 20:12:52 2017 -0500 @@ -160,7 +160,7 @@ self.ferr = src.ferr self.fin = src.fin self.pageractive = src.pageractive - self._neverpager = src._neverpager + self._disablepager = src._disablepager self._tcfg = src._tcfg.copy() self._ucfg = src._ucfg.copy() @@ -179,7 +179,7 @@ self.ferr = util.stderr self.fin = util.stdin self.pageractive = False - self._neverpager = False + self._disablepager = False # shared read-only environment self.environ = encoding.environ @@ -838,8 +838,8 @@ return False return util.isatty(fh) - def neverpager(self): - self._neverpager = True + def disablepager(self): + self._disablepager = True def pager(self, command): """Start a pager for subsequent command output. @@ -854,7 +854,7 @@ command: The full, non-aliased name of the command. That is, "log" not "history, "summary" not "summ", etc. """ - if (self._neverpager + if (self._disablepager or self.pageractive or command in self.configlist('pager', 'ignore') or not self.configbool('pager', 'attend-' + command, True)