This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9388

errors: raise InputError on bad top-level flags
ClosedPublic

Authored by martinvonz on Nov 24 2020, 1:05 PM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHGac565222b9f8: errors: raise InputError on bad top-level flags

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Nov 24 2020, 1:05 PM
mharbison72 accepted this revision.Nov 25 2020, 5:01 PM
This revision is now accepted and ready to land.Nov 25 2020, 5:01 PM
martinvonz added a commit: rHGac565222b9f8: errors: raise InputError on bad top-level flags.Nov 25 2020, 5:05 PM
Closed by commit rHGac565222b9f8: errors: raise InputError on bad top-level flags (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/dispatch.py (10 lines)
Mtests/test-dispatch.t (18 lines)
Mtests/test-globalopts.t (12 lines)

Diff 23678

mercurial/dispatch.py

fullargs = args fullargs = args
cmd, func, args, options, cmdoptions = _parse(lui, args) cmd, func, args, options, cmdoptions = _parse(lui, args)
# store the canonical command name in request object for later access # store the canonical command name in request object for later access
req.canonical_command = cmd req.canonical_command = cmd
if options[b"config"] != req.earlyoptions[b"config"]: if options[b"config"] != req.earlyoptions[b"config"]:
raise error.Abort(_(b"option --config may not be abbreviated")) raise error.InputError(_(b"option --config may not be abbreviated"))
if options[b"cwd"] != req.earlyoptions[b"cwd"]: if options[b"cwd"] != req.earlyoptions[b"cwd"]:
raise error.Abort(_(b"option --cwd may not be abbreviated")) raise error.InputError(_(b"option --cwd may not be abbreviated"))
if options[b"repository"] != req.earlyoptions[b"repository"]: if options[b"repository"] != req.earlyoptions[b"repository"]:
raise error.Abort( raise error.InputError(
_( _(
b"option -R has to be separated from other options (e.g. not " b"option -R has to be separated from other options (e.g. not "
b"-qR) and --repository may only be abbreviated as --repo" b"-qR) and --repository may only be abbreviated as --repo"
) )
) )
if options[b"debugger"] != req.earlyoptions[b"debugger"]: if options[b"debugger"] != req.earlyoptions[b"debugger"]:
raise error.Abort(_(b"option --debugger may not be abbreviated")) raise error.InputError(
_(b"option --debugger may not be abbreviated")
)
# don't validate --profile/--traceback, which can be enabled from now # don't validate --profile/--traceback, which can be enabled from now
if options[b"encoding"]: if options[b"encoding"]:
encoding.encoding = options[b"encoding"] encoding.encoding = options[b"encoding"]
if options[b"encodingmode"]: if options[b"encodingmode"]:
encoding.encodingmode = options[b"encodingmode"] encoding.encodingmode = options[b"encodingmode"]
if options[b"time"]: if options[b"time"]:

tests/test-dispatch.t

$ hg cat -- --debugger $ hg cat -- --debugger
--debugger: no such file in rev cb9a9f314b8b --debugger: no such file in rev cb9a9f314b8b
[1] [1]
Unparsable form of early options: Unparsable form of early options:
$ hg cat --debugg $ hg cat --debugg
abort: option --debugger may not be abbreviated abort: option --debugger may not be abbreviated
[255] [10]
Parsing failure of early options should be detected before executing the Parsing failure of early options should be detected before executing the
command: command:
$ hg log -b '--config=hooks.pre-log=false' default $ hg log -b '--config=hooks.pre-log=false' default
abort: option --config may not be abbreviated abort: option --config may not be abbreviated
[255] [10]
$ hg log -b -R. default $ hg log -b -R. default
abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo
[255] [10]
$ hg log --cwd .. -b --cwd=. default $ hg log --cwd .. -b --cwd=. default
abort: option --cwd may not be abbreviated abort: option --cwd may not be abbreviated
[255] [10]
However, we can't prevent it from loading extensions and configs: However, we can't prevent it from loading extensions and configs:
$ cat <<EOF > bad.py $ cat <<EOF > bad.py
> raise Exception('bad') > raise Exception('bad')
> EOF > EOF
$ hg log -b '--config=extensions.bad=bad.py' default $ hg log -b '--config=extensions.bad=bad.py' default
*** failed to import extension bad from bad.py: bad *** failed to import extension bad from bad.py: bad
abort: option --config may not be abbreviated abort: option --config may not be abbreviated
[255] [10]
$ mkdir -p badrepo/.hg $ mkdir -p badrepo/.hg
$ echo 'invalid-syntax' > badrepo/.hg/hgrc $ echo 'invalid-syntax' > badrepo/.hg/hgrc
$ hg log -b -Rbadrepo default $ hg log -b -Rbadrepo default
config error at badrepo/.hg/hgrc:1: invalid-syntax config error at badrepo/.hg/hgrc:1: invalid-syntax
[30] [30]
$ hg log -b --cwd=inexistent default $ hg log -b --cwd=inexistent default
$ hg log -b '--config=alias.log=log --config=hooks.pre-log=false' $ hg log -b '--config=alias.log=log --config=hooks.pre-log=false'
hg log: option -b not recognized hg log: option -b not recognized
error in definition for alias 'log': --config may only be given on the command error in definition for alias 'log': --config may only be given on the command
line line
[255] [255]
$ hg log -b '--config=defaults.log=--config=hooks.pre-log=false' $ hg log -b '--config=defaults.log=--config=hooks.pre-log=false'
abort: option --config may not be abbreviated abort: option --config may not be abbreviated
[255] [10]
Shell aliases bypass any command parsing rules but for the early one: Shell aliases bypass any command parsing rules but for the early one:
$ hg log -b '--config=alias.log=!echo howdy' $ hg log -b '--config=alias.log=!echo howdy'
howdy howdy
Early options must come first if HGPLAIN=+strictflags is specified: Early options must come first if HGPLAIN=+strictflags is specified:
(BUG: chg cherry-picks early options to pass them as a server command) (BUG: chg cherry-picks early options to pass them as a server command)
abort: unknown revision '--debugger' abort: unknown revision '--debugger'
[255] [255]
$ HGPLAIN=+strictflags hg log -b --config='alias.log=!echo pwned' default $ HGPLAIN=+strictflags hg log -b --config='alias.log=!echo pwned' default
abort: unknown revision '--config=alias.log=!echo pwned' abort: unknown revision '--config=alias.log=!echo pwned'
[255] [255]
$ HGPLAIN=+strictflags hg log --config='hooks.pre-log=false' -b default $ HGPLAIN=+strictflags hg log --config='hooks.pre-log=false' -b default
abort: option --config may not be abbreviated abort: option --config may not be abbreviated
[255] [10]
$ HGPLAIN=+strictflags hg log -q --cwd=.. -b default $ HGPLAIN=+strictflags hg log -q --cwd=.. -b default
abort: option --cwd may not be abbreviated abort: option --cwd may not be abbreviated
[255] [10]
$ HGPLAIN=+strictflags hg log -q -R . -b default $ HGPLAIN=+strictflags hg log -q -R . -b default
abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo
[255] [10]
$ HGPLAIN=+strictflags hg --config='hooks.pre-log=false' log -b default $ HGPLAIN=+strictflags hg --config='hooks.pre-log=false' log -b default
abort: pre-log hook exited with status 1 abort: pre-log hook exited with status 1
[255] [255]
$ HGPLAIN=+strictflags hg --cwd .. -q -Ra log -b default $ HGPLAIN=+strictflags hg --cwd .. -q -Ra log -b default
0:cb9a9f314b8b 0:cb9a9f314b8b
$ HGPLAIN=+strictflags hg --cwd .. -q --repository a log -b default $ HGPLAIN=+strictflags hg --cwd .. -q --repository a log -b default
0:cb9a9f314b8b 0:cb9a9f314b8b

tests/test-globalopts.t

$ hg -q -Rb tip $ hg -q -Rb tip
0:b6c483daf290 0:b6c483daf290
earlygetopt with illegal abbreviations: earlygetopt with illegal abbreviations:
$ hg --confi "foo.bar=baz" $ hg --confi "foo.bar=baz"
abort: option --config may not be abbreviated abort: option --config may not be abbreviated
[255] [10]
$ hg --cw a tip $ hg --cw a tip
abort: option --cwd may not be abbreviated abort: option --cwd may not be abbreviated
[255] [10]
$ hg --rep a tip $ hg --rep a tip
abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo
[255] [10]
$ hg --repositor a tip $ hg --repositor a tip
abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo
[255] [10]
$ hg -qR a tip $ hg -qR a tip
abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo
[255] [10]
$ hg -qRa tip $ hg -qRa tip
abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo
[255] [10]
Testing --cwd: Testing --cwd:
$ hg --cwd a parents $ hg --cwd a parents
changeset: 0:8580ff50825a changeset: 0:8580ff50825a
tag: tip tag: tip
user: test user: test
date: Thu Jan 01 00:00:01 1970 +0000 date: Thu Jan 01 00:00:01 1970 +0000