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 This is file a1 > a

     7

echo This is file b1 > b

     8

hg add a b

     9

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

    10

echo This is file b22 > b

    11

hg commit -m"comment #1" -d "1000000 0"

    12

hg update 0

    13

rm b

    14

hg commit -A -m"comment #2" -d "1000000 0"

    15

# in theory, we shouldn't need the "-y" below, but it prevents

    16

# this test from hanging when "hg update" erroneously prompts the

    17

# user for "keep or delete"

    18

hg update -y 1

    19

    20

exit 0