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

hg add a

     8

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

     9

echo This is file b1 > b

    10

hg add b

    11

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

    12

rm b

    13

hg update 0

    14

echo This is file b2 > b

    15

hg add b

    16

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

    17

cd ..; rm -r t

    18

    19

mkdir t

    20

cd t

    21

hg init

    22

echo This is file a1 > a

    23

hg add a

    24

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

    25

echo This is file b1 > b

    26

hg add b

    27

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

    28

rm b

    29

hg update 0

    30

echo This is file b2 > b

    31

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

    32

cd ..; rm -r t

    33

    34

mkdir t

    35

cd t

    36

hg init

    37

echo This is file a1 > a

    38

hg add a

    39

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

    40

echo This is file b1 > b

    41

hg add b

    42

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

    43

rm b

    44

hg remove b

    45

hg update 0

    46

echo This is file b2 > b

    47

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