This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3188

revlog: reset _nodepos after strip
ClosedPublic

Authored by joerg.sonnenberger on Apr 7 2018, 7:09 PM.

Details

Reviewers
indygreg
durin42
Group Reviewers
hg-reviewers
Commits
rHG1ce7a55b09d1: revlog: reset _nodepos after strip
Summary

When using the pure revlog parser, _nodepos is used to keep track of the
position during index scanning in the non-cached cache. If it is out of
bounds, BaseIndexObject._fix_index will assert. Since strip can actually
remove the position scanned last, make sure to reset it. Add an
assertion in the place where the invariance is clearer.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 accepted this revision.Apr 9 2018, 4:09 PM
This revision is now accepted and ready to land.Apr 9 2018, 4:09 PM
Closed by commit rHG1ce7a55b09d1: revlog: reset _nodepos after strip (authored by joerg.sonnenberger). · Explain WhyApr 9 2018, 4:13 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/revlog.py (3 lines)

Diff 7875

mercurial/revlog.py

raise LookupError(node, self.indexfile, _('no node')) raise LookupError(node, self.indexfile, _('no node'))
except KeyError: except KeyError:
# pure python cache lookup failed # pure python cache lookup failed
n = self._nodecache n = self._nodecache
i = self.index i = self.index
p = self._nodepos p = self._nodepos
if p is None: if p is None:
p = len(i) - 2 p = len(i) - 2
else:
assert p < len(i)
for r in xrange(p, -1, -1): for r in xrange(p, -1, -1):
v = i[r][7] v = i[r][7]
n[v] = r n[v] = r
if v == node: if v == node:
self._nodepos = r - 1 self._nodepos = r - 1
return r return r
if node == wdirid or node in wdirfilenodeids: if node == wdirid or node in wdirfilenodeids:
raise error.WdirUnsupported raise error.WdirUnsupported
# then reset internal state in memory to forget those revisions # then reset internal state in memory to forget those revisions
self._cache = None self._cache = None
self._chaininfocache = {} self._chaininfocache = {}
self._chunkclear() self._chunkclear()
for x in xrange(rev, len(self)): for x in xrange(rev, len(self)):
del self.nodemap[self.node(x)] del self.nodemap[self.node(x)]
del self.index[rev:-1] del self.index[rev:-1]
self._nodepos = None
def checksize(self): def checksize(self):
expected = 0 expected = 0
if len(self): if len(self):
expected = max(0, self.end(len(self) - 1)) expected = max(0, self.end(len(self) - 1))
try: try:
with self._datafp() as f: with self._datafp() as f: