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.

     1

#require test-repo

     2

     3

  $ checkflake8() {

     4

  >   if ! (which flake8 > /dev/null); then

     5

  >     echo skipped: missing tool: flake8;

     6

  >     exit 80;

     7

  >   fi;

     8

  > };

     9

  $ checkflake8

    10

    11

Copied from Mercurial core (60ee2593a270)

    12

    13

  $ cd "`dirname "$TESTDIR"`"

    14

    15

run flake8 if it exists; if it doesn't, then just skip

    16

    17

  $ hg files -0 'set:(**.py or grep("^#!.*python")) - removed()' \

    18

  > -X hgext3rd/evolve/thirdparty \

    19

  > 2>/dev/null \

    20

  > | xargs -0 flake8