Mercurial > hg
comparison hgext/fsmonitor/__init__.py @ 43374:65c37b431e76 stable
py3: fix fsmonitor's _watchmantofsencoding exception message encoding
Differential Revision: https://phab.mercurial-scm.org/D7190
author | Emmanuel Leblond <emmanuel.leblond@gmail.com> |
---|---|
date | Fri, 01 Nov 2019 11:02:47 -0700 |
parents | ddfd0f3956f4 |
children | e6ce1599af74 |
comparison
equal
deleted
inserted
replaced
43373:de2c8722a787 | 43374:65c37b431e76 |
---|---|
244 on Windows, it's always utf-8. | 244 on Windows, it's always utf-8. |
245 """ | 245 """ |
246 try: | 246 try: |
247 decoded = path.decode(_watchmanencoding) | 247 decoded = path.decode(_watchmanencoding) |
248 except UnicodeDecodeError as e: | 248 except UnicodeDecodeError as e: |
249 raise error.Abort(str(e), hint=b'watchman encoding error') | 249 raise error.Abort( |
250 stringutil.forcebytestr(e), hint=b'watchman encoding error' | |
251 ) | |
250 | 252 |
251 try: | 253 try: |
252 encoded = decoded.encode(_fsencoding, 'strict') | 254 encoded = decoded.encode(_fsencoding, 'strict') |
253 except UnicodeEncodeError as e: | 255 except UnicodeEncodeError as e: |
254 raise error.Abort(str(e)) | 256 raise error.Abort(stringutil.forcebytestr(e)) |
255 | 257 |
256 return encoded | 258 return encoded |
257 | 259 |
258 | 260 |
259 def overridewalk(orig, self, match, subrepos, unknown, ignored, full=True): | 261 def overridewalk(orig, self, match, subrepos, unknown, ignored, full=True): |