Mercurial > hg
changeset 48591:f1162b125991
histedit: attempt to make merge labels more helpful
Differential Revision: https://phab.mercurial-scm.org/D12023
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 21 Jan 2022 13:48:18 -0800 |
| parents | 7e503eff3c76 |
| children | bcc4820242cf |
| files | hgext/histedit.py tests/test-histedit-non-commute-abort.t |
| diffstat | 2 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/histedit.py Tue Jan 18 13:23:49 2022 -0800 +++ b/hgext/histedit.py Fri Jan 21 13:48:18 2022 -0800 @@ -667,7 +667,15 @@ repo.ui.setconfig( b'ui', b'forcemerge', opts.get(b'tool', b''), b'histedit' ) - stats = mergemod.graft(repo, ctx, labels=[b'local', b'histedit']) + stats = mergemod.graft( + repo, + ctx, + labels=[ + b'already edited', + b'current change', + b'parent of current change', + ], + ) finally: repo.ui.setconfig(b'ui', b'forcemerge', b'', b'histedit') return stats
--- a/tests/test-histedit-non-commute-abort.t Tue Jan 18 13:23:49 2022 -0800 +++ b/tests/test-histedit-non-commute-abort.t Fri Jan 21 13:48:18 2022 -0800 @@ -77,8 +77,8 @@ insert unsupported advisory merge record $ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -x $ hg debugmergestate - local (local): 8f7551c7e4a2f2efe0bc8c741baf7f227d65d758 - other (histedit): e860deea161a2f77de56603b340ebbb4536308ae + local (already edited): 8f7551c7e4a2f2efe0bc8c741baf7f227d65d758 + other (current change): e860deea161a2f77de56603b340ebbb4536308ae file: e (state "u") local path: e (hash 58e6b3a414a1e090dfc6029add0f3555ccba127f, flags "") ancestor path: e (node 0000000000000000000000000000000000000000)