This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1795

py3: use pycompat.bytestr() instead of str()
ClosedPublic

Authored by pulkit on Dec 28 2017, 7:49 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG35fb3367f72d: py3: use pycompat.bytestr() instead of str()
Summary

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.Dec 28 2017, 7:49 PM
durin42 accepted this revision.Jan 10 2018, 5:56 PM
This revision is now accepted and ready to land.Jan 10 2018, 5:56 PM
Closed by commit rHG35fb3367f72d: py3: use pycompat.bytestr() instead of str() (authored by pulkit). · Explain WhyJan 10 2018, 6:04 PM
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.Jan 11 2018, 9:34 AM

bytes() or "%d" is preferred. Can you send a follow up?

pulkit added a comment.Jan 12 2018, 6:46 AM
In D1795#31282, @yuja wrote:

bytes() or "%d" is preferred. Can you send a follow up?

I am not sure which one needs to be changed.

yuja added inline comments.Jan 12 2018, 7:24 AM
mercurial/subrepo.py
392

bytes()

399

bytes()

mercurial/verify.py
110

'%d', perhaps.

pulkit added inline comments.Jan 12 2018, 8:34 AM
mercurial/verify.py
110

Looks like we cannot use "%d" here as None can be possible value also and test-treemanifest.t has tests with None as a part of output.

yuja added inline comments.Jan 12 2018, 8:41 AM
mercurial/verify.py
110

Ugh, it smells, but let's just leave it for now.

Revision Contents
Changeset List

PathPackages
Mmercurial/debugcommands.py (2 lines)
Mmercurial/subrepo.py (4 lines)
Mmercurial/verify.py (4 lines)

Diff 4778

mercurial/debugcommands.py

at = -1 at = -1
atbranch = 'default' atbranch = 'default'
nodeids = [] nodeids = []
id = 0 id = 0
ui.progress(_('building'), id, unit=_('revisions'), total=total) ui.progress(_('building'), id, unit=_('revisions'), total=total)
for type, data in dagparser.parsedag(text): for type, data in dagparser.parsedag(text):
if type == 'n': if type == 'n':
ui.note(('node %s\n' % str(data))) ui.note(('node %s\n' % pycompat.bytestr(data)))
id, ps = data id, ps = data
files = [] files = []
filecontent = {} filecontent = {}
p2 = None p2 = None
if mergeable_file: if mergeable_file:
fn = "mf" fn = "mf"

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 str(source) return pycompat.bytestr(source)
yujaUnsubmitted
Not Done

bytes()

yuja: bytes()
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 str(parent) return pycompat.bytestr(parent)
yujaUnsubmitted
Not Done

bytes()

yuja: bytes()
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():

mercurial/verify.py

from .i18n import _ from .i18n import _
from .node import ( from .node import (
nullid, nullid,
short, short,
) )
from . import ( from . import (
error, error,
pycompat,
revlog, revlog,
scmutil, scmutil,
util, util,
) )
def verify(repo): def verify(repo):
with repo.lock(): with repo.lock():
return verifier(repo).verify() return verifier(repo).verify()
if linkrevs: if linkrevs:
if f and len(linkrevs) > 1: if f and len(linkrevs) > 1:
try: try:
# attempt to filter down to real linkrevs # attempt to filter down to real linkrevs
linkrevs = [l for l in linkrevs linkrevs = [l for l in linkrevs
if self.lrugetctx(l)[f].filenode() == node] if self.lrugetctx(l)[f].filenode() == node]
except Exception: except Exception:
pass pass
self.warn(_(" (expected %s)") % " ".join(map(str, linkrevs))) self.warn(_(" (expected %s)") % " ".join
(map(pycompat.bytestr, linkrevs)))
yujaUnsubmitted
Not Done

'%d', perhaps.

yuja: '%d', perhaps.
pulkitAuthorUnsubmitted
Not Done

Looks like we cannot use "%d" here as None can be possible value also and test-treemanifest.t has tests with None as a part of output.

pulkit: Looks like we cannot use "%d" here as None can be possible value also and test-treemanifest.t…
yujaUnsubmitted
Not Done

Ugh, it smells, but let's just leave it for now.

yuja: Ugh, it smells, but let's just leave it for now.
lr = None # can't be trusted lr = None # can't be trusted
try: try:
p1, p2 = obj.parents(node) p1, p2 = obj.parents(node)
if p1 not in seen and p1 != nullid: if p1 not in seen and p1 != nullid:
self.err(lr, _("unknown parent 1 %s of %s") % self.err(lr, _("unknown parent 1 %s of %s") %
(short(p1), short(node)), f) (short(p1), short(node)), f)
if p2 not in seen and p2 != nullid: if p2 not in seen and p2 != nullid: