Show More
@@ -246,12 +246,14 b' def _watchmantofsencoding(path):' | |||||
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 |
General Comments 0
You need to be logged in to leave comments.
Login now