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

"$TESTDIR/hghave" cvs cvsps || exit 80

     4

     5

echo "[extensions]" >> $HGRCPATH

     6

echo "convert = " >> $HGRCPATH

     7

     8

echo % create cvs repository

     9

mkdir cvsrepo

    10

cd cvsrepo

    11

export CVSROOT=`pwd`

    12

cd ..

    13

    14

cvs -q -d "$CVSROOT" init

    15

    16

echo % create source directory

    17

mkdir src-temp

    18

cd src-temp

    19

echo a > a

    20

mkdir b

    21

cd b

    22

echo c > c

    23

cd ..

    24

    25

echo % import source directory

    26

cvs -q import -m import src INITIAL start

    27

cd ..

    28

    29

echo % checkout source directory

    30

cvs -q checkout src

    31

    32

echo % convert fresh repo

    33

hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'

    34

cat src-hg/a

    35

cat src-hg/b/c

    36

    37

echo % commit new file revisions

    38

cd src

    39

echo a >> a

    40

echo c >> b/c

    41

cvs -q commit -mci1 . | grep '<--' |\

    42

    sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'

    43

cd ..

    44

    45

echo % convert again

    46

hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'

    47

cat src-hg/a

    48

cat src-hg/b/c

    49

    50

    51