changeset 84:af8268c7a99b

Fix cmdutil.findcmd() not taking a ui argument anymore
author Patrick Mezard <pmezard@gmail.com>
date Sat, 25 Oct 2008 14:23:57 +0200
parents 715440e45bf4
children 54afa0660a0d
files forest.py
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/forest.py	Mon Jan 28 12:59:13 2008 -0500
+++ b/forest.py	Sat Oct 25 14:23:57 2008 +0200
@@ -66,9 +66,13 @@
 def findcmd(ui, cmd, table):
     """Find and execute mercurial.*.findcmd(ui, cmd[, table])."""
     try:
-        return findcmd.findcmd(ui, cmd, table)
+        # ui argument was removed as of b4c035057d34
+        return findcmd.findcmd(cmd, table)
     except TypeError:
-        return findcmd.findcmd(ui, cmd)
+        try:
+            return findcmd.findcmd(ui, cmd, table)
+        except TypeError:
+            return findcmd.findcmd(ui, cmd)
 try:
     findcmd.findcmd = cmdutil.findcmd
     findcmd.__doc__ = cmdutil.findcmd.__doc__