Mercurial > evolve

changeset 4633:61c2518cd6d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: move status msg to verbose mode in content-divergence resolution As suggested by Pierre-Yves, lets move these too verbose message for the user to verbose mode to decrease some noise.
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Fri, 26 Apr 2019 01:20:08 +0530
parents b78707559f1f
children 0b231ea2124b
files hgext3rd/evolve/evolvecmd.py tests/test-evolve-content-divergent-basic.t tests/test-evolve-content-divergent-corner-cases.t tests/test-evolve-content-divergent-interrupted.t tests/test-evolve-content-divergent-meta.t tests/test-evolve-content-divergent-relocation.t tests/test-evolve-content-divergent-stack.t tests/test-evolve-public-content-divergent-corner-cases.t tests/test-evolve-public-content-divergent-discard.t tests/test-evolve-public-content-divergent-main.t tests/test-sharing.t tests/test-topic-stack-complex.t
diffstat 12 files changed, 4 insertions(+), 93 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/evolvecmd.py	Sat Apr 27 17:11:12 2019 +0800
+++ b/hgext3rd/evolve/evolvecmd.py	Fri Apr 26 01:20:08 2019 +0530
@@ -558,12 +558,12 @@
 def _mergecontentdivergents(repo, progresscb, divergent, other, base,
                             evolvestate):
     if divergent not in repo[None].parents():
-        repo.ui.status(_("updating to \"local\" side of the conflict: %s\n") %
-                       divergent.hex()[:12])
+        repo.ui.note(_("updating to \"local\" side of the conflict: %s\n") %
+                     divergent.hex()[:12])
         hg.updaterepo(repo, divergent.node(), False)
     # merging the two content-divergent changesets
-    repo.ui.status(_("merging \"other\" %s changeset '%s'\n") %
-                   (TROUBLES['CONTENTDIVERGENT'], other.hex()[:12]))
+    repo.ui.note(_("merging \"other\" %s changeset '%s'\n") %
+                 (TROUBLES['CONTENTDIVERGENT'], other.hex()[:12]))
     if progresscb:
         progresscb()
     mergeancestor = repo.changelog.isancestor(divergent.node(), other.node())
--- a/tests/test-evolve-content-divergent-basic.t	Sat Apr 27 17:11:12 2019 +0800
+++ b/tests/test-evolve-content-divergent-basic.t	Fri Apr 26 01:20:08 2019 +0530
@@ -139,8 +139,6 @@
   merge:[2] divergent
   with: [3] divergent
   base: [1] added b
-  updating to "local" side of the conflict: 593c57f2117e
-  merging "other" content-divergent changeset '8374d2ddc3a4'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory is now at 45bf1312f454
   $ hg log -G
@@ -237,7 +235,6 @@
   merge:[6] added d
   with: [5] added d
   base: [4] added d
-  merging "other" content-divergent changeset '9e5dffcb3d48'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   content divergent changesets on different branches.
   choose branch for the resolution changeset. (a) default or (b) watwat or (c) foobar?  c
@@ -292,7 +289,6 @@
   merge:[9] added a d with bar in it, expect some beers
   with: [8] added d
   base: [7] added d
-  merging "other" content-divergent changeset 'f621d00f5f0e'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory is now at a9d6fd6b5e40
 
@@ -341,7 +337,6 @@
   merge:[12] foo to d
   with: [11] foo to d
   base: [10] added a d with bar in it, expect some beers
-  merging "other" content-divergent changeset 'b10b07a394f1'
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -401,7 +396,6 @@
   merge:[15] wat to d, wat?
   with: [14] bar to d, expect beers
   base: [13] foo to d
-  merging "other" content-divergent changeset '27f0463f169a'
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -612,7 +606,6 @@
   merge:[6] More addition (2)
   with: [4] More addition
   base: [1] More addition
-  merging "other" content-divergent changeset '5bf84d1d71d1'
   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
@@ -960,8 +953,6 @@
   merge:[2] E2
   with: [3] E3
   base: [1] E1
