mercurial/ui.py
branchstable
changeset 33618 cc047a733f69
parent 33585 d90f9e4704de
child 33625 c2c6a0f7408b
--- a/mercurial/ui.py	Mon Jul 31 21:47:53 2017 +0900
+++ b/mercurial/ui.py	Tue Aug 01 18:52:52 2017 +0900
@@ -945,8 +945,14 @@
                    not "history, "summary" not "summ", etc.
         """
         if (self._disablepager
-            or self.pageractive
-            or command in self.configlist('pager', 'ignore')
+            or self.pageractive):
+            # how pager should do is already determined
+            return
+
+        if not command.startswith('internal-always-') and (
+            # explicit --pager=on (= 'internal-always-' prefix) should
+            # take precedence over disabling factors below
+            command in self.configlist('pager', 'ignore')
             or not self.configbool('ui', 'paginate')
             or not self.configbool('pager', 'attend-' + command, True)
             # TODO: if we want to allow HGPLAINEXCEPT=pager,