This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4332

revlog: fix pure version of _partialmatch() to include nullid
ClosedPublic

Authored by martinvonz on Aug 19 2018, 3:05 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG5517d62c1bcc: revlog: fix pure version of _partialmatch() to include nullid
Summary

Before this patch, test-issue842.t and a few more tests fail when they
try to refer to the null revision by using a "000.." prefix of it (or
because they use the "shortest" template function which internally
does that).

This should have been part of my a3dacabd476b (index: don't allow
index[len(index)] to mean nullid, 2018-07-20), but I had forgotten to
update another part of the pure code there, so it didn't fail until
a1f934573c0b (parsers: adjust pure-python version to mimic
a3dacabd476b, 2018-08-09) and 65d5de1169dd (revlog: fix pure nodemap
to not access missing index entry, 2018-08-17) fixed the other things
I had missed.

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.Aug 19 2018, 3:05 AM
Closed by commit rHG5517d62c1bcc: revlog: fix pure version of _partialmatch() to include nullid (authored by martinvonz). · Explain WhyAug 19 2018, 3:29 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/revlog.py (3 lines)

Diff 10453

mercurial/revlog.py

import re import re
import struct import struct
import zlib import zlib
# import stuff from node for others to import from revlog # import stuff from node for others to import from revlog
from .node import ( from .node import (
bin, bin,
hex, hex,
nullhex,
nullid, nullid,
nullrev, nullrev,
wdirfilenodeids, wdirfilenodeids,
wdirhex, wdirhex,
wdirid, wdirid,
wdirrev, wdirrev,
) )
from .i18n import _ from .i18n import _
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 nullhex.startswith(id):
nl.append(nullid)
if len(nl) > 0: if len(nl) > 0:
if len(nl) == 1 and not maybewdir: if len(nl) == 1 and not maybewdir:
self._pcache[id] = nl[0] self._pcache[id] = nl[0]
return nl[0] return nl[0]
raise AmbiguousPrefixLookupError(id, self.indexfile, raise AmbiguousPrefixLookupError(id, self.indexfile,
_('ambiguous identifier')) _('ambiguous identifier'))
if maybewdir: if maybewdir:
raise error.WdirUnsupported raise error.WdirUnsupported