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 "mq=" >> $HGRCPATH

     5

     6

echo % init

     7

hg init a

     8

cd a

     9

    10

echo % commit

    11

echo 'base' > base

    12

hg ci -Ambase -d '1 0'

    13

    14

echo % qnew mqbase

    15

hg qnew -mmqbase mqbase

    16

    17

echo % qrefresh

    18

echo 'patched' > base

    19

hg qrefresh

    20

    21

echo % qdiff

    22

hg qdiff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \

    23

               -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"

    24

    25

echo % qdiff dirname

    26

hg qdiff . | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \

    27

                 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"