diff --git a/mercurial/util.py b/mercurial/util.py --- a/mercurial/util.py +++ b/mercurial/util.py @@ -527,6 +527,10 @@ class sortdict(dict): def insert(self, index, key, val): self._list.insert(index, key) dict.__setitem__(self, key, val) + def __repr__(self): + if not self: + return '%s()' % self.__class__.__name__ + return '%s(%r)' % (self.__class__.__name__, self.items()) class _lrucachenode(object): """A node in a doubly linked list. diff --git a/tests/test-bundle-type.t b/tests/test-bundle-type.t --- a/tests/test-bundle-type.t +++ b/tests/test-bundle-type.t @@ -52,7 +52,7 @@ test bundle types 1 changesets found HG20\x00\x00 (esc) Stream params: {} - changegroup -- "{'version': '02'}" + changegroup -- "sortdict([('version', '02')])" c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf none-v2 @@ -60,8 +60,8 @@ test bundle types searching for changes 1 changesets found HG20\x00\x00 (esc) - Stream params: {'Compression': 'BZ'} - changegroup -- "{'version': '02'}" + Stream params: sortdict([('Compression', 'BZ')]) + changegroup -- "sortdict([('version', '02')])" c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf bzip2-v2 @@ -69,8 +69,8 @@ test bundle types searching for changes 1 changesets found HG20\x00\x00 (esc) - Stream params: {'Compression': 'GZ'} - changegroup -- "{'version': '02'}" + Stream params: sortdict([('Compression', 'GZ')]) + changegroup -- "sortdict([('version', '02')])" c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf gzip-v2 @@ -79,7 +79,7 @@ test bundle types 1 changesets found HG20\x00\x00 (esc) Stream params: {} - changegroup -- "{'version': '02'}" + changegroup -- "sortdict([('version', '02')])" c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf none-v2 @@ -87,8 +87,8 @@ test bundle types searching for changes 1 changesets found HG20\x00\x00 (esc) - Stream params: {'Compression': 'BZ'} - changegroup -- "{'version': '02'}" + Stream params: sortdict([('Compression', 'BZ')]) + changegroup -- "sortdict([('version', '02')])" c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf bzip2-v2 diff --git a/tests/test-bundle2-format.t b/tests/test-bundle2-format.t --- a/tests/test-bundle2-format.t +++ b/tests/test-bundle2-format.t @@ -990,7 +990,7 @@ Support for changegroup $ hg debugbundle ../rev.hg2 Stream params: {} - changegroup -- '{}' + changegroup -- 'sortdict()' 32af7686d403cf45b5d95f2d70cebea587ac806a 9520eea781bcca16c1e15acc0ba14335a0e8e5ba eea13746799a9e0bfd88f29d3c2e9dc9389f524f @@ -1118,8 +1118,8 @@ Simple case where it just work: GZ 0360: db fb 6a 33 df c1 7d 99 cf ef d4 d5 6d da 77 7c |..j3..}.....m.w|| 0370: 3b 19 fd af c5 3f f1 60 c3 17 |;....?.`..| $ hg debugbundle ../rev.hg2.bz - Stream params: {'Compression': 'GZ'} - changegroup -- '{}' + Stream params: sortdict([('Compression', 'GZ')]) + changegroup -- 'sortdict()' 32af7686d403cf45b5d95f2d70cebea587ac806a 9520eea781bcca16c1e15acc0ba14335a0e8e5ba eea13746799a9e0bfd88f29d3c2e9dc9389f524f @@ -1205,8 +1205,8 @@ Simple case where it just work: BZ 0420: 8b 43 88 57 9c 01 f5 61 b5 e1 27 41 7e af 83 fe |.C.W...a..'A~...| 0430: 2e e4 8a 70 a1 21 46 96 30 7a |...p.!F.0z| $ hg debugbundle ../rev.hg2.bz - Stream params: {'Compression': 'BZ'} - changegroup -- '{}' + Stream params: sortdict([('Compression', 'BZ')]) + changegroup -- 'sortdict()' 32af7686d403cf45b5d95f2d70cebea587ac806a 9520eea781bcca16c1e15acc0ba14335a0e8e5ba eea13746799a9e0bfd88f29d3c2e9dc9389f524f diff --git a/tests/test-debugbundle.t b/tests/test-debugbundle.t --- a/tests/test-debugbundle.t +++ b/tests/test-debugbundle.t @@ -31,7 +31,7 @@ Terse output: $ hg debugbundle bundle2.hg Stream params: {} - changegroup -- "{'version': '02'}" + changegroup -- "sortdict([('version', '02')])" 0e067c57feba1a5694ca4844f05588bb1bf82342 991a3460af53952d10ec8a295d3d2cc2e5fa9690 @@ -56,7 +56,7 @@ Verbose output: $ hg debugbundle --all bundle2.hg Stream params: {} - changegroup -- "{'version': '02'}" + changegroup -- "sortdict([('version', '02')])" format: id, p1, p2, cset, delta base, len(delta) changelog diff --git a/tests/test-generaldelta.t b/tests/test-generaldelta.t --- a/tests/test-generaldelta.t +++ b/tests/test-generaldelta.t @@ -154,8 +154,8 @@ Test that strip bundle use bundle2 0 files updated, 0 files merged, 5 files removed, 0 files unresolved saved backup bundle to $TESTTMP/aggressive/.hg/strip-backup/1c5d4dc9a8b8-6c68e60c-backup.hg (glob) $ hg debugbundle .hg/strip-backup/* - Stream params: {'Compression': 'BZ'} - changegroup -- "{'version': '02'}" + Stream params: sortdict([('Compression', 'BZ')]) + changegroup -- "sortdict([('version', '02')])" 1c5d4dc9a8b8d6e1750966d343e94db665e7a1e9 $ cd .. diff --git a/tests/test-getbundle.t b/tests/test-getbundle.t --- a/tests/test-getbundle.t +++ b/tests/test-getbundle.t @@ -170,7 +170,7 @@ Get branch and merge: $ hg debuggetbundle repo bundle -t bundle2 $ hg debugbundle bundle Stream params: {} - changegroup -- "{'version': '01'}" + changegroup -- "sortdict([('version', '01')])" 7704483d56b2a7b5db54dcee7c62378ac629b348 29a4d1f17bd3f0779ca0525bebb1cfb51067c738 713346a995c363120712aed1aee7e04afd867638 diff --git a/tests/test-shelve.t b/tests/test-shelve.t --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -1044,8 +1044,8 @@ with general delta shelved as default 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg debugbundle .hg/shelved/*.hg - Stream params: {'Compression': 'BZ'} - changegroup -- "{'version': '02'}" + Stream params: sortdict([('Compression', 'BZ')]) + changegroup -- "sortdict([('version', '02')])" 45993d65fe9dc3c6d8764b9c3b07fa831ee7d92d $ cd .. diff --git a/tests/test-strip.t b/tests/test-strip.t --- a/tests/test-strip.t +++ b/tests/test-strip.t @@ -210,8 +210,8 @@ summary: b $ hg debugbundle .hg/strip-backup/* - Stream params: {'Compression': 'BZ'} - changegroup -- "{'version': '02'}" + Stream params: sortdict([('Compression', 'BZ')]) + changegroup -- "sortdict([('version', '02')])" 264128213d290d868c54642d13aeaa3675551a78 $ hg pull .hg/strip-backup/* pulling from .hg/strip-backup/264128213d29-0b39d6bf-backup.hg