This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4256

stringutil: if we get a memoryview in escapestr, coerce it to bytes
ClosedPublic

Authored by durin42 on Aug 10 2018, 11:08 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG1419ba5e3b56: stringutil: if we get a memoryview in escapestr, coerce it to bytes
Summary

Otherwise we get an exception. Sadly, this manifesting deep inside the
wireproto code, inside a future. For some reason the exception was
/causing a hang/ rather than actually propagating out, which seems
like it might merit some investigation in the future.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/utils/stringutil.py (2 lines)

Diff 10316

mercurial/utils/stringutil.py

''' '''
return _correctauthorformat.match(author) is not None return _correctauthorformat.match(author) is not None
def ellipsis(text, maxlength=400): def ellipsis(text, maxlength=400):
"""Trim string to at most maxlength (default: 400) columns in display.""" """Trim string to at most maxlength (default: 400) columns in display."""
return encoding.trim(text, maxlength, ellipsis='...') return encoding.trim(text, maxlength, ellipsis='...')
def escapestr(s): def escapestr(s):
if isinstance(s, memoryview):
s = bytes(s)
# call underlying function of s.encode('string_escape') directly for # call underlying function of s.encode('string_escape') directly for
# Python 3 compatibility # Python 3 compatibility
return codecs.escape_encode(s)[0] return codecs.escape_encode(s)[0]
def unescapestr(s): def unescapestr(s):
return codecs.escape_decode(s)[0] return codecs.escape_decode(s)[0]
def forcebytestr(obj): def forcebytestr(obj):