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 "added file1" > file1

     7

echo "another line of text" >> file1

     8

echo "added file2" > file2

     9

hg add file1 file2

    10

hg commit -m "added file1 and file2" -d "1000000 0" -u user

    11

echo "changed file1" >> file1

    12

hg commit -m "changed file1" -d "1000000 0" -u user

    13

hg -q log

    14

hg id

    15

hg update -C 0

    16

hg id

    17

echo "changed file1" >> file1

    18

hg id

    19

hg revert --no-backup --all

    20

hg diff

    21

hg status

    22

hg id

    23

hg update

    24

hg diff

    25

hg status

    26

hg id

    27

hg update -C 0

    28

echo "changed file1 different" >> file1

    29

hg update

    30

hg diff --nodates

    31

hg status

    32

hg id

    33

hg revert --no-backup --all

    34

hg diff

    35

hg status

    36

hg id

    37

hg revert -r tip --no-backup --all

    38

hg diff

    39

hg status

    40

hg id

    41

hg update -C

    42

hg diff

    43

hg status

    44

hg id

    45