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 t

     4

cd t

     5

hg init

     6

echo import > port

     7

hg add port

     8

hg commit -m 0 -u spam -d '0 0'

     9

echo export >> port

    10

hg commit -m 1 -u eggs -d '1 0'

    11

echo export > port

    12

echo vaportight >> port

    13

echo 'import/export' >> port

    14

hg commit -m 2 -u spam -d '2 0'

    15

echo 'import/export' >> port

    16

hg commit -m 3 -u eggs -d '3 0'

    17

head -n 3 port > port1

    18

mv port1 port

    19

hg commit -m 4 -u spam -d '4 0'

    20

echo % simple

    21

hg grep port port

    22

echo % all

    23

hg grep --all -nu port port

    24

echo % other

    25

hg grep import port

    26

    27

hg cp port port2

    28

hg commit -m 4 -u spam -d '5 0'

    29

echo '% follow'

    30

hg grep -f 'import$' port2

    31

echo deport >> port2

    32

hg commit -m 5 -u eggs -d '6 0'

    33

hg grep -f --all -nu port port2

    34

    35

cd ..

    36

hg init t2

    37

cd t2

    38

hg grep foobar foo

    39

hg grep foobar

    40

echo blue >> color

    41

echo black >> color

    42

hg add color

    43

hg ci -m 0 -d '0 0'

    44

echo orange >> color

    45

hg ci -m 1 -d '0 0'

    46

echo black > color

    47

hg ci -m 2 -d '0 0'

    48

echo orange >> color

    49

echo blue >> color

    50

hg ci -m 3 -d '0 0'

    51

hg grep orange

    52

hg grep --all orange