Patchwork D8986: debugmergestate: sort extras before printing

login
register
mail settings
Submitter phabricator
Date Sept. 5, 2020, 7:10 a.m.
Message ID <differential-rev-PHID-DREV-nrkpbz77nhdev535eoyr-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/47096/
State Superseded
Headers show

Comments

phabricator - Sept. 5, 2020, 7:10 a.m.
pulkit created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  Prevents flaky output.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D8986

AFFECTED FILES
  mercurial/debugcommands.py

CHANGE DETAILS




To: pulkit, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/mercurial/debugcommands.py b/mercurial/debugcommands.py
--- a/mercurial/debugcommands.py
+++ b/mercurial/debugcommands.py
@@ -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)