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

hg init rep

     4

cd rep

     5

mkdir dir

     6

touch foo dir/bar

     7

hg -v addremove

     8

hg -v commit -m "add 1" -d "1000000 0"

     9

cd dir/

    10

touch ../foo_2 bar_2

    11

hg -v addremove

    12

hg -v commit -m "add 2" -d "1000000 0"

    13

    14

cd ..

    15

hg init sim

    16

cd sim

    17

echo a > a

    18

echo a >> a

    19

echo a >> a

    20

echo c > c

    21

hg commit -Ama

    22

mv a b

    23

rm c

    24

echo d > d

    25

hg addremove -s 50

    26

hg commit -mb