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

mkdir a

     4

cd a

     5

hg init

     6

echo foo > t1

     7

hg add t1

     8

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

     9

    10

cd ..

    11

hg clone a b

    12

    13

cd a

    14

echo foo > t2

    15

hg add t2

    16

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

    17

    18

cd ../b

    19

echo foo > t3

    20

hg add t3

    21

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

    22

    23

hg push ../a

    24

hg pull ../a

    25

hg push ../a

    26

hg merge

    27

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

    28

hg push ../a

    29

cd ..

    30

    31

hg init c

    32

cd c

    33

for i in 0 1 2; do

    34

    echo $i >> foo

    35

    hg ci -Am $i -d "1000000 0"

    36

done

    37

cd ..

    38

    39

hg clone c d

    40

cd d

    41

for i in 0 1; do

    42

    hg co -C $i

    43

    echo d-$i >> foo

    44

    hg ci -m d-$i -d "1000000 0"

    45

done

    46

    47

HGMERGE=true hg merge 3

    48

hg ci -m c-d -d "1000000 0"

    49

    50

hg push ../c; echo $?

    51

hg push -r 2 ../c; echo $?

    52

hg push -r 3 ../c; echo $?

    53

hg push -r 3 -r 4 ../c; echo $?

    54

hg push -f -r 3 -r 4 ../c; echo $?

    55

hg push -r 5 ../c; echo $?

    56

    57

# issue 450

    58

hg init ../e

    59

hg push -r 0 ../e ; echo $?

    60

hg push -r 1 ../e ; echo $?

    61

    62

exit 0