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

# Test for changeset 9fe267f77f56ff127cf7e65dc15dd9de71ce8ceb

     4

# (merge correctly when all the files in a directory are moved

     5

# but then local changes are added in the same directory)

     6

     7

hg init a

     8

cd a

     9

mkdir -p testdir

    10

echo a > testdir/a

    11

hg add testdir/a

    12

hg commit -u test -d '1000000 0' -m a

    13

cd ..

    14

    15

hg clone a b

    16

cd a

    17

echo alpha > testdir/a

    18

hg commit -u test -d '1000000 0' -m remote-change

    19

cd ..

    20

    21

cd b

    22

mkdir testdir/subdir

    23

hg mv testdir/a testdir/subdir/a

    24

hg commit -u test -d '1000000 0' -m move

    25

mkdir newdir

    26

echo beta > newdir/beta

    27

hg add newdir/beta

    28

hg commit -u test -d '1000000 0' -m local-addition

    29

hg pull ../a

    30

hg up -C 2

    31

hg merge

    32

hg stat

    33

hg diff --nodates