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.

Download Raw Diff

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

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 17 2021, 3:34 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptAug 17 2021, 3:34 PM

Herald added a subscriber: mercurial-patches. · View Herald Transcript

marmoute added a child revision: D11284: pyoxidized: adapt test-devel-warnings.t.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.

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

Revision Contents
Changeset List

			Path	Packages
M			tests/hghave.py (5 lines)
M			tests/run-tests.py (4 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	29892		Aug 17 2021, 3:34 PM	★	★
Diff 2	29902	rHG94158c541c7447318988f442b0a849385c86097a	Aug 17 2021, 2:48 PM	★	★
Diff 3	29904		Aug 18 2021, 1:16 AM	★	★

Status	Author	Revision
Closed	marmoute	D11306 pyoxidizer: always run the associated CI jobs
Closed	marmoute	D11305 pyoxidizer: skip for ZeroConf related test for now
Closed	marmoute	D11304 pyoxidizer: disable the test for disabled & broken extensions help
Closed	marmoute	D11302 pyoxidizer: re-install PYTHONPATH behavior
Closed	marmoute	D11300 pyoxidizer: wrap the pyoxidizer script on multiple line
Closed	marmoute	D11301 windows: add pytest-vcr to the dependencies
Closed	marmoute	D11299 pyoxidized: silence the fuzzywuzzy warning about python-Levenshtein
Closed	marmoute	D11298 pyoxidized: install fuzzywuzzy too
Closed	marmoute	D11297 pyoxidized: adapt output of test-install.t
Closed	marmoute	D11296 pyoxidized: disable part of `test-install.t` related to pip and virtualenv
Closed	marmoute	D11295 pyoxidized: adapt output of test-bad-extension.t
Closed	marmoute	D11294 pyoxidized: adapt output of test-flagprocessor.t
Closed	marmoute	D11293 pyoxidized: adapt output of `test-phases.t`
Closed	marmoute	D11292 pyoxidized: add a copy of the `doc` directory in the right location
Closed	marmoute	D11291 pyoxidized: add a copy of the `contrib` directory in the right location
Closed	marmoute	D11290 pyoxidized: add a copy of the `defaultrc` file in the right location
Closed	marmoute	D11289 pyoxidized: add a copy of the `helptext` directory in the right location
Closed	marmoute	D11288 template: handle missing resource in `_readmapfile`
Closed	marmoute	D11287 pyoxidized: add a copy of the `templates` directory in the right location
Closed	marmoute	D11286 pyoxidized: add a dedicated target in the tests
Closed	marmoute	D11285 test-extension: adapt output to pyoxidizer
Closed	marmoute	D11284 pyoxidized: adapt test-devel-warnings.t
Closed	marmoute	D11283 pyoxidized: add a `pyoxidizer` hghave keyword for line matching
Closed	marmoute	D11282 templater: swap `\` with `/` in more location
Closed	marmoute	D11281 templater: swap `\` with `/` to allow the resource logic to kicks in

Diff 29902

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: