##// END OF EJS Templates
py3: use bytes instead of pycompat.bytestr...
Pulkit Goyal -
r35631:991f0be9 default
parent child Browse files
Show More
@@ -389,14 +389,14 b' def _abssource(repo, push=False, abort=T'
389 if util.safehasattr(repo, '_subparent'):
389 if util.safehasattr(repo, '_subparent'):
390 source = util.url(repo._subsource)
390 source = util.url(repo._subsource)
391 if source.isabs():
391 if source.isabs():
392 return pycompat.bytestr(source)
392 return bytes(source)
393 source.path = posixpath.normpath(source.path)
393 source.path = posixpath.normpath(source.path)
394 parent = _abssource(repo._subparent, push, abort=False)
394 parent = _abssource(repo._subparent, push, abort=False)
395 if parent:
395 if parent:
396 parent = util.url(util.pconvert(parent))
396 parent = util.url(util.pconvert(parent))
397 parent.path = posixpath.join(parent.path or '', source.path)
397 parent.path = posixpath.join(parent.path or '', source.path)
398 parent.path = posixpath.normpath(parent.path)
398 parent.path = posixpath.normpath(parent.path)
399 return pycompat.bytestr(parent)
399 return bytes(parent)
400 else: # recursion reached top repo
400 else: # recursion reached top repo
401 if util.safehasattr(repo, '_subtoppath'):
401 if util.safehasattr(repo, '_subtoppath'):
402 return repo._subtoppath
402 return repo._subtoppath
General Comments 0
You need to be logged in to leave comments. Login now