This is an archive of the discontinued Mercurial Phabricator instance.

Differential D574

pager: do not start pager if `ui` has been `pushbuffer`-ed
ClosedPublic

Authored by quark on Aug 30 2017, 5:33 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG31a2eb0f74e5: pager: do not start pager if `ui` has been `pushbuffer`-ed
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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

quark created this revision.Aug 30 2017, 5:33 PM
martinvonz added a subscriber: martinvonz.Aug 30 2017, 5:54 PM

Makes sense, but how did you even notice this? I would have thought that we start the pager at a pretty high level, before pushbuffer would normally be called.

Closed by commit rHG31a2eb0f74e5: pager: do not start pager if `ui` has been `pushbuffer`-ed (authored by quark). · Explain WhyAug 31 2017, 2:23 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/ui.py (1 line)
Mtests/test-pager.t (14 lines)

Diff 1468

mercurial/ui.py

# take precedence over disabling factors below # take precedence over disabling factors below
command in self.configlist('pager', 'ignore') command in self.configlist('pager', 'ignore')
or not self.configbool('ui', 'paginate') or not self.configbool('ui', 'paginate')
or not self.configbool('pager', 'attend-' + command, True) or not self.configbool('pager', 'attend-' + command, True)
# TODO: if we want to allow HGPLAINEXCEPT=pager, # TODO: if we want to allow HGPLAINEXCEPT=pager,
# formatted() will need some adjustment. # formatted() will need some adjustment.
or not self.formatted() or not self.formatted()
or self.plain() or self.plain()
or self._buffers
# TODO: expose debugger-enabled on the UI object # TODO: expose debugger-enabled on the UI object
or '--debugger' in pycompat.sysargv): or '--debugger' in pycompat.sysargv):
# We only want to paginate if the ui appears to be # We only want to paginate if the ui appears to be
# interactive, the user didn't say HGPLAIN or # interactive, the user didn't say HGPLAIN or
# HGPLAINEXCEPT=pager, and the user didn't specify --debug. # HGPLAINEXCEPT=pager, and the user didn't specify --debug.
return return
pagercmd = self.config('pager', 'pager', rcutil.fallbackpager) pagercmd = self.config('pager', 'pager', rcutil.fallbackpager)

tests/test-pager.t

4: a 4 4: a 4
5: a 5 5: a 5
6: a 6 6: a 6
7: a 7 7: a 7
8: a 8 8: a 8
9: a 9 9: a 9
10: a 10 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: Environment variables like LESS and LV are set automatically:
$ cat > $TESTTMP/printlesslv.py <<EOF $ cat > $TESTTMP/printlesslv.py <<EOF
> from __future__ import absolute_import > from __future__ import absolute_import
> import os > import os
> import sys > import sys
> sys.stdin.read() > sys.stdin.read()
> for name in ['LESS', 'LV']: > for name in ['LESS', 'LV']:
> sys.stdout.write(('%s=%s\n') % (name, os.environ.get(name, '-'))) > sys.stdout.write(('%s=%s\n') % (name, os.environ.get(name, '-')))