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

echo "[extensions]" >> $HGRCPATH

     4

echo "hgext.convert=" >> $HGRCPATH

     5

     6

hg init orig

     7

cd orig

     8

echo foo > foo

     9

echo bar > bar

    10

hg ci -qAm 'add foo and bar' -d '0 0'

    11

    12

hg rm foo

    13

hg ci -m 'remove foo' -d '0 0'

    14

    15

mkdir foo

    16

echo file > foo/file

    17

hg ci -qAm 'add foo/file' -d '0 0'

    18

    19

hg tag -d '0 0' some-tag

    20

    21

hg log

    22

cd ..

    23

    24

hg convert orig new 2>&1 | grep -v 'subversion python bindings could not be loaded'

    25

cd new

    26

hg out ../orig

    27

    28

echo '% dirstate should be empty:'

    29

hg debugstate

    30

hg parents -q

    31

    32

hg up -C

    33

hg copy bar baz

    34

echo '% put something in the dirstate:'

    35

hg debugstate > debugstate

    36

grep baz debugstate

    37

    38

echo '% add a new revision in the original repo'

    39

cd ../orig

    40

echo baz > baz

    41

hg ci -qAm 'add baz'

    42

    43

cd ..

    44

hg convert orig new 2>&1 | grep -v 'subversion python bindings could not be loaded'

    45

cd new

    46

hg out ../orig

    47

echo '% dirstate should be the same (no output below):'

    48

hg debugstate > new-debugstate

    49

diff debugstate new-debugstate

    50

    51

echo '% no copies'

    52

hg up -C

    53

hg debugrename baz