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 repo1

     4

cd repo1

     5

mkdir a b a/1 b/1 b/2

     6

touch in_root a/in_a b/in_b a/1/in_a_1 b/1/in_b_1 b/2/in_b_2

     7

echo "hg status in repo root:"

     8

hg status

     9

echo "hg status . in repo root:"

    10

hg status .

    11

for dir in a b a/1 b/1 b/2; do

    12

    echo "hg status in $dir:"

    13

    hg status --cwd "$dir"

    14

    echo "hg status . in $dir:"

    15

    hg status --cwd "$dir" .

    16

    echo "hg status .. in $dir:"

    17

    hg status --cwd "$dir" ..

    18

done

    19

cd ..

    20

    21

hg init repo2

    22

cd repo2

    23

touch modified removed deleted ignored

    24

echo "ignored" > .hgignore

    25

hg ci -A -m 'initial checkin' -d "1000000 0"

    26

sleep 1 # make sure mtime is changed

    27

touch modified added unknown ignored

    28

hg add added

    29

hg remove removed

    30

rm deleted

    31

echo "hg status:"

    32

hg status

    33

echo "hg status modified added removed deleted unknown never-existed ignored:"

    34

hg status modified added removed deleted unknown never-existed ignored

    35

hg copy modified copied

    36

echo "hg status -C:"

    37

hg status -C

    38

echo "hg status -A:"

    39

hg status -A