# HG changeset patch # User Steve Borho # Date 1232933064 21600 # Node ID e0b6f2cf99e1094eab0129327f885fd3452ddd77 # Parent 2c26a72ce357b1990ee6e82c1d9122e0cd9314ec many exceptions have been moved to error.py diff -r 2c26a72ce357 -r e0b6f2cf99e1 forest.py --- a/forest.py Fri Jan 02 17:38:16 2009 +0100 +++ b/forest.py Sun Jan 25 19:24:24 2009 -0600 @@ -55,10 +55,9 @@ import re import shutil -from mercurial import cmdutil, commands, hg, hgweb, node, util +from mercurial import cmdutil, commands, error, hg, hgweb, node, util from mercurial import localrepo, sshrepo, sshserver, httprepo, statichttprepo from mercurial.i18n import gettext as _ -from mercurial.repo import RepoError # For backwards compatibility, we need the following function definition. # If we didn't want that, we'd have just written: @@ -75,11 +74,17 @@ try: findcmd.findcmd = cmdutil.findcmd findcmd.__doc__ = cmdutil.findcmd.__doc__ - findcmd.UnknownCommand = cmdutil.UnknownCommand except AttributeError: findcmd.findcmd = commands.findcmd findcmd.__doc__ = commands.findcmd.__doc__ - findcmd.UnknownCommand = commands.UnknownCommand +for m in (error, cmdutil, commands): + if hasattr(m, "UnknownCommand"): + findcmd.UnknownCommand = m.UnknownCommand + break +try: + from mercurial.error import RepoError +except AttributeError: + from mercurial.repo import RepoError # For backwards compatibility, find the parseurl() function that splits # urls and revisions. Mercurial 0.9.3 doesn't have this, so we need