This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3462

revset: make id() an empty set for ambiguous nodeid (BC)
ClosedPublic

Authored by martinvonz on May 7 2018, 6:18 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG37e7ae332e90: revset: make id() an empty set for ambiguous nodeid (BC)
Summary

As Yuya pointed out in the review of D3311, id() (and rev()) does not
raise an error when the input is an unknown identifier, so it doesn't
make sense for it to do that when the input is ambiguous with a
filtered node. However, it turned out that it already does raise an
error when the input is ambiguous among the visible nodes. So let's
start by fixing that.

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.May 7 2018, 6:18 PM
Closed by commit rHG37e7ae332e90: revset: make id() an empty set for ambiguous nodeid (BC) (authored by martinvonz). · Explain WhyMay 8 2018, 8:47 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 8516

mercurial/revset.py

except (LookupError, TypeError): except (LookupError, TypeError):
rn = None rn = None
else: else:
rn = None rn = None
try: try:
pm = repo.changelog._partialmatch(n) pm = repo.changelog._partialmatch(n)
if pm is not None: if pm is not None:
rn = repo.changelog.rev(pm) rn = repo.changelog.rev(pm)
except LookupError:
pass
except error.WdirUnsupported: except error.WdirUnsupported:
rn = node.wdirrev rn = node.wdirrev
if rn is None: if rn is None:
return baseset() return baseset()
result = baseset([rn]) result = baseset([rn])
return result & subset return result & subset

tests/test-revset.t

9 9
$ log 'rev(10)' $ log 'rev(10)'
$ log 'rev(tip)' $ log 'rev(tip)'
hg: parse error: rev expects a number hg: parse error: rev expects a number
[255] [255]
Test hexadecimal revision Test hexadecimal revision
$ log 'id(2)' $ log 'id(2)'
abort: 00changelog.i@2: ambiguous identifier!
[255]
$ log 'id(23268)' $ log 'id(23268)'
4 4
$ log 'id(2785f51eece)' $ log 'id(2785f51eece)'
0 0
$ log 'id(d5d0dcbdc4d9ff5dbb2d336f32f0bb561c1a532c)' $ log 'id(d5d0dcbdc4d9ff5dbb2d336f32f0bb561c1a532c)'
8 8
$ log 'id(d5d0dcbdc4a)' $ log 'id(d5d0dcbdc4a)'
$ log 'id(d5d0dcbdc4w)' $ log 'id(d5d0dcbdc4w)'