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

# initial

     4

hg init test-a

     5

cd test-a

     6

cat >test.txt <<"EOF"

     7

1

     8

2

     9

3

    10

EOF

    11

hg add test.txt

    12

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

    13

    14

# clone

    15

cd ..

    16

hg clone test-a test-b

    17

    18

# change test-a

    19

cd test-a

    20

cat >test.txt <<"EOF"

    21

one

    22

two

    23

three

    24

EOF

    25

hg commit -m "Numbers as words" -d "1000000 0"

    26

    27

# change test-b

    28

cd ../test-b

    29

cat >test.txt <<"EOF"

    30

1

    31

2.5

    32

3

    33

EOF

    34

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

    35

    36

# now pull and merge from test-a

    37

hg pull ../test-a

    38

hg merge

    39

# resolve conflict

    40

cat >test.txt <<"EOF"

    41

one

    42

two-point-five

    43

three

    44

EOF

    45

rm -f *.orig

    46

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

    47

    48

# change test-a again

    49

cd ../test-a

    50

cat >test.txt <<"EOF"

    51

one

    52

two-point-one

    53

three

    54

EOF

    55

hg commit -m "two -> two-point-one" -d "1000000 0"

    56

    57

# pull and merge from test-a again

    58

cd ../test-b

    59

hg pull ../test-a

    60

hg merge --debug

    61

    62

cat test.txt

    63

    64

hg debugindex .hg/store/data/test.txt.i

    65

    66

hg log