Mercurial > public > mercurial-scm > hg
comparison mercurial/subrepo.py @ 15498:ac5a340b26de stable
subrepo: use correct paths for subrepos with ..-relative paths on windows
posixpath normpath of c:\foo\bar/../baz is baz, so now we pconvert first.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Tue, 15 Nov 2011 02:16:30 +0100 |
| parents | b3e19c355ca7 |
| children | 646759147717 0810ccc51f0a |
comparison
equal
deleted
inserted
replaced
| 15497:9bea3aed6ee1 | 15498:ac5a340b26de |
|---|---|
| 221 if source.isabs(): | 221 if source.isabs(): |
| 222 return str(source) | 222 return str(source) |
| 223 source.path = posixpath.normpath(source.path) | 223 source.path = posixpath.normpath(source.path) |
| 224 parent = _abssource(repo._subparent, push, abort=False) | 224 parent = _abssource(repo._subparent, push, abort=False) |
| 225 if parent: | 225 if parent: |
| 226 parent = util.url(parent) | 226 parent = util.url(util.pconvert(parent)) |
| 227 parent.path = posixpath.join(parent.path or '', source.path) | 227 parent.path = posixpath.join(parent.path or '', source.path) |
| 228 parent.path = posixpath.normpath(parent.path) | 228 parent.path = posixpath.normpath(parent.path) |
| 229 return str(parent) | 229 return str(parent) |
| 230 else: # recursion reached top repo | 230 else: # recursion reached top repo |
| 231 if util.safehasattr(repo, '_subtoppath'): | 231 if util.safehasattr(repo, '_subtoppath'): |