This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2648

py3: use pycompat.bytestr instead of str
ClosedPublic

Authored by pulkit on Mar 4 2018, 12:27 PM.

Details

Reviewers
indygreg
yuja
Group Reviewers
hg-reviewers
Commits
rHG390d16ea7c76: py3: use pycompat.bytestr instead of str

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Mar 4 2018, 12:27 PM
yuja requested changes to this revision.Mar 4 2018, 1:02 PM
yuja added a subscriber: yuja.
yuja added inline comments.
mercurial/context.py
436

Nit: could be %d.

mercurial/dispatch.py
993

Better to use forcebytestr() here because we are blaming a bad extension
which may put anything into testedwith.

mercurial/revlog.py
2470

Perhaps bytes() is more appropriate here. I think this is just making a sort of bytes
immutable.

This revision now requires changes to proceed.Mar 4 2018, 1:02 PM
yuja accepted this revision.Mar 4 2018, 3:16 PM
This revision is now accepted and ready to land.Mar 4 2018, 3:16 PM
Closed by commit rHG390d16ea7c76: py3: use pycompat.bytestr instead of str (authored by pulkit). · Explain WhyMar 4 2018, 3:18 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 6562

mercurial/cmdutil.py

# 3b. (apply) # 3b. (apply)
if dopatch: if dopatch:
try: try:
ui.debug('applying patch\n') ui.debug('applying patch\n')
ui.debug(fp.getvalue()) ui.debug(fp.getvalue())
patch.internalpatch(ui, repo, fp, 1, eolmode=None) patch.internalpatch(ui, repo, fp, 1, eolmode=None)
except error.PatchError as err: except error.PatchError as err:
raise error.Abort(str(err)) raise error.Abort(pycompat.bytestr(err))
del fp del fp
# 4. We prepared working directory according to filtered # 4. We prepared working directory according to filtered
# patch. Now is the time to delegate the job to # patch. Now is the time to delegate the job to
# commit/qrefresh or the like! # commit/qrefresh or the like!
# Make all of the pathnames absolute. # Make all of the pathnames absolute.
newfiles = [repo.wjoin(nf) for nf in newfiles] newfiles = [repo.wjoin(nf) for nf in newfiles]
partial = opts.get('partial', False) partial = opts.get('partial', False)
files = set() files = set()
try: try:
patch.patch(ui, repo, tmpname, strip=strip, prefix=prefix, patch.patch(ui, repo, tmpname, strip=strip, prefix=prefix,
files=files, eolmode=None, similarity=sim / 100.0) files=files, eolmode=None, similarity=sim / 100.0)
except error.PatchError as e: except error.PatchError as e:
if not partial: if not partial:
raise error.Abort(str(e)) raise error.Abort(pycompat.bytestr(e))
if partial: if partial:
rejects = True rejects = True
files = list(files) files = list(files)
if nocommit: if nocommit:
if message: if message:
msgs.append(message) msgs.append(message)
else: else:
tobackup.remove(abs) tobackup.remove(abs)
c.write(fp) c.write(fp)
dopatch = fp.tell() dopatch = fp.tell()
fp.seek(0) fp.seek(0)
if dopatch: if dopatch:
try: try:
patch.internalpatch(repo.ui, repo, fp, 1, eolmode=None) patch.internalpatch(repo.ui, repo, fp, 1, eolmode=None)
except error.PatchError as err: except error.PatchError as err:
raise error.Abort(str(err)) raise error.Abort(pycompat.bytestr(err))
del fp del fp
else: else:
for f in actions['revert'][0]: for f in actions['revert'][0]:
checkout(f) checkout(f)
if normal: if normal:
normal(f) normal(f)
for f in actions['add'][0]: for f in actions['add'][0]:

mercurial/commands.py

if revstrings and not revs: if revstrings and not revs:
raise error.Abort(_('no commits to bundle')) raise error.Abort(_('no commits to bundle'))
bundletype = opts.get('type', 'bzip2').lower() bundletype = opts.get('type', 'bzip2').lower()
try: try:
bcompression, cgversion, params = exchange.parsebundlespec( bcompression, cgversion, params = exchange.parsebundlespec(
repo, bundletype, strict=False) repo, bundletype, strict=False)
except error.UnsupportedBundleSpecification as e: except error.UnsupportedBundleSpecification as e:
raise error.Abort(str(e), raise error.Abort(pycompat.bytestr(e),
hint=_("see 'hg help bundlespec' for supported " hint=_("see 'hg help bundlespec' for supported "
"values for --type")) "values for --type"))
# Packed bundles are a pseudo bundle format for now. # Packed bundles are a pseudo bundle format for now.
if cgversion == 's1': if cgversion == 's1':
raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'), raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
hint=_("use 'hg debugcreatestreamclonebundle'")) hint=_("use 'hg debugcreatestreamclonebundle'"))

mercurial/context.py

self._repo = repo self._repo = repo
try: try:
if isinstance(changeid, int): if isinstance(changeid, int):
self._node = repo.changelog.node(changeid) self._node = repo.changelog.node(changeid)
self._rev = changeid self._rev = changeid
return return
if not pycompat.ispy3 and isinstance(changeid, long): if not pycompat.ispy3 and isinstance(changeid, long):
changeid = str(changeid) changeid = pycompat.bytestr(changeid)
yujaUnsubmitted
Not Done

Nit: could be %d.

yuja: Nit: could be %d.
if changeid == 'null': if changeid == 'null':
self._node = nullid self._node = nullid
self._rev = nullrev self._rev = nullrev
return return
if changeid == 'tip': if changeid == 'tip':
self._node = repo.changelog.tip() self._node = repo.changelog.tip()
self._rev = repo.changelog.rev(self._node) self._rev = repo.changelog.rev(self._node)
return return

mercurial/debugcommands.py

With five args, set a key to new if it currently is set to old. With five args, set a key to new if it currently is set to old.
Reports success or failure. Reports success or failure.
''' '''
target = hg.peer(ui, {}, repopath) target = hg.peer(ui, {}, repopath)
if keyinfo: if keyinfo:
key, old, new = keyinfo key, old, new = keyinfo
r = target.pushkey(namespace, key, old, new) r = target.pushkey(namespace, key, old, new)
ui.status(str(r) + '\n') ui.status(pycompat.bytestr(r) + '\n')
return not r return not r
else: else:
for k, v in sorted(target.listkeys(namespace).iteritems()): for k, v in sorted(target.listkeys(namespace).iteritems()):
ui.write("%s\t%s\n" % (util.escapestr(k), ui.write("%s\t%s\n" % (util.escapestr(k),
util.escapestr(v))) util.escapestr(v)))
@command('debugpvec', [], _('A B')) @command('debugpvec', [], _('A B'))
def debugpvec(ui, repo, a, b=None): def debugpvec(ui, repo, a, b=None):

mercurial/dispatch.py

lower = [t for t in tested if t < ct] lower = [t for t in tested if t < ct]
nearest = max(lower or tested) nearest = max(lower or tested)
if worst[0] is None or nearest < worst[1]: if worst[0] is None or nearest < worst[1]:
worst = name, nearest, report worst = name, nearest, report
if worst[0] is not None: if worst[0] is not None:
name, testedwith, report = worst name, testedwith, report = worst
if not isinstance(testedwith, (bytes, str)): if not isinstance(testedwith, (bytes, str)):
testedwith = '.'.join([str(c) for c in testedwith]) testedwith = '.'.join([pycompat.bytestr(c) for c in testedwith])
yujaUnsubmitted
Not Done

Better to use forcebytestr() here because we are blaming a bad extension
which may put anything into testedwith.

