Mercurial > hg
comparison mercurial/subrepoutil.py @ 37586:b94fecf4cd8c
py3: use bytes() instead of str() on util.url()
We internally deal with bytes and anything as string breaks things.
Differential Revision: https://phab.mercurial-scm.org/D3285
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Thu, 12 Apr 2018 17:22:59 +0530 |
| parents | df4fd29c0854 |
| children | 876494fd967d |
comparison
equal
deleted
inserted
replaced
| 37585:df4fd29c0854 | 37586:b94fecf4cd8c |
|---|---|
| 104 parent = _abssource(repo, abort=False) | 104 parent = _abssource(repo, abort=False) |
| 105 if parent: | 105 if parent: |
| 106 parent = util.url(parent) | 106 parent = util.url(parent) |
| 107 parent.path = posixpath.join(parent.path or '', src) | 107 parent.path = posixpath.join(parent.path or '', src) |
| 108 parent.path = posixpath.normpath(parent.path) | 108 parent.path = posixpath.normpath(parent.path) |
| 109 joined = str(parent) | 109 joined = bytes(parent) |
| 110 # Remap the full joined path and use it if it changes, | 110 # Remap the full joined path and use it if it changes, |
| 111 # else remap the original source. | 111 # else remap the original source. |
| 112 remapped = remap(joined) | 112 remapped = remap(joined) |
| 113 if remapped == joined: | 113 if remapped == joined: |
| 114 src = remap(src) | 114 src = remap(src) |