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

cat >> readlink.py <<EOF

     7

import errno, os, sys

     8

     9

for f in sys.argv[1:]:

    10

    try:

    11

        print f, '->', os.readlink(f)

    12

    except OSError, err:

    13

        if err.errno != errno.EINVAL: raise

    14

        print f, 'not a symlink'

    15

EOF

    16

    17

hg init

    18

hg qinit

    19

hg qnew base.patch

    20

echo a > a

    21

echo b > b

    22

hg add a b

    23

hg qrefresh

    24

python readlink.py a

    25

    26

hg qnew symlink.patch

    27

rm a

    28

ln -s b a

    29

hg qrefresh --git

    30

python readlink.py a

    31

    32

hg qpop

    33

hg qpush

    34

python readlink.py a