revlog: remove the last bits of punched/shallow
authorSune Foldager <cryo@cyanite.org>
Sat, 07 May 2011 22:37:40 +0200
changeset 14251 258fbccf22f5
parent 14250 34ec9b313638
child 14252 19067884c5f5
revlog: remove the last bits of punched/shallow Most of it was removed in e7483ec3c374, but a few pieces were accidentally left behind.
mercurial/revlog.py
--- a/mercurial/revlog.py	Sat May 07 21:12:35 2011 +0200
+++ b/mercurial/revlog.py	Sat May 07 22:37:40 2011 +0200
@@ -27,11 +27,10 @@
 REVLOGV0 = 0
 REVLOGNG = 1
 REVLOGNGINLINEDATA = (1 << 16)
-REVLOGSHALLOW = (1 << 17)
 REVLOG_DEFAULT_FLAGS = REVLOGNGINLINEDATA
 REVLOG_DEFAULT_FORMAT = REVLOGNG
 REVLOG_DEFAULT_VERSION = REVLOG_DEFAULT_FORMAT | REVLOG_DEFAULT_FLAGS
-REVLOGNG_FLAGS = REVLOGNGINLINEDATA | REVLOGSHALLOW
+REVLOGNG_FLAGS = REVLOGNGINLINEDATA
 
 # revlog index flags
 REVIDX_KNOWN_FLAGS = 0
@@ -207,7 +206,7 @@
     remove data, and can use some simple techniques to avoid the need
     for locking while reading.
     """
-    def __init__(self, opener, indexfile, shallowroot=None):
+    def __init__(self, opener, indexfile):
         """
         create a revlog object
 
@@ -220,7 +219,6 @@
         self._cache = None
         self._chunkcache = (0, '')
         self.index = []
-        self._shallowroot = shallowroot
         self._pcache = {}
         self._nodecache = {nullid: nullrev}
         self._nodepos = None
@@ -231,9 +229,6 @@
             if v & REVLOGNG:
                 v |= REVLOGNGINLINEDATA
 
-        if shallowroot:
-            v |= REVLOGSHALLOW
-
         i = ''
         try:
             f = self.opener(self.indexfile)
@@ -247,7 +242,6 @@
 
         self.version = v
         self._inline = v & REVLOGNGINLINEDATA
-        self._shallow = v & REVLOGSHALLOW
         flags = v & ~0xFFFF
         fmt = v & 0xFFFF
         if fmt == REVLOGV0 and flags: