tests/test-merge-prompt

localrepo.commit: grab locks before getting the list of files to commit

Somebody may change the dirstate after we've determined the parents of
the working dir and run repo.status, but before we called wlock().

This should also fix issue997, where backout would change a file without
changing its size and then call repo.commit without passing the list of
files. If this happened in less than one second, we wouldn't detect any
file changes - the in-memory dirstate still has the cached stat data for
that file. Grabbing the wlock early causes the dirstate to be
invalidated and we end up reading the dirstate file again, which has
that file marked for lookup (size == -1).

A better fix would be for backout to give repo.commit the exact list of
files, but that'll require some changes to the revert operation.

A significant user-visible change is that the precommit hook is always
run with both locks grabbed - previously, hg commit would run it before
grabbing any locks, but hg import would run it after grabbing locks.

#!/bin/sh
#
# Test for b5605d88dc27
#  Make ui.prompt repeat on "unrecognized response" again (issue897)
# and for 840e2b315c1f
#  Fix misleading error and prompts during update/merge (issue556)

status() {
    [ $? -ne 0 ] && echo "failed."
    echo "status:"
    hg st -A file1 file2
    for file in file1 file2; do
        if [ -f $file ]; then
            echo "$file:"
            cat $file
        else
            echo "$file does not exist"
        fi
    done
}

hg init repo
cd repo
echo 1 > file1
echo 2 > file2
hg ci -Am 'added file1 and file2' # rev 0

hg rm file1
echo changed >> file2
hg ci -m 'removed file1, changed file2' # rev 1

hg co 0
echo changed >> file1
hg rm file2
hg ci -m 'changed file1, removed file2' # rev 2

echo
echo "# non-interactive merge"
hg merge -y || echo "failed"
status

echo
echo "# interactive merge"
hg co -C
hg merge --config ui.interactive=true <<EOF || echo "failed"
c
d
EOF
status

echo
echo "# interactive merge with bad input"
hg co -C
hg merge --config ui.interactive=true <<EOF || echo "failed"
foo
bar
d
baz
c
EOF
status

echo
echo "# interactive merge with not enough input"
hg co -C
hg merge --config ui.interactive=true <<EOF || echo "failed"
d
EOF
status