This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7203

fsmonitor: reapply dd35abc409ee
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG9eed959cd8ae: fsmonitor: reapply dd35abc409ee
Summary

The recent revendoring of pywatchman undid this bug fix.
Let's reapply it.

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
indygreg added a commit: rHG9eed959cd8ae: fsmonitor: reapply dd35abc409ee.Nov 4 2019, 11:26 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG9eed959cd8ae: fsmonitor: reapply dd35abc409ee (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.
marmoute added a subscriber: marmoute.Nov 20 2019, 12:51 PM

Out of curiosity, was the fix submitted upstream too ?

Revision Contents
Changeset List

Diff 17518

hgext/fsmonitor/pywatchman/__init__.py

# 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)