# HG changeset patch # User Matt Mackall <mpm@selenic.com> # Date 1336078988 18000 # Thu May 03 16:03:08 2012 -0500 # Branch stable # Node ID 5983de86462c5a9f42a3ad0f5e90ce5b1d221d25 # Parent 8d44b5a2974f245967fe8a29dbca8dfac3dfd672 bookmarks: catch the proper exception for missing revisions This fixes a regression from 1.7 diff --git a/mercurial/bookmarks.py b/mercurial/bookmarks.py --- a/mercurial/bookmarks.py +++ b/mercurial/bookmarks.py @@ -7,7 +7,7 @@ from mercurial.i18n import _ from mercurial.node import hex -from mercurial import encoding, error, util +from mercurial import encoding, util import errno, os def valid(mark): @@ -36,7 +36,7 @@ refspec = encoding.tolocal(refspec) try: bookmarks[refspec] = repo.changelog.lookup(sha) - except error.RepoLookupError: + except LookupError: pass except IOError, inst: if inst.errno != errno.ENOENT: diff --git a/tests/test-bookmarks.t b/tests/test-bookmarks.t --- a/tests/test-bookmarks.t +++ b/tests/test-bookmarks.t @@ -371,3 +371,8 @@ * Z 3:125c9a1d6df6 x y 2:db815d6d32e6 +test missing revisions + + $ echo "925d80f479bc z" > .hg/bookmarks + $ hg book + no bookmarks set