-  updating to "local" side of the conflict: 084ae625fa51
-  merging "other" content-divergent changeset '19ed1bf64a2c'
   merging numbers
   merging romans
   1 files updated, 2 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-evolve-content-divergent-corner-cases.t	Sat Apr 27 17:11:12 2019 +0800
+++ b/tests/test-evolve-content-divergent-corner-cases.t	Fri Apr 26 01:20:08 2019 +0530
@@ -76,8 +76,6 @@
   merge:[2] divergent
   with: [3] divergent
   base: [1] added b
-  updating to "local" side of the conflict: 593c57f2117e
-  merging "other" content-divergent changeset '8374d2ddc3a4'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory is now at 45bf1312f454
   $ hg log -G
@@ -137,8 +135,6 @@
   merge:[6] add cdivergent1
   with: [7] add _c
   base: [5] add _c
-  updating to "local" side of the conflict: e3ff64ce8d4c
-  merging "other" content-divergent changeset 'b2ae71172042'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   nothing changed
   working directory is now at e3ff64ce8d4c
@@ -207,8 +203,6 @@
   merge:[2] bdivergent
   with: [3] bdivergent
   base: [1] add _b
-  updating to "local" side of the conflict: 05a6b6a9e633
-  merging "other" content-divergent changeset '6b096fb45070'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory is now at 73ff357d3975
 
@@ -309,8 +303,6 @@
 
   $ hg evolve --continue
   evolving 6:de4ea3103326 "updated e"
-  updating to "local" side of the conflict: ff6f7cd76a7c
-  merging "other" content-divergent changeset 'e504bd82de7e'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory is now at 83b1664a580f
 
@@ -368,8 +360,6 @@
   merge:[2] delete a
   with: [3] delete a
   base: [1] delete a
-  updating to "local" side of the conflict: 0825dcee2670
-  merging "other" content-divergent changeset '92ecd58f9b05'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory is now at 7ca6a9fafcf6
   $ hg glog
--- a/tests/test-evolve-content-divergent-interrupted.t	Sat Apr 27 17:11:12 2019 +0800
+++ b/tests/test-evolve-content-divergent-interrupted.t	Fri Apr 26 01:20:08 2019 +0530
@@ -83,7 +83,6 @@
   merge:[6] added d
   with: [5] added d
   base: [4] added d
-  merging "other" content-divergent changeset 'e49523854bc8'
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -191,14 +190,10 @@
   merge:[8] added c
   with: [10] added c
   base: [3] added c
-  updating to "local" side of the conflict: 2ba73e31f264
-  merging "other" content-divergent changeset '491e10505bae'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merge:[5] added d
   with: [7] added d
   base: [4] added d
-  updating to "local" side of the conflict: e49523854bc8
-  merging "other" content-divergent changeset 'f0f1694f123e'
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -358,8 +353,6 @@
   with: [8] added d
   base: [4] added d
   rebasing "other" content-divergent changeset 33e4442acf98 on ca1b80f7960a
-  updating to "local" side of the conflict: e49523854bc8
-  merging "other" content-divergent changeset 'a663d1567f0b'
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -451,7 +444,6 @@
   merge:[6] added d
   with: [5] added d
   base: [4] added d
-  merging "other" content-divergent changeset 'e49523854bc8'
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -504,8 +496,6 @@
   with: [7] added d
   base: [4] added d
   rebasing "other" content-divergent changeset 517d4375cb72 on ca1b80f7960a
-  updating to "local" side of the conflict: e49523854bc8
-  merging "other" content-divergent changeset '606ad96040fc'
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
--- a/tests/test-evolve-content-divergent-meta.t	Sat Apr 27 17:11:12 2019 +0800
+++ b/tests/test-evolve-content-divergent-meta.t	Fri Apr 26 01:20:08 2019 +0530
@@ -86,8 +86,6 @@
   merge:[3] added c e
   with: [4] added c
   base: [2] added c
