--- a/mercurial/revset.py Sun Feb 01 09:36:47 2015 +0900
+++ b/mercurial/revset.py Sat Jan 31 01:00:50 2015 +0900
@@ -496,7 +496,8 @@
if kind == 'literal':
bmrev = repo._bookmarks.get(pattern, None)
if not bmrev:
- raise util.Abort(_("bookmark '%s' does not exist") % bm)
+ raise error.RepoLookupError(_("bookmark '%s' does not exist")
+ % bm)
bms.add(repo[bmrev].rev())
else:
matchrevs = set()
@@ -504,8 +505,8 @@
if matcher(name):
matchrevs.add(bmrev)
if not matchrevs:
- raise util.Abort(_("no bookmarks exist that match '%s'")
- % pattern)
+ raise error.RepoLookupError(_("no bookmarks exist"
+ " that match '%s'") % pattern)
for bmrev in matchrevs:
bms.add(repo[bmrev].rev())
else:
@@ -1262,15 +1263,16 @@
namespaces = set()
if kind == 'literal':
if pattern not in repo.names:
- raise util.Abort(_("namespace '%s' does not exist") % ns)
+ raise error.RepoLookupError(_("namespace '%s' does not exist")
+ % ns)
namespaces.add(repo.names[pattern])
else:
for name, ns in repo.names.iteritems():
if matcher(name):
namespaces.add(ns)
if not namespaces:
- raise util.Abort(_("no namespace exists that match '%s'")
- % pattern)
+ raise error.RepoLookupError(_("no namespace exists"
+ " that match '%s'") % pattern)
names = set()
for ns in namespaces:
@@ -1816,7 +1818,8 @@
# avoid resolving all tags
tn = repo._tagscache.tags.get(pattern, None)
if tn is None:
- raise util.Abort(_("tag '%s' does not exist") % pattern)
+ raise error.RepoLookupError(_("tag '%s' does not exist")
+ % pattern)
s = set([repo[tn].rev()])
else:
s = set([cl.rev(n) for t, n in repo.tagslist() if matcher(t)])