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

     5

     6

hg init a

     7

cd a

     8

echo a > a

     9

echo b > b

    10

hg add

    11

# should diff cloned directories

    12

hg extdiff -o -r $opt

    13

    14

echo "[extdiff]" >> $HGRCPATH

    15

echo "cmd.falabala=echo" >> $HGRCPATH

    16

echo "opts.falabala=diffing" >> $HGRCPATH

    17

    18

hg falabala

    19

    20

hg help falabala

    21

    22

hg ci -d '0 0' -mtest1

    23

    24

echo b >> a

    25

hg ci -d '1 0' -mtest2

    26

    27

# should diff cloned files directly

    28

hg falabala -r 0:1

    29

    30

# test diff during merge

    31

hg update 0

    32

echo c >> c

    33

hg add c

    34

hg ci -m "new branch" -d '1 0'

    35

hg update -C 1

    36

hg merge tip

    37

# should diff cloned file against wc file

    38

hg falabala > out || echo "diff-like tools yield a non-zero exit code"

    39

# cleanup the output since the wc is a tmp directory

    40

sed  's:\(.* \).*\(\/test-extdiff\):\1[tmp]\2:' out