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

HGMERGE=true; export HGMERGE

     4

     5

set -e

     6

mkdir r1

     7

cd r1

     8

hg init

     9

echo a > a

    10

hg addremove

    11

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

    12

    13

hg clone . ../r2

    14

cd ../r2

    15

hg up

    16

echo abc > a

    17

hg diff --nodates

    18

    19

cd ../r1

    20

echo b > b

    21

echo a2 > a

    22

hg addremove

    23

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

    24

    25

cd ../r2

    26

hg -q pull ../r1

    27

hg status

    28

hg parents

    29

hg --debug up

    30

hg parents

    31

hg --debug up 0

    32

hg parents

    33

hg --debug merge || echo failed

    34

hg parents

    35

hg --debug up

    36

hg parents

    37

hg -v history

    38

hg diff --nodates

    39

    40

# create a second head

    41

cd ../r1

    42

hg up 0

    43

echo b2 > b

    44

echo a3 > a

    45

hg addremove

    46

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

    47

    48

cd ../r2

    49

hg -q pull ../r1

    50

hg status

    51

hg parents

    52

hg --debug up || echo failed

    53

hg --debug merge || echo failed

    54

hg --debug merge -f

    55

hg parents

    56

hg diff --nodates

    57

    58

# test a local add

    59

cd ..

    60

hg init a

    61

hg init b

    62

echo a > a/a

    63

echo a > b/a

    64

hg --cwd a commit -A -m a

    65

cd b

    66

hg add a

    67

hg pull -u ../a

    68

hg st