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

cat >findbranch.py <<EOF

     4

import re, sys

     5

     6

head_re = re.compile('^#(?:(?:\\s+([A-Za-z][A-Za-z0-9_]*)(?:\\s.*)?)|(?:\\s*))$')

     7

     8

for line in sys.stdin:

     9

    hmatch = head_re.match(line)

    10

    if not hmatch:

    11

        sys.exit(1)

    12

    if hmatch.group(1) == 'Branch':

    13

        sys.exit(0)

    14

sys.exit(1)

    15

EOF

    16

hg init a

    17

cd a

    18

echo "Rev 1" >rev

    19

hg add rev

    20

hg commit -m "No branch."

    21

hg branch abranch

    22

echo "Rev  2" >rev

    23

hg commit -m "With branch."

    24

if hg export 0 | python ../findbranch.py; then

    25

    echo "Export of default branch revision has Branch header" 1>&2

    26

    exit 1

    27

fi

    28

if hg export 1 | python ../findbranch.py; then

    29

    :  # Do nothing

    30

else

    31

    echo "Export of branch revision is missing Branch header" 1>&2

    32

    exit 1

    33

fi

    34

# Make sure import still works with branch information in patches.

    35

cd ..

    36

hg init b

    37

cd b

    38

hg -R ../a export 0 | hg import -

    39

hg -R ../a export 1 | hg import -

    40

cd ..

    41

rm -rf b

    42

hg init b

    43

cd b

    44

hg -R ../a export 0 | hg import --exact -

    45

hg -R ../a export 1 | hg import --exact -