##// END OF EJS Templates
alias: do not crash when aliased command has no usage help text
Nicolas Dumazet -
r9993:8bce1e0d stable
parent child Browse files
Show More
@@ -196,7 +196,12 b' class cmdalias(object):'
196 cmd = args.pop(0)
196 cmd = args.pop(0)
197
197
198 try:
198 try:
199 self.fn, self.opts, self.help = cmdutil.findcmd(cmd, cmdtable, False)[1]
199 tableentry = cmdutil.findcmd(cmd, cmdtable, False)[1]
200 if len(tableentry) > 2:
201 self.fn, self.opts, self.help = tableentry
202 else:
203 self.fn, self.opts = tableentry
204
200 self.args = aliasargs(self.fn) + args
205 self.args = aliasargs(self.fn) + args
201 if cmd not in commands.norepo.split(' '):
206 if cmd not in commands.norepo.split(' '):
202 self.norepo = False
207 self.norepo = False
@@ -12,6 +12,7 b' mylog = log'
12 lognull = log -r null
12 lognull = log -r null
13 shortlog = log --template '{rev} {node|short} | {date|isodate}\n'
13 shortlog = log --template '{rev} {node|short} | {date|isodate}\n'
14 dln = lognull --debug
14 dln = lognull --debug
15 nousage = rollback
15
16
16 [defaults]
17 [defaults]
17 mylog = -q
18 mylog = -q
@@ -35,6 +36,10 b" echo '% no definition'"
35 hg nodef
36 hg nodef
36
37
37 cd alias
38 cd alias
39
40 echo '% no usage'
41 hg nousage
42
38 echo foo > foo
43 echo foo > foo
39 hg ci -Amfoo
44 hg ci -Amfoo
40
45
@@ -7,6 +7,8 b" alias 'ambiguous' resolves to ambiguous "
7 alias 'recursive' resolves to unknown command 'recursive'
7 alias 'recursive' resolves to unknown command 'recursive'
8 % no definition
8 % no definition
9 no definition for alias 'nodefinition'
9 no definition for alias 'nodefinition'
10 % no usage
11 no rollback information available
10 adding foo
12 adding foo
11 % with opts
13 % with opts
12 C foo
14 C foo
General Comments 0
You need to be logged in to leave comments. Login now