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 "mq=" >> $HGRCPATH

     5

     6

hg init a

     7

cd a

     8

     9

echo 'base' > base

    10

hg ci -Ambase -d '1 0'

    11

    12

hg qnew a

    13

hg qnew b

    14

hg qnew c

    15

    16

hg qdel

    17

    18

hg qdel c

    19

hg qpop

    20

hg qdel c

    21

hg qseries

    22

ls .hg/patches

    23

hg qpop

    24

hg qdel -k b

    25

ls .hg/patches

    26

hg qdel -r a

    27

hg qapplied

    28

hg log --template '{rev} {desc}\n'

    29

    30

hg qnew d

    31

hg qnew e

    32

hg qnew f

    33

    34

hg qdel -r e

    35

hg qdel -r qbase:e

    36

hg qapplied

    37

hg log --template '{rev} {desc}\n'