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

cat > patchtool.py <<EOF

     4

import sys

     5

print 'Using custom patch'

     6

if '--binary' in sys.argv:

     7

    print '--binary found !'

     8

EOF

     9

    10

echo "[ui]" >> $HGRCPATH

    11

echo "patch=python ../patchtool.py" >> $HGRCPATH

    12

    13

hg init a

    14

cd a

    15

echo a > a

    16

hg commit -Ama -d '1 0'

    17

echo b >> a

    18

hg commit -Amb -d '2 0'

    19

cd ..

    20

    21

# This test check that:

    22

# - custom patch commands with arguments actually works

    23

# - patch code does not try to add weird arguments like

    24

# --binary when custom patch commands are used. For instance

    25

# --binary is added by default under win32.

    26

    27

echo % check custom patch options are honored

    28

hg --cwd a export -o ../a.diff tip

    29

hg clone -r 0 a b

    30

    31

hg --cwd b import -v ../a.diff

    32

    33

    34

    35

    36