Mercurial > hg-stable
changeset 9994:931d2c757627
Merge with stable
| author | Henrik Stuart <hg@hstuart.dk> |
|---|---|
| date | Thu, 03 Dec 2009 06:35:39 +0100 |
| parents | e97dd3a8e8d7 (current diff) 8bce1e0d2801 (diff) |
| children | c08583734fc5 6950dd804e69 |
| files | mercurial/dispatch.py |
| diffstat | 3 files changed, 13 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/dispatch.py Thu Dec 03 01:06:15 2009 +0100 +++ b/mercurial/dispatch.py Thu Dec 03 06:35:39 2009 +0100 @@ -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
--- a/tests/test-alias Thu Dec 03 01:06:15 2009 +0100 +++ b/tests/test-alias Thu Dec 03 06:35:39 2009 +0100 @@ -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
--- a/tests/test-alias.out Thu Dec 03 01:06:15 2009 +0100 +++ b/tests/test-alias.out Thu Dec 03 06:35:39 2009 +0100 @@ -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