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

     7

mkdir a

     8

echo foo > a/a

     9

echo bar > a/b

    10

    11

hg add a

    12

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

    13

    14

hg co -C 0

    15

hg mv a b

    16

hg ci -m "1 mv a/ b/" -d "0 0"

    17

    18

hg co -C 0

    19

echo baz > a/c

    20

hg add a/c

    21

hg ci -m "2 add a/c" -d "0 0"

    22

    23

hg merge --debug 1

    24

echo a/* b/*

    25

hg st -C

    26

hg ci -m "3 merge 2+1" -d "0 0"

    27

hg debugrename b/c

    28

    29

hg co -C 1

    30

hg merge --debug 2

    31

echo a/* b/*

    32

hg st -C

    33

hg ci -m "4 merge 1+2" -d "0 0"

    34

hg debugrename b/c