pick: remove transaction on the whole command (issue6037) At its core, pick is a pretty straightforward and well-behaving command, it uses functions already in core hg, it checks that wdir is clean and that changeset to pick is not public, it checks if there happen to be merge conflicts and can be --continue'd later, etc. It is very similar to graft in core (it also uses mergemod.graft function), but it obsoletes the original changeset. However, graft does not experience this incorrect behavior from issue 6037. What happens in the test case for this issue when we pick a revision that touches both "a" and "b": mergemod.graft() takes the original changeset and tries to apply it to the wdir, which results in "b" being marked as newly added and ready to be committed, "a" updated with the new content and being marked as modified, but "a" also has conflicts. Pick correctly notices this and saves its state before asking for user intervention. So far so good. However, when the command raises InterventionRequired to print a user-facing message and exit while being wrapped in repo.transaction() context manager, the latter partially undoes what mergemod.graft() did: it unmarks "b" as added. And when user continues pick, "b" is therefore not tracked and is not included in the resulting commit. The transaction is not useful here, because it doesn't touch wdir (it's still dirty), it doesn't remove pickstate (and other commands will refuse to work until pick --abort or --continue), it just makes "b" untracked. The solution is to use repo.transaction() only to wrap code that writes data to hg store in the final stages of the command after all checks have passed and is not expected to fail on trivial cases like merge conflicts. For example, committing the picked changeset. But since pick uses repo.commit() for that, and because that function already uses a transaction, wrapping it in another transaction doesn't make sense.

     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

}