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

Enable obsolescence to avoid the warning issue when obsmarker are found

     4

     5

  $ cat << EOF >> $HGRCPATH

     6

  > [diff]

     7

  > git = yes

     8

  > [experimental]

     9

  > evolution=all

    10

  > EOF

    11

    12

Go back in the hg repo

    13

    14

  $ cd $TESTDIR/..

    15

    16

  $ for node in `hg log --rev 'not public() and ::. and not desc("# no-check-commit")' --template '{node|short}\n'`; do

    17

  >    hg export $node | ${RUNTESTDIR}/../contrib/check-commit > ${TESTTMP}/check-commit.out

    18

  >    if [ $? -ne 0 ]; then

    19

  >        echo "Revision $node does not comply with rules"

    20

  >        echo '------------------------------------------------------'

    21

  >        cat ${TESTTMP}/check-commit.out

    22

  >        echo

    23

  >   fi

    24

  > done