This is an archive of the discontinued Mercurial Phabricator instance.

fsmonitor: correct an error message
ClosedPublic

Authored by quark on Aug 10 2017, 12:38 PM.

Reviewers

lothiraldan

Group Reviewers

hg-reviewers

Commits

rHGdd35abc409ee: fsmonitor: correct an error message

Summary

Without the change, the error looks like:

warning: Watchman unavailable: "watchman" executable not in PATH (%s),
while executing [Errno 2] No such file or directory

With the change, it now looks like:

warning: Watchman unavailable: "watchman" executable not in PATH
([Errno 2] No such file or directory)

Repository

rHG Mercurial

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

LGTM, we don't have a test for it?

This revision was automatically updated to reflect the committed changes.

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

	# Using the flag STARTF_USESHOWWINDOW to avoid this behavior.			# Using the flag STARTF_USESHOWWINDOW to avoid this behavior.
	startupinfo = subprocess.STARTUPINFO()			startupinfo = subprocess.STARTUPINFO()
	startupinfo.dwFlags \|= subprocess.STARTF_USESHOWWINDOW			startupinfo.dwFlags \|= subprocess.STARTF_USESHOWWINDOW
	args['startupinfo'] = startupinfo			args['startupinfo'] = startupinfo

	p = subprocess.Popen(cmd, **args)			p = subprocess.Popen(cmd, **args)

	except OSError as e:			except OSError as e:
	raise WatchmanError('"watchman" executable not in PATH (%s)', e)			raise WatchmanError('"watchman" executable not in PATH (%s)' % e)

	stdout, stderr = p.communicate()			stdout, stderr = p.communicate()
	exitcode = p.poll()			exitcode = p.poll()

	if exitcode:			if exitcode:
	raise WatchmanError("watchman exited with code %d" % exitcode)			raise WatchmanError("watchman exited with code %d" % exitcode)

	result = bser.loads(stdout)			result = bser.loads(stdout)