-  updating to "local" side of the conflict: 0c9267e23c9d
-  merging "other" content-divergent changeset '6c06cda6dc99'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Make sure resultant cset don't replace the initial user with user running the command:
--- a/tests/test-evolve-content-divergent-relocation.t	Sat Apr 27 17:11:12 2019 +0800
+++ b/tests/test-evolve-content-divergent-relocation.t	Fri Apr 26 01:20:08 2019 +0530
@@ -69,8 +69,6 @@
   with: [6] added b
   base: [2] added b
   rebasing "other" content-divergent changeset da4b96f4a8d6 on c7586e2a9264
-  updating to "local" side of the conflict: 7ed0642d644b
-  merging "other" content-divergent changeset '11f849d7159f'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory is now at 171614c9a791
 
@@ -167,8 +165,6 @@
   with: [12] added foo to x
   base: [11] added x
   rebasing "other" content-divergent changeset 1e1a50385a7d on 4ae4427ee9f8
-  updating to "local" side of the conflict: 1e4f6b3bb39b
-  merging "other" content-divergent changeset '80cc9b1ec650'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory is now at b006cf317e0e
 
@@ -256,8 +252,6 @@
   with: [17] added y
   base: [16] added y
   rebasing "other" content-divergent changeset 2a9f6ccbdeba on b006cf317e0e
-  updating to "local" side of the conflict: b4575ed6fcfc
-  merging "other" content-divergent changeset '48f745db3f53'
   merging y
   warning: conflicts while merging y! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -421,8 +415,6 @@
 
   $ hg evolve --continue
   evolving 23:3f7a1f693080 "added z"
-  updating to "local" side of the conflict: 53242575ffa9
-  merging "other" content-divergent changeset 'cdb0643c69fc'
   merging y
   warning: conflicts while merging y! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
--- a/tests/test-evolve-content-divergent-stack.t	Sat Apr 27 17:11:12 2019 +0800
+++ b/tests/test-evolve-content-divergent-stack.t	Fri Apr 26 01:20:08 2019 +0530
@@ -143,25 +143,18 @@
   merge:[5] watbar to a
   with: [9] watbar to a
   base: [1] added a
-  merging "other" content-divergent changeset '82b74d5dc678'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merge:[6] added b
   with: [10] added b
   base: [2] added b
-  updating to "local" side of the conflict: d5f148423c16
-  merging "other" content-divergent changeset '88516dccf68a'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merge:[7] added c
   with: [11] added c
   base: [3] added c
-  updating to "local" side of the conflict: 3ce4be6d8e5e
-  merging "other" content-divergent changeset '9e5fb1d5b955'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merge:[8] added d
   with: [12] added d
   base: [4] added d
-  updating to "local" side of the conflict: c72d2885eb51
-  merging "other" content-divergent changeset '15c781f93cac'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory is now at f66f262fff6c
 
@@ -318,29 +311,21 @@
   with: [5] watbar to a
   base: [1] added a
   rebasing "other" content-divergent changeset 8e222f257bbf on 2228e3b74514
-  updating to "local" side of the conflict: c04ff147ef79
-  merging "other" content-divergent changeset '186bdc2cdfa2'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merge:[11] added b
   with: [6] added b
   base: [2] added b
   rebasing "other" content-divergent changeset d5f148423c16 on c04ff147ef79
-  updating to "local" side of the conflict: 6eb54b5af3fb
-  merging "other" content-divergent changeset '8542f15656e7'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merge:[12] added c
   with: [7] added c
   base: [3] added c
   rebasing "other" content-divergent changeset 3ce4be6d8e5e on 6eb54b5af3fb
-  updating to "local" side of the conflict: 8ed612937375
-  merging "other" content-divergent changeset 'a690ce53104a'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merge:[13] added d
   with: [8] added d
   base: [4] added d
   rebasing "other" content-divergent changeset c72d2885eb51 on 8ed612937375
-  updating to "local" side of the conflict: d45f050514c2
-  merging "other" content-divergent changeset '1d1772990a3b'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory is now at 74fbf3e6a0b6
 
