mercurial-scm/hg: mercurial/revlog.py comparison

revlog: fix reading of larger revlog indices on Windows

comparison

equal deleted inserted replaced

-:67f76a4463ef
+:5726bb290bfe
 def parseindex(self, fp, data, inline):
 s = self.size
 index = []
 nodemap =  {nullid: nullrev}
 n = off = 0
-if len(data) < _prereadsize:
+if len(data) == _prereadsize:
 data += fp.read() # read the rest
 l = len(data)
 while off + s <= l:
 cur = data[off:off + s]
 off += s
 class revlogio(object):
 def __init__(self):
 self.size = struct.calcsize(indexformatng)
 def parseindex(self, fp, data, inline):
-try:
+if len(data) == _prereadsize:
-size = len(data)
+if util.openhardlinks() and not inline:
-if size == _prereadsize:
+# big index, let's parse it on demand
-size = util.fstat(fp).st_size
+parser = lazyparser(fp, size)
-except AttributeError:
+index = lazyindex(parser)
-size = 0
+nodemap = lazymap(parser)
+e = list(index[0])
-if util.openhardlinks() and not inline and size > _prereadsize:
+type = gettype(e[0])
-# big index, let's parse it on demand
+e[0] = offset_type(0, type)
-parser = lazyparser(fp, size)
+index[0] = e
-index = lazyindex(parser)
+return index, nodemap, None
-nodemap = lazymap(parser)
+else:
-e = list(index[0])
+data += fp.read()
-type = gettype(e[0])
-e[0] = offset_type(0, type)
-index[0] = e
-return index, nodemap, None
 # call the C implementation to parse the index data
 index, nodemap, cache = parsers.parse_index(data, inline)
 return index, nodemap, cache

Mercurial > public > mercurial-scm > hg