This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7855

fsmonitor: properly handle str ex.msg
ClosedPublic

Authored by indygreg on Jan 13 2020, 11:13 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG806d14efec8d: fsmonitor: properly handle str ex.msg
rHG8e9ca778261a: fsmonitor: properly handle str ex.msg
rHG18f9a534dfb7: fsmonitor: properly handle str ex.msg
Summary

ex.msg is always a str, since pywatchman uses str for exception messages.

This commit removes a b'' from a string compare to avoid types
mismatch and adds a coercion to bytes before stuffing the exception
message on our local exception type, which uses bytes for the message
elsewhere in this file.

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.

Event Timeline

indygreg created this revision.Jan 13 2020, 11:13 PM
pulkit accepted this revision.Jan 14 2020, 10:03 AM
This revision is now accepted and ready to land.Jan 14 2020, 10:03 AM
indygreg added a commit: rHG18f9a534dfb7: fsmonitor: properly handle str ex.msg.Jan 14 2020, 11:13 AM
Closed by commit rHG18f9a534dfb7: fsmonitor: properly handle str ex.msg (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 19215

hgext/fsmonitor/watchmanclient.py

) )
self._watchmanclient = pywatchman.client( self._watchmanclient = pywatchman.client(
timeout=self._timeout, timeout=self._timeout,
useImmutableBser=True, useImmutableBser=True,
binpath=procutil.tonativestr(watchman_exe), binpath=procutil.tonativestr(watchman_exe),
) )
return self._watchmanclient.query(*watchmanargs) return self._watchmanclient.query(*watchmanargs)
except pywatchman.CommandError as ex: except pywatchman.CommandError as ex:
if b'unable to resolve root' in ex.msg: if 'unable to resolve root' in ex.msg:
raise WatchmanNoRoot( raise WatchmanNoRoot(
self._root, stringutil.forcebytestr(ex.msg) self._root, stringutil.forcebytestr(ex.msg)
) )
raise Unavailable(ex.msg) raise Unavailable(stringutil.forcebytestr(ex.msg))
except pywatchman.WatchmanError as ex: except pywatchman.WatchmanError as ex:
raise Unavailable(stringutil.forcebytestr(ex)) raise Unavailable(stringutil.forcebytestr(ex))
def command(self, *args): def command(self, *args):
try: try:
try: try:
return self._command(*args) return self._command(*args)
except WatchmanNoRoot: except WatchmanNoRoot: