| marmoute |
| hg-reviewers |
Prevents flaky output.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/debugcommands.py (2 lines) |
| fm_files.data(local_flags=state[7]) | fm_files.data(local_flags=state[7]) | ||||
| elif state[0] in ( | elif state[0] in ( | ||||
| mergestatemod.MERGE_RECORD_UNRESOLVED_PATH, | mergestatemod.MERGE_RECORD_UNRESOLVED_PATH, | ||||
| mergestatemod.MERGE_RECORD_RESOLVED_PATH, | mergestatemod.MERGE_RECORD_RESOLVED_PATH, | ||||
| ): | ): | ||||
| fm_files.data(renamed_path=state[1]) | fm_files.data(renamed_path=state[1]) | ||||
| fm_files.data(rename_side=state[2]) | fm_files.data(rename_side=state[2]) | ||||
| fm_extras = fm_files.nested(b'extras') | 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.startitem() | ||||
| fm_extras.data(key=k) | fm_extras.data(key=k) | ||||
| fm_extras.data(value=v) | fm_extras.data(value=v) | ||||
| fm_extras.end() | fm_extras.end() | ||||
| fm_files.end() | fm_files.end() | ||||
| fm_extras = fm.nested(b'extras') | fm_extras = fm.nested(b'extras') | ||||