D6680: fsmonitor: refactor watchmanclient.client to accept ui and repo path
durin42 (Augie Fackler)
phabricator at mercurial-scm.org
Tue Jul 23 19:40:16 UTC 2019
durin42 created this revision.
Herald added subscribers: mercurial-devel, mjpieters.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This will make my next patch simpler.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D6680
AFFECTED FILES
hgext/fsmonitor/__init__.py
hgext/fsmonitor/watchmanclient.py
CHANGE DETAILS
diff --git a/hgext/fsmonitor/watchmanclient.py b/hgext/fsmonitor/watchmanclient.py
--- a/hgext/fsmonitor/watchmanclient.py
+++ b/hgext/fsmonitor/watchmanclient.py
@@ -33,12 +33,12 @@
super(WatchmanNoRoot, self).__init__(msg)
class client(object):
- def __init__(self, repo, timeout=1.0):
+ def __init__(self, ui, root, timeout=1.0):
err = None
if not self._user:
err = "couldn't get user"
warn = True
- if self._user in repo.ui.configlist('fsmonitor', 'blacklistusers'):
+ if self._user in ui.configlist('fsmonitor', 'blacklistusers'):
err = 'user %s in blacklist' % self._user
warn = False
@@ -47,8 +47,8 @@
self._timeout = timeout
self._watchmanclient = None
- self._root = repo.root
- self._ui = repo.ui
+ self._root = root
+ self._ui = ui
self._firsttime = True
def settimeout(self, timeout):
diff --git a/hgext/fsmonitor/__init__.py b/hgext/fsmonitor/__init__.py
--- a/hgext/fsmonitor/__init__.py
+++ b/hgext/fsmonitor/__init__.py
@@ -780,7 +780,7 @@
return
try:
- client = watchmanclient.client(repo)
+ client = watchmanclient.client(repo.ui, repo._root)
except Exception as ex:
_handleunavailable(ui, fsmonitorstate, ex)
return
To: durin42, #hg-reviewers
Cc: mjpieters, mercurial-devel
More information about the Mercurial-devel
mailing list