--- a/tests/test-evolve-public-content-divergent-corner-cases.t	Sat Apr 27 17:11:12 2019 +0800
+++ b/tests/test-evolve-public-content-divergent-corner-cases.t	Fri Apr 26 01:20:08 2019 +0530
@@ -134,8 +134,6 @@
   with: [5] updated c
   base: [2] added c
   rebasing "other" content-divergent changeset f5f9b4fc8b77 on c9241b0f2d5b
-  updating to "local" side of the conflict: c0d7ee6604ea
-  merging "other" content-divergent changeset 'c3d442d80993'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   committed as 3b336cbee992
   working directory is now at 3b336cbee992
@@ -417,8 +415,6 @@
 
   $ hg evolve --continue
   evolving 4:e568fd1029bb "added c e"
-  updating to "local" side of the conflict: 93cd84bbdaca
-  merging "other" content-divergent changeset '2af3359250d3'
   file 'd' was deleted in other but was modified in local.
   What do you want to do?
   use (c)hanged version, (d)elete, or leave (u)nresolved? u
@@ -639,16 +635,12 @@
   with: [9] c_E
   base: [5] c_E
   rebasing "other" content-divergent changeset b4a584aea4bd on eb1b4e1205b8
-  updating to "local" side of the conflict: c7d2d47c7240
-  merging "other" content-divergent changeset '0773642cfa95'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   content divergence resolution between c7d2d47c7240 (public) and 0773642cfa95 has same content as c7d2d47c7240, discarding 0773642cfa95
   merge:[8] c_F
   with: [10] c_F
   base: [6] c_F
   rebasing "other" content-divergent changeset 8ae8db670b4a on c7d2d47c7240
-  updating to "local" side of the conflict: a52ac76b45f5
-  merging "other" content-divergent changeset '6a87ed4aa317'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   content divergence resolution between a52ac76b45f5 (public) and 6a87ed4aa317 has same content as a52ac76b45f5, discarding 6a87ed4aa317
   $ hg sum
--- a/tests/test-evolve-public-content-divergent-discard.t	Sat Apr 27 17:11:12 2019 +0800
+++ b/tests/test-evolve-public-content-divergent-discard.t	Fri Apr 26 01:20:08 2019 +0530
@@ -90,7 +90,6 @@
   merge:[4] added c
   with: [3] added ch
   base: [2] added c
-  merging "other" content-divergent changeset '90522bccf499'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   other divergent changeset 90522bccf499 has same content as local f7c1071f1e7c and differs by "description" only, discarding 90522bccf499
   content divergence resolution between f7c1071f1e7c (public) and 90522bccf499 has same content as f7c1071f1e7c, discarding 90522bccf499
@@ -183,8 +182,6 @@
   with: [4] added dh
   base: [3] added d
   rebasing "other" content-divergent changeset 5acd58ef5066 on 155349b645be
-  updating to "local" side of the conflict: e800202333a4
-  merging "other" content-divergent changeset 'ae3429430ef1'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   other divergent changeset ae3429430ef1 has same content as local e800202333a4 and differs by "description" only, discarding ae3429430ef1
   content divergence resolution between e800202333a4 (public) and ae3429430ef1 has same content as e800202333a4, discarding ae3429430ef1
@@ -269,7 +266,6 @@
   merge:[4] added c
   with: [3] added ch
   base: [2] added c
-  merging "other" content-divergent changeset '229da2719b19'
   merging ch
   warning: conflicts while merging ch! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -397,8 +393,6 @@
 
   $ hg evolve --continue
   evolving 4:f89a8e2f86ac "added dh"
-  updating to "local" side of the conflict: e800202333a4
-  merging "other" content-divergent changeset 'bc309da55b88'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   other divergent changeset bc309da55b88 has same content as local e800202333a4 and differs by "description" only, discarding bc309da55b88
   working directory is now at e800202333a4
@@ -491,8 +485,6 @@
   with: [4] added dh
   base: [3] added d
   rebasing "other" content-divergent changeset db0b7bba0aae on 155349b645be
