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 -e

     2

     3

umask 027

     4

mkdir test1

     5

cd test1

     6

     7

hg init

     8

touch a b

     9

hg add a b

    10

hg ci -m "added a b" -d "1000000 0"

    11

    12

cd ..

    13

hg clone test1 test3

    14

mkdir test2

    15

cd test2

    16

    17

hg init

    18

hg pull ../test1

    19

hg co

    20

chmod +x a

    21

hg ci -m "chmod +x a" -d "1000000 0"

    22

echo % the changelog should mention file a:

    23

hg tip --template '#files#\n'

    24

    25

cd ../test1

    26

echo 123 >>a

    27

hg ci -m "a updated" -d "1000000 0"

    28

    29

hg pull ../test2

    30

hg heads

    31

hg history

    32

    33

hg -v merge

    34

    35

cd ../test3

    36

echo 123 >>b

    37

hg ci -m "b updated" -d "1000000 0"

    38

    39

hg pull ../test2

    40

hg heads

    41

hg history

    42

    43

hg -v merge

    44

    45

ls -l ../test[123]/a > foo

    46

cut -b 1-10 < foo

    47

    48

hg debugindex .hg/store/data/a.i

    49

hg debugindex ../test2/.hg/store/data/a.i

    50

hg debugindex ../test1/.hg/store/data/a.i