This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4016

revlog: remove some knowledge of sentinel nullid in index
ClosedPublic

Authored by martinvonz on Aug 1 2018, 2:47 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG119d14f41cb2: revlog: remove some knowledge of sentinel nullid in index
Summary

I think the "-2" to mean "last position in index, not counting the
null revision at the end" is an implementation detail of the index
that we should avoid spreading knowledge of. I hope we can even remove
support for index[-2].

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Aug 1 2018, 2:47 PM
martinvonz updated this revision to Diff 9776.Aug 2 2018, 12:40 AM
Closed by commit rHG119d14f41cb2: revlog: remove some knowledge of sentinel nullid in index (authored by martinvonz). · Explain WhyAug 3 2018, 11:41 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/revlog.py (6 lines)

Diff 9776

mercurial/revlog.py

def _enforceinlinesize(self, tr, fp=None): def _enforceinlinesize(self, tr, fp=None):
"""Check if the revlog is too big for inline and convert if so. """Check if the revlog is too big for inline and convert if so.
This should be called after revisions are added to the revlog. If the This should be called after revisions are added to the revlog. If the
revlog has grown too large to be an inline revlog, it will convert it revlog has grown too large to be an inline revlog, it will convert it
to use multiple index and data files. to use multiple index and data files.
""" """
if not self._inline or (self.start(-2) + self.length(-2)) < _maxinline: tiprev = len(self) - 1
if (not self._inline or
(self.start(tiprev) + self.length(tiprev)) < _maxinline):
return return
trinfo = tr.find(self.indexfile) trinfo = tr.find(self.indexfile)
if trinfo is None: if trinfo is None:
raise RevlogError(_("%s not found in the transaction") raise RevlogError(_("%s not found in the transaction")
% self.indexfile) % self.indexfile)
trindex = trinfo[2] trindex = trinfo[2]
if trindex is not None: if trindex is not None:
dataoff = self.start(trindex) dataoff = self.start(trindex)
else: else:
# revlog was stripped at start of transaction, use all leftover data # revlog was stripped at start of transaction, use all leftover data
trindex = len(self) - 1 trindex = len(self) - 1
dataoff = self.end(-2) dataoff = self.end(tiprev)
tr.add(self.datafile, dataoff) tr.add(self.datafile, dataoff)
if fp: if fp:
fp.flush() fp.flush()
fp.close() fp.close()
with self._datafp('w') as df: with self._datafp('w') as df: