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

# http://www.selenic.com/mercurial/bts/issue322

     3

     4

echo % file replaced with directory

     5

     6

hg init a

     7

cd a

     8

echo a > a

     9

hg commit -Ama

    10

rm a

    11

mkdir a

    12

echo a > a/a

    13

    14

echo % should fail - would corrupt dirstate

    15

hg add a/a

    16

    17

cd ..

    18

    19

echo % directory replaced with file

    20

    21

hg init c

    22

cd c

    23

mkdir a

    24

echo a > a/a

    25

hg commit -Ama

    26

    27

rm -r a

    28

echo a > a

    29

    30

echo % should fail - would corrupt dirstate

    31

hg add a

    32

    33

cd ..

    34

    35

echo % directory replaced with file

    36

    37

hg init d

    38

cd d

    39

mkdir b

    40

mkdir b/c

    41

echo a > b/c/d

    42

hg commit -Ama

    43

rm -r b

    44

echo a > b

    45

    46

echo % should fail - would corrupt dirstate

    47

hg add b

    48

    49

exit 0