# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1248303203 18000
# Node ID f783bb979fb3b6d3c99cfd8469f14b06625e3c94
# Parent  d9a2e6327949ea751011850c8792c878b28b7e07
subrepo: use '/' for joining non-local paths

diff -r d9a2e6327949 -r f783bb979fb3 mercurial/subrepo.py
--- a/mercurial/subrepo.py	Wed Jul 22 00:28:37 2009 -0500
+++ b/mercurial/subrepo.py	Wed Jul 22 17:53:23 2009 -0500
@@ -107,7 +107,12 @@
         source = repo._subsource
         if source.startswith('/') or '://' in source:
             return source
-        return os.path.join(_abssource(repo._subparent), repo._subsource)
+        parent = _abssource(repo._subparent)
+        if '://' in parent:
+            if parent[-1] == '/':
+                parent = parent[:-1]
+            return parent + '/' + source
+        return os.path.join(parent, repo._subsource)
     if push and repo.ui.config('paths', 'default-push'):
         return repo.ui.config('paths', 'default-push', repo.root)
     return repo.ui.config('paths', 'default', repo.root)