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

HGMERGE=true; export HGMERGE

     4

     5

echo % init

     6

hg init

     7

     8

echo % commit

     9

echo 'a' > a

    10

hg ci -A -m test -u nobody -d '1 0'

    11

    12

echo % annotate -c

    13

hg annotate -c a

    14

    15

echo % annotate -d

    16

hg annotate -d a

    17

    18

echo % annotate -n

    19

hg annotate -n a

    20

    21

echo % annotate -u

    22

hg annotate -u a

    23

    24

echo % annotate -cdnu

    25

hg annotate -cdnu a

    26

    27

cat <<EOF >>a

    28

a

    29

a

    30

EOF

    31

hg ci -ma1 -d '1 0'

    32

hg cp a b

    33

hg ci -mb -d '1 0'

    34

cat <<EOF >> b

    35

b

    36

b

    37

b

    38

EOF

    39

hg ci -mb2 -d '2 0'

    40

    41

echo % annotate b

    42

hg annotate b

    43

echo % annotate -nf b

    44

hg annotate -nf b

    45

    46

hg up -C 2

    47

cat <<EOF >> b

    48

b

    49

c

    50

b

    51

EOF

    52

hg ci -mb2.1 -d '2 0'

    53

hg merge

    54

hg ci -mmergeb -d '3 0'

    55

echo % annotate after merge

    56

hg annotate -nf b

    57

    58

hg up -C 1

    59

hg cp a b

    60

cat <<EOF > b

    61

a

    62

z

    63

a

    64

EOF

    65

hg ci -mc -d '3 0'

    66

hg merge

    67

cat <<EOF >> b

    68

b

    69

c

    70

b

    71

EOF

    72

echo d >> b

    73

hg ci -mmerge2 -d '4 0'

    74

echo % annotate after rename merge

    75

hg annotate -nf b

    76

    77

echo % linkrev vs rev

    78

hg annotate -r tip a