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

echo a > a

     5

hg commit -A -ma

     6

     7

echo a >> a

     8

hg commit -mb

     9

    10

echo a >> a

    11

hg commit -mc

    12

    13

hg up 1

    14

echo a >> a

    15

hg commit -md

    16

    17

hg up 1

    18

echo a >> a

    19

hg commit -me

    20

    21

hg up 1

    22

echo % should fail because not at a head

    23

hg merge

    24

    25

hg up

    26

echo % should fail because \> 2 heads

    27

hg merge

    28

    29

echo % should succeed

    30

hg merge 2

    31

hg commit -mm1

    32

    33

echo % should succeed - 2 heads

    34

hg merge

    35

hg commit -mm2

    36

    37

echo % should fail because at tip

    38

hg merge

    39

    40

hg up 0

    41

echo % should fail because 1 head

    42

hg merge

    43

    44

true