This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7218

fsmonitor: use stringutil.forcebytestr() instead of str() on an exception
ClosedPublic

Authored by Kwan on Nov 4 2019, 2:06 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG90fba2248693: fsmonitor: use stringutil.forcebytestr() instead of str() on an exception
Summary

Similar to 5fa8ac91190e / D7206, should get test-install.t passing on py3.

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

Kwan created this revision.Nov 4 2019, 2:06 PM
Kwan added a commit: rHG90fba2248693: fsmonitor: use stringutil.forcebytestr() instead of str() on an exception.Nov 4 2019, 4:53 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG90fba2248693: fsmonitor: use stringutil.forcebytestr() instead of str() on an exception (authored by Kwan). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 17537

hgext/fsmonitor/__init__.py

try: try:
v = c.command(b"version") v = c.command(b"version")
fm.write( fm.write(
b"fsmonitor-watchman-version", b"fsmonitor-watchman-version",
_(b" watchman binary version %s\n"), _(b" watchman binary version %s\n"),
pycompat.bytestr(v["version"]), pycompat.bytestr(v["version"]),
) )
except watchmanclient.Unavailable as e: except watchmanclient.Unavailable as e:
err = str(e) err = stringutil.forcebytestr(e)
fm.condwrite( fm.condwrite(
err, err,
b"fsmonitor-watchman-error", b"fsmonitor-watchman-error",
_(b" watchman binary missing or broken: %s\n"), _(b" watchman binary missing or broken: %s\n"),
err, err,
) )
return 1 if err else 0 return 1 if err else 0