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

login
register
mail settings
Submitter phabricator
Date Aug. 23, 2019, 9:06 p.m.
Message ID <differential-rev-PHID-DREV-jzvvqlyeso53qdtdt2u6-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/41392/
State Superseded
Headers show

Comments

phabricator - Aug. 23, 2019, 9:06 p.m.
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION 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.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D6759

AFFECTED FILES
  tests/run-tests.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/tests/run-tests.py b/tests/run-tests.py
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -493,6 +493,8 @@ 
             sys.stderr.write('warning: --with-hg should specify an hg script\n')
             sys.stderr.flush()
     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])))
         reporootdir = os.path.dirname(testdir)
         pathandattrs = [(b'hg', 'with_hg')]