This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7205

fsmonitor: fix str/bytes mismatch when accessing watchman version
ClosedPublic

Authored by indygreg on Nov 2 2019, 6:03 PM.

Download Raw Diff

Details

Reviewers

None

Group Reviewers

hg-reviewers

Commits

rHGe6ce1599af74: fsmonitor: fix str/bytes mismatch when accessing watchman version

Summary

There were 2 bugs here. First, keys in the tuple are always
str. Second, we needed to normalize the value to bytes to
prevent a str/bytes mismatch on Python 3.

With this commit, hg debuginstall with fsmonitor enabled now
works on Python 3.

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.Nov 2 2019, 6:03 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptNov 2 2019, 6:03 PM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

indygreg added a child revision: D7206: fsmonitor: coerce watchman exception to bytes.Nov 2 2019, 6:03 PM

indygreg added a commit: rHGe6ce1599af74: fsmonitor: fix str/bytes mismatch when accessing watchman version.Nov 4 2019, 11:27 AM

This revision was not accepted when it landed; it landed in state Needs Review.

Closed by commit rHGe6ce1599af74: fsmonitor: fix str/bytes mismatch when accessing watchman version (authored by indygreg). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			hgext/fsmonitor/__init__.py (2 lines)

Status	Author	Revision
Closed	indygreg	D7214 fsmonitor: normalize exception types to bytes
Closed	indygreg	D7213 fsmonitor: normalize clock value to bytes
Closed	indygreg	D7212 fsmonitor: use next() instead of .next()
Closed	indygreg	D7211 fsmonitor: normalize Watchman paths to bytes
Closed	indygreg	D7210 fsmonitor: handle unicode keys in tuples
Closed	indygreg	D7209 fsmonitor: make _hashignore compatible with Python 3
Closed	indygreg	D7208 fsmonitor: normalize hostname to bytes
Closed	indygreg	D7207 fsmonitor: access repo.root
Closed	indygreg	D7206 fsmonitor: coerce watchman exception to bytes
Closed	indygreg	D7205 fsmonitor: fix str/bytes mismatch when accessing watchman version
Closed	indygreg	D7204 fsmonitor: reapply b1f62cd39b5c
Closed	indygreg	D7203 fsmonitor: reapply dd35abc409ee
Closed	indygreg	D7202 fsmonitor: remove pywatchman from exclusion rule
Closed	indygreg	D7201 fsmonitor: refresh pywatchman with upstream

Diff 17521

hgext/fsmonitor/init.py

	root = tempfile.mkdtemp()			root = tempfile.mkdtemp()
	c = watchmanclient.client(ui, root)			c = watchmanclient.client(ui, root)
	err = None			err = None
	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"),
	v[b"version"],			pycompat.bytestr(v["version"]),
	)			)
	except watchmanclient.Unavailable as e:			except watchmanclient.Unavailable as e:
	err = str(e)			err = str(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,

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	17503		Nov 2 2019, 6:03 PM	★	★
Diff 2	17521	rHGe6ce1599af74467a38065c9640d16be1a1ff3309	Nov 2 2019, 4:04 PM	★	★