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

# http://www.selenic.com/mercurial/bts/issue322

     3

     4

echo % file replaced with directory

     5

     6

hg init a

     7

cd a       

     8

echo a > a 

     9

hg commit -Ama 

    10

rm a       

    11

mkdir a    

    12

echo a > a/a

    13

    14

echo % should fail - would corrupt dirstate

    15

hg add a/a

    16

    17

cd ..      

    18

    19

echo % directory replaced with file

    20

    21

hg init c

    22

cd c

    23

mkdir a

    24

echo a > a/a

    25

hg commit -Ama

    26

    27

rm -r a

    28

echo a > a

    29

    30

echo % should fail - would corrupt dirstate

    31

hg add a

    32

    33

cd ..

    34

    35

echo % directory replaced with file

    36

    37

hg init d

    38

cd d

    39

mkdir b

    40

mkdir b/c

    41

echo a > b/c/d

    42

hg commit -Ama

    43

rm -r b

    44

echo a > b

    45

    46

echo % should fail - would corrupt dirstate

    47

hg add b

    48

    49

exit 0