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

     4

     5

# Test issue 562: .hgignore requires newline at end

     6

touch foo

     7

touch bar

     8

touch baz

     9

cat > makeignore.py <<EOF

    10

f = open(".hgignore", "w")

    11

f.write("ignore\n")

    12

f.write("foo\n")

    13

# No EOL here

    14

f.write("bar")

    15

f.close()

    16

EOF

    17

    18

python makeignore.py

    19

echo % should display baz only

    20

hg status

    21

rm foo bar baz .hgignore makeignore.py

    22

    23

touch a.o

    24

touch a.c

    25

touch syntax

    26

mkdir dir

    27

touch dir/a.o

    28

touch dir/b.o

    29

touch dir/c.o

    30

    31

hg add dir/a.o

    32

hg commit -m 0

    33

hg add dir/b.o

    34

    35

echo "--" ; hg status

    36

    37

echo "*.o" > .hgignore

    38

echo "--" ; hg status 2>&1 | sed -e 's/abort: .*\.hgignore:/abort: .hgignore:/'

    39

    40

echo ".*\.o" > .hgignore

    41

echo "--" ; hg status

    42

    43

echo "glob:**.o" > .hgignore

    44

echo "--" ; hg status

    45

    46

echo "glob:*.o" > .hgignore

    47

echo "--" ; hg status

    48

    49

echo "syntax: glob" > .hgignore

    50

echo "re:.*\.o" >> .hgignore

    51

echo "--" ; hg status

    52

    53

echo "syntax: invalid" > .hgignore

    54

echo "--" ; hg status 2>&1 | sed -e 's/.*\.hgignore:/.hgignore:/'

    55

    56

echo "syntax: glob" > .hgignore

    57

echo "*.o" >> .hgignore

    58

echo "--" ; hg status

    59

    60

echo "relglob:syntax*" > .hgignore

    61

echo "--" ; hg status

    62

    63

echo "relglob:*" > .hgignore

    64

echo "--" ; hg status

    65

    66

cd dir

    67

echo "--" ; hg status .