evolve: add a `--abort` flag for `hg evolve` command This patch adds a new flag `--abort` to `hg evolve` command which will abort the interrupted evolve going on undoes the changes created by the evolve command till now. The changes are bookmark movements, creation of evolved commits, obsolete the old commits in favor of evolved commits. In case when user changed things while the interrupted evolve, like did some actions which created a new commit on top of evolved commits, or changed phase of evolved commits to public, the evolve fails to abort as we should not strip out the new commit formed by user neither we can strip the public changeset. The abort fails and tell user to use `hg evolve --stop` instead. Right now bookmark movement is broken, and will be fixed in upcoming patches. Tests are added for the new flag.

     1

#!/bin/bash

     2

. $TESTDIR/testlib/pythonpath.sh

     3

     4

mkcommit() {

     5

   echo "$1" > "$1"

     6

   hg add "$1"

     7

   hg ci -m "$1"

     8

}

     9

    10

getid() {

    11

   hg log --hidden --template '{node}\n' --rev "$1"

    12

}

    13

    14

cat >> $HGRCPATH <<EOF

    15

[alias]

    16

debugobsolete=debugobsolete -d '0 0'

    17

EOF

    18

    19

html_output() {

    20

    filepath="$1"

    21

    touch "$filepath"

    22

    shift

    23

    24

    python $TESTDIR/testlib/arguments_printer.py 'hg' "$@" > "$filepath"

    25

    hg "$@" --color=always 2>&1 | aha -n | tee -a "$filepath"

    26

}

    27

    28

html_raw_output() {

    29

    filepath="$1"

    30

    touch "$filepath"

    31

    shift

    32

    33

    # python $TESTDIR/testlib/arguments_printer.py "$@" > "$filepath"

    34

    echo "" > "$filepath"

    35

    "$@" | tee -a "$filepath"

    36

}

    37

    38

graph() {

    39

    hg docgraph --rankdir LR --arrowhead=true --obsarrowhead=true --sphinx-directive --dot-output "$@"

    40

}