Mercurial > hg

changeset 10887:3a1a1077f177

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable
author Patrick Mezard <pmezard@gmail.com>
date Mon, 12 Apr 2010 21:55:34 +0200
parents 38f2ef9c134b (current diff) 9e4d120e3c32 (diff)
children 5e18023820a9
files
diffstat 3 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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
--- 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