cmdstate: introduce a "saver" contextmanager and use it in place of save() Previously, the state was only saved in some paths out of these functions. This can be problematic, if the user ctrl-c's (or `kill -9`'s) the process, or we exit out of `relocate` for anything besides the "expected" reason, we won't record that we were in the middle of an evolve. One of our users has discovered that this leaves hg in a weird state; the user did something like this: ``` $ hg evolve <something goes wrong with the merge tool, hits ctrl-c> <deals with the merge conflicts> $ hg evolve --continue abort: no interrupted evolve to continue $ hg evolve abort: uncommitted changes # Note: commands.status.verbose=True is set. $ hg status M foo # The repository is in an unfinished *update* state. # No unresolved merge conflicts # To continue: hg update ``` The user did an `hg update`, but it didn't actually do anything besides take it out of the unfinished update state (the files were still dirty in the working directory).

     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

}