diff tests/test-evolve-order.t @ 4122:4eb3877540f1

evovle: remove redundancy in evolve output

Copying the discription of this redundancy issue given by Pierre Yves David:

When running `hg evolve` to stabilize orphan changeset output about the
currently stabilized changeset is issued. For example:

$ hg evolve
  move:[3] a3
  atop:[4] a2
  working directory is now at 7c5649f73d11

This output can become quite repetitive when orphan are stabilized atop
each other. For example:

$ hg evolve --all
  move:[8] dansk 2!
  atop:[10] dansk!
  merging main-file-1
  move:[9] dansk 3!
  atop:[11] dansk 2!

In this case it would be smoother to issue:

$ hg evolve --all
  move:[8] dansk 2!
  atop:[10] dansk!
  merging main-file-1
  move:[9] dansk 3!

Since we are moving "dansk 3!" atop the changeset we just stabilized.

When adding this be careful that we still want to issue the "atop" message
in various cases:

  1. first changesets in a stack
  2. when the orphan is not stabilized atop previous one
  3. when using hg evolve --continue to resume an evolution

So, I have made the changes which also respect above listed three points.
And changes in tests/test-evovle*.t reflecting the changed behavior.

--- a/tests/test-evolve-order.t	Tue Sep 18 02:14:10 2018 +0200
+++ b/tests/test-evolve-order.t	Fri Sep 21 15:52:53 2018 +0530
@@ -62,7 +62,6 @@
   move:[2] add _b
   atop:[4] add _a
   move:[3] add _c
-  atop:[5] add _b
   working directory is now at 52b8f9b04f83
 
 evolve --rev reorders the rev to solve instability. Harder case, obsolescence
@@ -106,9 +105,7 @@
   move:[10] bprime
   atop:[11] asecond
   move:[6] add _c
-  atop:[12] bprime
   move:[7] add _d
-  atop:[13] add _c
   working directory is now at 739f18ac1d03
   $ hg log -G
   @  14:739f18ac1d03@default(draft) add _d
@@ -214,7 +211,6 @@
   move:[17] add c3_
   atop:[28] add c2prime
   move:[18] add c4_
-  atop:[30] add c3_
   working directory is now at 35e7b797ace5
   $ hg log -G -r "desc(_d)::"
   @  31:35e7b797ace5@default(draft) add c4_