This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2611

scmutil: avoid using basestring and add explicit handling of unicodes
ClosedPublic

Authored by durin42 on Mar 3 2018, 5:54 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGb76248e51605: scmutil: avoid using basestring and add explicit handling of unicodes
Summary

This resolves some Python 3 defects, and I don't think it is a
meaningful behavior change in Python 2.

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

durin42 created this revision.Mar 3 2018, 5:54 PM
indygreg accepted this revision.Mar 3 2018, 5:57 PM
This revision is now accepted and ready to land.Mar 3 2018, 5:57 PM
Closed by commit rHGb76248e51605: scmutil: avoid using basestring and add explicit handling of unicodes (authored by durin42). · Explain WhyMar 3 2018, 5:59 PM
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.Mar 4 2018, 8:04 AM
yuja added inline comments.
mercurial/scmutil.py
191

msg is unused

Revision Contents
Changeset List

PathPackages
Mmercurial/scmutil.py (5 lines)

Diff 6495

mercurial/scmutil.py

if inst.hint: if inst.hint:
ui.warn('(%s)\n' % inst.hint) ui.warn('(%s)\n' % inst.hint)
except error.RepoError as inst: except error.RepoError as inst:
ui.warn(_("abort: %s!\n") % inst) ui.warn(_("abort: %s!\n") % inst)
if inst.hint: if inst.hint:
ui.warn(_("(%s)\n") % inst.hint) ui.warn(_("(%s)\n") % inst.hint)
except error.ResponseError as inst: except error.ResponseError as inst:
ui.warn(_("abort: %s") % inst.args[0]) ui.warn(_("abort: %s") % inst.args[0])
if not isinstance(inst.args[1], basestring): msg = inst.args[1]
if isinstance(msg, type(u'')):
msg = pycompat.sysbytes(msg)
yujaUnsubmitted
Not Done

msg is unused

yuja: `msg` is unused
elif not isinstance(inst.args[1], bytes):
ui.warn(" %r\n" % (inst.args[1],)) ui.warn(" %r\n" % (inst.args[1],))
elif not inst.args[1]: elif not inst.args[1]:
ui.warn(_(" empty string\n")) ui.warn(_(" empty string\n"))
else: else:
ui.warn("\n%r\n" % util.ellipsis(inst.args[1])) ui.warn("\n%r\n" % util.ellipsis(inst.args[1]))
except error.CensoredNodeError as inst: except error.CensoredNodeError as inst:
ui.warn(_("abort: file censored %s!\n") % inst) ui.warn(_("abort: file censored %s!\n") % inst)
except error.RevlogError as inst: except error.RevlogError as inst: