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

echo "[extensions]" >> $HGRCPATH

     4

echo "fetch=" >> $HGRCPATH

     5

     6

hg init a

     7

echo a > a/a

     8

hg --cwd a commit -d '1 0' -Ama

     9

    10

hg clone a b

    11

hg clone a c

    12

    13

echo b > a/b

    14

hg --cwd a commit -d '2 0' -Amb

    15

hg --cwd a parents -q

    16

    17

echo % should pull one change

    18

hg --cwd b fetch ../a

    19

hg --cwd b parents -q

    20

    21

echo c > c/c

    22

hg --cwd c commit -d '3 0' -Amc

    23

hg --cwd c fetch -d '4 0' -m 'automated merge' ../a

    24

ls c