# HG changeset patch # User Emmanuel Leblond # Date 2019-11-01 17:57:31 # Node ID ddfd0f3956f4621f348c7b534326e9f63b8f3bb7 # Parent 9892599de2dc8296a2476fb9f72ab45bfd55ae70 py3: fix fsmonitor's _handleunavailable exception message encoding Differential Revision: https://phab.mercurial-scm.org/D7196 diff --git a/hgext/fsmonitor/__init__.py b/hgext/fsmonitor/__init__.py --- a/hgext/fsmonitor/__init__.py +++ b/hgext/fsmonitor/__init__.py @@ -132,6 +132,7 @@ from mercurial import ( util, ) from mercurial import match as matchmod +from mercurial.utils import stringutil from . import ( pywatchman, @@ -207,8 +208,8 @@ def _handleunavailable(ui, state, ex): if isinstance(ex, watchmanclient.Unavailable): # experimental config: fsmonitor.verbose if ex.warn and ui.configbool(b'fsmonitor', b'verbose'): - if b'illegal_fstypes' not in str(ex): - ui.warn(str(ex) + b'\n') + if b'illegal_fstypes' not in stringutil.forcebytestr(ex): + ui.warn(stringutil.forcebytestr(ex) + b'\n') if ex.invalidate: state.invalidate() # experimental config: fsmonitor.verbose