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

# b51a8138292a introduced a regression where we would mention in the

     3

# changelog executable files added by the second parent of a merge.

     4

# Test that that doesn't happen anymore

     5

     6

"$TESTDIR/hghave" execbit || exit 80

     7

     8

hg init repo

     9

cd repo

    10

echo foo > foo

    11

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

    12

    13

echo bar > bar

    14

chmod +x bar

    15

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

    16

echo '% manifest of p2:'

    17

hg manifest

    18

echo

    19

    20

hg up -qC 0

    21

echo >> foo

    22

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

    23

echo '% manifest of p1:'

    24

hg manifest

    25

    26

hg merge

    27

hg ci -m 'merge' -d '0 0'

    28

    29

echo '% this should not mention bar:'

    30

hg tip -v

    31

    32

hg debugindex .hg/store/data/bar.i