mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 07:17:55 +03:00
46266b7436
Summary: `helpers-testrepo.sh` decides whether to use the in-repo hg or the system hg. With the latest treemanifest chagne, the in-repo hg could fail on `hg files` complaining about `remotefilelog.reponame` not being set, while `hg id` still works. Since most `test-check` tests just run `hg files`. Use the same command instead of `hg id` to decide whether to use system hg. Reviewed By: sfilipco Differential Revision: D14372231 fbshipit-source-id: e87d407ff1d2552306f62912e0805dafe3c0bacb
58 lines
1.8 KiB
Bash
58 lines
1.8 KiB
Bash
# In most cases, the mercurial repository can be read by the bundled hg, but
|
|
# that isn't always true because third-party extensions may change the store
|
|
# format, for example. In which case, the system hg installation is used.
|
|
#
|
|
# We want to use the hg version being tested when interacting with the test
|
|
# repository, and the system hg when interacting with the mercurial source code
|
|
# repository.
|
|
#
|
|
# The mercurial source repository was typically orignally cloned with the
|
|
# system mercurial installation, and may require extensions or settings from
|
|
# the system installation.
|
|
|
|
# Revert the environment so that running "hg" runs the system hg
|
|
# rather than the test hg installation.
|
|
syshgenv () {
|
|
. "$HGTEST_RESTOREENV"
|
|
HGPLAIN=1
|
|
export HGPLAIN
|
|
}
|
|
|
|
# The test-repo is a live hg repository which may have evolution markers
|
|
# created, e.g. when a ~/.hgrc enabled evolution.
|
|
#
|
|
# Tests may be run using a custom HGRCPATH, which do not enable evolution
|
|
# markers by default.
|
|
#
|
|
# If test-repo includes evolution markers, and we do not enable evolution
|
|
# markers, hg will occasionally complain when it notices them, which disrupts
|
|
# tests resulting in sporadic failures.
|
|
#
|
|
# Since we aren't performing any write operations on the test-repo, there's
|
|
# no harm in telling hg that we support evolution markers, which is what the
|
|
# following lines for the hgrc file do:
|
|
cat >> "$HGRCPATH" << EOF
|
|
[experimental]
|
|
evolution = createmarkers
|
|
EOF
|
|
|
|
# Use the system hg environment if the bundled hg can't read the repository with
|
|
# no warning nor error.
|
|
if [ -n "`hg files --cwd "$TESTDIR/" 2>&1 >/dev/null`" ]; then
|
|
testrepohgenv () {
|
|
syshgenv
|
|
}
|
|
else
|
|
testrepohgenv () {
|
|
# No need to do anything in this case.
|
|
:
|
|
}
|
|
fi
|
|
|
|
testrepohg () {
|
|
(
|
|
testrepohgenv
|
|
exec hg "$@"
|
|
)
|
|
}
|