# HG changeset patch
# User Emmanuel Leblond <emmanuel.leblond@gmail.com>
# Date 2019-11-01 18:02:47
# Node ID 65c37b431e7652b2c3036eac25703c1504efadad
# Parent  de2c8722a78724c0f1bc92d0daf0b754be49cf83

py3: fix fsmonitor's _watchmantofsencoding exception message encoding

Differential Revision: https://phab.mercurial-scm.org/D7190

diff --git a/hgext/fsmonitor/__init__.py b/hgext/fsmonitor/__init__.py
--- a/hgext/fsmonitor/__init__.py
+++ b/hgext/fsmonitor/__init__.py
@@ -246,12 +246,14 @@ def _watchmantofsencoding(path):
     try:
         decoded = path.decode(_watchmanencoding)
     except UnicodeDecodeError as e:
-        raise error.Abort(str(e), hint=b'watchman encoding error')
+        raise error.Abort(
+            stringutil.forcebytestr(e), hint=b'watchman encoding error'
+        )
 
     try:
         encoded = decoded.encode(_fsencoding, 'strict')
     except UnicodeEncodeError as e:
-        raise error.Abort(str(e))
+        raise error.Abort(stringutil.forcebytestr(e))
 
     return encoded