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

mkdir a

     4

cd a

     5

hg init

     6

echo foo > t1

     7

hg add t1

     8

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

     9

    10

cd ..

    11

hg clone a b

    12

    13

cd a

    14

echo foo > t2

    15

hg add t2

    16

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

    17

    18

cd ../b

    19

echo foo > t3

    20

hg add t3

    21

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

    22

    23

hg push ../a

    24

hg pull ../a

    25

hg push ../a

    26

hg merge

    27

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

    28

hg push ../a

    29

cd ..

    30

    31

hg init c

    32

cd c

    33

for i in 0 1 2; do

    34

    echo $i >> foo

    35

    hg ci -Am $i -d "1000000 0"

    36

done

    37

cd ..

    38

    39

hg clone c d

    40

cd d

    41

for i in 0 1; do

    42

    hg co -C $i

    43

    echo d-$i >> foo

    44

    hg ci -m d-$i -d "1000000 0"

    45

done

    46

    47

HGMERGE=true hg merge 3

    48

hg ci -m c-d -d "1000000 0"

    49

    50

hg push ../c; echo $?

    51

hg push -r 2 ../c; echo $?

    52

hg push -r 3 ../c; echo $?

    53

hg push -r 3 -r 4 ../c; echo $?

    54

hg push -f -r 3 -r 4 ../c; echo $?

    55

hg push -r 5 ../c; echo $?

    56

    57

# issue 450

    58

hg init ../e

    59

hg push -r 0 ../e ; echo $?

    60

hg push -r 1 ../e ; echo $?

    61

    62

exit 0