changeset 3741:ec460882eab7

evolve: show cset hash in "merging conetnt-divergent changeset"

While I was here I also mae de it repo.ui.status() instead of repo.ui.note() to
align the behavior with rest of the messages.

--- a/hgext3rd/evolve/evolvecmd.py	Sun Apr 29 19:14:41 2018 +0530
+++ b/hgext3rd/evolve/evolvecmd.py	Sun Apr 29 19:18:54 2018 +0530
@@ -405,7 +405,8 @@
         repo.ui.status(_("updating to \"local\" side of the conflict: %s\n") %
                        divergent.hex()[:12])
         hg.updaterepo(repo, divergent.node(), False)
-    repo.ui.note(_('merging %s changeset\n') % TROUBLES['CONTENTDIVERGENT'])
+    repo.ui.status(_("merging \"other\" %s changeset '%s'\n") %
+                   (TROUBLES['CONTENTDIVERGENT'], other.hex()[:12]))
     if progresscb:
         progresscb()
     stats = merge.update(repo,

--- a/tests/test-divergent.t	Sun Apr 29 19:14:41 2018 +0530
+++ b/tests/test-divergent.t	Sun Apr 29 19:18:54 2018 +0530
@@ -58,6 +58,7 @@
   with: [3] add bdivergent2
   base: [1] add _b
   updating to "local" side of the conflict: c2f698071cba
+  merging "other" content-divergent changeset 'e708fd28d5cf'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory is now at c26f1d3baed2
   $ hg log -G
@@ -102,6 +103,7 @@
   with: [7] cdivergent2
   base: [5] add _c
   updating to "local" side of the conflict: 26c7705fee96
+  merging "other" content-divergent changeset '0a768ef678d9'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   nothing changed
   working directory is now at 26c7705fee96
@@ -150,6 +152,7 @@
   merge:[3] add bdivergent2
   with: [2] add bdivergent1
   base: [1] add _b
+  merging "other" content-divergent changeset 'c2f698071cba'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory is now at aa26817f6fbe
 

--- a/tests/test-sharing.t	Sun Apr 29 19:14:41 2018 +0530
+++ b/tests/test-sharing.t	Sun Apr 29 19:18:54 2018 +0530
@@ -509,6 +509,7 @@
   merge:[5] fix bug 24 (v2 by bob)
   with: [6] fix bug 24 (v2 by alice)
   base: [4] fix bug 24 (v1)
+  merging "other" content-divergent changeset 'e3f99ce9d9cd'
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   working directory is now at 5ad6037c046c
   $ hg log -q -r 'contentdivergent()'

--- a/tests/test-stabilize-result.t	Sun Apr 29 19:14:41 2018 +0530
+++ b/tests/test-stabilize-result.t	Sun Apr 29 19:18:54 2018 +0530
@@ -290,7 +290,7 @@
   merge:[14] More addition
   with: [13] More addition
   base: [12] More addition
-  merging content-divergent changeset
+  merging "other" content-divergent changeset 'd2f173e25686'
   resolving manifests
   merging a
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
@@ -390,6 +390,7 @@
   merge:[17] More addition (2)
   with: [15] More addition
   base: [12] More addition
+  merging "other" content-divergent changeset 'f344982e63c4'
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -416,6 +417,7 @@
   with: [18] More addition (2)
   base: [16] More addition
   updating to "local" side of the conflict: 0b336205a5d0
+  merging "other" content-divergent changeset 'e015aa78acee'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory is now at e015aa78acee
   $ glog