This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5220

revsets: make bookmark/named('re:nonexistent') revset not abort (issue6018)
ClosedPublic

Authored by martinvonz on Nov 5 2018, 12:18 PM.

Details

Reviewers
foozy
Group Reviewers
hg-reviewers
Commits
rHG7ed611c60168: revsets: make bookmark/named('re:nonexistent') not abort (issue6018) (BC)
Summary

Foozy documented the differences between revsets branch(), tag(),
bookmark(), and named() in eeb5d5ab14a6 (revset: raise RepoLookupError
to make present() predicate continue the query, 2015-01-31). He seemed
to want tag() to change behavior to not error out on non-matching
regular expressions. I think it's instead bookmark() and named() that
should not error out. So that's what this patch does.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Nov 5 2018, 12:18 PM
yuja added a subscriber: yuja.Nov 6 2018, 6:51 AM

Flagged as (BC) and queued, thanks.

Closed by commit rHG7ed611c60168: revsets: make bookmark/named('re:nonexistent') not abort (issue6018) (BC) (authored by martinvonz). · Explain WhyNov 6 2018, 6:53 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/revset.py (6 lines)
Mtests/test-bookmarks.t (2 lines)
Mtests/test-revset2.t (2 lines)

Diff 12447

mercurial/revset.py

raise error.RepoLookupError(_("bookmark '%s' does not exist") raise error.RepoLookupError(_("bookmark '%s' does not exist")
% pattern) % pattern)
bms.add(repo[bmrev].rev()) bms.add(repo[bmrev].rev())
else: else:
matchrevs = set() matchrevs = set()
for name, bmrev in repo._bookmarks.iteritems(): for name, bmrev in repo._bookmarks.iteritems():
if matcher(name): if matcher(name):
matchrevs.add(bmrev) matchrevs.add(bmrev)
if not matchrevs:
raise error.RepoLookupError(_("no bookmarks exist"
" that match '%s'") % pattern)
for bmrev in matchrevs: for bmrev in matchrevs:
bms.add(repo[bmrev].rev()) bms.add(repo[bmrev].rev())
else: else:
bms = {repo[r].rev() for r in repo._bookmarks.values()} bms = {repo[r].rev() for r in repo._bookmarks.values()}
bms -= {node.nullrev} bms -= {node.nullrev}
return subset & bms return subset & bms
@predicate('branch(string or set)', safe=True, weight=10) @predicate('branch(string or set)', safe=True, weight=10)
if pattern not in repo.names: if pattern not in repo.names:
raise error.RepoLookupError(_("namespace '%s' does not exist") raise error.RepoLookupError(_("namespace '%s' does not exist")
% ns) % ns)
namespaces.add(repo.names[pattern]) namespaces.add(repo.names[pattern])
else: else:
for name, ns in repo.names.iteritems(): for name, ns in repo.names.iteritems():
if matcher(name): if matcher(name):
namespaces.add(ns) namespaces.add(ns)
if not namespaces:
raise error.RepoLookupError(_("no namespace exists"
" that match '%s'") % pattern)
names = set() names = set()
for ns in namespaces: for ns in namespaces:
for name in ns.listnames(repo): for name in ns.listnames(repo):
if name not in ns.deprecated: if name not in ns.deprecated:
names.update(repo[n].rev() for n in ns.nodes(repo, name)) names.update(repo[n].rev() for n in ns.nodes(repo, name))
names -= {node.nullrev} names -= {node.nullrev}

tests/test-bookmarks.t

$ hg log -r 'bookmark(unknown)' $ hg log -r 'bookmark(unknown)'
abort: bookmark 'unknown' does not exist! abort: bookmark 'unknown' does not exist!
[255] [255]
$ hg log -r 'bookmark("literal:unknown")' $ hg log -r 'bookmark("literal:unknown")'
abort: bookmark 'unknown' does not exist! abort: bookmark 'unknown' does not exist!
[255] [255]
$ hg log -r 'bookmark("re:unknown")' $ hg log -r 'bookmark("re:unknown")'
abort: no bookmarks exist that match 'unknown'!
[255]
$ hg log -r 'present(bookmark("literal:unknown"))' $ hg log -r 'present(bookmark("literal:unknown"))'
$ hg log -r 'present(bookmark("re:unknown"))' $ hg log -r 'present(bookmark("re:unknown"))'
$ hg help revsets | grep 'bookmark(' $ hg help revsets | grep 'bookmark('
"bookmark([name])" "bookmark([name])"
reactivate "X2" reactivate "X2"

tests/test-revset2.t

2 2
3 3
1 1
$ log 'named("unknown")' $ log 'named("unknown")'
abort: namespace 'unknown' does not exist! abort: namespace 'unknown' does not exist!
[255] [255]
$ log 'named("re:unknown")' $ log 'named("re:unknown")'
abort: no namespace exists that match 'unknown'!
[255]
$ log 'present(named("unknown"))' $ log 'present(named("unknown"))'
$ log 'present(named("re:unknown"))' $ log 'present(named("re:unknown"))'
$ log 'tag()' $ log 'tag()'
6 6
$ log 'named("tags")' $ log 'named("tags")'
6 6