##// END OF EJS Templates
revlog: remove the last bits of punched/shallow...
Sune Foldager -
r14251:258fbccf default
parent child Browse files
Show More
@@ -27,11 +27,10 import struct, zlib, errno
27 27 REVLOGV0 = 0
28 28 REVLOGNG = 1
29 29 REVLOGNGINLINEDATA = (1 << 16)
30 REVLOGSHALLOW = (1 << 17)
31 30 REVLOG_DEFAULT_FLAGS = REVLOGNGINLINEDATA
32 31 REVLOG_DEFAULT_FORMAT = REVLOGNG
33 32 REVLOG_DEFAULT_VERSION = REVLOG_DEFAULT_FORMAT | REVLOG_DEFAULT_FLAGS
34 REVLOGNG_FLAGS = REVLOGNGINLINEDATA | REVLOGSHALLOW
33 REVLOGNG_FLAGS = REVLOGNGINLINEDATA
35 34
36 35 # revlog index flags
37 36 REVIDX_KNOWN_FLAGS = 0
@@ -207,7 +206,7 class revlog(object):
207 206 remove data, and can use some simple techniques to avoid the need
208 207 for locking while reading.
209 208 """
210 def __init__(self, opener, indexfile, shallowroot=None):
209 def __init__(self, opener, indexfile):
211 210 """
212 211 create a revlog object
213 212
@@ -220,7 +219,6 class revlog(object):
220 219 self._cache = None
221 220 self._chunkcache = (0, '')
222 221 self.index = []
223 self._shallowroot = shallowroot
224 222 self._pcache = {}
225 223 self._nodecache = {nullid: nullrev}
226 224 self._nodepos = None
@@ -231,9 +229,6 class revlog(object):
231 229 if v & REVLOGNG:
232 230 v |= REVLOGNGINLINEDATA
233 231
234 if shallowroot:
235 v |= REVLOGSHALLOW
236
237 232 i = ''
238 233 try:
239 234 f = self.opener(self.indexfile)
@@ -247,7 +242,6 class revlog(object):
247 242
248 243 self.version = v
249 244 self._inline = v & REVLOGNGINLINEDATA
250 self._shallow = v & REVLOGSHALLOW
251 245 flags = v & ~0xFFFF
252 246 fmt = v & 0xFFFF
253 247 if fmt == REVLOGV0 and flags:
General Comments 0
You need to be logged in to leave comments. Login now