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

hg init test

     4

cd test

     5

cat >>afile <<EOF

     6

0

     7

EOF

     8

hg add afile

     9

hg commit -m "0.0"

    10

cat >>afile <<EOF

    11

1

    12

EOF

    13

hg commit -m "0.1"

    14

cat >>afile <<EOF

    15

2

    16

EOF

    17

hg commit -m "0.2"

    18

cat >>afile <<EOF

    19

3

    20

EOF

    21

hg commit -m "0.3"

    22

hg update -C 0

    23

cat >>afile <<EOF

    24

1

    25

EOF

    26

hg commit -m "1.1"

    27

cat >>afile <<EOF

    28

2

    29

EOF

    30

hg commit -m "1.2"

    31

cat >fred <<EOF

    32

a line

    33

EOF

    34

cat >>afile <<EOF

    35

3

    36

EOF

    37

hg add fred

    38

hg commit -m "1.3"

    39

hg mv afile adifferentfile

    40

hg commit -m "1.3m"

    41

hg update -C 3

    42

hg mv afile anotherfile

    43

hg commit -m "0.3m"

    44

hg debugindex .hg/store/data/afile.i

    45

hg debugindex .hg/store/data/adifferentfile.i

    46

hg debugindex .hg/store/data/anotherfile.i

    47

hg debugindex .hg/store/data/fred.i

    48

hg debugindex .hg/store/00manifest.i

    49

hg verify

    50

cd ..

    51

for i in 0 1 2 3 4 5 6 7 8; do

    52

   hg clone -r "$i" test test-"$i"

    53

   cd test-"$i"

    54

   hg verify

    55

   cd ..

    56

done

    57

cd test-8

    58

hg pull ../test-7

    59

hg verify