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

hg init

     4

echo foo > a

     5

hg add a

     6

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

     7

     8

echo bar > b

     9

hg add b

    10

hg remove a

    11

    12

echo "%%% should show a removed and b added"

    13

hg status

    14

    15

echo "reverting..."

    16

hg revert --all

    17

    18

echo "%%% should show b unknown and a back to normal"

    19

hg status

    20

    21

rm b

    22

    23

hg co -C 0

    24

echo foo-a > a

    25

hg commit -m "2a" -d "1000000 0"

    26

    27

hg co -C 0

    28

echo foo-b > a

    29

hg commit -m "2b" -d "1000000 0"

    30

    31

HGMERGE=true hg merge 1

    32

    33

echo "%%% should show foo-b"

    34

cat a

    35

    36

echo bar > b

    37

hg add b

    38

rm a

    39

hg remove a

    40

    41

echo "%%% should show a removed and b added"

    42

hg status

    43

    44

echo "%%% revert should fail"

    45

hg revert --all

    46

    47

echo "%%% revert should be ok now"

    48

hg revert -r2 --all

    49

    50

echo "%%% should show b unknown and a marked modified (merged)"

    51

hg status

    52

    53

echo "%%% should show foo-b"

    54

cat a

    55