Show More
@@ -750,7 +750,7 b' def _dispatch(req):' | |||||
750 | ui_.setconfig('ui', 'interactive', 'off', '-y') |
|
750 | ui_.setconfig('ui', 'interactive', 'off', '-y') | |
751 |
|
751 | |||
752 | if options['pager'] != 'auto' and not util.parsebool(options['pager']): |
|
752 | if options['pager'] != 'auto' and not util.parsebool(options['pager']): | |
753 |
ui. |
|
753 | ui.disablepager() | |
754 |
|
754 | |||
755 | if cmdoptions.get('insecure', False): |
|
755 | if cmdoptions.get('insecure', False): | |
756 | for ui_ in uis: |
|
756 | for ui_ in uis: |
@@ -160,7 +160,7 b' class ui(object):' | |||||
160 | self.ferr = src.ferr |
|
160 | self.ferr = src.ferr | |
161 | self.fin = src.fin |
|
161 | self.fin = src.fin | |
162 | self.pageractive = src.pageractive |
|
162 | self.pageractive = src.pageractive | |
163 |
self._ |
|
163 | self._disablepager = src._disablepager | |
164 |
|
164 | |||
165 | self._tcfg = src._tcfg.copy() |
|
165 | self._tcfg = src._tcfg.copy() | |
166 | self._ucfg = src._ucfg.copy() |
|
166 | self._ucfg = src._ucfg.copy() | |
@@ -179,7 +179,7 b' class ui(object):' | |||||
179 | self.ferr = util.stderr |
|
179 | self.ferr = util.stderr | |
180 | self.fin = util.stdin |
|
180 | self.fin = util.stdin | |
181 | self.pageractive = False |
|
181 | self.pageractive = False | |
182 |
self._ |
|
182 | self._disablepager = False | |
183 |
|
183 | |||
184 | # shared read-only environment |
|
184 | # shared read-only environment | |
185 | self.environ = encoding.environ |
|
185 | self.environ = encoding.environ | |
@@ -838,8 +838,8 b' class ui(object):' | |||||
838 | return False |
|
838 | return False | |
839 | return util.isatty(fh) |
|
839 | return util.isatty(fh) | |
840 |
|
840 | |||
841 |
def |
|
841 | def disablepager(self): | |
842 |
self._ |
|
842 | self._disablepager = True | |
843 |
|
843 | |||
844 | def pager(self, command): |
|
844 | def pager(self, command): | |
845 | """Start a pager for subsequent command output. |
|
845 | """Start a pager for subsequent command output. | |
@@ -854,7 +854,7 b' class ui(object):' | |||||
854 | command: The full, non-aliased name of the command. That is, "log" |
|
854 | command: The full, non-aliased name of the command. That is, "log" | |
855 | not "history, "summary" not "summ", etc. |
|
855 | not "history, "summary" not "summ", etc. | |
856 | """ |
|
856 | """ | |
857 |
if (self._ |
|
857 | if (self._disablepager | |
858 | or self.pageractive |
|
858 | or self.pageractive | |
859 | or command in self.configlist('pager', 'ignore') |
|
859 | or command in self.configlist('pager', 'ignore') | |
860 | or not self.configbool('pager', 'attend-' + command, True) |
|
860 | or not self.configbool('pager', 'attend-' + command, True) |
General Comments 0
You need to be logged in to leave comments.
Login now