This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11302

pyoxidizer: re-install PYTHONPATH behavior
ClosedPublic

Authored by marmoute on Aug 18 2021, 12:21 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGb962a913ee3b: pyoxidizer: re-install PYTHONPATH behavior
Summary

Hooks and extensions can rely on PYTHONPATH value. Yet the pyoxidized binary
ignore the variable. So we manually reinstall the behavior to fix various tests
and restore the expected behavior.

This positively affects:

  • test-extension.t
  • test-hook.t

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

marmoute created this revision.Aug 18 2021, 12:21 PM
marmoute added a commit: rHGb962a913ee3b: pyoxidizer: re-install PYTHONPATH behavior.Aug 18 2021, 9:20 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGb962a913ee3b: pyoxidizer: re-install PYTHONPATH behavior (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/hgcli/pyoxidizer.bzl (8 lines)

Diff 29953

rust/hgcli/pyoxidizer.bzl

SIGNING_PFX_PASSWORD = VARS.get("SIGNING_PFX_PASSWORD", "") SIGNING_PFX_PASSWORD = VARS.get("SIGNING_PFX_PASSWORD", "")
SIGNING_SUBJECT_NAME = VARS.get("SIGNING_SUBJECT_NAME") SIGNING_SUBJECT_NAME = VARS.get("SIGNING_SUBJECT_NAME")
TIME_STAMP_SERVER_URL = VARS.get("TIME_STAMP_SERVER_URL", "http://timestamp.digicert.com") TIME_STAMP_SERVER_URL = VARS.get("TIME_STAMP_SERVER_URL", "http://timestamp.digicert.com")
IS_WINDOWS = "windows" in BUILD_TARGET_TRIPLE IS_WINDOWS = "windows" in BUILD_TARGET_TRIPLE
# Code to run in Python interpreter. # Code to run in Python interpreter.
RUN_CODE = """ RUN_CODE = """
import os
import sys
extra_path = os.environ.get('PYTHONPATH')
if extra_path is not None:
# extensions and hooks expect a working python environment
# 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.
sys.path.extend(extra_path.split(os.pathsep))
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")