amend: query the wdir parent after taking lock (issue5266) If we query wdir parent without taking a lock, that can lead to bugs because the wdir parent can change is another process has changed the wdir parent. One such example of this was issue 5266. When a user is running amend and that amend is waiting for commit message, the user runs another amend which waits for lock. The second amend is waiting for lock, but has already read the description from the parent of working directory to use. Once the first amend completes the wdir parent changes but we still have the description from an old wdir parent. This patch fixes the bug by querying the description after taking lock. Attempts were made to add test for this but the results were unstable because they depend on time in which lock is released.

     1

#!/bin/sh

     2

. $TESTDIR/testlib/pythonpath.sh

     3

     4

# This file holds logic that is used in many tests.

     5

# It can be called in a test like this:

     6

#  $ . "$TESTDIR/testlib/topic_setup.sh"

     7

     8

# Enable obsolete markers and enable extensions

     9

cat >> $HGRCPATH << EOF

    10

[experimental]

    11

evolution=createmarkers,exchange

    12

    13

[extensions]

    14

rebase=

    15

topic=

    16

EOF