This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6759

run-tests: error out on `--local --with-[c]hg`
ClosedPublic

Authored by martinvonz on Aug 23 2019, 5:05 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGfb84730d1c5a: run-tests: error out on `--local --with-[c]hg`
Summary

I don't see much reason to allow these combinations. You could use
--local and override only one of --with-hg or --with-chg, but I don't
see much practical use for that. It would be easy to work around
anyway by passing both --with-hg and --with-chg. By erroring out, it
makes the code a bit easier to reason about to allow the next few
patches.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Aug 23 2019, 5:05 PM
pulkit accepted this revision.Aug 27 2019, 3:57 PM
This revision is now accepted and ready to land.Aug 27 2019, 3:57 PM
martinvonz added a commit: rHGfb84730d1c5a: run-tests: error out on `--local --with-[c]hg`.Aug 27 2019, 4:59 PM
Closed by commit rHGfb84730d1c5a: run-tests: error out on `--local --with-[c]hg` (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 16302

tests/run-tests.py

options.with_hg = canonpath(_bytespath(options.with_hg)) options.with_hg = canonpath(_bytespath(options.with_hg))
if not (os.path.isfile(options.with_hg) and if not (os.path.isfile(options.with_hg) and
os.access(options.with_hg, os.X_OK)): os.access(options.with_hg, os.X_OK)):
parser.error('--with-hg must specify an executable hg script') parser.error('--with-hg must specify an executable hg script')
if os.path.basename(options.with_hg) not in [b'hg', b'hg.exe']: if os.path.basename(options.with_hg) not in [b'hg', b'hg.exe']:
sys.stderr.write('warning: --with-hg should specify an hg script\n') sys.stderr.write('warning: --with-hg should specify an hg script\n')
sys.stderr.flush() sys.stderr.flush()
if options.local: if options.local:
if options.with_hg or options.with_chg:
parser.error('--local cannot be used with --with-hg or --with-chg')
testdir = os.path.dirname(_bytespath(canonpath(sys.argv[0]))) testdir = os.path.dirname(_bytespath(canonpath(sys.argv[0])))
reporootdir = os.path.dirname(testdir) reporootdir = os.path.dirname(testdir)
pathandattrs = [(b'hg', 'with_hg')] pathandattrs = [(b'hg', 'with_hg')]
if options.chg: if options.chg:
pathandattrs.append((b'contrib/chg/chg', 'with_chg')) pathandattrs.append((b'contrib/chg/chg', 'with_chg'))
for relpath, attr in pathandattrs: for relpath, attr in pathandattrs:
binpath = os.path.join(reporootdir, relpath) binpath = os.path.join(reporootdir, relpath)
if os.name != 'nt' and not os.access(binpath, os.X_OK): if os.name != 'nt' and not os.access(binpath, os.X_OK):