Patchwork [3,of,5,V2] rebase: specify custom conflict marker labels for rebase

login
register
mail settings
Submitter Durham Goode
Date May 10, 2014, 2:48 a.m.
Message ID <bb42f0b255a6cbe2128c.1399690090@dev2000.prn2.facebook.com>
Download mbox | patch
Permalink /patch/4700/
State Accepted
Headers show

Comments

Durham Goode - May 10, 2014, 2:48 a.m.
# HG changeset patch
# User Durham Goode <durham@fb.com>
# Date 1399593356 25200
#      Thu May 08 16:55:56 2014 -0700
# Node ID bb42f0b255a6cbe2128ca0cb6cee7b238d932389
# Parent  72a14d81d73869c88a1d1c857ee6cc57606d9bf0
rebase: specify custom conflict marker labels for rebase

Changes rebase conflict markers to say 'source' and 'dest' instead of
'local' and 'other'.  This ends up looking like:

  one
  <<<<<<< dest:   a3e5  master - "A commit to master"
  master
  =======
  mine
  >>>>>>> source: c7fd  - "A commit to my feature branch"
  three

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -533,7 +533,8 @@ 
         repo.ui.debug("   detach base %d:%s\n" % (repo[base].rev(), repo[base]))
     # When collapsing in-place, the parent is the common ancestor, we
     # have to allow merging with it.
-    return merge.update(repo, rev, True, True, False, base, collapse)
+    return merge.update(repo, rev, True, True, False, base, collapse,
+        labels=['dest', 'source'])
 
 def nearestrebased(repo, rev, state):
     """return the nearest ancestors of rev in the rebase result"""
diff --git a/tests/test-shelve.t b/tests/test-shelve.t
--- a/tests/test-shelve.t
+++ b/tests/test-shelve.t
@@ -210,11 +210,11 @@ 
   +++ b/a/a
   @@ -1,2 +1,6 @@
    a
-  +<<<<<<< local: *  shelve - "pending changes temporary commit" (glob)
+  +<<<<<<< dest:   *  shelve - "pending changes temporary commit" (glob)
    c
   +=======
   +a
-  +>>>>>>> other: *  shelve - "changes to '[mq]: second.patch'" (glob)
+  +>>>>>>> source: *  shelve - "changes to '[mq]: second.patch'" (glob)
   diff --git a/b.rename/b b/b.rename/b
   new file mode 100644
   --- /dev/null
@@ -604,11 +604,11 @@ 
   M f
   ? f.orig
   $ cat f
-  <<<<<<< local: 5f6b  shelve - "pending changes temporary commit"
+  <<<<<<< dest:   5f6b  shelve - "pending changes temporary commit"
   g
   =======
   f
-  >>>>>>> other: 23b2  shelve - "changes to 'commit stuff'"
+  >>>>>>> source: 23b2  shelve - "changes to 'commit stuff'"
   $ cat f.orig
   g
   $ hg unshelve --abort
@@ -647,11 +647,11 @@ 
   M f
   ? f.orig
   $ cat f
-  <<<<<<< local: 6b56  test - "intermediate other change"
+  <<<<<<< dest:   6b56  test - "intermediate other change"
   g
   =======
   f
-  >>>>>>> other: 23b2  shelve - "changes to 'commit stuff'"
+  >>>>>>> source: 23b2  shelve - "changes to 'commit stuff'"
   $ cat f.orig
   g
   $ hg unshelve --abort