This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2292

scmutil: bytes-ify IOErrors before wrapping them in abort message
ClosedPublic

Authored by durin42 on Feb 17 2018, 1:41 AM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG2b00dda6dad9: scmutil: bytes-ify IOErrors before wrapping them in abort message
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

durin42 created this revision.Feb 17 2018, 1:41 AM
pulkit added a subscriber: pulkit.Feb 17 2018, 4:39 AM

It's recommended using util.forcebytestr() to convert error messages to bytes. https://phab.mercurial-scm.org/D2269#inline-5791

yuja requested changes to this revision.Feb 17 2018, 4:55 AM
This revision now requires changes to proceed.Feb 17 2018, 4:55 AM
durin42 updated this revision to Diff 5813.Feb 17 2018, 4:17 PM
Closed by commit rHG2b00dda6dad9: scmutil: bytes-ify IOErrors before wrapping them in abort message (authored by durin42). · Explain WhyFeb 17 2018, 8:45 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/scmutil.py (2 lines)

Diff 5815

mercurial/scmutil.py

ui.warn(_("abort: %s!\n") % inst) ui.warn(_("abort: %s!\n") % inst)
m = str(inst).split()[-1] m = str(inst).split()[-1]
if m in "mpatch bdiff".split(): if m in "mpatch bdiff".split():
ui.warn(_("(did you forget to compile extensions?)\n")) ui.warn(_("(did you forget to compile extensions?)\n"))
elif m in "zlib".split(): elif m in "zlib".split():
ui.warn(_("(is your Python install correct?)\n")) ui.warn(_("(is your Python install correct?)\n"))
except IOError as inst: except IOError as inst:
if util.safehasattr(inst, "code"): if util.safehasattr(inst, "code"):
ui.warn(_("abort: %s\n") % inst) ui.warn(_("abort: %s\n") % util.forcebytestr(inst))
elif util.safehasattr(inst, "reason"): elif util.safehasattr(inst, "reason"):
try: # usually it is in the form (errno, strerror) try: # usually it is in the form (errno, strerror)
reason = inst.reason.args[1] reason = inst.reason.args[1]
except (AttributeError, IndexError): except (AttributeError, IndexError):
# it might be anything, for example a string # it might be anything, for example a string
reason = inst.reason reason = inst.reason
if isinstance(reason, unicode): if isinstance(reason, unicode):
# SSLError of Python 2.7.9 contains a unicode # SSLError of Python 2.7.9 contains a unicode