# HG changeset patch
# User Henrik Stuart <hg@hstuart.dk>
# Date 1259818539 -3600
# Node ID 931d2c7576272b1e90723de95eefbfe81a1ea4a3
# Parent  e97dd3a8e8d70450dce7b0a0dc8d420ea1d0bbc3# Parent  8bce1e0d280105db1fa286aff28d08550767fa2c
Merge with stable

diff -r e97dd3a8e8d7 -r 931d2c757627 mercurial/dispatch.py
--- 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
diff -r e97dd3a8e8d7 -r 931d2c757627 tests/test-alias
--- 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
 
diff -r e97dd3a8e8d7 -r 931d2c757627 tests/test-alias.out
--- 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