Avoid extra filelogs entries. Right now, there are some situations in which localrepo.filecommit can create filelog entries even though they're not needed. For example: - permissions for a file have changed; - qrefresh can create a filelog entry identical to its parent (see the added test); - convert-repo creates extra filelog entries in every merge where the first parent has added files (for example, changeset ebebe9577a1a of the kernel repo added extra filelog entries to files in the arch/blackfin directory, even though the merge should only touch the drivers/ata directory). This makes "hg log file" in a converted repo less useful than it could be, since it may mention many merges that don't actually touch that specific file. They all come from the same basic problem: localrepo.commit (through filecommit) creates new filelog entries for all files passed to it (except for some cases during a merge). Patch and test case provided by Benoit. This should fix issue351.

     1

#!/bin/sh

     2

#

     3

# Corrupt an hg repo with a pull started during an aborted commit

     4

#

     5

     6

# Create two repos, so that one of them can pull from the other one.

     7

hg init source

     8

cd source

     9

touch foo

    10

hg add foo

    11

hg ci -m 'add foo'

    12

hg clone . ../corrupted

    13

echo >> foo

    14

hg ci -m 'change foo'

    15

    16

# Add a hook to wait 5 seconds and then abort the commit

    17

cd ../corrupted

    18

echo '[hooks]' >> .hg/hgrc

    19

echo 'pretxncommit = sleep 5; exit 1' >> .hg/hgrc

    20

    21

# start a commit...

    22

touch bar

    23

hg add bar

    24

hg ci -m 'add bar' &

    25

    26

# ... and start a pull while the commit is still running

    27

sleep 1

    28

hg pull ../source 2>/dev/null

    29

    30

# see what happened

    31

wait

    32

hg verify