D7207: fsmonitor: access repo.root

Submitter	phabricator
Date	Nov. 2, 2019, 10:04 p.m.
Message ID	<differential-rev-PHID-DREV-ilk6uniek6kp2rfimfzt-req@mercurial-scm.org>
Download	mbox \| patch
Permalink	/patch/42690/
State	Superseded
Headers	show Return-Path: <mercurial-devel-bounces@mercurial-scm.org> Date: Sat, 2 Nov 2019 22:04:25 +0000 To: Phabricator <phabricator@mercurial-scm.org> From: "indygreg (Gregory Szorc)" <phabricator@mercurial-scm.org> Subject: D7207: fsmonitor: access repo.root Message-ID: <differential-rev-PHID-DREV-ilk6uniek6kp2rfimfzt-req@mercurial-scm.org> Precedence: bulk Thread-Topic: PHID-DREV-ilk6uniek6kp2rfimfzt Thread-Index: MmRlNGRhN2JiNGQ1ODBkNzQ0MjA5ZGE0OWU1 MIME-Version: 1.0 Cc: mercurial-devel@mercurial-scm.org Reply-To: "indygreg \(Gregory Szorc\)" <phabricator+D7207+public+062486b65c8b29be@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
  There is no repo._root. It looks like fsmonitor has
  been busted since this access was introduced in
  ab1900323b1 <https://phab.mercurial-scm.org/rHGab1900323b1d334a4211669cc6f483413b625013> in July 2019!

REPOSITORY
  rHG Mercurial

BRANCH
  stable

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

AFFECTED FILES
  hgext/fsmonitor/__init__.py

CHANGE DETAILS




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

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

indygreg added a comment.
indygreg added a subscriber: durin42.


  @durin42 if you don't want to take this entire series for stable, this patch should be taken because it unborks fsmonitor.
  
  In related news, apparently we don't have meaningful test coverage that watchman integration is actually working, ugh.

REPOSITORY
  rHG Mercurial

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

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

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

Patch

diff --git a/hgext/fsmonitor/__init__.py b/hgext/fsmonitor/__init__.py
--- a/hgext/fsmonitor/__init__.py
+++ b/hgext/fsmonitor/__init__.py
@@ -927,7 +927,7 @@ 
             return
 
         try:
-            client = watchmanclient.client(repo.ui, repo._root)
+            client = watchmanclient.client(repo.ui, repo.root)
         except Exception as ex:
             _handleunavailable(ui, fsmonitorstate, ex)
             return

Patchwork D7207: fsmonitor: access repo.root

Comments

Patch