Patchwork D12023: histedit: attempt to make merge labels more helpful

login
register
mail settings
Submitter phabricator
Date Jan. 21, 2022, 11:37 p.m.
Message ID <differential-rev-PHID-DREV-fnhtbmbvpiw5ynni7l7b-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/50349/
State New
Headers show

Comments

phabricator - Jan. 21, 2022, 11:37 p.m.
martinvonz created this revision.
Herald added a reviewer: durin42.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  hgext/histedit.py
  tests/test-histedit-non-commute-abort.t

CHANGE DETAILS




To: martinvonz, durin42, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/tests/test-histedit-non-commute-abort.t b/tests/test-histedit-non-commute-abort.t
--- a/tests/test-histedit-non-commute-abort.t
+++ b/tests/test-histedit-non-commute-abort.t
@@ -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)
diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -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