diff -r efeeb73f54c3 -r 1419ba5e3b56 mercurial/utils/stringutil.py --- a/mercurial/utils/stringutil.py Fri Aug 10 03:14:52 2018 -0400 +++ b/mercurial/utils/stringutil.py Fri Aug 10 03:16:02 2018 -0400 @@ -427,6 +427,8 @@ return encoding.trim(text, maxlength, ellipsis='...') def escapestr(s): + if isinstance(s, memoryview): + s = bytes(s) # call underlying function of s.encode('string_escape') directly for # Python 3 compatibility return codecs.escape_encode(s)[0]