D574: pager: do not start pager if `ui` has been `pushbuffer`-ed
quark (Jun Wu)
phabricator at mercurial-scm.org
Wed Aug 30 21:33:17 UTC 2017
quark created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
The `pushbuffer`, `popbuffer` APIs are intended to capture internal output.
They will prevent `ui.write` from writing to the actual `ui.fout`. So a
pager won't receive the output and do the right thing. In general, it does
not make sense to start a pager if ui is in the "pushbuffer" mode.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D574
AFFECTED FILES
mercurial/ui.py
tests/test-pager.t
CHANGE DETAILS
diff --git a/tests/test-pager.t b/tests/test-pager.t
--- a/tests/test-pager.t
+++ b/tests/test-pager.t
@@ -340,6 +340,20 @@
9: a 9
10: a 10
+During pushbuffer, pager should not start:
+ $ cat > $TESTTMP/pushbufferpager.py <<EOF
+ > def uisetup(ui):
+ > ui.pushbuffer()
+ > ui.pager('mycmd')
+ > ui.write('content\n')
+ > ui.write(ui.popbuffer())
+ > EOF
+
+ $ echo append >> a
+ $ hg --config extensions.pushbuffer=$TESTTMP/pushbufferpager.py status --color=off
+ content
+ paged! 'M a\n'
+
Environment variables like LESS and LV are set automatically:
$ cat > $TESTTMP/printlesslv.py <<EOF
> from __future__ import absolute_import
diff --git a/mercurial/ui.py b/mercurial/ui.py
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
@@ -962,6 +962,7 @@
# formatted() will need some adjustment.
or not self.formatted()
or self.plain()
+ or self._buffers
# TODO: expose debugger-enabled on the UI object
or '--debugger' in pycompat.sysargv):
# We only want to paginate if the ui appears to be
To: quark, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list