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

echo "[extensions]" >> $HGRCPATH

     4

echo "hgext.convert=" >> $HGRCPATH

     5

     6

hg init orig

     7

cd orig

     8

     9

echo foo > foo

    10

echo bar > bar

    11

hg ci -qAm 'add foo bar' -d '0 0'

    12

    13

echo >> foo

    14

hg ci -m 'change foo' -d '1 0'

    15

    16

hg up -qC 0

    17

hg copy --after --force foo bar

    18

hg copy foo baz

    19

hg ci -m 'make bar and baz copies of foo' -d '2 0'

    20

    21

hg merge

    22

hg ci -m 'merge local copy' -d '3 0'

    23

    24

hg up -C 1

    25

hg merge 2

    26

hg ci -m 'merge remote copy' -d '4 0'

    27

    28

cd ..

    29

hg convert --datesort orig new 2>&1 | grep -v 'subversion python bindings could not be loaded'

    30

cd new

    31

hg out ../orig

    32

    33

true