Mercurial > hg
changeset 44706:ce126b6bea79
manifest: remove a final 40-byte assumption from pure-python parser
Differential Revision: https://phab.mercurial-scm.org/D8372
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Thu, 02 Apr 2020 16:24:34 -0400 |
| parents | 75f1197db884 |
| children | 9d569983668b |
| files | mercurial/manifest.py |
| diffstat | 1 files changed, 13 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/manifest.py Thu Apr 02 16:01:36 2020 -0400 +++ b/mercurial/manifest.py Thu Apr 02 16:24:34 2020 -0400 @@ -57,7 +57,12 @@ raise ValueError(b'Manifest lines not in sorted order.') prev = l f, n = l.split(b'\0') - if len(n) > 40: + nl = len(n) + if 64 < nl: + # modern hash, full width + yield f, bin(n[:64]), n[64:] + elif 40 < nl < 45: + # legacy hash, always sha1 yield f, bin(n[:40]), n[40:] else: yield f, bin(n), b'' @@ -265,9 +270,15 @@ if pos == -1: return (data[1], data[2]) zeropos = data.find(b'\x00', pos) + nlpos = data.find(b'\n', zeropos) assert 0 <= needle <= len(self.positions) assert len(self.extrainfo) == len(self.positions) - hashval = unhexlify(data, self.extrainfo[needle], zeropos + 1, 40) + hlen = nlpos - zeropos - 1 + # Hashes sometimes have an extra byte tucked on the end, so + # detect that. + if hlen % 2: + hlen -= 1 + hashval = unhexlify(data, self.extrainfo[needle], zeropos + 1, hlen) flags = self._getflags(data, needle, zeropos) return (hashval, flags)