Issue 2310 - Handle alternative syntax of Git SSH URLs

ensure_dependencies.py

 #!/usr/bin/env python
 # coding: utf-8
 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import sys
 import os
 import posixpath
@@ skipping 172 matching lines @@
   type = None
   for key in roots:
     if key == parenttype or (key in repo_types and type is None):
       type = key
   if type is None:
     raise Exception("No valid source found to create %s" % target)
 
   if os.path.exists(roots[type]):
     url = os.path.join(roots[type], sourcename)
   else:
-    url = urlparse.urljoin(roots[type], sourcename)
+    if (type == "git" and "@" in sourcename and
+        not urlparse.urlsplit(sourcename).scheme):
+      # Handle alternative syntax of Git SSH URLS
+      url = "ssh://" + sourcename.replace(":", "/", 1)
+    else:

[Wladimir Palant, 2015/04/29 18:03:05]

This seems to be the wrong place to do it. What we really need to do is
post-process Git "URLs" - all of them. So I'd expect something like:

  root = postprocess_url(roots[type], type)
  sourcename = postprocess_url(sourcename, type)

And the logic joining URLs should be unchanged, merely with roots[type] replaced
by root.

+      url = urlparse.urljoin(roots[type], sourcename)
 
   logging.info("Cloning repository %s into %s" % (url, target))
   repo_types[type].clone(url, target)
 
   for repo in repo_types.itervalues():
     if repo.istype(parentrepo):
       repo.ignore(target, parentrepo)
 
 def update_repo(target, revisions):
   type = get_repo_type(target)
@@ skipping 86 matching lines @@
   args = parser.parse_args()
 
   if args.quiet:
     logging.disable(logging.INFO)
 
   repos = args.repos
   if not len(repos):
     repos = [os.path.dirname(__file__)]
   for repo in repos:
     resolve_deps(repo)