convert: add a mode where mercurial_sink skips empty revisions. The getchanges function of some converter_source classes can return some false positives. I.e. they sometimes claim that a file "foo" was changed in some revision, even though its contents are still the same. convert_svn is particularly bad, but I think this can also happen with convert_cvs and, at least in theory, with mercurial_source. For regular conversions this is not really a problem - as long as getfile returns the right contents, we'll get a converted revision with the right contents. But when we use --filemap, this could lead to superfluous revisions being converted. Instead of fixing every converter_source, I decided to change mercurial_sink to work around this problem. When --filemap is used, we're interested only in revisions that touch some specific files. If a revision doesn't change any of these files, then we're not interested in it (at least for revisions with a single parent; merges are special). For mercurial_sink, we abuse this property and rollback a commit if the manifest text hasn't changed. This avoids duplicating the logic from localrepo.filecommit to detect unchanged files.

     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