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

import os

     2

from mercurial import dispatch

     3

     4

def testdispatch(cmd):

     5

    """Simple wrapper around dispatch.dispatch()

     6

     7

    Prints command and result value, but does not handle quoting.

     8

    """

     9

    print "running: %s" % (cmd,)

    10

    result = dispatch.dispatch(cmd.split())

    11

    print "result: %r" % (result,)

    12

    13

    14

testdispatch("init test1")

    15

os.chdir('test1')

    16

    17

# create file 'foo', add and commit

    18

f = file('foo', 'wb')

    19

f.write('foo\n')

    20

f.close()

    21

testdispatch("add foo")

    22

testdispatch("commit -m commit1 -d 2000-01-01 foo")

    23

    24

# append to file 'foo' and commit

    25

f = file('foo', 'ab')

    26

f.write('bar\n')

    27

f.close()

    28

testdispatch("commit -m commit2 -d 2000-01-02 foo")

    29

    30

# check 88803a69b24 (fancyopts modified command table)

    31

testdispatch("log -r 0")

    32

testdispatch("log -r tip")