This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1854

py3: use bytes instead of pycompat.bytestr
ClosedPublic

Authored by pulkit on Jan 12 2018, 9:10 AM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG991f0be9dc39: py3: use bytes instead of pycompat.bytestr
Summary

Follow up for D1795.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Jan 12 2018, 9:10 AM
yuja accepted this revision.Jan 12 2018, 9:44 PM
This revision is now accepted and ready to land.Jan 12 2018, 9:44 PM
Closed by commit rHG991f0be9dc39: py3: use bytes instead of pycompat.bytestr (authored by pulkit). · Explain WhyJan 12 2018, 9:54 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/subrepo.py (4 lines)

Diff 4815

mercurial/subrepo.py

return sub._relpath return sub._relpath
def _abssource(repo, push=False, abort=True): def _abssource(repo, push=False, abort=True):
"""return pull/push path of repo - either based on parent repo .hgsub info """return pull/push path of repo - either based on parent repo .hgsub info
or on the top repo config. Abort or return None if no source found.""" or on the top repo config. Abort or return None if no source found."""
if util.safehasattr(repo, '_subparent'): if util.safehasattr(repo, '_subparent'):
source = util.url(repo._subsource) source = util.url(repo._subsource)
if source.isabs(): if source.isabs():
return pycompat.bytestr(source) return bytes(source)
source.path = posixpath.normpath(source.path) source.path = posixpath.normpath(source.path)
parent = _abssource(repo._subparent, push, abort=False) parent = _abssource(repo._subparent, push, abort=False)
if parent: if parent:
parent = util.url(util.pconvert(parent)) parent = util.url(util.pconvert(parent))
parent.path = posixpath.join(parent.path or '', source.path) parent.path = posixpath.join(parent.path or '', source.path)
parent.path = posixpath.normpath(parent.path) parent.path = posixpath.normpath(parent.path)
return pycompat.bytestr(parent) return bytes(parent)
else: # recursion reached top repo else: # recursion reached top repo
if util.safehasattr(repo, '_subtoppath'): if util.safehasattr(repo, '_subtoppath'):
return repo._subtoppath return repo._subtoppath
if push and repo.ui.config('paths', 'default-push'): if push and repo.ui.config('paths', 'default-push'):
return repo.ui.config('paths', 'default-push') return repo.ui.config('paths', 'default-push')
if repo.ui.config('paths', 'default'): if repo.ui.config('paths', 'default'):
return repo.ui.config('paths', 'default') return repo.ui.config('paths', 'default')
if repo.shared(): if repo.shared():