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

adding a

     2

? a

     3

adding a

     4

A a

     5

A a

     6

? b

     7

A a

     8

A b

     9

% should fail

    10

b already tracked!

    11

A a

    12

A b

    13

% should fail

    14

a already tracked!

    15

1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    16

warning: conflicts during merge.

    17

merging a

    18

merging a failed!

    19

0 files updated, 0 files merged, 0 files removed, 1 files unresolved

    20

There are unresolved merges, you can redo the full merge using:

    21

  hg update -C 2

    22

  hg merge 1

    23

M a

    24

% should fail

    25

a already tracked!

    26

M a

    27

% issue683

    28

R a

    29

M a