[Request] [+ ] D8766: manifest: kill one more instance of the old merge hash hack
joerg.sonnenberger (Joerg Sonnenberger)
phabricator at mercurial-scm.org
Sat Jul 18 21:13:29 UTC 2020
joerg.sonnenberger created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D8766
AFFECTED FILES
mercurial/manifest.py
CHANGE DETAILS
diff --git a/mercurial/manifest.py b/mercurial/manifest.py
--- a/mercurial/manifest.py
+++ b/mercurial/manifest.py
@@ -313,16 +313,9 @@
b"Manifest values must be a tuple of (node, flags)."
)
hashval = value[0]
- # hashes are either 20 or 32 bytes (sha1 or its replacement),
- # 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
- ):
+ if not isinstance(hashval, bytes) or len(hashval) not in (20, 32):
raise TypeError(b"node must be a 20-byte or 32-byte byte string")
flags = value[1]
- if len(hashval) == 22:
- hashval = hashval[:-1]
if not isinstance(flags, bytes) or len(flags) > 1:
raise TypeError(b"flags must a 0 or 1 byte string, got %r", flags)
needle, found = self.bsearch2(key)
To: joerg.sonnenberger, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mercurial-scm.org/pipermail/mercurial-patches/attachments/20200718/d1f6ad9b/attachment.html>
More information about the Mercurial-patches
mailing list