This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9384

errors: raise ConfigError on bad alias definition
ClosedPublic

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

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG35ab6e39f482: errors: raise ConfigError on bad alias definition

Diff Detail

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

Event Timeline

martinvonz created this revision.Nov 24 2020, 1:05 PM
mharbison72 accepted this revision.Nov 25 2020, 1:34 AM
This revision is now accepted and ready to land.Nov 25 2020, 1:34 AM
martinvonz added a commit: rHG35ab6e39f482: errors: raise ConfigError on bad alias definition.Nov 25 2020, 1:38 AM
Closed by commit rHG35ab6e39f482: errors: raise ConfigError on bad alias definition (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/dispatch.py (2 lines)
Mtests/test-alias.t (60 lines)

Diff 23642

mercurial/dispatch.py

hint = None hint = None
if self.unknowncmd: if self.unknowncmd:
try: try:
# check if the command is in a disabled extension # check if the command is in a disabled extension
cmd, ext = extensions.disabledcmd(ui, self.cmdname)[:2] cmd, ext = extensions.disabledcmd(ui, self.cmdname)[:2]
hint = _(b"'%s' is provided by '%s' extension") % (cmd, ext) hint = _(b"'%s' is provided by '%s' extension") % (cmd, ext)
except error.UnknownCommand: except error.UnknownCommand:
pass pass
raise error.Abort(self.badalias, hint=hint) raise error.ConfigError(self.badalias, hint=hint)
if self.shadows: if self.shadows:
ui.debug( ui.debug(
b"alias '%s' shadows command '%s'\n" % (self.name, self.cmdname) b"alias '%s' shadows command '%s'\n" % (self.name, self.cmdname)
) )
ui.log( ui.log(
b'commandalias', b'commandalias',
b"alias '%s' expands to '%s'\n", b"alias '%s' expands to '%s'\n",

tests/test-alias.t

alias for: hg dln alias for: hg dln
Logs the null rev in debug mode Logs the null rev in debug mode
unknown unknown
$ hg unknown $ hg unknown
abort: alias 'unknown' resolves to unknown command 'bargle' config error: alias 'unknown' resolves to unknown command 'bargle'
[255] [30]
$ hg help unknown $ hg help unknown
alias 'unknown' resolves to unknown command 'bargle' alias 'unknown' resolves to unknown command 'bargle'
ambiguous ambiguous
$ hg ambiguous $ hg ambiguous
abort: alias 'ambiguous' resolves to ambiguous command 's' config error: alias 'ambiguous' resolves to ambiguous command 's'
[255] [30]
$ hg help ambiguous $ hg help ambiguous
alias 'ambiguous' resolves to ambiguous command 's' alias 'ambiguous' resolves to ambiguous command 's'
recursive recursive
$ hg recursive $ hg recursive
abort: alias 'recursive' resolves to unknown command 'recursive' config error: alias 'recursive' resolves to unknown command 'recursive'
[255] [30]
$ hg help recursive $ hg help recursive
alias 'recursive' resolves to unknown command 'recursive' alias 'recursive' resolves to unknown command 'recursive'
disabled disabled
$ hg disabled $ hg disabled
abort: alias 'disabled' resolves to unknown command 'email' config error: alias 'disabled' resolves to unknown command 'email'
('email' is provided by 'patchbomb' extension) ('email' is provided by 'patchbomb' extension)
[255] [30]
$ hg help disabled $ hg help disabled
alias 'disabled' resolves to unknown command 'email' alias 'disabled' resolves to unknown command 'email'
'email' is provided by the following extension: 'email' is provided by the following extension:
patchbomb command to send changesets as (a series of) patch emails patchbomb command to send changesets as (a series of) patch emails
(use 'hg help extensions' for information on enabling extensions) (use 'hg help extensions' for information on enabling extensions)
no definition no definition
$ hg nodef $ hg nodef
abort: no definition for alias 'nodefinition' config error: no definition for alias 'nodefinition'
[255] [30]
$ hg help nodef $ hg help nodef
no definition for alias 'nodefinition' no definition for alias 'nodefinition'
no closing quotation no closing quotation
$ hg noclosing $ hg noclosing
abort: error in definition for alias 'noclosingquotation': No closing quotation config error: error in definition for alias 'noclosingquotation': No closing quotation
[255] [30]
$ hg help noclosing $ hg help noclosing
error in definition for alias 'noclosingquotation': No closing quotation error in definition for alias 'noclosingquotation': No closing quotation
"--" in alias definition should be preserved "--" in alias definition should be preserved
$ hg --config alias.dash='cat --' -R alias dash -r0 $ hg --config alias.dash='cat --' -R alias dash -r0
abort: -r0 not under root '$TESTTMP/alias' abort: -r0 not under root '$TESTTMP/alias'
(consider using '--cwd alias') (consider using '--cwd alias')
[255] [255]
invalid options invalid options
$ hg no--cwd $ hg no--cwd
abort: error in definition for alias 'no--cwd': --cwd may only be given on the command line config error: error in definition for alias 'no--cwd': --cwd may only be given on the command line
[255] [30]
$ hg help no--cwd $ hg help no--cwd
error in definition for alias 'no--cwd': --cwd may only be given on the error in definition for alias 'no--cwd': --cwd may only be given on the
command line command line
$ hg no-R $ hg no-R
abort: error in definition for alias 'no-R': -R may only be given on the command line config error: error in definition for alias 'no-R': -R may only be given on the command line
[255] [30]
$ hg help no-R $ hg help no-R
error in definition for alias 'no-R': -R may only be given on the command line error in definition for alias 'no-R': -R may only be given on the command line
$ hg no--repo $ hg no--repo
abort: error in definition for alias 'no--repo': --repo may only be given on the command line config error: error in definition for alias 'no--repo': --repo may only be given on the command line
[255] [30]
$ hg help no--repo $ hg help no--repo
error in definition for alias 'no--repo': --repo may only be given on the error in definition for alias 'no--repo': --repo may only be given on the
command line command line
$ hg no--repository $ hg no--repository
abort: error in definition for alias 'no--repository': --repository may only be given on the command line config error: error in definition for alias 'no--repository': --repository may only be given on the command line
[255] [30]
$ hg help no--repository $ hg help no--repository
error in definition for alias 'no--repository': --repository may only be given error in definition for alias 'no--repository': --repository may only be given
on the command line on the command line
$ hg no--config $ hg no--config
abort: error in definition for alias 'no--config': --config may only be given on the command line config error: error in definition for alias 'no--config': --config may only be given on the command line
[255] [30]
$ hg no --config alias.no='--repo elsewhere --cwd elsewhere status' $ hg no --config alias.no='--repo elsewhere --cwd elsewhere status'
abort: error in definition for alias 'no': --repo/--cwd may only be given on the command line config error: error in definition for alias 'no': --repo/--cwd may only be given on the command line
[255] [30]
$ hg no --config alias.no='--repo elsewhere' $ hg no --config alias.no='--repo elsewhere'
abort: error in definition for alias 'no': --repo may only be given on the command line config error: error in definition for alias 'no': --repo may only be given on the command line
[255] [30]
optional repository optional repository
#if no-outer-repo #if no-outer-repo
$ hg optionalrepo $ hg optionalrepo
init init
#endif #endif
$ cd alias $ cd alias
... b'invaliddoc:doc = \xc3\xa9\n' ... b'invaliddoc:doc = \xc3\xa9\n'
... b'invalidhelp = log\n' ... b'invalidhelp = log\n'
... b'invalidhelp:help = \xc3\xa9\n') and None ... b'invalidhelp:help = \xc3\xa9\n') and None
$ hg help invaliddoc $ hg help invaliddoc
non-ASCII character in alias definition 'invaliddoc:doc' non-ASCII character in alias definition 'invaliddoc:doc'
$ hg help invalidhelp $ hg help invalidhelp
non-ASCII character in alias definition 'invalidhelp:help' non-ASCII character in alias definition 'invalidhelp:help'
$ hg invaliddoc $ hg invaliddoc
abort: non-ASCII character in alias definition 'invaliddoc:doc' config error: non-ASCII character in alias definition 'invaliddoc:doc'
[255] [30]
$ hg invalidhelp $ hg invalidhelp
abort: non-ASCII character in alias definition 'invalidhelp:help' config error: non-ASCII character in alias definition 'invalidhelp:help'
[255] [30]
invalid arguments invalid arguments
$ hg rt foo $ hg rt foo
hg rt: invalid arguments hg rt: invalid arguments
hg rt hg rt
alias for: hg root alias for: hg root