# HG changeset patch
# User Augie Fackler <durin42@gmail.com>
# Date 1330203082 21600
# Node ID 9ce00cb1d6766b5df59662c3ac5e649b5342df88
# Parent  d3bc067c0f72135d2d72da84be11cbca9afb8146# Parent  4e203a47102a1fa75224e7e12bab78ccb921e0bf
Merge alternate tunnel schemes.

diff --git a/hgsubversion/__init__.py b/hgsubversion/__init__.py
--- a/hgsubversion/__init__.py
+++ b/hgsubversion/__init__.py
@@ -177,6 +177,8 @@ def extsetup():
 def reposetup(ui, repo):
     if repo.local():
         svnrepo.generate_repo_class(ui, repo)
+        for tunnel in ui.configlist('hgsubversion', 'tunnels'):
+            hg.schemes['svn+' + tunnel] = svnrepo
 
 _old_local = hg.schemes['file']
 def _lookup(url):
diff --git a/hgsubversion/svnexternals.py b/hgsubversion/svnexternals.py
--- a/hgsubversion/svnexternals.py
+++ b/hgsubversion/svnexternals.py
@@ -95,9 +95,9 @@ def diff(ext1, ext2):
 class BadDefinition(Exception):
     pass
 
-re_defold = re.compile(r'^\s*(.*?)\s+(?:-r\s*(\d+|\{REV\})\s+)?([a-zA-Z]+://.*)\s*$')
-re_defnew = re.compile(r'^\s*(?:-r\s*(\d+|\{REV\})\s+)?((?:[a-zA-Z]+://|\^/).*)\s+(\S+)\s*$')
-re_scheme = re.compile(r'^[a-zA-Z]+://')
+re_defold = re.compile(r'^\s*(.*?)\s+(?:-r\s*(\d+|\{REV\})\s+)?([a-zA-Z+]+://.*)\s*$')
+re_defnew = re.compile(r'^\s*(?:-r\s*(\d+|\{REV\})\s+)?((?:[a-zA-Z+]+://|\^/).*)\s+(\S+)\s*$')
+re_scheme = re.compile(r'^[a-zA-Z+]+://')
 
 def parsedefinition(line):
     """Parse an external definition line, return a tuple (path, rev, source)