Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/dispatch.py
changeset 7640 7197812e8d44
parent 7637 1d54e2f6c0b7
child 7641 d2f753830f80 
--- a/mercurial/dispatch.py	Mon Jan 12 10:59:08 2009 -0600
+++ b/mercurial/dispatch.py	Mon Jan 12 11:09:14 2009 -0600
@@ -63,13 +63,13 @@
         commands.help_(ui, 'shortlist')
     except error.RepoError, inst:
         ui.warn(_("abort: %s!\n") % inst)
-    except lock.LockHeld, inst:
+    except error.LockHeld, inst:
         if inst.errno == errno.ETIMEDOUT:
             reason = _('timed out waiting for lock held by %s') % inst.locker
         else:
             reason = _('lock held by %s') % inst.locker
         ui.warn(_("abort: %s: %s\n") % (inst.desc or inst.filename, reason))
-    except lock.LockUnavailable, inst:
+    except error.LockUnavailable, inst:
         ui.warn(_("abort: could not lock %s: %s\n") %
                (inst.desc or inst.filename, inst.strerror))
     except error.RevlogError, inst:
Mercurial