diff -r 70415568ea65 -r c98d1c6763a6 mercurial/util.py --- a/mercurial/util.py Fri Mar 02 22:59:12 2018 -0500 +++ b/mercurial/util.py Fri Mar 02 22:47:18 2018 -0500 @@ -702,6 +702,9 @@ DATA_ESCAPE_RE = remod.compile(br'[\x00-\x08\x0a-\x1f\\\x7f-\xff]') def escapedata(s): + if isinstance(s, bytearray): + s = bytes(s) + return DATA_ESCAPE_RE.sub(lambda m: DATA_ESCAPE_MAP[m.group(0)], s) class fileobjectobserver(object):