This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7319

revlog: move nodemap update within the index code
ClosedPublic

Authored by marmoute on Nov 8 2019, 4:29 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGdcf9826c8d8c: revlog: move nodemap update within the index code
rHGe04e21262f15: revlog: move nodemap update within the index code
Summary

Since the nodemap data now live in the index, it should be the index
responsibility to ensure the data are up to date.

This work is part of a refactoring to unify the revlog index and the nodemap.
This unification prepare the use of a persistent nodemap.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

PathPackages
Mmercurial/pure/parsers.py (2 lines)
Mmercurial/revlog.py (5 lines)

Diff 17735

mercurial/pure/parsers.py

def clearcaches(self): def clearcaches(self):
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):
self.nodemap[tup[7]] = len(self)
self._extra.append(tup) self._extra.append(tup)
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

mercurial/revlog.py

@util.propertycache @util.propertycache
def nodemap(self): def nodemap(self):
nodemap = revlogutils.NodeMap({nullid: nullrev}) nodemap = revlogutils.NodeMap({nullid: nullrev})
for r in range(0, len(self)): for r in range(0, len(self)):
n = self[r][7] n = self[r][7]
nodemap[n] = r nodemap[n] = r
return nodemap return nodemap
def append(self, tup):
self.nodemap[tup[7]] = len(self)
super(revlogoldindex, self).append(tup)
def clearcaches(self): def clearcaches(self):
self.__dict__.pop('nodemap', None) self.__dict__.pop('nodemap', None)
def __getitem__(self, i): def __getitem__(self, i):
if i == -1: if i == -1:
return (0, 0, 0, -1, -1, -1, -1, nullid) return (0, 0, 0, -1, -1, -1, -1, nullid)
return list.__getitem__(self, i) return list.__getitem__(self, i)
textlen, textlen,
deltainfo.base, deltainfo.base,
link, link,
p1r, p1r,
p2r, p2r,
node, node,
) )
self.index.append(e) self.index.append(e)
self.nodemap[node] = curr
# Reset the pure node cache start lookup offset to account for new # Reset the pure node cache start lookup offset to account for new
# revision. # revision.
if self._nodepos is not None: if self._nodepos is not None:
self._nodepos = curr self._nodepos = curr
entry = self._io.packentry(e, self.node, self.version, curr) entry = self._io.packentry(e, self.node, self.version, curr)
self._writeentry( self._writeentry(