( )⚙ D11050 run-tests: drop the `rhg` flag for `hghave.py` if unset

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11050

run-tests: drop the `rhg` flag for `hghave.py` if unset
ClosedPublic

Authored by marmoute on Jul 9 2021, 8:35 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG5654323832f0: run-tests: drop the `rhg` flag for `hghave.py` if unset
rHG9f7a6e6711ec: run-tests: drop the `rhg` flag for `hghave.py` if unset
Summary

This seems cleaner.

Diff Detail

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

Event Timeline

marmoute created this revision.Jul 9 2021, 8:35 PM
baymax updated this revision to Diff 29085.Jul 9 2021, 9:21 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 29105.Jul 9 2021, 11:41 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute updated this revision to Diff 29137.Jul 10 2021, 1:47 PM
Alphare accepted this revision.Jul 13 2021, 11:58 AM
This revision is now accepted and ready to land.Jul 13 2021, 11:58 AM
marmoute added a commit: rHG9f7a6e6711ec: run-tests: drop the `rhg` flag for `hghave.py` if unset.Jul 13 2021, 12:26 PM
Closed by commit rHG9f7a6e6711ec: run-tests: drop the `rhg` flag for `hghave.py` if unset (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/run-tests.py (3 lines)

Diff 29137

tests/run-tests.py

# Affects hghave.py # Affects hghave.py
osenvironb[b'RHG_INSTALLED_AS_HG'] = b'1' 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'] = real_hg osenvironb[b'RHG_FALLBACK_EXECUTABLE'] = real_hg
else:
# drop flag for hghave
osenvironb.pop(b'RHG_INSTALLED_AS_HG', None)
if self.options.rhg: if self.options.rhg:
self._hgcommand = b'rhg' self._hgcommand = b'rhg'
elif self.options.with_rhg: elif self.options.with_rhg:
rhgbindir = os.path.dirname(os.path.realpath(self.options.with_rhg)) rhgbindir = os.path.dirname(os.path.realpath(self.options.with_rhg))
self._hgcommand = os.path.basename(self.options.with_rhg) self._hgcommand = os.path.basename(self.options.with_rhg)
osenvironb[b"BINDIR"] = self._bindir osenvironb[b"BINDIR"] = self._bindir
osenvironb[b"PYTHON"] = PYTHON osenvironb[b"PYTHON"] = PYTHON