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

HG=hg

     3

"$HG" init

     4

mkdir b

     5

echo 'Bouncy' >b/bouncy

     6

echo 'tricycle' >b/vehicle

     7

"$HG" add b/bouncy

     8

"$HG" add b/vehicle

     9

"$HG" commit -m 'Adding bouncy'

    10

echo 'bouncy' >>b/bouncy

    11

"$HG" commit -m 'Making it bouncier'

    12

"$HG" update -C 0

    13

echo 'stationary' >>b/vehicle

    14

"$HG" commit -m 'Clarifying the vehicle.'

    15

"$HG" update -C 1

    16

chmod a-w b/vehicle

    17

"$HG" merge 2 2>&1 | sed 's|^\(.*[ 	]\).*/\([^/]*/[^/]*/[^/]*\)$|\1\2|g'