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

     4

touch a

     5

hg add a

     6

hg commit -m "Added a" -d "1000000 0"

     7

     8

touch main

     9

hg add main

    10

hg commit -m "Added main" -d "1000000 0"

    11

hg checkout 0

    12

    13

echo Main should be gone

    14

ls

    15

    16

touch side1

    17

hg add side1

    18

hg commit -m "Added side1" -d "1000000 0"

    19

touch side2

    20

hg add side2

    21

hg commit -m "Added side2" -d "1000000 0"

    22

    23

hg log

    24

    25

echo Should have two heads, side2 and main

    26

hg heads

    27

    28

echo Should show "a side1 side2"

    29

ls

    30

    31

hg update --debug -C 1

    32

echo Should only show "a main"

    33

ls

    34