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 a

     4

cd a

     5

echo a > foo

     6

hg rm foo

     7

hg add foo

     8

hg commit -m 1 -d "1000000 0"

     9

hg remove

    10

rm foo

    11

hg remove foo

    12

hg revert --all

    13

rm foo

    14

hg remove --after

    15

hg commit -m 2 -d "1000000 0"

    16

hg export --nodates 0

    17

hg export --nodates 1

    18

hg log -p -r 0

    19

hg log -p -r 1

    20

    21

echo a > a

    22

hg add a

    23

hg rm a

    24

hg rm -f a

    25

echo b > b

    26

mkdir c

    27

echo d > c/d

    28

hg ci -A -m 3 -d "1000001 0"

    29

echo c >> b

    30

hg rm b

    31

hg rm -f b

    32

hg rm -A c/d

    33

hg st

    34

cat c/d

    35

hg revert c

    36

hg rm -A

    37

hg st

    38

hg rm -A c

    39

hg st

    40

rm c/d

    41

hg rm -A

    42

hg st

    43

    44

cd ..

    45

hg clone a b