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

unset HGUSER

     4

EMAIL="My Name <myname@example.com>"

     5

export EMAIL

     6

     7

hg init test

     8

cd test

     9

touch asdf

    10

hg add asdf

    11

hg commit -d '1000000 0' -m commit-1

    12

hg tip

    13

    14

unset EMAIL

    15

echo 1234 > asdf

    16

hg commit -d '1000000 0' -u "foo@bar.com" -m commit-1

    17

hg tip

    18

echo "[ui]" >> .hg/hgrc

    19

echo "username = foobar <foo@bar.com>" >> .hg/hgrc

    20

echo 12 > asdf

    21

hg commit -d '1000000 0' -m commit-1

    22

hg tip

    23

echo 1 > asdf

    24

hg commit -d '1000000 0' -u "foo@bar.com" -m commit-1

    25

hg tip

    26

echo 123 > asdf

    27

echo "[ui]" > .hg/hgrc

    28

echo "username = " >> .hg/hgrc

    29

hg commit -d '1000000 0' -m commit-1

    30

rm .hg/hgrc

    31

hg commit -d '1000000 0' -m commit-1 2>&1 | sed -e "s/'[^']*'/user@host/"