This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12556

windows: disable pager when packaged with py2exe
AcceptedPublic

Authored by mharbison72 on Wed, Apr 13, 6:48 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Summary

With Windows and py3, all output that got directed to the pager was lost. It
can be worked around by the user piping to more, but that's easy to forget,
and can be dangerous if hg diff or similar incorrectly shows no changes. The
problem appears to be the new WindowsConsoleIO in py3.6[1]. We've worked around
it with PyOxidizer by setting the Py_LegacyWindowsStdioFlag interpreter
option, and worked around it with hg.bat and exewrapper.c by internally
setting PYTHONLEGACYWINDOWSSTDIO=1.

Unfortunately, py2exe doesn't appear to be able to set the interpreter option,
and somehow seems to also ignore the environment variable. The latter isn't a
good fix anyway, since setting it in the environment would affect other python
programs too. We can't install a global config for this because a config closer
to the user (e.g. from before pager was turned on by default) can override it.

[1] https://peps.python.org/pep-0528/

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

mharbison72 created this revision.Wed, Apr 13, 6:48 PM
Alphare accepted this revision.Thu, Apr 14, 4:50 AM
This revision is now accepted and ready to land.Thu, Apr 14, 4:50 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/ui.py (8 lines)

Diff 33171

mercurial/ui.py

# TODO: expose debugger-enabled on the UI object # TODO: expose debugger-enabled on the UI object
or b'--debugger' in pycompat.sysargv or b'--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
# py2exe doesn't appear to be able to use legacy I/O, and nothing is
# output to the pager for paged commands. Piping to `more` in cmd.exe
# works, but is easy to forget. Just disable pager for py2exe, but
# leave it working for pyoxidizer and exewrapper builds.
if pycompat.iswindows and getattr(sys, "frozen", None) == "console_exe":
self.debug(b"pager is unavailable with py2exe packaging\n")
return
pagercmd = self.config(b'pager', b'pager', rcutil.fallbackpager) pagercmd = self.config(b'pager', b'pager', rcutil.fallbackpager)
if not pagercmd: if not pagercmd:
return return
pagerenv = {} pagerenv = {}
for name, value in rcutil.defaultpagerenv().items(): for name, value in rcutil.defaultpagerenv().items():
if name not in encoding.environ: if name not in encoding.environ:
pagerenv[name] = value pagerenv[name] = value