D3311: revset: use resolvehexnodeidprefix() in id() predicate (BC)
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Sat Apr 14 02:16:44 EDT 2018
martinvonz updated this revision to Diff 8248.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3311?vs=8117&id=8248
REVISION DETAIL
https://phab.mercurial-scm.org/D3311
AFFECTED FILES
mercurial/revset.py
tests/test-revset.t
CHANGE DETAILS
diff --git a/tests/test-revset.t b/tests/test-revset.t
--- a/tests/test-revset.t
+++ b/tests/test-revset.t
@@ -1878,7 +1878,8 @@
[255]
BROKEN should be '2' (node lookup uses unfiltered repo since dc25ed84bee8)
$ hg debugrevspec '0:wdir() & id(fffb)'
- 2
+ abort: 00changelog.i at fffb: ambiguous identifier!
+ [255]
$ hg debugrevspec '0:wdir() & ffff8'
4
$ hg debugrevspec '0:wdir() & fffff'
diff --git a/mercurial/revset.py b/mercurial/revset.py
--- a/mercurial/revset.py
+++ b/mercurial/revset.py
@@ -1333,7 +1333,7 @@
else:
rn = None
try:
- pm = repo.changelog._partialmatch(n)
+ pm = scmutil.resolvehexnodeidprefix(repo, n)
if pm is not None:
rn = repo.changelog.rev(pm)
except error.WdirUnsupported:
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list