| martinvonz |
| hg-reviewers |
Previously delta chunk returned a dictionary. Now that we consume deltachunk
within changegroup (instead of outside in revlog) we can just return a tuple and
have it be returned directly by deltaiter.
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/changegroup.py (17 lines) |
| def deltachunk(self, prevnode): | def deltachunk(self, prevnode): | ||||
| l = self._chunklength() | l = self._chunklength() | ||||
| if not l: | if not l: | ||||
| return {} | return {} | ||||
| headerdata = readexactly(self._stream, self.deltaheadersize) | headerdata = readexactly(self._stream, self.deltaheadersize) | ||||
| header = struct.unpack(self.deltaheader, headerdata) | header = struct.unpack(self.deltaheader, headerdata) | ||||
| delta = readexactly(self._stream, l - self.deltaheadersize) | delta = readexactly(self._stream, l - self.deltaheadersize) | ||||
| node, p1, p2, deltabase, cs, flags = self._deltaheader(header, prevnode) | node, p1, p2, deltabase, cs, flags = self._deltaheader(header, prevnode) | ||||
| return {'node': node, 'p1': p1, 'p2': p2, 'cs': cs, | return (node, p1, p2, cs, deltabase, delta, flags) | ||||
| 'deltabase': deltabase, 'delta': delta, 'flags': flags} | |||||
| def getchunks(self): | def getchunks(self): | ||||
| """returns all the chunks contains in the bundle | """returns all the chunks contains in the bundle | ||||
| Used when you need to forward the binary stream to a file or another | Used when you need to forward the binary stream to a file or another | ||||
| network API. To do so, it parse the changegroup data, otherwise it will | network API. To do so, it parse the changegroup data, otherwise it will | ||||
| block in case of sshrepo because it don't know the end of the stream. | block in case of sshrepo because it don't know the end of the stream. | ||||
| """ | """ | ||||
| def deltaiter(self): | def deltaiter(self): | ||||
| """ | """ | ||||
| returns an iterator of the deltas in this changegroup | returns an iterator of the deltas in this changegroup | ||||
| Useful for passing to the underlying storage system to be stored. | Useful for passing to the underlying storage system to be stored. | ||||
| """ | """ | ||||
| chain = None | chain = None | ||||
| for chunkdata in iter(lambda: self.deltachunk(chain), {}): | for chunkdata in iter(lambda: self.deltachunk(chain), {}): | ||||
| node = chunkdata['node'] | # Chunkdata: (node, p1, p2, cs, deltabase, delta, flags) | ||||
| p1 = chunkdata['p1'] | yield chunkdata | ||||
| p2 = chunkdata['p2'] | chain = chunkdata[0] | ||||
| cs = chunkdata['cs'] | |||||
| deltabase = chunkdata['deltabase'] | |||||
| delta = chunkdata['delta'] | |||||
| flags = chunkdata['flags'] | |||||
| chain = node | |||||
| yield (node, p1, p2, cs, deltabase, delta, flags) | |||||
| class cg2unpacker(cg1unpacker): | class cg2unpacker(cg1unpacker): | ||||
| """Unpacker for cg2 streams. | """Unpacker for cg2 streams. | ||||
| cg2 streams add support for generaldelta, so the delta header | cg2 streams add support for generaldelta, so the delta header | ||||
| format is slightly different. All other features about the data | format is slightly different. All other features about the data | ||||
| remain the same. | remain the same. | ||||
| """ | """ | ||||