This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3428

revlog: make pure version of _partialmatch() support 40-byte hex nodeids
ClosedPublic

Authored by martinvonz on Apr 25 2018, 12:38 PM.

Details

Reviewers
indygreg
durin42
Group Reviewers
hg-reviewers
Commits
rHGee3d58b4a47f: revlog: make pure version of _partialmatch() support 40-byte hex nodeids
Summary

Without this patch, test-histedit-arguments.t would fail when run with
--pure. It turned out to be because the pure version of
_partialmatch() does not support full 40-byte hex nodeids. When
histedit's instructions include things like "pick tip", it resolves
the "tip" revision early to a full nodeid (but plain hex nodeid
prefixes are not resolved to full nodeids). Then the nodeid (full or
not) is looked up using to a full nodeid later. This step is what
fails in pure mode. It has been failing since my c4131138eadb
(histedit: look up partial nodeid as partial nodeid, 2018-04-06). I
haven't verified, but I suspect histedit instructions like "pick <full
hex nodeid>" would have been failing before my commit too, though.

The fix is trivial: change a "< 40" to "<= 40".

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.Apr 25 2018, 12:38 PM
durin42 accepted this revision.Apr 25 2018, 12:51 PM
This revision is now accepted and ready to land.Apr 25 2018, 12:51 PM
Closed by commit rHGee3d58b4a47f: revlog: make pure version of _partialmatch() support 40-byte hex nodeids (authored by martinvonz). · Explain WhyApr 25 2018, 12:53 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/revlog.py (2 lines)

Diff 8431

mercurial/revlog.py

# fall through to slow path that filters hidden revisions # fall through to slow path that filters hidden revisions
except (AttributeError, ValueError): except (AttributeError, ValueError):
# we are pure python, or key was too short to search radix tree # we are pure python, or key was too short to search radix tree
pass pass
if id in self._pcache: if id in self._pcache:
return self._pcache[id] return self._pcache[id]
if len(id) < 40: if len(id) <= 40:
try: try:
# hex(node)[:...] # hex(node)[:...]
l = len(id) // 2 # grab an even number of digits l = len(id) // 2 # grab an even number of digits
prefix = bin(id[:l * 2]) prefix = bin(id[:l * 2])
nl = [e[7] for e in self.index if e[7].startswith(prefix)] nl = [e[7] for e in self.index if e[7].startswith(prefix)]
nl = [n for n in nl if hex(n).startswith(id) and nl = [n for n in nl if hex(n).startswith(id) and
self.hasnode(n)] self.hasnode(n)]
if len(nl) > 0: if len(nl) > 0: