Show More
@@ -188,8 +188,7 b' class cg1unpacker(object):' | |||||
188 | header = struct.unpack(self.deltaheader, headerdata) |
|
188 | header = struct.unpack(self.deltaheader, headerdata) | |
189 | delta = readexactly(self._stream, l - self.deltaheadersize) |
|
189 | delta = readexactly(self._stream, l - self.deltaheadersize) | |
190 | node, p1, p2, deltabase, cs, flags = self._deltaheader(header, prevnode) |
|
190 | node, p1, p2, deltabase, cs, flags = self._deltaheader(header, prevnode) | |
191 | return {'node': node, 'p1': p1, 'p2': p2, 'cs': cs, |
|
191 | return (node, p1, p2, cs, deltabase, delta, flags) | |
192 | 'deltabase': deltabase, 'delta': delta, 'flags': flags} |
|
|||
193 |
|
192 | |||
194 | def getchunks(self): |
|
193 | def getchunks(self): | |
195 | """returns all the chunks contains in the bundle |
|
194 | """returns all the chunks contains in the bundle | |
@@ -438,17 +437,9 b' class cg1unpacker(object):' | |||||
438 | """ |
|
437 | """ | |
439 | chain = None |
|
438 | chain = None | |
440 | for chunkdata in iter(lambda: self.deltachunk(chain), {}): |
|
439 | for chunkdata in iter(lambda: self.deltachunk(chain), {}): | |
441 | node = chunkdata['node'] |
|
440 | # Chunkdata: (node, p1, p2, cs, deltabase, delta, flags) | |
442 |
|
|
441 | yield chunkdata | |
443 |
|
|
442 | chain = chunkdata[0] | |
444 | cs = chunkdata['cs'] |
|
|||
445 | deltabase = chunkdata['deltabase'] |
|
|||
446 | delta = chunkdata['delta'] |
|
|||
447 | flags = chunkdata['flags'] |
|
|||
448 |
|
||||
449 | chain = node |
|
|||
450 |
|
||||
451 | yield (node, p1, p2, cs, deltabase, delta, flags) |
|
|||
452 |
|
443 | |||
453 | class cg2unpacker(cg1unpacker): |
|
444 | class cg2unpacker(cg1unpacker): | |
454 | """Unpacker for cg2 streams. |
|
445 | """Unpacker for cg2 streams. |
General Comments 0
You need to be logged in to leave comments.
Login now