# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 1271102134 -7200
# Node ID 3a1a1077f1777396ffbaba9c0cfc307af17ccc36
# Parent  38f2ef9c134b7c5b243d3929379f902dd1baaeb7# Parent  9e4d120e3c32d5d24dd6fa078ff986b7ff74bb1b
Merge with crew-stable

diff -r 38f2ef9c134b -r 3a1a1077f177 hgext/convert/subversion.py
--- a/hgext/convert/subversion.py	Mon Apr 12 21:37:21 2010 +0200
+++ b/hgext/convert/subversion.py	Mon Apr 12 21:55:34 2010 +0200
@@ -178,7 +178,7 @@
         path = os.path.abspath(url)
     if proto == 'file':
         path = path.replace(os.sep, '/')
-    check = protomap.get(proto, lambda p, p2: False)
+    check = protomap.get(proto, lambda *args: False)
     while '/' in path:
         if check(ui, path, proto):
             return True
diff -r 38f2ef9c134b -r 3a1a1077f177 tests/test-convert
--- a/tests/test-convert	Mon Apr 12 21:37:21 2010 +0200
+++ b/tests/test-convert	Mon Apr 12 21:55:34 2010 +0200
@@ -62,4 +62,7 @@
 echo % "contents of fncache file:"
 cat b/.hg/store/fncache
 
+echo '% test bogus URL'
+hg convert -q bzr+ssh://foobar@selenic.com/baz baz
+
 true
diff -r 38f2ef9c134b -r 3a1a1077f177 tests/test-convert.out
--- a/tests/test-convert.out	Mon Apr 12 21:37:21 2010 +0200
+++ b/tests/test-convert.out	Mon Apr 12 21:55:34 2010 +0200
@@ -287,3 +287,5 @@
 % contents of fncache file:
 data/a.i
 data/b.i
+% test bogus URL
+abort: bzr+ssh://foobar@selenic.com/baz: missing or unsupported repository