( )⚙ D11283 pyoxidized: add a `pyoxidizer` hghave keyword for line matching

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11283

pyoxidized: add a `pyoxidizer` hghave keyword for line matching
ClosedPublic

Authored by marmoute on Aug 17 2021, 3:34 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG94158c541c74: pyoxidized: add a `pyoxidizer` hghave keyword for line matching
Summary

Some output line can be affected by pyoxidizer, for example the source file path
are replaced by the module name. We introduce a new condition keyword to cope
with this.

Diff Detail

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

Event Timeline

marmoute created this revision.Aug 17 2021, 3:34 PM
marmoute added a commit: rHG94158c541c74: pyoxidized: add a `pyoxidizer` hghave keyword for line matching.Aug 18 2021, 12:44 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG94158c541c74: pyoxidized: add a `pyoxidizer` hghave keyword for line matching (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.
baymax updated this revision to Diff 29904.Aug 18 2021, 1:16 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)
⚠ This patch is intended for stable ⚠

Revision Contents
Changeset List

PathPackages
Mtests/hghave.py (5 lines)
Mtests/run-tests.py (4 lines)

Diff 29904

tests/hghave.py

return 'CHG_INSTALLED_AS_HG' in os.environ return 'CHG_INSTALLED_AS_HG' in os.environ
@check("rhg", "running with rhg as 'hg'") @check("rhg", "running with rhg as 'hg'")
def has_rhg(): def has_rhg():
return 'RHG_INSTALLED_AS_HG' in os.environ return 'RHG_INSTALLED_AS_HG' in os.environ
@check("pyoxidizer", "running with pyoxidizer build as 'hg'")
def has_rhg():
return 'PYOXIDIZED_INSTALLED_AS_HG' in os.environ
@check("cvs", "cvs client/server") @check("cvs", "cvs client/server")
def has_cvs(): def has_cvs():
re = br'Concurrent Versions System.*?server' re = br'Concurrent Versions System.*?server'
return matchoutput('cvs --version 2>&1', re) and not has_msys() return matchoutput('cvs --version 2>&1', re) and not has_msys()
@check("cvs112", "cvs client/server 1.12.* (not cvsnt)") @check("cvs112", "cvs client/server 1.12.* (not cvsnt)")
def has_cvs112(): def has_cvs112():

tests/run-tests.py

testdir = os.path.dirname(_sys2bytes(canonpath(sys.argv[0]))) testdir = os.path.dirname(_sys2bytes(canonpath(sys.argv[0])))
reporootdir = os.path.dirname(testdir) reporootdir = os.path.dirname(testdir)
# XXX we should ideally install stuff instead of using the local build # XXX we should ideally install stuff instead of using the local build
bin_path = ( bin_path = (
b'build/pyoxidizer/x86_64-pc-windows-msvc/release/app/hg.exe' b'build/pyoxidizer/x86_64-pc-windows-msvc/release/app/hg.exe'
) )
full_path = os.path.join(reporootdir, bin_path) full_path = os.path.join(reporootdir, bin_path)
self._hgcommand = full_path self._hgcommand = full_path
# Affects hghave.py
osenvironb[b'PYOXIDIZED_INSTALLED_AS_HG'] = b'1'
else:
osenvironb.pop(b'PYOXIDIZED_INSTALLED_AS_HG', None)
osenvironb[b"BINDIR"] = self._bindir osenvironb[b"BINDIR"] = self._bindir
osenvironb[b"PYTHON"] = PYTHON osenvironb[b"PYTHON"] = PYTHON
fileb = _sys2bytes(__file__) fileb = _sys2bytes(__file__)
runtestdir = os.path.abspath(os.path.dirname(fileb)) runtestdir = os.path.abspath(os.path.dirname(fileb))
osenvironb[b'RUNTESTDIR'] = runtestdir osenvironb[b'RUNTESTDIR'] = runtestdir
if PYTHON3: if PYTHON3: