This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7190

py3: fix fsmonitor's _watchmantofsencoding exception message encoding
ClosedPublic

Authored by touilleMan on Nov 1 2019, 12:41 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG65c37b431e76: py3: fix fsmonitor's _watchmantofsencoding exception message encoding
rHGe7e19b24ed43: py3: fix fsmonitor's _watchmantofsencoding exception message encoding
rHG29e75689d4a2: py3: fix fsmonitor's _watchmantofsencoding exception message encoding

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mhgext/fsmonitor/__init__.py (4 lines)

Diff 17464

hgext/fsmonitor/__init__.py

"""Fix path to match watchman and local filesystem encoding """Fix path to match watchman and local filesystem encoding
watchman's paths encoding can differ from filesystem encoding. For example, watchman's paths encoding can differ from filesystem encoding. For example,
on Windows, it's always utf-8. on Windows, it's always utf-8.
""" """
try: try:
decoded = path.decode(_watchmanencoding) decoded = path.decode(_watchmanencoding)
except UnicodeDecodeError as e: except UnicodeDecodeError as e:
raise error.Abort(str(e), hint=b'watchman encoding error') raise error.Abort(forcebytestr(e), hint=b'watchman encoding error')
try: try:
encoded = decoded.encode(_fsencoding, 'strict') encoded = decoded.encode(_fsencoding, 'strict')
except UnicodeEncodeError as e: except UnicodeEncodeError as e:
raise error.Abort(str(e)) raise error.Abort(forcebytestr(e))
return encoded return encoded
def overridewalk(orig, self, match, subrepos, unknown, ignored, full=True): def overridewalk(orig, self, match, subrepos, unknown, ignored, full=True):
'''Replacement for dirstate.walk, hooking into Watchman. '''Replacement for dirstate.walk, hooking into Watchman.
Whenever full is False, ignored is False, and the Watchman client is Whenever full is False, ignored is False, and the Watchman client is