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 a

     4

cd a

     5

echo a > a

     6

hg add -n

     7

hg st

     8

hg add

     9

hg st

    10

    11

echo b > b

    12

hg add -n b

    13

hg st

    14

hg add b

    15

hg st

    16

echo % should fail

    17

hg add b

    18

hg st

    19

    20

hg ci -m 0

    21

echo % should fail

    22

hg add a

    23

    24

echo aa > a

    25

hg ci -m 1

    26

hg up 0

    27

echo aaa > a

    28

hg ci -m 2

    29

    30

hg merge

    31

hg st

    32

echo % should fail

    33

hg add a

    34

hg st

    35

hg ci -m merge

    36

    37

echo % issue683

    38

hg rm a

    39

hg st

    40

echo a > a

    41

hg add a

    42

hg st