--- 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