Patchwork D1854: py3: use bytes instead of pycompat.bytestr

login
register
mail settings
Submitter phabricator
Date Jan. 13, 2018, 2:54 a.m.
Message ID <4a2f2230b69c720e4d87af96b269bfcd@localhost.localdomain>
Download mbox | patch
Permalink /patch/26711/
State Not Applicable
Headers show

Comments

phabricator - Jan. 13, 2018, 2:54 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG991f0be9dc39: py3: use bytes instead of pycompat.bytestr (authored by pulkit, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1854?vs=4808&id=4815

REVISION DETAIL
  https://phab.mercurial-scm.org/D1854

AFFECTED FILES
  mercurial/subrepo.py

CHANGE DETAILS




To: pulkit, #hg-reviewers, yuja
Cc: mercurial-devel

Patch

diff --git a/mercurial/subrepo.py b/mercurial/subrepo.py
--- a/mercurial/subrepo.py
+++ b/mercurial/subrepo.py
@@ -389,14 +389,14 @@ 
     if util.safehasattr(repo, '_subparent'):
         source = util.url(repo._subsource)
         if source.isabs():
-            return pycompat.bytestr(source)
+            return bytes(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 pycompat.bytestr(parent)
+            return bytes(parent)
     else: # recursion reached top repo
         if util.safehasattr(repo, '_subtoppath'):
             return repo._subtoppath