tests: Add `rhg` and `no-rhg` for #require and #if in .t files
ClosedPublic

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	26031		Mar 3 2021, 12:09 PM	★	★
Diff 2	26033		Mar 3 2021, 1:24 PM	★	★
Diff 3	26051		Mar 4 2021, 6:10 AM	★	★
Diff 4	26070		Mar 4 2021, 8:00 AM	★	★
Diff 5	26286		Mar 12 2021, 5:06 PM	★	★
Diff 6	26405	rHG78e6700ab009172adc3f92285ec019a41a230514	Mar 3 2021, 12:00 PM	★	★

Status	Author	Revision
Closed	SimonSapin	D10196 ci: Add a job testing with rhg installed as `hg`
Closed	SimonSapin	D10195 run-test: install rhg if --rhg is passed
Closed	SimonSapin	D10194 makefile: add a install option
Closed	SimonSapin	D10193 makefile: add a build-rhg option
Closed	SimonSapin	D10192 makefile: add a install-chg option
Closed	SimonSapin	D10191 makefile: add a build-chg option
Closed	SimonSapin	D10190 tests: Disable for rhg remaining tests that fail in that mode
Closed	SimonSapin	D10189 rhg: Remove `rhg.fallback-executable=hg` default configuration
Closed	SimonSapin	D10145 rhg: Return an error code for `rhg config Section.idontexist`
Closed	SimonSapin	D10144 rhg: Fall back to Python for --version
Closed	SimonSapin	D10143 rhg: Exit with an error code if `files` finds nothing
Closed	SimonSapin	D10142 rhg: `cat` command: print error messages for missing files
Closed	SimonSapin	D10141 rhg: Silently ignore missing files in config %include
Closed	SimonSapin	D10140 rhg: Add support for environment variables in config include paths
Closed	SimonSapin	D10139 rhg: Add support for the HGRCSKIPREPO environment variable
Closed	SimonSapin	D10138 rhg: Don’t make repository path absolute too early
Closed	SimonSapin	D10137 rhg: Fall back to Python if ui.relative-paths is configured
Closed	SimonSapin	D10136 tests: clarify some missing output in test-merge-subrepos
Closed	SimonSapin	D10135 tests: Adapt expected output for minor differences with rhg
Closed	SimonSapin	D10134 rhg: Add support for --cwd
Closed	SimonSapin	D10133 rhg: Align with Python on some more error messages
Closed	SimonSapin	D10188 rhg: Add an allow-list of ignored extensions
Closed	SimonSapin	D10132 rhg: Ignore trailing newlines in .hg/sharedpath
Closed	SimonSapin	D10112 rhg: Fall back to Python if unsupported extensions are enabled
Closed	SimonSapin	D10111 rhg: Sort config files when adding a directory
Closed	SimonSapin	D10110 rhg: Align config file parse error formatting with Python
Closed	SimonSapin	D10102 rhg: Fall back to Python for bundle repositories
Closed	SimonSapin	D10101 rhg: Fall back to Python on --repository with an URL
Closed	SimonSapin	D10100 rhg: Print non-absolutized path in "repository {} not found" errors
Closed	SimonSapin	D10099 rhg: Align "malformed --config" error message with Python
Closed	SimonSapin	D10098 rhg: Fall back to Python on unsupported `rhg config <section>`
Closed	SimonSapin	D10097 rhg: Fall back to Python for unsupported revset syntax
Closed	SimonSapin	D10096 tests: Add `rhg` and `no-rhg` for #require and #if in .t files
Closed	SimonSapin	D10187 tests: Enable rhg fallback to Python by default in tests
Closed	SimonSapin	D10186 rhg: Add environment variables for fallback configuration

Diff 26405

