This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8367

manifest: remove a 20-byte-hash assumption from pure manifest parsing
ClosedPublic

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

Details

Reviewers
pulkit
Alphare
Group Reviewers
hg-reviewers
Commits
rHGecbba7b2e444: manifest: remove a 20-byte-hash assumption from pure manifest parsing
Summary

This is almost certainly slower, but it shouldn't be by much. We need
to do this for the eventual hash transition, no matter what that looks like.

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:31 PM
pulkit accepted this revision.Apr 7 2020, 5:22 AM
This revision is now accepted and ready to land.Apr 7 2020, 5:22 AM
Alphare accepted this revision.Apr 14 2020, 4:38 AM
durin42 updated this revision to Diff 21050.Apr 14 2020, 11:29 AM
pulkit accepted this revision.Apr 14 2020, 2:55 PM

Queuing the series, thanks to @Alphare for reviewing.

Revision Contents
Changeset List

PathPackages
Mmercurial/manifest.py (6 lines)

Diff 21080

mercurial/manifest.py

self.extrainfo[i] = ord(t[1][21]) self.extrainfo[i] = ord(t[1][21])
offset += len(l[-1]) offset += len(l[-1])
i += 1 i += 1
self.data = b''.join(l) self.data = b''.join(l)
self.hasremovals = False self.hasremovals = False
self.extradata = [] self.extradata = []
def _pack(self, d): def _pack(self, d):
return d[0] + b'\x00' + hex(d[1][:20]) + d[2] + b'\n' n = d[1]
if len(n) == 21 or len(n) == 33:
n = n[:-1]
assert len(n) == 20 or len(n) == 32
return d[0] + b'\x00' + hex(n) + d[2] + b'\n'
def text(self): def text(self):
self._compact() self._compact()
return self.data return self.data
def diff(self, m2, clean=False): def diff(self, m2, clean=False):
'''Finds changes between the current manifest and m2.''' '''Finds changes between the current manifest and m2.'''
# XXX think whether efficiency matters here # XXX think whether efficiency matters here