debugmergestate: sort extras before printing
authorPulkit Goyal <7895pulkit@gmail.com>
Thu, 03 Sep 2020 14:45:16 +0530
changeset 45446 00e4e97c6bc8
parent 45445 766797f23f77
child 45447 e7c8a5030a90
debugmergestate: sort extras before printing Prevents flaky output. Differential Revision: https://phab.mercurial-scm.org/D8986
mercurial/debugcommands.py
--- a/mercurial/debugcommands.py	Mon Aug 24 18:59:19 2020 +0530
+++ b/mercurial/debugcommands.py	Thu Sep 03 14:45:16 2020 +0530
@@ -2062,7 +2062,7 @@
                 fm_files.data(renamed_path=state[1])
                 fm_files.data(rename_side=state[2])
             fm_extras = fm_files.nested(b'extras')
-            for k, v in ms.extras(f).items():
+            for k, v in sorted(ms.extras(f).items()):
                 fm_extras.startitem()
                 fm_extras.data(key=k)
                 fm_extras.data(value=v)