Mercurial > public > mercurial-scm > hg-stable

diff mercurial/subrepo.py @ 35585:35fb3367f72d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: use pycompat.bytestr() instead of str() Differential Revision: https://phab.mercurial-scm.org/D1795
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 29 Dec 2017 05:29:04 +0530
parents 72b91f905065
children f2f0a777b2e2
line wrap: on
line diff
--- a/mercurial/subrepo.py	Fri Dec 29 05:28:05 2017 +0530
+++ b/mercurial/subrepo.py	Fri Dec 29 05:29:04 2017 +0530
@@ -389,14 +389,14 @@
     if util.safehasattr(repo, '_subparent'):
         source = util.url(repo._subsource)
         if source.isabs():
-            return str(source)
+            return pycompat.bytestr(source)
         source.path = posixpath.normpath(source.path)
         parent = _abssource(repo._subparent, push, abort=False)
         if parent:
             parent = util.url(util.pconvert(parent))
             parent.path = posixpath.join(parent.path or '', source.path)
             parent.path = posixpath.normpath(parent.path)
-            return str(parent)
+            return pycompat.bytestr(parent)
     else: # recursion reached top repo
         if util.safehasattr(repo, '_subtoppath'):
             return repo._subtoppath