##// END OF EJS Templates
py3: fix fsmonitor's _handleunavailable exception message encoding...
Emmanuel Leblond -
r43679:ddfd0f39 stable
parent child Browse files
Show More
@@ -132,6 +132,7 b' from mercurial import ('
132 util,
132 util,
133 )
133 )
134 from mercurial import match as matchmod
134 from mercurial import match as matchmod
135 from mercurial.utils import stringutil
135
136
136 from . import (
137 from . import (
137 pywatchman,
138 pywatchman,
@@ -207,8 +208,8 b' def _handleunavailable(ui, state, ex):'
207 if isinstance(ex, watchmanclient.Unavailable):
208 if isinstance(ex, watchmanclient.Unavailable):
208 # experimental config: fsmonitor.verbose
209 # experimental config: fsmonitor.verbose
209 if ex.warn and ui.configbool(b'fsmonitor', b'verbose'):
210 if ex.warn and ui.configbool(b'fsmonitor', b'verbose'):
210 if b'illegal_fstypes' not in str(ex):
211 if b'illegal_fstypes' not in stringutil.forcebytestr(ex):
211 ui.warn(str(ex) + b'\n')
212 ui.warn(stringutil.forcebytestr(ex) + b'\n')
212 if ex.invalidate:
213 if ex.invalidate:
213 state.invalidate()
214 state.invalidate()
214 # experimental config: fsmonitor.verbose
215 # experimental config: fsmonitor.verbose
General Comments 0
You need to be logged in to leave comments. Login now