Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/debugcommands.py @ 45457:00e4e97c6bc8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
debugmergestate: sort extras before printing Prevents flaky output. Differential Revision: https://phab.mercurial-scm.org/D8986
author Pulkit Goyal <7895pulkit@gmail.com>
date Thu, 03 Sep 2020 14:45:16 +0530
parents 766797f23f77
children 308ca5528ee6
comparison
equal deleted inserted replaced
45456:766797f23f77 45457:00e4e97c6bc8
2060 mergestatemod.MERGE_RECORD_RESOLVED_PATH, 2060 mergestatemod.MERGE_RECORD_RESOLVED_PATH,
2061 ): 2061 ):
2062 fm_files.data(renamed_path=state[1]) 2062 fm_files.data(renamed_path=state[1])
2063 fm_files.data(rename_side=state[2]) 2063 fm_files.data(rename_side=state[2])
2064 fm_extras = fm_files.nested(b'extras') 2064 fm_extras = fm_files.nested(b'extras')
2065 for k, v in ms.extras(f).items(): 2065 for k, v in sorted(ms.extras(f).items()):
2066 fm_extras.startitem() 2066 fm_extras.startitem()
2067 fm_extras.data(key=k) 2067 fm_extras.data(key=k)
2068 fm_extras.data(value=v) 2068 fm_extras.data(value=v)
2069 fm_extras.end() 2069 fm_extras.end()
2070 2070