diff -r 9626819b2e3d -r 08cabecfa8a8 mercurial/dispatch.py --- a/mercurial/dispatch.py Sat Jan 10 18:02:38 2009 -0600 +++ b/mercurial/dispatch.py Sun Jan 11 22:48:28 2009 -0600 @@ -8,7 +8,7 @@ from i18n import _ from repo import RepoError import os, sys, atexit, signal, pdb, socket, errno, shlex, time -import util, commands, hg, lock, fancyopts, revlog, extensions, hook +import util, commands, hg, lock, fancyopts, extensions, hook, error import cmdutil import ui as _ui @@ -76,7 +76,7 @@ except lock.LockUnavailable, inst: ui.warn(_("abort: could not lock %s: %s\n") % (inst.desc or inst.filename, inst.strerror)) - except revlog.RevlogError, inst: + except error.RevlogError, inst: ui.warn(_("abort: %s!\n") % inst) except util.SignalInterrupt: ui.warn(_("killed!\n"))