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

     4

     5

echo foo > a

     6

echo foo > b

     7

hg add a b

     8

     9

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

    10

    11

echo blah > a

    12

    13

hg ci -m "branch a" -d "1000000 0"

    14

    15

hg co 0

    16

    17

echo blah > b

    18

    19

hg ci -m "branch b" -d "1000000 0"

    20

HGMERGE=true hg merge 1

    21

    22

hg ci -m "merge b/a -> blah" -d "1000000 0"

    23

    24

hg co 1

    25

HGMERGE=true hg merge 2

    26

hg ci -m "merge a/b -> blah" -d "1000000 0"

    27

    28

hg log

    29

hg debugindex .hg/store/00changelog.i

    30

    31

echo

    32

    33

echo 1

    34

hg manifest --debug 1

    35

echo 2

    36

hg manifest --debug 2

    37

echo 3

    38

hg manifest --debug 3

    39

echo 4

    40

hg manifest --debug 4

    41

    42

echo

    43

    44

hg debugindex .hg/store/data/a.i

    45

    46

hg verify