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

mkdir t

     4

cd t

     5

hg init

     6

echo "[merge]" >> .hg/hgrc

     7

echo "followcopies = 1" >> .hg/hgrc

     8

echo foo > a

     9

echo foo > a2

    10

hg add a a2

    11

hg ci -m "start" -d "0 0"

    12

hg mv a b

    13

hg mv a2 b2

    14

hg ci -m "rename" -d "0 0"

    15

echo "checkout"

    16

hg co 0

    17

echo blahblah > a

    18

echo blahblah > a2

    19

hg mv a2 c2

    20

hg ci -m "modify" -d "0 0"

    21

echo "merge"

    22

hg merge -y --debug

    23

hg status -AC

    24

cat b

    25

hg ci -m "merge" -d "0 0"

    26

hg debugindex .hg/store/data/b.i

    27

hg debugrename b