This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11354

hg: don't attempt to extend `sys.path` with the user site without `APPDATA`
ClosedPublic

Authored by mharbison72 on Aug 26 2021, 11:19 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG769cd5703b2c: hg: don't attempt to extend `sys.path` with the user site without `APPDATA`
Summary

This variable is created by the system and *should* be available, but
test-lfs-bundle.t has a test where it is explicitly unset. It wasn't caught
before because prior to 95af358fcdfe, it was limited to the py2exe binary. As a
precaution, fix both that and the pyoxidizer case that was causing the test to
fail.

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

mharbison72 created this revision.Aug 26 2021, 11:19 AM
Alphare accepted this revision.Aug 27 2021, 4:33 AM
Alphare added a subscriber: Alphare.

Sounds good

This revision is now accepted and ready to land.Aug 27 2021, 4:33 AM

Revision Contents
Changeset List

PathPackages
Mhg (16 lines)
Mrust/hgcli/pyoxidizer.bzl (16 lines)

Diff 30076

hg

# Make `pip install --user ...` packages available to the official Windows # Make `pip install --user ...` packages available to the official Windows
# build. Most py2 packaging installs directly into the system python # build. Most py2 packaging installs directly into the system python
# environment, so no changes are necessary for other platforms. The Windows # environment, so no changes are necessary for other platforms. The Windows
# py2 package uses py2exe, which lacks a `site` module. Hardcode it according # py2 package uses py2exe, which lacks a `site` module. Hardcode it according
# to the documentation. # to the documentation.
if getattr(sys, 'frozen', None) == 'console_exe': if getattr(sys, 'frozen', None) == 'console_exe':
vi = sys.version_info vi = sys.version_info
appdata = os.environ.get('APPDATA')
if appdata:
sys.path.append( sys.path.append(
os.path.join( os.path.join(
os.environ['APPDATA'], appdata,
'Python', 'Python',
'Python%d%d' % (vi[0], vi[1]), 'Python%d%d' % (vi[0], vi[1]),
'site-packages', 'site-packages',
) )
) )
from hgdemandimport import tracing from hgdemandimport import tracing
with tracing.log('hg script'): with tracing.log('hg script'):
# enable importing on demand to reduce startup time # enable importing on demand to reduce startup time
try: try:
if sys.version_info[0] < 3 or sys.version_info >= (3, 6): if sys.version_info[0] < 3 or sys.version_info >= (3, 6):
import hgdemandimport import hgdemandimport

rust/hgcli/pyoxidizer.bzl

if extra_path is not None: if extra_path is not None:
# extensions and hooks expect a working python environment # extensions and hooks expect a working python environment
# We do not prepend the values because the Mercurial library wants to be in # We do not prepend the values because the Mercurial library wants to be in
# the front of the sys.path to avoid picking up other installations. # the front of the sys.path to avoid picking up other installations.
sys.path.extend(extra_path.split(os.pathsep)) sys.path.extend(extra_path.split(os.pathsep))
# Add user site to sys.path to load extensions without the full path # Add user site to sys.path to load extensions without the full path
if os.name == 'nt': if os.name == 'nt':
vi = sys.version_info vi = sys.version_info
appdata = os.environ.get('APPDATA')
if appdata:
sys.path.append( sys.path.append(
os.path.join( os.path.join(
os.environ['APPDATA'], appdata,
'Python', 'Python',
'Python%d%d' % (vi[0], vi[1]), 'Python%d%d' % (vi[0], vi[1]),
'site-packages', 'site-packages',
) )
) )
import hgdemandimport; import hgdemandimport;
hgdemandimport.enable(); hgdemandimport.enable();
from mercurial import dispatch; from mercurial import dispatch;
dispatch.run(); dispatch.run();
""" """
set_build_path(ROOT + "/build/pyoxidizer") set_build_path(ROOT + "/build/pyoxidizer")