This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8766

manifest: kill one more instance of the old merge hash hack
ClosedPublic

Authored by joerg.sonnenberger on Jul 18 2020, 5:13 PM.

Details

Reviewers
marmoute
pulkit
Group Reviewers
hg-reviewers
Commits
rHGff59af8395a5: manifest: kill one more instance of the old merge hash hack

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

marmoute accepted this revision.Jul 20 2020, 1:29 PM
marmoute added a subscriber: marmoute.

This seems good and if the test are happy, we should be too.

pulkit accepted this revision.Jul 25 2020, 5:30 AM
This revision is now accepted and ready to land.Jul 25 2020, 5:30 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/manifest.py (9 lines)

Diff 22127

mercurial/manifest.py

def __setitem__(self, key, value): def __setitem__(self, key, value):
if not isinstance(key, bytes): if not isinstance(key, bytes):
raise TypeError(b"setitem: manifest keys must be a byte string.") raise TypeError(b"setitem: manifest keys must be a byte string.")
if not isinstance(value, tuple) or len(value) != 2: if not isinstance(value, tuple) or len(value) != 2:
raise TypeError( raise TypeError(
b"Manifest values must be a tuple of (node, flags)." b"Manifest values must be a tuple of (node, flags)."
) )
hashval = value[0] hashval = value[0]
# hashes are either 20 or 32 bytes (sha1 or its replacement), if not isinstance(hashval, bytes) or len(hashval) not in (20, 32):
# and allow one extra byte taht won't be persisted to disk but
# is sometimes used in memory.
if not isinstance(hashval, bytes) or not (
20 <= len(hashval) <= 22 or 32 <= len(hashval) <= 34
):
raise TypeError(b"node must be a 20-byte or 32-byte byte string") raise TypeError(b"node must be a 20-byte or 32-byte byte string")
flags = value[1] flags = value[1]
if len(hashval) == 22:
hashval = hashval[:-1]
if not isinstance(flags, bytes) or len(flags) > 1: if not isinstance(flags, bytes) or len(flags) > 1:
raise TypeError(b"flags must a 0 or 1 byte string, got %r", flags) raise TypeError(b"flags must a 0 or 1 byte string, got %r", flags)
needle, found = self.bsearch2(key) needle, found = self.bsearch2(key)
if found: if found:
# put the item # put the item
pos = self.positions[needle] pos = self.positions[needle]
if pos < 0: if pos < 0:
self.extradata[-pos - 1] = (key, hashval, value[1]) self.extradata[-pos - 1] = (key, hashval, value[1])