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

cat <<EOF > merge

     4

import sys, os

     5

print "merging for", os.path.basename(sys.argv[1])

     6

EOF

     7

HGMERGE="python ../merge"; export HGMERGE

     8

     9

mkdir A1

    10

cd A1

    11

hg init

    12

echo This is file foo1 > foo

    13

echo This is file bar1 > bar

    14

hg add foo bar

    15

hg commit -m "commit text" -d "1000000 0"

    16

    17

cd ..

    18

hg clone A1 B1

    19

    20

cd A1

    21

rm bar

    22

hg remove bar

    23

hg commit -m "commit test" -d "1000000 0"

    24

    25

cd ../B1

    26

echo This is file foo22 > foo

    27

hg commit -m "commit test" -d "1000000 0"

    28

    29

cd ..

    30

hg clone A1 A2

    31

hg clone B1 B2

    32

    33

cd A1

    34

hg pull ../B1

    35

hg merge

    36

hg commit -m "commit test" -d "1000000 0"

    37

echo bar should remain deleted.

    38

hg manifest --debug

    39

    40

cd ../B2

    41

hg pull ../A2

    42

hg merge

    43

hg commit -m "commit test" -d "1000000 0"

    44

echo bar should remain deleted.

    45

hg manifest --debug