convertrepo: make it work with refactored convert extension

contrib/convert-repo

@@ -1,25 +1,27
 #!/usr/bin/env python
 #
 # Wrapper script around the convert.py hgext extension
 # for foreign SCM conversion to mercurial format.
 #
 
 import sys
 from mercurial import ui, fancyopts
 from hgext import convert
 
 # Options extracted from the cmdtable
 func, options, help = convert.cmdtable['convert']
 
 # An ui instance
 u = ui.ui()
 
 opts = {}
 args = []
 try:
-    args = fancyopts.fancyopts(sys.argv[1:], options, opts)
-except fancyopts.getopt.GetoptError, inst:
-    u.warn('Usage:\n%s' % help)
+    args = list(fancyopts.fancyopts(sys.argv[1:], options, opts))
+    args += [None]*(3 - len(args))
+    src, dest, revmapfile = args
+except (fancyopts.getopt.GetoptError, ValueError), inst:
+    u.warn('Usage:\n%s\n' % help)
     sys.exit(-1)
 
-convert._convert(u, *args, **opts)
+convert.convert(u, src, dest, revmapfile, **opts)