yuja: Better to use forcebytestr() here because we are blaming a bad extension which may put anything…
warning = (_('** Unknown exception encountered with ' warning = (_('** Unknown exception encountered with '
'possibly-broken third-party extension %s\n' 'possibly-broken third-party extension %s\n'
'** which supports versions %s of Mercurial.\n' '** which supports versions %s of Mercurial.\n'
'** Please disable %s and try your action again.\n' '** Please disable %s and try your action again.\n'
'** If that fixes the bug please report it to %s\n') '** If that fixes the bug please report it to %s\n')
% (name, testedwith, name, report)) % (name, testedwith, name, report))
else: else:
bugtracker = ui.config('ui', 'supportcontact') bugtracker = ui.config('ui', 'supportcontact')

mercurial/revlog.py

# (Possibly) reuse the delta from the revlog if allowed and # (Possibly) reuse the delta from the revlog if allowed and
# the revlog chunk is a delta. # the revlog chunk is a delta.
cachedelta = None cachedelta = None
rawtext = None rawtext = None
if populatecachedelta: if populatecachedelta:
dp = self.deltaparent(rev) dp = self.deltaparent(rev)
if dp != nullrev: if dp != nullrev:
cachedelta = (dp, str(self._chunk(rev))) cachedelta = (dp, pycompat.bytestr(self._chunk(rev)))
yujaUnsubmitted
Not Done

Perhaps bytes() is more appropriate here. I think this is just making a sort of bytes
immutable.

yuja: Perhaps bytes() is more appropriate here. I think this is just making a sort of bytes immutable.
if not cachedelta: if not cachedelta:
rawtext = self.revision(rev, raw=True) rawtext = self.revision(rev, raw=True)
if deltareuse == self.DELTAREUSEFULLADD: if deltareuse == self.DELTAREUSEFULLADD:
destrevlog.addrevision(rawtext, tr, linkrev, p1, p2, destrevlog.addrevision(rawtext, tr, linkrev, p1, p2,
cachedelta=cachedelta, cachedelta=cachedelta,

mercurial/subrepo.py

return True return True
@annotatesubrepoerror @annotatesubrepoerror
def files(self): def files(self):
output = self._svncommand(['list', '--recursive', '--xml'])[0] output = self._svncommand(['list', '--recursive', '--xml'])[0]
doc = xml.dom.minidom.parseString(output) doc = xml.dom.minidom.parseString(output)
paths = [] paths = []
for e in doc.getElementsByTagName('entry'): for e in doc.getElementsByTagName('entry'):
kind = str(e.getAttribute('kind')) kind = pycompat.bytestr(e.getAttribute('kind'))
if kind != 'file': if kind != 'file':
continue continue
name = ''.join(c.data for c name = ''.join(c.data for c
in e.getElementsByTagName('name')[0].childNodes in e.getElementsByTagName('name')[0].childNodes
if c.nodeType == c.TEXT_NODE) if c.nodeType == c.TEXT_NODE)
paths.append(name.encode('utf-8')) paths.append(name.encode('utf-8'))
return paths return paths

mercurial/wireproto.py

# We did not change it to minimise code change. # We did not change it to minimise code change.
# This need to be moved to something proper. # This need to be moved to something proper.
# Feel free to do it. # Feel free to do it.
util.stderr.write("abort: %s\n" % exc) util.stderr.write("abort: %s\n" % exc)
if exc.hint is not None: if exc.hint is not None:
util.stderr.write("(%s)\n" % exc.hint) util.stderr.write("(%s)\n" % exc.hint)
return pushres(0, output.getvalue() if output else '') return pushres(0, output.getvalue() if output else '')
except error.PushRaced: except error.PushRaced:
return pusherr(str(exc), return pusherr(pycompat.bytestr(exc),
output.getvalue() if output else '') output.getvalue() if output else '')
bundler = bundle2.bundle20(repo.ui) bundler = bundle2.bundle20(repo.ui)
for out in getattr(exc, '_bundle2salvagedoutput', ()): for out in getattr(exc, '_bundle2salvagedoutput', ()):
bundler.addpart(out) bundler.addpart(out)
try: try:
try: try:
raise raise