convert/svn: update svn working copy only when necessary I have not tried to produce the bug but here is idea: f85c0034a062 stopped passing the modified files list to commit. This makes commit more fragile since we better not touch unrelated files by mistake. But putcommit() still applies file changes before exiting upon ignored revisions. So in theory, we could apply changes from a skipped branch then commit them as part of another revision. This patch makes the sink apply the changes after possibly skipping the revision. The real fix would be to use svn commit --targets option to pass the file names in an argument file. Unfortunately, it seems to be bugged in svn 1.7.1: http://svn.haxx.se/dev/archive-2011-11/0211.shtml

     1

#!/usr/bin/env python

     2

#

     3

# Wrapper script around the convert.py hgext extension

     4

# for foreign SCM conversion to mercurial format.

     5

#

     6

     7

import sys

     8

from mercurial import ui, fancyopts

     9

from hgext import convert

    10

    11

# Options extracted from the cmdtable

    12

func, options, help = convert.cmdtable['convert']

    13

    14

# An ui instance

    15

u = ui.ui()

    16

    17

opts = {}

    18

args = []

    19

try:

    20

    args = list(fancyopts.fancyopts(sys.argv[1:], options, opts))

    21

    args += [None]*(3 - len(args))

    22

    src, dest, revmapfile = args

    23

except (fancyopts.getopt.GetoptError, ValueError), inst:

    24

    u.warn('Usage:\n%s\n' % help)

    25

    sys.exit(-1)

    26

    27

convert.convert(u, src, dest, revmapfile, **opts)