--- a/mercurial/dispatch.py	Sun Jan 11 23:04:24 2009 -0600
+++ b/mercurial/dispatch.py	Mon Jan 12 10:42:31 2009 -0600
@@ -6,7 +6,6 @@
 # of the GNU General Public License, incorporated herein by reference.
 
 from i18n import _
-from repo import RepoError
 import os, sys, atexit, signal, pdb, socket, errno, shlex, time
 import util, commands, hg, lock, fancyopts, extensions, hook, error
 import cmdutil
@@ -62,7 +61,7 @@
     except cmdutil.UnknownCommand, inst:
         ui.warn(_("hg: unknown command '%s'\n") % inst.args[0])
         commands.help_(ui, 'shortlist')
-    except RepoError, inst:
+    except error.RepoError, inst:
         ui.warn(_("abort: %s!\n") % inst)
     except lock.LockHeld, inst:
         if inst.errno == errno.ETIMEDOUT:
@@ -342,7 +341,7 @@
             if not repo.local():
                 raise util.Abort(_("repository '%s' is not local") % path)
             ui.setconfig("bundle", "mainreporoot", repo.root)
-        except RepoError:
+        except error.RepoError:
             if cmd not in commands.optionalrepo.split():
                 if args and not path: # try to infer -R from command args
                     repos = map(_findrepo, args)
@@ -350,8 +349,8 @@
                     if guess and repos.count(guess) == len(repos):
                         return _dispatch(ui, ['--repository', guess] + fullargs)
                 if not path:
-                    raise RepoError(_("There is no Mercurial repository here"
-                                      " (.hg not found)"))
+                    raise error.RepoError(_("There is no Mercurial repository"
+                                      " here (.hg not found)"))
                 raise
         args.insert(0, repo)