changeset 90:2571a40714e4

ParseError has been moved to error.py
author Steve Borho <steve@borho.org>
date Mon, 26 Jan 2009 20:35:51 -0600
parents e0b6f2cf99e1
children 872a57531db6
files forest.py
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/forest.py	Sun Jan 25 19:24:24 2009 -0600
+++ b/forest.py	Mon Jan 26 20:35:51 2009 -0600
@@ -82,9 +82,10 @@
         findcmd.UnknownCommand = m.UnknownCommand
         break
 try:
-    from mercurial.error import RepoError
+    from mercurial.repo import RepoError
+    from mercurial.cmdutil import ParseError
 except AttributeError:
-    from mercurial.repo import RepoError
+    from mercurial.error import RepoError, ParseError
 
 # For backwards compatibility, find the parseurl() function that splits
 # urls and revisions.  Mercurial 0.9.3 doesn't have this, so we need
@@ -1126,7 +1127,7 @@
 
     snapfile = snapshot or opts['snapfile']
     if not snapfile:
-        raise cmdutil.ParseError("fseed", _("invalid arguments"))
+        raise ParseError("fseed", _("invalid arguments"))
     forest = Forest(snapfile=snapfile)
     tip = opts['tip']
     dest = opts['root']