mercurial-crew-with-dirclash: mercurial/revlog.py comparison

revlog: simplify the v0 parser

comparison

equal deleted inserted replaced

-:8d0cf46e0dc6
+:a386a6e4fe46
 def parseindex(self, fp, st, inline):
 s = struct.calcsize(indexformatv0)
 index = []
 nodemap =  {nullid: nullrev}
-n = 0
+n = off = 0
-leftover = None
+data = fp.read()
-while True:
+l = len(data)
-if st:
+while off + s <= l:
-data = fp.read(65536)
+cur = data[off:off + s]
-else:
+off += s
-# hack for httprangereader, it doesn't do partial reads well
+e = struct.unpack(indexformatv0, cur)
-data = fp.read()
+index.append(e)
-if not data:
+nodemap[e[-1]] = n
-break
+n += 1
-if leftover:
-data = leftover + data
-leftover = None
-off = 0
-l = len(data)
-while off < l:
-if l - off < s:
-leftover = data[off:]
-break
-cur = data[off:off + s]
-off += s
-e = struct.unpack(indexformatv0, cur)
-index.append(e)
-nodemap[e[-1]] = n
-n += 1
-if not st:
-break
 return index, nodemap
 class revlogio(object):
 def __init__(self):

Mercurial > hg > mercurial-crew-with-dirclash