This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3569

py3: convert the report to bytes
ClosedPublic

Authored by pulkit on May 15 2018, 10:48 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG5046c906b25d: py3: convert the report to bytes
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

pulkit created this revision.May 15 2018, 10:48 PM
yuja added a subscriber: yuja.May 16 2018, 7:42 AM
  • a/mercurial/dispatch.py

+++ b/mercurial/dispatch.py
@@ -1028,7 +1028,7 @@

'** which supports versions %s of Mercurial.\n'
'** Please disable %s and try your action again.\n'
'** If that fixes the bug please report it to %s\n')
  • % (name, testedwith, name, report))

+ % (name, testedwith, name, pycompat.bytestr(report)))

Maybe stringutil.forcebytestr()?

The report must be bytes, but a broken extension might provide a unicode
for example, and a unicode can't always be byte-ified with bytestr().

pulkit updated this revision to Diff 8719.May 16 2018, 3:30 PM
Closed by commit rHG5046c906b25d: py3: convert the report to bytes (authored by pulkit). · Explain WhyMay 17 2018, 8:12 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/dispatch.py (2 lines)

Diff 8723

mercurial/dispatch.py

if not isinstance(testedwith, (bytes, str)): if not isinstance(testedwith, (bytes, str)):
testedwith = '.'.join([stringutil.forcebytestr(c) testedwith = '.'.join([stringutil.forcebytestr(c)
for c in testedwith]) for c in testedwith])
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, stringutil.forcebytestr(report)))
else: else:
bugtracker = ui.config('ui', 'supportcontact') bugtracker = ui.config('ui', 'supportcontact')
if bugtracker is None: if bugtracker is None:
bugtracker = _("https://mercurial-scm.org/wiki/BugTracker") bugtracker = _("https://mercurial-scm.org/wiki/BugTracker")
warning = (_("** unknown exception encountered, " warning = (_("** unknown exception encountered, "
"please report by visiting\n** ") + bugtracker + '\n') "please report by visiting\n** ") + bugtracker + '\n')
sysversion = pycompat.sysbytes(sys.version).replace('\n', '') sysversion = pycompat.sysbytes(sys.version).replace('\n', '')
warning += ((_("** Python %s\n") % sysversion) + warning += ((_("** Python %s\n") % sysversion) +