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

#  A          B

     4

#

     5

#  3  4       3

     6

#  |\/|       |\

     7

#  |/\|       | \

     8

#  1  2       1  2

     9

#  \ /        \ /

    10

#   0          0

    11

#

    12

# if the result of the merge of 1 and 2

    13

# is the same in 3 and 4, no new manifest

    14

# will be created and the manifest group

    15

# will be empty during the pull

    16

#

    17

# (plus we test a failure where outgoing

    18

# wrongly reported the number of csets)

    19

#

    20

    21

hg init a

    22

cd a

    23

touch init

    24

hg ci -A -m 0 -d "1000000 0"

    25

touch x y

    26

hg ci -A -m 1 -d "1000000 0"

    27

hg update 0

    28

touch x y

    29

hg ci -A -m 2 -d "1000000 0"

    30

hg merge 1

    31

hg ci -A -m m1 -d "1000000 0"

    32

#hg log

    33

#hg debugindex .hg/store/00manifest.i

    34

hg update -C 1

    35

hg merge 2

    36

hg ci -A -m m2 -d "1000000 0"

    37

#hg log

    38

#hg debugindex .hg/store/00manifest.i

    39

    40

cd ..

    41

hg clone -r 3 a b

    42

hg clone -r 4 a c

    43

hg -R a outgoing b

    44

hg -R a outgoing c

    45

hg -R b outgoing c

    46

hg -R c outgoing b

    47

    48

hg -R b pull a

    49

hg -R c pull a