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

cat <<EOF > merge

     4

import sys, os

     5

print "merging for", os.path.basename(sys.argv[1])

     6

EOF

     7

HGMERGE="python ../merge"; export HGMERGE

     8

     9

mkdir A1

    10

cd A1

    11

hg init

    12

echo This is file foo1 > foo

    13

echo This is file bar1 > bar

    14

hg add foo bar

    15

hg commit -m "commit text" -d "1000000 0"

    16

    17

cd ..

    18

hg clone A1 B1

    19

    20

cd A1

    21

rm bar

    22

hg remove bar

    23

hg commit -m "commit test" -d "1000000 0"

    24

    25

cd ../B1

    26

echo This is file foo22 > foo

    27

hg commit -m "commit test" -d "1000000 0"

    28

    29

cd ..

    30

hg clone A1 A2

    31

hg clone B1 B2

    32

    33

cd A1

    34

hg pull ../B1

    35

hg merge

    36

hg commit -m "commit test" -d "1000000 0"

    37

echo bar should remain deleted.

    38

hg manifest --debug

    39

    40

cd ../B2

    41

hg pull ../A2

    42

hg merge

    43

hg commit -m "commit test" -d "1000000 0"

    44

echo bar should remain deleted.

    45

hg manifest --debug