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

mkdir test

     4

cd test

     5

hg init

     6

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

     7

	echo $i >> foo

     8

	hg commit -A -m $i -d "1000000 0"

     9

done

    10

hg verify

    11

hg serve -p 20059 -d --pid-file=hg.pid

    12

cat hg.pid >> $DAEMON_PIDS

    13

cd ..

    14

    15

hg init new

    16

# http incoming

    17

http_proxy= hg -R new incoming http://localhost:20059/

    18

http_proxy= hg -R new incoming -r 4 http://localhost:20059/

    19

# local incoming

    20

hg -R new incoming test

    21

hg -R new incoming -r 4 test

    22

    23

# test with --bundle

    24

http_proxy= hg -R new incoming --bundle test.hg http://localhost:20059/

    25

hg -R new incoming --bundle test2.hg test

    26

    27

# test the resulting bundles

    28

hg init temp

    29

hg init temp2

    30

hg -R temp unbundle test.hg

    31

hg -R temp2 unbundle test2.hg

    32

hg -R temp tip

    33

hg -R temp2 tip

    34

    35

rm -r temp temp2 new

    36

    37

# test outgoing

    38

hg clone test test-dev

    39

cd test-dev

    40

for i in 9 10 11 12 13; do

    41

	echo $i >> foo

    42

	hg commit -A -m $i -d "1000000 0"

    43

done

    44

hg verify

    45

cd ..

    46

hg -R test-dev outgoing test

    47

http_proxy= hg -R test-dev outgoing http://localhost:20059/

    48

http_proxy= hg -R test-dev outgoing -r 11 http://localhost:20059/