Mercurial > hg
changeset 42650:ab1900323b1d
fsmonitor: refactor watchmanclient.client to accept ui and repo path
This will make my next patch simpler.
Differential Revision: https://phab.mercurial-scm.org/D6680
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Tue, 23 Jul 2019 14:36:38 -0400 |
| parents | 12addcc7956c |
| children | 7f1df7019497 |
| files | hgext/fsmonitor/__init__.py hgext/fsmonitor/watchmanclient.py |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/fsmonitor/__init__.py Sun Jul 21 14:42:01 2019 +0900 +++ b/hgext/fsmonitor/__init__.py Tue Jul 23 14:36:38 2019 -0400 @@ -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
--- a/hgext/fsmonitor/watchmanclient.py Sun Jul 21 14:42:01 2019 +0900 +++ b/hgext/fsmonitor/watchmanclient.py Tue Jul 23 14:36:38 2019 -0400 @@ -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):