| indygreg | |
| Alphare |
| hg-reviewers |
The "w+" file mode is deleting all the content of the opened file. Which is bad…
This is not caught by the test because the test only check for a full, initial
pull where not pre-existing content exists. So we need to fix our test coverage
here.
However they are another issue that prevent "incremental" pull to work here. See
next changeset for details.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/revlog.py (2 lines) |
| entry = (new_offset_flags,) + entry[1:8] | entry = (new_offset_flags,) + entry[1:8] | ||||
| entry += (current_offset, len(serialized_sidedata)) | entry += (current_offset, len(serialized_sidedata)) | ||||
| fp.write(serialized_sidedata) | fp.write(serialized_sidedata) | ||||
| new_entries.append(entry) | new_entries.append(entry) | ||||
| current_offset += len(serialized_sidedata) | current_offset += len(serialized_sidedata) | ||||
| # rewrite the new index entries | # rewrite the new index entries | ||||
| with self._indexfp(b'w+') as fp: | with self._indexfp(b'r+') as fp: | ||||
| fp.seek(startrev * self.index.entry_size) | fp.seek(startrev * self.index.entry_size) | ||||
| for i, e in enumerate(new_entries): | for i, e in enumerate(new_entries): | ||||
| rev = startrev + i | rev = startrev + i | ||||
| self.index.replace_sidedata_info(rev, e[8], e[9], e[0]) | self.index.replace_sidedata_info(rev, e[8], e[9], e[0]) | ||||
| packed = self.index.entry_binary(rev) | packed = self.index.entry_binary(rev) | ||||
| if rev == 0: | if rev == 0: | ||||
| header = self.index.pack_header(self.version) | header = self.index.pack_header(self.version) | ||||
| packed = header + packed | packed = header + packed | ||||
| fp.write(packed) | fp.write(packed) | ||||