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

# Test that qpush cleans things up if it doesn't complete

     4

     5

echo "[extensions]" >> $HGRCPATH

     6

echo "mq=" >> $HGRCPATH

     7

     8

hg init repo

     9

cd repo

    10

    11

echo foo > foo

    12

hg ci -Am 'add foo' -d '0 0'

    13

    14

touch untracked-file

    15

echo 'syntax: glob' > .hgignore

    16

echo '.hgignore' >> .hgignore

    17

    18

hg qinit

    19

hg qnew patch1

    20

echo >> foo

    21

hg qrefresh -m 'patch 1'

    22

    23

hg qnew patch2

    24

echo bar > bar

    25

hg add bar

    26

hg qrefresh -m 'patch 2'

    27

    28

hg qnew bad-patch

    29

echo >> foo

    30

hg qrefresh

    31

    32

hg qpop -a

    33

    34

python -c 'print "\xe9"' > message

    35

cat .hg/patches/bad-patch >> message

    36

mv message .hg/patches/bad-patch

    37

    38

hg qpush -a && echo 'qpush succeded?!'

    39

    40

hg parents

    41

    42

echo '% bar should be gone; other unknown/ignored files should still be around'

    43

hg status -A