--- a/contrib/convert-repo	Sun Mar 23 21:40:27 2008 +0100
+++ b/contrib/convert-repo	Sun Mar 23 21:41:03 2008 +0100
@@ -17,9 +17,11 @@
 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)