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 test

     4

cd test

     5

cat >>afile <<EOF

     6

0

     7

EOF

     8

hg add afile

     9

hg commit -m "0.0"

    10

cat >>afile <<EOF

    11

1

    12

EOF

    13

hg commit -m "0.1"

    14

cat >>afile <<EOF

    15

2

    16

EOF

    17

hg commit -m "0.2"

    18

cat >>afile <<EOF

    19

3

    20

EOF

    21

hg commit -m "0.3"

    22

hg update -C 0

    23

cat >>afile <<EOF

    24

1

    25

EOF

    26

hg commit -m "1.1"

    27

cat >>afile <<EOF

    28

2

    29

EOF

    30

hg commit -m "1.2"

    31

cat >fred <<EOF

    32

a line

    33

EOF

    34

cat >>afile <<EOF

    35

3

    36

EOF

    37

hg add fred

    38

hg commit -m "1.3"

    39

hg mv afile adifferentfile

    40

hg commit -m "1.3m"

    41

hg update -C 3

    42

hg mv afile anotherfile

    43

hg commit -m "0.3m"

    44

hg debugindex .hg/store/data/afile.i

    45

hg debugindex .hg/store/data/adifferentfile.i

    46

hg debugindex .hg/store/data/anotherfile.i

    47

hg debugindex .hg/store/data/fred.i

    48

hg debugindex .hg/store/00manifest.i

    49

hg verify

    50

cd ..

    51

for i in 0 1 2 3 4 5 6 7 8; do

    52

   mkdir test-"$i"

    53

   hg --cwd test-"$i" init

    54

   hg -R test push -r "$i" test-"$i"

    55

   cd test-"$i"

    56

   hg verify

    57

   cd ..

    58

done

    59

cd test-8

    60

hg pull ../test-7

    61

hg verify