( )⚙ D1478 py3: cast error message to localstr in blackbox.py

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1478

py3: cast error message to localstr in blackbox.py
ClosedPublic

Authored by indygreg on Nov 21 2017, 2:53 AM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHGde598e84c244: py3: cast error message to localstr in blackbox.py
rHGdb1c2e2d8037: py3: cast error message to localstr in blackbox.py
Summary

According to the exceptions reporting mechanism, this is the #1 crasher
in the test harness for Python 3.

Since this exception is in an except block, we'll likely get a
new #1 crasher after this change. But at least we won't die
during error handling!

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Nov 21 2017, 2:53 AM
yuja requested changes to this revision.Nov 21 2017, 7:30 AM
yuja added a subscriber: yuja.

encoding.strtolocal() should be used here.
IOError may contain non-ascii character on Windows.

This revision now requires changes to proceed.Nov 21 2017, 7:30 AM
indygreg edited the summary of this revision. (Show Details)Jan 14 2018, 3:13 PM
indygreg retitled this revision from py3: cast error message to bytes in blackbox.py to py3: cast error message to localstr in blackbox.py.
indygreg updated this revision to Diff 4823.
yuja accepted this revision.Jan 17 2018, 9:31 AM
This revision is now accepted and ready to land.Jan 17 2018, 9:31 AM
Closed by commit rHGdb1c2e2d8037: py3: cast error message to localstr in blackbox.py (authored by indygreg). · Explain WhyJan 17 2018, 9:47 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/blackbox.py (3 lines)

Diff 4823

hgext/blackbox.py

import errno import errno
import re import re
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial.node import hex from mercurial.node import hex
from mercurial import ( from mercurial import (
encoding,
registrar, registrar,
ui as uimod, ui as uimod,
util, util,
) )
# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
# be specifying the version(s) of Mercurial they are tested with, or # be specifying the version(s) of Mercurial they are tested with, or
src = '' src = ''
try: try:
fmt = '%s %s @%s%s (%s)%s> %s' fmt = '%s %s @%s%s (%s)%s> %s'
args = (date, user, rev, changed, pid, src, formattedmsg) args = (date, user, rev, changed, pid, src, formattedmsg)
with _openlogfile(ui, vfs) as fp: with _openlogfile(ui, vfs) as fp:
fp.write(fmt % args) fp.write(fmt % args)
except (IOError, OSError) as err: except (IOError, OSError) as err:
self.debug('warning: cannot write to blackbox.log: %s\n' % self.debug('warning: cannot write to blackbox.log: %s\n' %
err.strerror) encoding.strtolocal(err.strerror))
# do not restore _bbinlog intentionally to avoid failed # do not restore _bbinlog intentionally to avoid failed
# logging again # logging again
else: else:
ui._bbinlog = False ui._bbinlog = False
def setrepo(self, repo): def setrepo(self, repo):
self._bbrepo = repo self._bbrepo = repo