comparison mercurial/subrepo.py @ 13912:71ea5b2b9517 stable

subrepo: prevent url normalization from removing // in ssh paths (issue2556)

13905:08d49b6b8d32

        if parent:
            if '://' in parent:
                if parent[-1] == '/':
                    parent = parent[:-1]
                r = urlparse.urlparse(parent + '/' + source)
                r = urlparse.urlunparse((r[0], r[1],
                                         posixpath.normpath(r[2]),
                                         r[3], r[4], r[5]))
                return r
            else: # plain file system path
                return posixpath.normpath(os.path.join(parent, repo._subsource))
    else: # recursion reached top repo

13912:71ea5b2b9517

        if parent:
            if '://' in parent:
                if parent[-1] == '/':
                    parent = parent[:-1]
                r = urlparse.urlparse(parent + '/' + source)
                if parent.startswith('ssh://'):
                    host, path = r[2][2:].split('/', 1)
                    r2 = '//%s/%s' % (host, posixpath.normpath(path))
                else:
                    r2 = posixpath.normpath(r[2])
                r = urlparse.urlunparse((r[0], r[1], r2,
                                         r[3], r[4], r[5]))
                return r
            else: # plain file system path
                return posixpath.normpath(os.path.join(parent, repo._subsource))
    else: # recursion reached top repo