Mercurial > hg-stable
changeset 29591:6215b5537ba5
bundle2: use a sorted dict for holding parameters
An upcoming change that introduces a 2nd part parameter to a part
reveals that `hg debugbundle` isn't deterministic because parameters
are stored on n plain, unsorted dict.
While we could change that command to sort before output, I think
the more important underlying issue is that bundle2 reading is taking
an ordered data structure and converting it to an unordered one.
Plugging in util.sortdict() fixes that problem while preserving API
compatibility.
This patch also appears to shine light on the fact that we don't
have tests verifying parts with multiple parameters roundtrip
correctly. That would be a good thing to test (and fuzz)... someday.
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Sun, 17 Jul 2016 14:51:00 -0700 |
| parents | 84c1a5942f1d |
| children | 37cccad55410 |
| files | mercurial/bundle2.py |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/bundle2.py Fri Jul 15 13:41:34 2016 -0700 +++ b/mercurial/bundle2.py Sun Jul 17 14:51:00 2016 -0700 @@ -690,7 +690,7 @@ def _processallparams(self, paramsblock): """""" - params = {} + params = util.sortdict() for p in paramsblock.split(' '): p = p.split('=', 1) p = [urlreq.unquote(i) for i in p] @@ -1115,8 +1115,8 @@ self.mandatoryparams = tuple(mandatoryparams) self.advisoryparams = tuple(advisoryparams) # user friendly UI - self.params = dict(self.mandatoryparams) - self.params.update(dict(self.advisoryparams)) + self.params = util.sortdict(self.mandatoryparams) + self.params.update(self.advisoryparams) self.mandatorykeys = frozenset(p[0] for p in mandatoryparams) def _payloadchunks(self, chunknum=0):