tests/hghave.py

	return False			return False


	@check("chg", "running with chg")			@check("chg", "running with chg")
	def has_chg():			def has_chg():
	return 'CHGHG' in os.environ			return 'CHGHG' in os.environ


				@check("rhg", "running with rhg as 'hg'")
				def has_rhg():
				return 'RHG_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

	self._hgcommand = b'chg'			self._hgcommand = b'chg'
	elif self.options.with_chg:			elif self.options.with_chg:
	chgbindir = os.path.dirname(os.path.realpath(self.options.with_chg))			chgbindir = os.path.dirname(os.path.realpath(self.options.with_chg))
	self._hgcommand = os.path.basename(self.options.with_chg)			self._hgcommand = os.path.basename(self.options.with_chg)

	# configure fallback and replace "hg" command by "rhg"			# configure fallback and replace "hg" command by "rhg"
	rhgbindir = self._bindir			rhgbindir = self._bindir
	if self.options.rhg or self.options.with_rhg:			if self.options.rhg or self.options.with_rhg:
				# Affects hghave.py
				osenvironb[b'RHG_INSTALLED_AS_HG'] = b'1'
	# Affects configuration. Alternatives would be setting configuration through			# Affects configuration. Alternatives would be setting configuration through
	# `$HGRCPATH` but some tests override that, or changing `_hgcommand` to include			# `$HGRCPATH` but some tests override that, or changing `_hgcommand` to include
	# `--config` but that disrupts tests that print command lines and check expected			# `--config` but that disrupts tests that print command lines and check expected
	# output.			# output.
	osenvironb[b'RHG_ON_UNSUPPORTED'] = b'fallback'			osenvironb[b'RHG_ON_UNSUPPORTED'] = b'fallback'
	osenvironb[b'RHG_FALLBACK_EXECUTABLE'] = os.path.join(			osenvironb[b'RHG_FALLBACK_EXECUTABLE'] = os.path.join(
	self._bindir, self._hgcommand			self._bindir, self._hgcommand
	)			)

tests/test-rhg.t

	#require rust			#require rhg

	Define an rhg function that will only run if rhg exists
	$ RHG="$RUNTESTDIR/../rust/target/release/rhg"
	$ rhg() {
	> if [ -f "$RHG" ]; then
	> "$RHG" "$@"
	> else
	> echo "skipped: Cannot find rhg. Try to run cargo build in rust/rhg."
	> exit 80
	> fi
	> }

	$ NO_FALLBACK="env RHG_ON_UNSUPPORTED=abort"			$ NO_FALLBACK="env RHG_ON_UNSUPPORTED=abort"

	Unimplemented command			Unimplemented command
	$ $NO_FALLBACK rhg unimplemented-command			$ $NO_FALLBACK rhg unimplemented-command
	unsupported feature: error: Found argument 'unimplemented-command' which wasn't expected, or isn't valid in this context			unsupported feature: error: Found argument 'unimplemented-command' which wasn't expected, or isn't valid in this context

	USAGE:			USAGE:
	$ rhg cat original --config rhg.fallback-executable=false			$ rhg cat original --config rhg.fallback-executable=false
	[1]			[1]

	$ rhg cat original --config rhg.fallback-executable=hg-non-existent			$ rhg cat original --config rhg.fallback-executable=hg-non-existent
	tried to fall back to a 'hg-non-existent' sub-process but got error $ENOENT$			tried to fall back to a 'hg-non-existent' sub-process but got error $ENOENT$
	unsupported feature: `rhg cat` without `--rev` / `-r`			unsupported feature: `rhg cat` without `--rev` / `-r`
	[252]			[252]

	$ rhg cat original --config rhg.fallback-executable="$RHG"			$ rhg cat original --config rhg.fallback-executable=rhg
	Blocking recursive fallback. The 'rhg.fallback-executable = */rust/target/release/rhg' config points to `rhg` itself. (glob)			Blocking recursive fallback. The 'rhg.fallback-executable = rhg' config points to `rhg` itself.
	unsupported feature: `rhg cat` without `--rev` / `-r`			unsupported feature: `rhg cat` without `--rev` / `-r`
	[252]			[252]

	Requirements			Requirements
	$ $NO_FALLBACK rhg debugrequirements			$ $NO_FALLBACK rhg debugrequirements
	dotencode			dotencode
	fncache			fncache
	generaldelta			generaldelta

This is an archive of the discontinued Mercurial Phabricator instance.

tests: Add `rhg` and `no-rhg` for #require and #if in .t filesClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 26405

tests/hghave.py

tests/run-tests.py

tests/test-rhg.t

tests: Add `rhg` and `no-rhg` for #require and #if in .t files
ClosedPublic

Revision Contents
Changeset List