This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8372

manifest: remove a final 40-byte assumption from pure-python parser
ClosedPublic

Authored by durin42 on Apr 2 2020, 4:32 PM.

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHGce126b6bea79: manifest: remove a final 40-byte assumption from pure-python parser
rHG2db2e9e585b3: manifest: remove a final 40-byte assumption from pure-python parser

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

durin42 created this revision.Apr 2 2020, 4:32 PM
Alphare accepted this revision.Apr 14 2020, 4:58 AM
durin42 updated this revision to Diff 21054.Apr 14 2020, 11:29 AM
pulkit accepted this revision.Apr 14 2020, 2:57 PM
This revision is now accepted and ready to land.Apr 14 2020, 2:57 PM
yuja added a subscriber: yuja.Apr 15 2020, 7:05 AM

diff --git a/mercurial/manifest.py b/mercurial/manifest.py

  • a/mercurial/manifest.py

+++ b/mercurial/manifest.py
@@ -57,7 +57,10 @@

    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:
+ yield f, bin(n[:64]), n[64:]
+ if 40 < nl < 45:

    yield f, bin(n[:40]), n[40:]
else:
    yield f, bin(n), b''

elif 40 < nl:

otherwise full-width hash would be yielded twice.

Revision Contents
Changeset List

PathPackages
Mmercurial/manifest.py (15 lines)

Diff 21085

mercurial/manifest.py

if data and data[-1:] != b'\n': if data and data[-1:] != b'\n':
raise ValueError(b'Manifest did not end in a newline.') raise ValueError(b'Manifest did not end in a newline.')
prev = None prev = None
for l in data.splitlines(): for l in data.splitlines():
if prev is not None and prev > l: if prev is not None and prev > l:
raise ValueError(b'Manifest lines not in sorted order.') raise ValueError(b'Manifest lines not in sorted order.')
prev = l prev = l
f, n = l.split(b'\0') 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:]
if 40 < nl < 45:
# legacy hash, always sha1
yield f, bin(n[:40]), n[40:] yield f, bin(n[:40]), n[40:]
else: else:
yield f, bin(n), b'' yield f, bin(n), b''
def _text(it): def _text(it):
files = [] files = []
lines = [] lines = []
raise TypeError(b"getitem: manifest keys must be a bytes.") raise TypeError(b"getitem: manifest keys must be a bytes.")
needle = self.bsearch(key) needle = self.bsearch(key)
if needle == -1: if needle == -1:
raise KeyError raise KeyError
data, pos = self._get(needle) data, pos = self._get(needle)
if pos == -1: if pos == -1:
return (data[1], data[2]) return (data[1], data[2])
zeropos = data.find(b'\x00', pos) zeropos = data.find(b'\x00', pos)
nlpos = data.find(b'\n', zeropos)
assert 0 <= needle <= len(self.positions) assert 0 <= needle <= len(self.positions)
assert len(self.extrainfo) == 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) flags = self._getflags(data, needle, zeropos)
return (hashval, flags) return (hashval, flags)
def __delitem__(self, key): def __delitem__(self, key):
needle, found = self.bsearch2(key) needle, found = self.bsearch2(key)
if not found: if not found:
raise KeyError raise KeyError
cur = self.positions[needle] cur = self.positions[needle]