# HG changeset patch # User David Stanek # Date 1248120037 14400 # Node ID 15443c592f7af1ee92bdc60df10a2af85975a507 # Parent 63cb630d667d31df0c5bc37500e39529a6397d03 Remove the svn+ from svn+https urls before calling the Subversion API. This was already being done for svn+http urls. diff --git a/hgsubversion/util.py b/hgsubversion/util.py --- a/hgsubversion/util.py +++ b/hgsubversion/util.py @@ -71,7 +71,7 @@ def version(ui): def normalize_url(url): - if url.startswith('svn+http://'): + if url.startswith('svn+http://') or url.startswith('svn+https://'): url = url[4:] url, revs, checkout = hg.parseurl(url) url = url.rstrip('/') diff --git a/tests/test_urls.py b/tests/test_urls.py --- a/tests/test_urls.py +++ b/tests/test_urls.py @@ -56,6 +56,9 @@ class TestSvnRepo(test_util.TestBase): repo = svnrepo.svnremoterepo(ui, 'svn+http://joe@foo/bar') self.assertEqual(('http://foo/bar', 'bob', None), repo.svnauth) + repo = svnrepo.svnremoterepo(ui, 'svn+https://joe@foo/bar') + self.assertEqual(('https://foo/bar', 'bob', None), repo.svnauth) + def suite(): all = [unittest.TestLoader().loadTestsFromTestCase(TestSubversionUrls)] return unittest.TestSuite(all)