[cig-commits] commit: Avoid failure if findcmd has been moved to cmdutil

[Mercurial]

changeset:   47:7ed36c52acd0
user:        Christian Ebert <blacktrash at gmx.net>
date:        Wed Jun 13 12:36:37 2007 +0200
files:       forest.py
description:
Avoid failure if findcmd has been moved to cmdutil


diff -r 8075151c30e9 -r 7ed36c52acd0 forest.py
--- a/forest.py	Fri Jun 01 15:50:18 2007 -0400
+++ b/forest.py	Wed Jun 13 12:36:37 2007 +0200
@@ -49,6 +49,10 @@ import re
 import re
 
 from mercurial import commands, hg, node, util
+if not hasattr(commands, "findcmd"):
+    from mercurial.cmdutil import findcmd
+else:
+    findcmd = commands.findcmd
 from mercurial.i18n import gettext as _
 from mercurial.repo import RepoError
 
@@ -58,7 +62,7 @@ commands.norepo += " fclone fseed"
 
 
 def cmd_options(ui, cmd, remove=None):
-    aliases, spec = commands.findcmd(ui, cmd)
+    aliases, spec = findcmd(ui, cmd)
     res = list(spec[1])
     if remove is not None:
         res = [opt for opt in res if opt[0] not in remove]