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 repo1

     4

cd repo1

     5

mkdir a b a/1 b/1 b/2

     6

touch in_root a/in_a b/in_b a/1/in_a_1 b/1/in_b_1 b/2/in_b_2

     7

echo "hg status in repo root:"

     8

hg status

     9

echo "hg status . in repo root:"

    10

hg status .

    11

for dir in a b a/1 b/1 b/2; do

    12

    echo "hg status in $dir:"

    13

    hg status --cwd "$dir"

    14

    echo "hg status . in $dir:"

    15

    hg status --cwd "$dir" .

    16

    echo "hg status .. in $dir:"

    17

    hg status --cwd "$dir" ..

    18

done

    19

cd ..

    20

    21

hg init repo2

    22

cd repo2

    23

touch modified removed deleted ignored

    24

echo "ignored" > .hgignore

    25

hg ci -A -m 'initial checkin' -d "1000000 0"

    26

sleep 1 # make sure mtime is changed

    27

touch modified added unknown ignored

    28

hg add added

    29

hg remove removed

    30

rm deleted

    31

echo "hg status:"

    32

hg status

    33

echo "hg status modified added removed deleted unknown never-existed ignored:"

    34

hg status modified added removed deleted unknown never-existed ignored

    35

hg copy modified copied

    36

echo "hg status -C:"

    37

hg status -C

    38

echo "hg status -A:"

    39

hg status -A