##// END OF EJS Templates
fsmonitor: refactor watchmanclient.client to accept ui and repo path...
Augie Fackler -
r42877:ab190032 default
parent child Browse files
Show More
@@ -780,7 +780,7 b' def reposetup(ui, repo):'
780 return
780 return
781
781
782 try:
782 try:
783 client = watchmanclient.client(repo)
783 client = watchmanclient.client(repo.ui, repo._root)
784 except Exception as ex:
784 except Exception as ex:
785 _handleunavailable(ui, fsmonitorstate, ex)
785 _handleunavailable(ui, fsmonitorstate, ex)
786 return
786 return
@@ -33,12 +33,12 b' class WatchmanNoRoot(Unavailable):'
33 super(WatchmanNoRoot, self).__init__(msg)
33 super(WatchmanNoRoot, self).__init__(msg)
34
34
35 class client(object):
35 class client(object):
36 def __init__(self, repo, timeout=1.0):
36 def __init__(self, ui, root, timeout=1.0):
37 err = None
37 err = None
38 if not self._user:
38 if not self._user:
39 err = "couldn't get user"
39 err = "couldn't get user"
40 warn = True
40 warn = True
41 if self._user in repo.ui.configlist('fsmonitor', 'blacklistusers'):
41 if self._user in ui.configlist('fsmonitor', 'blacklistusers'):
42 err = 'user %s in blacklist' % self._user
42 err = 'user %s in blacklist' % self._user
43 warn = False
43 warn = False
44
44
@@ -47,8 +47,8 b' class client(object):'
47
47
48 self._timeout = timeout
48 self._timeout = timeout
49 self._watchmanclient = None
49 self._watchmanclient = None
50 self._root = repo.root
50 self._root = root
51 self._ui = repo.ui
51 self._ui = ui
52 self._firsttime = True
52 self._firsttime = True
53
53
54 def settimeout(self, timeout):
54 def settimeout(self, timeout):
General Comments 0
You need to be logged in to leave comments. Login now