D7203: fsmonitor: reapply dd35abc409ee

Submitter	phabricator
Date	Nov. 2, 2019, 10:04 p.m.
Message ID	<differential-rev-PHID-DREV-7j5gdavafce76jwj5lzr-req@mercurial-scm.org>
Download	mbox \| patch
Permalink	/patch/42685/
State	Superseded
Headers	show Return-Path: <mercurial-devel-bounces@mercurial-scm.org> Date: Sat, 2 Nov 2019 22:04:24 +0000 To: Phabricator <phabricator@mercurial-scm.org> From: "indygreg (Gregory Szorc)" <phabricator@mercurial-scm.org> Subject: D7203: fsmonitor: reapply dd35abc409ee Message-ID: <differential-rev-PHID-DREV-7j5gdavafce76jwj5lzr-req@mercurial-scm.org> Precedence: bulk Thread-Topic: PHID-DREV-7j5gdavafce76jwj5lzr Thread-Index: ZTg1ZjY2NWY3MzEyOGYzNWRmNmM2NWM1NGQw MIME-Version: 1.0 Cc: mercurial-devel@mercurial-scm.org Reply-To: "indygreg \(Gregory Szorc\)" <phabricator+D7203+public+d28c33416c083dbe@mercurial-scm.org> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: mercurial-devel-bounces@mercurial-scm.org Sender: "Mercurial-devel" <mercurial-devel-bounces@mercurial-scm.org>

Comments

phabricator - Nov. 2, 2019, 10:04 p.m.

indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

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

REPOSITORY
  rHG Mercurial

BRANCH
  stable

REVISION DETAIL
  https://phab.mercurial-scm.org/D7203

AFFECTED FILES
  hgext/fsmonitor/pywatchman/__init__.py

CHANGE DETAILS




To: indygreg, #hg-reviewers
Cc: mercurial-devel

phabricator - Nov. 20, 2019, 5:51 p.m.

marmoute added a comment.


  Out of curiosity, was the fix submitted upstream too ?

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7203/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7203

To: indygreg, #hg-reviewers
Cc: marmoute, mercurial-devel

Patch

diff --git a/hgext/fsmonitor/pywatchman/__init__.py b/hgext/fsmonitor/pywatchman/__init__.py
--- a/hgext/fsmonitor/pywatchman/__init__.py
+++ b/hgext/fsmonitor/pywatchman/__init__.py
@@ -996,7 +996,7 @@ 
             p = subprocess.Popen(cmd, **args)
 
         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()
         exitcode = p.poll()

Patchwork D7203: fsmonitor: reapply dd35abc409ee

Comments

Patch