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

# Test issue 529 - mq aborts when merging patch deleting files

     4

     5

rewrite_path()

     6

{

     7

    sed -e 's:\\:/:g' -e 's:[^ ]*/t/::g'

     8

}

     9

    10

echo "[extensions]" >> $HGRCPATH

    11

echo "hgext.mq=" >> $HGRCPATH

    12

    13

# Commit two dummy files in "init" changeset

    14

hg init t

    15

cd t

    16

echo a > a

    17

echo b > b

    18

hg ci -Am init

    19

hg tag -l init

    20

    21

# Create a patch removing a

    22

hg qnew rm_a

    23

hg rm a

    24

hg qrefresh -m "rm a"

    25

    26

# Save the patch queue so we can merge it later

    27

hg qsave -c -e 2>&1 | rewrite_path

    28

    29

# Update b and commit in an "update" changeset

    30

hg up -C init

    31

echo b >> b

    32

hg st

    33

hg ci -m update

    34

    35

# Here, qpush used to abort with :

    36

# The system cannot find the file specified => a

    37

hg manifest

    38

hg qpush -a -m 2>&1 | rewrite_path

    39

hg manifest

    40

    41

# ensure status is correct after merge

    42

hg qpop -a