-  updating to "local" side of the conflict: e800202333a4
-  merging "other" content-divergent changeset 'a5bbf2042450'
   merging dh
   warning: conflicts while merging dh! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -609,8 +601,6 @@
 
   $ hg evolve --continue
   evolving 4:67b19bbd770f "added dh"
-  updating to "local" side of the conflict: e800202333a4
-  merging "other" content-divergent changeset '09054d1f3c97'
   merging dh
   warning: conflicts while merging dh! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -697,8 +687,6 @@
   merge:[5] added d
   with: [6] closing feature branch
   base: [3] added d
-  updating to "local" side of the conflict: 497d0d2b90ba
-  merging "other" content-divergent changeset 'af442315d198'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   other divergent changeset af442315d198 is a closed branch head and differs from local 497d0d2b90ba by "branch, description" only, discarding af442315d198
   content divergence resolution between 497d0d2b90ba (public) and af442315d198 has same content as 497d0d2b90ba, discarding af442315d198
--- a/tests/test-evolve-public-content-divergent-main.t	Sat Apr 27 17:11:12 2019 +0800
+++ b/tests/test-evolve-public-content-divergent-main.t	Fri Apr 26 01:20:08 2019 +0530
@@ -73,8 +73,6 @@
   merge:[2] added b
   with: [3] updated b
   base: [1] added b
-  updating to "local" side of the conflict: 44f360db368f
-  merging "other" content-divergent changeset 'dcdaf152280a'
   merging b
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   committed as c1aa9cfb6cf8
@@ -169,8 +167,6 @@
   merge:[2] added b
   with: [3] updated b
   base: [1] added b
-  updating to "local" side of the conflict: 580f2d01e52c
-  merging "other" content-divergent changeset '0e805383168e'
   merging b
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -271,8 +267,6 @@
   with: [5] added d e
   base: [3] added d
   rebasing "other" content-divergent changeset 4291d72ee19a on 155349b645be
-  updating to "local" side of the conflict: 93cd84bbdaca
-  merging "other" content-divergent changeset 'f88581407163'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   committed as 4cbe48a0c3d9
   working directory is now at 4cbe48a0c3d9
@@ -393,8 +387,6 @@
 
   $ hg evolve --continue
   evolving 4:f31bcc378766 "added d c e"
-  updating to "local" side of the conflict: 93cd84bbdaca
-  merging "other" content-divergent changeset 'bd28d3e4a228'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   committed as 412dde898967
   working directory is now at 412dde898967
@@ -491,8 +483,6 @@
   with: [4] added d
   base: [3] added d
   rebasing "other" content-divergent changeset 9411ad1fe615 on 155349b645be
-  updating to "local" side of the conflict: 93cd84bbdaca
-  merging "other" content-divergent changeset 'b5c690cdf1d5'
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -619,8 +609,6 @@
 
   $ hg evolve --continue
   evolving 4:3c17c7afaf6e "added c e"
-  updating to "local" side of the conflict: 93cd84bbdaca
-  merging "other" content-divergent changeset 'c4ce3d34e784'
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   2 files updated, 0 files merged, 0 files removed, 1 files unresolved
--- a/tests/test-sharing.t	Sat Apr 27 17:11:12 2019 +0800
+++ b/tests/test-sharing.t	Fri Apr 26 01:20:08 2019 +0530
@@ -516,7 +516,6 @@
   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 b1499b0f03ca
   $ hg log -q -r 'contentdivergent()'
--- a/tests/test-topic-stack-complex.t	Sat Apr 27 17:11:12 2019 +0800
+++ b/tests/test-topic-stack-complex.t	Fri Apr 26 01:20:08 2019 +0530
@@ -172,7 +172,5 @@
   merge:[s5] Added e and f
   with: [s4] Added e and f
   base: [3] Added e and f
-  updating to "local" side of the conflict: ec94a1ed1330
-  merging "other" content-divergent changeset 'f2eff98490d2'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory is now at 8faad6276dc6