This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2209

ui: convert stack traces to sysbytes before logging
ClosedPublic

Authored by durin42 on Feb 12 2018, 10:30 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGdf1760b58fda: ui: convert stack traces to sysbytes before logging
Summary

They're coming back as unicodes, so sysbytes seems like the best we can do.

This is like D2171 and D2172, but those fail on Python 2.7.5
(seriously!), so this is my version of the same change. I actually
wrote this before reviewing those, then discarded it, then came back
to it after finding out 2.7.5 is a silly place.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Feb 12 2018, 10:30 PM
indygreg accepted this revision.Feb 12 2018, 10:43 PM
This revision is now accepted and ready to land.Feb 12 2018, 10:43 PM
Closed by commit rHGdf1760b58fda: ui: convert stack traces to sysbytes before logging (authored by durin42). · Explain WhyFeb 12 2018, 10:48 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/ui.py (10 lines)

Diff 5601

mercurial/ui.py

stacklevel += 1 # get in develwarn stacklevel += 1 # get in develwarn
if self.tracebackflag: if self.tracebackflag:
util.debugstacktrace(msg, stacklevel, self.ferr, self.fout) util.debugstacktrace(msg, stacklevel, self.ferr, self.fout)
self.log('develwarn', '%s at:\n%s' % self.log('develwarn', '%s at:\n%s' %
(msg, ''.join(util.getstackframes(stacklevel)))) (msg, ''.join(util.getstackframes(stacklevel))))
else: else:
curframe = inspect.currentframe() curframe = inspect.currentframe()
calframe = inspect.getouterframes(curframe, 2) calframe = inspect.getouterframes(curframe, 2)
self.write_err('%s at: %s:%s (%s)\n' fname, lineno, fmsg = calframe[stacklevel][1:4]
% ((msg,) + calframe[stacklevel][1:4])) fname, fmsg = pycompat.sysbytes(fname), pycompat.sysbytes(fmsg)
self.log('develwarn', '%s at: %s:%s (%s)\n', self.write_err('%s at: %s:%d (%s)\n'
msg, *calframe[stacklevel][1:4]) % (msg, fname, lineno, fmsg))
self.log('develwarn', '%s at: %s:%d (%s)\n',
msg, fname, lineno, fmsg)
curframe = calframe = None # avoid cycles curframe = calframe = None # avoid cycles
def deprecwarn(self, msg, version, stacklevel=2): def deprecwarn(self, msg, version, stacklevel=2):
"""issue a deprecation warning """issue a deprecation warning
- msg: message explaining what is deprecated and how to upgrade, - msg: message explaining what is deprecated and how to upgrade,
- version: last version where the API will be supported, - version: last version where the API will be supported,
""" """