Mercurial > evolve

changeset 4454:f530850c8184

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: drop the "computing new diff message" for phase-divergence Future code update will remove this message, dropping it early clarify the future diff.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 26 Mar 2019 12:30:10 +0100
parents 700b8b3a5a54
children b58e45aa9be2
files hgext3rd/evolve/evolvecmd.py tests/test-evolve-abort-phasediv.t tests/test-evolve-phase-divergence.t tests/test-evolve-public-content-divergent.t tests/test-evolve.t tests/test-stabilize-result.t
diffstat 6 files changed, 0 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/evolvecmd.py	Wed Mar 20 09:19:02 2019 -0700
+++ b/hgext3rd/evolve/evolvecmd.py	Tue Mar 26 12:30:10 2019 +0100
@@ -274,7 +274,6 @@
         bumped = tmpctx
 
     # Create the new commit context
-    repo.ui.status(_('computing new diff\n'))
     files = set()
     copied = copies.pathcopies(prec, bumped)
     precmanifest = prec.manifest().copy()
--- a/tests/test-evolve-abort-phasediv.t	Wed Mar 20 09:19:02 2019 -0700
+++ b/tests/test-evolve-abort-phasediv.t	Tue Mar 26 12:30:10 2019 +0100
@@ -207,7 +207,6 @@
   recreate:[7] added d
   atop:[4] added d
   rebasing to destination parent: ca1b80f7960a
-  computing new diff
   no changes to commit
   recreate:[9] added c
   atop:[3] added c
@@ -292,7 +291,6 @@
   continue: hg evolve --continue
   $ hg evolve --continue
   evolving 9:28cd06b3f801 "added c"
-  computing new diff
   committed as 95d746965290
   recreate:[10] added d
   atop:[4] added d
--- a/tests/test-evolve-phase-divergence.t	Wed Mar 20 09:19:02 2019 -0700
+++ b/tests/test-evolve-phase-divergence.t	Tue Mar 26 12:30:10 2019 +0100
@@ -196,7 +196,6 @@
   $ hg evolve --phase-divergent
   recreate:[2] tweak a
   atop:[1] modify a
-  computing new diff
   no changes to commit
   working directory is now at 4d1169d82e47
 
@@ -311,7 +310,6 @@
   $ hg evolve --phase-divergent
   recreate:[4] added bar to foo
   atop:[3] added foo to foo
-  computing new diff
   committed as 3d62500c673d
   working directory is now at 3d62500c673d
 
@@ -462,7 +460,6 @@
   $ hg evolve --phase-divergent
   recreate:[7] foo to bar
   atop:[6] added bar to bar
-  computing new diff
   committed as 502e73736632
   working directory is now at 502e73736632
 
@@ -599,7 +596,6 @@
   atop:[9] added x to x
   rebasing to destination parent: 502e73736632
   (leaving bookmark bm)
-  computing new diff
   no changes to commit
   working directory is now at 2352021b3785
 
@@ -718,7 +714,6 @@
   recreate:[14] y to y and foobar to foo
   atop:[12] y to y and foobar to foo
   rebasing to destination parent: 2352021b3785
-  computing new diff
   committed as 8c2bb6fb44e9
   working directory is now at 8c2bb6fb44e9
 
@@ -822,7 +817,6 @@
 
   $ hg evolve --continue
   evolving 19:5fd38c0de46e "added l to l"
-  computing new diff
   committed as e3090241a10c
   working directory is now at e3090241a10c
 
@@ -919,7 +913,6 @@
   recreate:[24] added f
   atop:[23] added g
   rebasing to destination parent: 21ae52e414e6
-  computing new diff
   no changes to commit
   working directory is now at 428f7900a969
 
@@ -986,13 +979,11 @@
   $ hg evolve --all --phase-divergent
   recreate:[2] added m
   atop:[1] added m and n
-  computing new diff
   committed as 86419909e017
   1 new orphan changesets
   recreate:[3] added n
   atop:[1] added m and n
   rebasing to destination parent: d3873e73d99e
-  computing new diff
   committed as 89ba615ea1ec
   working directory is now at 89ba615ea1ec
 
@@ -1105,11 +1096,9 @@
   $ hg evolve --all --phase-divergent
   recreate:[2] added p
   atop:[1] added p and q
-  computing new diff
   committed as 25875a9cb640
   recreate:[3] added q
   atop:[1] added p and q
-  computing new diff
   committed as 26f564f94bcc
   working directory is now at 26f564f94bcc
 
--- a/tests/test-evolve-public-content-divergent.t	Wed Mar 20 09:19:02 2019 -0700
+++ b/tests/test-evolve-public-content-divergent.t	Tue Mar 26 12:30:10 2019 +0100
@@ -70,7 +70,6 @@
   merging "other" content-divergent changeset 'dcdaf152280a'
   merging b
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-  computing new diff
   committed as c1aa9cfb6cf8
   working directory is now at c1aa9cfb6cf8
 
@@ -177,7 +176,6 @@
   (no more unresolved files)
   continue: hg evolve --continue
   $ hg evolve --continue
-  computing new diff
   committed as 1a739394e9d4
   working directory is now at 1a739394e9d4
 
@@ -312,7 +310,6 @@
   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
-  computing new diff
   committed as 3b336cbee992
   working directory is now at 3b336cbee992
 
@@ -446,7 +443,6 @@
   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
-  computing new diff
   committed as 4cbe48a0c3d9
   working directory is now at 4cbe48a0c3d9
 
@@ -563,7 +559,6 @@
   updating to "local" side of the conflict: 93cd84bbdaca
   merging "other" content-divergent changeset '2af3359250d3'
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  computing new diff
   committed as 06e4564a3897
   working directory is now at 06e4564a3897
 
@@ -657,7 +652,6 @@
   continue: hg evolve --continue
 
   $ hg evolve --continue
-  computing new diff
   committed as 2a0f44767904
   working directory is now at 2a0f44767904
 
@@ -786,7 +780,6 @@
   continue: hg evolve --continue
 
   $ hg evolve --continue
-  computing new diff
   committed as b9082a9e66ce
   working directory is now at b9082a9e66ce
 
--- a/tests/test-evolve.t	Wed Mar 20 09:19:02 2019 -0700
+++ b/tests/test-evolve.t	Tue Mar 26 12:30:10 2019 +0100
@@ -409,7 +409,6 @@
   $ hg evolve --any --traceback --phase-divergent
   recreate:[6] another feature that rox
   atop:[5] another feature (child of ba0ec09b1bab)
-  computing new diff
   committed as aca219761afb
   working directory is now at aca219761afb
   $ glog
@@ -1061,7 +1060,6 @@
   $ hg evolve -r "desc('add new file bumped')" --phase-divergent
   recreate:[11] add new file bumped
   atop:[10] a2
-  computing new diff
   committed as a8bb31d4b7f2
   working directory is now at a8bb31d4b7f2
   $ hg evolve --any
--- a/tests/test-stabilize-result.t	Wed Mar 20 09:19:02 2019 -0700
+++ b/tests/test-stabilize-result.t	Tue Mar 26 12:30:10 2019 +0100
@@ -171,7 +171,6 @@
   atop:[6] newer a
   perform evolve? [Ny] y
   rebasing to destination parent: 66719795a494
-  computing new diff
   committed as 8fc63fe1f297
   working directory is now at 8fc63fe1f297
   $ glog