( )⚙ D10664 revlog: pass around the `rev` we deal with when packing/unpacking entry

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10664

revlog: pass around the `rev` we deal with when packing/unpacking entry
ClosedPublic

Authored by marmoute on May 4 2021, 10:16 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG55d280bc59fa: revlog: pass around the `rev` we deal with when packing/unpacking entry
Summary

This will help code to compute some flag on the fly.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

marmoute created this revision.May 4 2021, 10:16 AM
baymax updated this revision to Diff 27903.May 11 2021, 1:47 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Alphare accepted this revision.May 17 2021, 5:49 PM
This revision is now accepted and ready to land.May 17 2021, 5:49 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/pure/parsers.py (16 lines)

Diff 27903

mercurial/pure/parsers.py

self.__dict__.pop('_nodemap', None) self.__dict__.pop('_nodemap', None)
def __len__(self): def __len__(self):
return self._lgt + len(self._extra) return self._lgt + len(self._extra)
def append(self, tup): def append(self, tup):
if '_nodemap' in vars(self): if '_nodemap' in vars(self):
self._nodemap[tup[7]] = len(self) self._nodemap[tup[7]] = len(self)
data = self._pack_entry(tup) data = self._pack_entry(len(self), tup)
self._extra.append(data) self._extra.append(data)
def _pack_entry(self, entry): def _pack_entry(self, rev, entry):
assert entry[8] == 0 assert entry[8] == 0
assert entry[9] == 0 assert entry[9] == 0
return self.index_format.pack(*entry[:8]) return self.index_format.pack(*entry[:8])
def _check_index(self, i): def _check_index(self, i):
if not isinstance(i, int): if not isinstance(i, int):
raise TypeError(b"expecting int indexes") raise TypeError(b"expecting int indexes")
if i < 0 or i >= len(self): if i < 0 or i >= len(self):
raise IndexError raise IndexError
def __getitem__(self, i): def __getitem__(self, i):
if i == -1: if i == -1:
return self.null_item return self.null_item
self._check_index(i) self._check_index(i)
if i >= self._lgt: if i >= self._lgt:
data = self._extra[i - self._lgt] data = self._extra[i - self._lgt]
else: else:
index = self._calculate_index(i) index = self._calculate_index(i)
data = self._data[index : index + self.entry_size] data = self._data[index : index + self.entry_size]
r = self._unpack_entry(data) r = self._unpack_entry(i, data)
if self._lgt and i == 0: if self._lgt and i == 0:
r = (offset_type(0, gettype(r[0])),) + r[1:] r = (offset_type(0, gettype(r[0])),) + r[1:]
return r return r
def _unpack_entry(self, data): def _unpack_entry(self, rev, data):
r = self.index_format.unpack(data) r = self.index_format.unpack(data)
r = r + ( r = r + (
0, 0,
0, 0,
revlog_constants.COMP_MODE_INLINE, revlog_constants.COMP_MODE_INLINE,
revlog_constants.COMP_MODE_INLINE, revlog_constants.COMP_MODE_INLINE,
) )
return r return r
raise KeyError(msg) raise KeyError(msg)
else: else:
entry = list(self[rev]) entry = list(self[rev])
entry[0] = offset_flags entry[0] = offset_flags
entry[8] = sidedata_offset entry[8] = sidedata_offset
entry[9] = sidedata_length entry[9] = sidedata_length
entry[11] = compression_mode entry[11] = compression_mode
entry = tuple(entry) entry = tuple(entry)
new = self._pack_entry(entry) new = self._pack_entry(rev, entry)
self._extra[rev - self._lgt] = new self._extra[rev - self._lgt] = new
def _unpack_entry(self, data): def _unpack_entry(self, rev, data):
data = self.index_format.unpack(data) data = self.index_format.unpack(data)
entry = data[:10] entry = data[:10]
data_comp = data[10] & 3 data_comp = data[10] & 3
sidedata_comp = (data[10] & (3 << 2)) >> 2 sidedata_comp = (data[10] & (3 << 2)) >> 2
return entry + (data_comp, sidedata_comp) return entry + (data_comp, sidedata_comp)
def _pack_entry(self, entry): def _pack_entry(self, rev, entry):
data = entry[:10] data = entry[:10]
data_comp = entry[10] & 3 data_comp = entry[10] & 3
sidedata_comp = (entry[11] & 3) << 2 sidedata_comp = (entry[11] & 3) << 2
data += (data_comp | sidedata_comp,) data += (data_comp | sidedata_comp,)
return self.index_format.pack(*data) return self.index_format.pack(*data)
def entry_binary(self, rev): def entry_binary(self, rev):
"""return the raw binary string representing a revision""" """return the raw binary string representing a revision"""
entry = self[rev] entry = self[rev]
return self._pack_entry(entry) return self._pack_entry(rev, entry)
def pack_header(self, header): def pack_header(self, header):
"""pack header information as binary""" """pack header information as binary"""
msg = 'version header should go in the docket, not the index: %d' msg = 'version header should go in the docket, not the index: %d'
msg %= header msg %= header
raise error.ProgrammingError(msg) raise error.ProgrammingError(msg)