# HG changeset patch # User Martin von Zweigbergk # Date 2019-08-23 15:46:49 # Node ID fb84730d1c5ab7a1c2b29fd465500cc0ee82e138 # Parent 197e7326b8b86c97c0298cfa14e0dcb4a2da5e41 run-tests: error out on `--local --with-[c]hg` 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. Differential Revision: https://phab.mercurial-scm.org/D6759 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 @@ def parseargs(args, parser): 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')]