# HG changeset patch # User Augie Fackler # Date 2017-02-15 22:48:03 # Node ID 3ed6e43998df6600c7b17ac21899377e2931811e # Parent 9c2977ceaa460af53584e7ef8076b7c60b96b96a ui: introduce neverpager() call I'm about to add direct paging support to some commands, and as a result we need a way to communicate from the higher layers of dispatch that paging is explicitly disabled. diff --git a/mercurial/dispatch.py b/mercurial/dispatch.py --- a/mercurial/dispatch.py +++ b/mercurial/dispatch.py @@ -749,6 +749,9 @@ def _dispatch(req): for ui_ in uis: ui_.setconfig('ui', 'interactive', 'off', '-y') + if options['pager'] != 'auto' and not util.parsebool(options['pager']): + ui.neverpager() + if cmdoptions.get('insecure', False): for ui_ in uis: ui_.insecureconnections = True diff --git a/mercurial/ui.py b/mercurial/ui.py --- a/mercurial/ui.py +++ b/mercurial/ui.py @@ -155,6 +155,7 @@ class ui(object): self.ferr = src.ferr self.fin = src.fin self.pageractive = src.pageractive + self._neverpager = src._neverpager self._tcfg = src._tcfg.copy() self._ucfg = src._ucfg.copy() @@ -173,6 +174,7 @@ class ui(object): self.ferr = util.stderr self.fin = util.stdin self.pageractive = False + self._neverpager = False # shared read-only environment self.environ = encoding.environ @@ -831,6 +833,9 @@ class ui(object): return False return util.isatty(fh) + def neverpager(self): + self._neverpager = True + def pager(self, command): """Start a pager for subsequent command output. @@ -844,7 +849,8 @@ class ui(object): command: The full, non-aliased name of the command. That is, "log" not "history, "summary" not "summ", etc. """ - if (self.pageractive + if (self._neverpager + or self.pageractive # TODO: if we want to allow HGPLAINEXCEPT=pager, # formatted() will need some adjustment. or not self.formatted()