Patchwork D4016: revlog: remove some knowledge of sentinel nullid in index

login
register
mail settings
Submitter phabricator
Date Aug. 4, 2018, 3:41 a.m.
Message ID <7cb1402e01b1af2560b8b68bc5995a56@localhost.localdomain>
Download mbox | patch
Permalink /patch/33212/
State Not Applicable
Headers show

Comments

phabricator - Aug. 4, 2018, 3:41 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG119d14f41cb2: revlog: remove some knowledge of sentinel nullid in index (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D4016?vs=9776&id=9878

REVISION DETAIL
  https://phab.mercurial-scm.org/D4016

AFFECTED FILES
  mercurial/revlog.py

CHANGE DETAILS




To: martinvonz, indygreg, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/revlog.py b/mercurial/revlog.py
--- a/mercurial/revlog.py
+++ b/mercurial/revlog.py
@@ -2247,7 +2247,9 @@ 
         revlog has grown too large to be an inline revlog, it will convert it
         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
 
         trinfo = tr.find(self.indexfile)
@@ -2261,7 +2263,7 @@ 
         else:
             # revlog was stripped at start of transaction, use all leftover data
             trindex = len(self) - 1
-            dataoff = self.end(-2)
+            dataoff = self.end(tiprev)
 
         tr.add(self.datafile, dataoff)