Skip to content
Snippets Groups Projects
Commit 8bce1e0d authored by Nicolas Dumazet's avatar Nicolas Dumazet
Browse files

alias: do not crash when aliased command has no usage help text

parent 60cefb8b
No related branches found
No related tags found
No related merge requests found
......@@ -196,7 +196,12 @@
cmd = args.pop(0)
try:
self.fn, self.opts, self.help = cmdutil.findcmd(cmd, cmdtable, False)[1]
tableentry = cmdutil.findcmd(cmd, cmdtable, False)[1]
if len(tableentry) > 2:
self.fn, self.opts, self.help = tableentry
else:
self.fn, self.opts = tableentry
self.args = aliasargs(self.fn) + args
if cmd not in commands.norepo.split(' '):
self.norepo = False
......
......@@ -12,6 +12,7 @@
lognull = log -r null
shortlog = log --template '{rev} {node|short} | {date|isodate}\n'
dln = lognull --debug
nousage = rollback
[defaults]
mylog = -q
......@@ -35,6 +36,10 @@
hg nodef
cd alias
echo '% no usage'
hg nousage
echo foo > foo
hg ci -Amfoo
......
......@@ -7,6 +7,8 @@
alias 'recursive' resolves to unknown command 'recursive'
% no definition
no definition for alias 'nodefinition'
% no usage
no rollback information available
adding foo
% with opts
C foo
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment