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

"$TESTDIR/hghave" symlink || exit 80

     4

     5

cleanpath()

     6

{

     7

    sed -e "s:/.*\(/test-symlink-basic/.*\):...\1:"

     8

}

     9

    10

cat >> readlink.py <<EOF

    11

import os

    12

import sys

    13

    14

for f in sys.argv[1:]:

    15

    print f, '->', os.readlink(f)

    16

EOF

    17

    18

hg init a

    19

cd a

    20

ln -s nothing dangling

    21

hg commit -m 'commit symlink without adding' -d '0 0' dangling 2>&1 | cleanpath

    22

hg add dangling

    23

hg commit -m 'add symlink' -d '0 0'

    24

    25

hg tip -v

    26

hg manifest --debug

    27

echo '% rev 0:'

    28

python ../readlink.py dangling

    29

    30

rm dangling

    31

ln -s void dangling

    32

hg commit -m 'change symlink'

    33

echo '% rev 1:'

    34

python ../readlink.py dangling

    35

    36

echo '% modifying link'

    37

rm dangling

    38

ln -s empty dangling

    39

python ../readlink.py dangling

    40

    41

echo '% reverting to rev 0:'

    42

hg revert -r 0 -a

    43

python ../readlink.py dangling

    44

    45

echo '% backups:'

    46

python ../readlink.py *.orig

    47

    48

rm *.orig

    49

hg up -C

    50

echo '% copies'

    51

hg cp -v dangling dangling2

    52

hg st -Cmard

    53

python ../readlink.py dangling dangling2