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

hg init

     4

echo foo > a

     5

hg add a

     6

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

     7

     8

echo bar > b

     9

hg add b

    10

hg remove a

    11

    12

echo "%%% should show a removed and b added"

    13

hg status

    14

    15

echo "reverting..."

    16

hg revert --all

    17

    18

echo "%%% should show b unknown and a back to normal"

    19

hg status

    20

    21

rm b

    22

    23

hg co -C 0

    24

echo foo-a > a

    25

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

    26

    27

hg co -C 0

    28

echo foo-b > a

    29

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

    30

    31

HGMERGE=true hg merge 1

    32

    33

echo "%%% should show foo-b"

    34

cat a

    35

    36

echo bar > b

    37

hg add b

    38

rm a

    39

hg remove a

    40

    41

echo "%%% should show a removed and b added"

    42

hg status

    43

    44

echo "%%% revert should fail"

    45

hg revert --all

    46

    47

echo "%%% revert should be ok now"

    48

hg revert -r2 --all

    49

    50

echo "%%% should show b unknown and a marked modified (merged)"

    51

hg status

    52

    53

echo "%%% should show foo-b"

    54

cat a

    55