Show More
@@ -1,125 +1,125 b'' | |||||
1 | # __init__.py - inotify-based status acceleration for Linux |
|
1 | # __init__.py - inotify-based status acceleration for Linux | |
2 | # |
|
2 | # | |
3 | # Copyright 2006, 2007, 2008 Bryan O'Sullivan <bos@serpentine.com> |
|
3 | # Copyright 2006, 2007, 2008 Bryan O'Sullivan <bos@serpentine.com> | |
4 | # Copyright 2007, 2008 Brendan Cully <brendan@kublai.com> |
|
4 | # Copyright 2007, 2008 Brendan Cully <brendan@kublai.com> | |
5 | # |
|
5 | # | |
6 | # This software may be used and distributed according to the terms |
|
6 | # This software may be used and distributed according to the terms | |
7 | # of the GNU General Public License, incorporated herein by reference. |
|
7 | # of the GNU General Public License, incorporated herein by reference. | |
8 |
|
8 | |||
9 | '''inotify-based status acceleration for Linux systems |
|
9 | '''inotify-based status acceleration for Linux systems | |
10 | ''' |
|
10 | ''' | |
11 |
|
11 | |||
12 | # todo: socket permissions |
|
12 | # todo: socket permissions | |
13 |
|
13 | |||
14 | from mercurial.i18n import _ |
|
14 | from mercurial.i18n import _ | |
15 | from mercurial import cmdutil, util |
|
15 | from mercurial import cmdutil, util | |
16 | import client, errno, os, server, socket |
|
16 | import client, errno, os, server, socket | |
17 | from weakref import proxy |
|
17 | from weakref import proxy | |
18 |
|
18 | |||
19 | def serve(ui, repo, **opts): |
|
19 | def serve(ui, repo, **opts): | |
20 | '''start an inotify server for this repository''' |
|
20 | '''start an inotify server for this repository''' | |
21 | timeout = opts.get('timeout') |
|
21 | timeout = opts.get('timeout') | |
22 | if timeout: |
|
22 | if timeout: | |
23 | timeout = float(timeout) * 1e3 |
|
23 | timeout = float(timeout) * 1e3 | |
24 |
|
24 | |||
25 | class service: |
|
25 | class service: | |
26 | def init(self): |
|
26 | def init(self): | |
27 | try: |
|
27 | try: | |
28 | self.master = server.Master(ui, repo, timeout) |
|
28 | self.master = server.Master(ui, repo, timeout) | |
29 | except server.AlreadyStartedException, inst: |
|
29 | except server.AlreadyStartedException, inst: | |
30 | raise util.Abort(str(inst)) |
|
30 | raise util.Abort(str(inst)) | |
31 |
|
31 | |||
32 | def run(self): |
|
32 | def run(self): | |
33 | try: |
|
33 | try: | |
34 | self.master.run() |
|
34 | self.master.run() | |
35 | finally: |
|
35 | finally: | |
36 | self.master.shutdown() |
|
36 | self.master.shutdown() | |
37 |
|
37 | |||
38 | service = service() |
|
38 | service = service() | |
39 | cmdutil.service(opts, initfn=service.init, runfn=service.run) |
|
39 | cmdutil.service(opts, initfn=service.init, runfn=service.run) | |
40 |
|
40 | |||
41 | def reposetup(ui, repo): |
|
41 | def reposetup(ui, repo): | |
42 | if not hasattr(repo, 'dirstate'): |
|
42 | if not hasattr(repo, 'dirstate'): | |
43 | return |
|
43 | return | |
44 |
|
44 | |||
45 | # XXX: weakref until hg stops relying on __del__ |
|
45 | # XXX: weakref until hg stops relying on __del__ | |
46 | repo = proxy(repo) |
|
46 | repo = proxy(repo) | |
47 |
|
47 | |||
48 | class inotifydirstate(repo.dirstate.__class__): |
|
48 | class inotifydirstate(repo.dirstate.__class__): | |
49 | # Set to True if we're the inotify server, so we don't attempt |
|
49 | # Set to True if we're the inotify server, so we don't attempt | |
50 | # to recurse. |
|
50 | # to recurse. | |
51 | inotifyserver = False |
|
51 | inotifyserver = False | |
52 |
|
52 | |||
53 | def status(self, match, ignored, clean, unknown=True): |
|
53 | def status(self, match, ignored, clean, unknown=True): | |
54 | files = match.files() |
|
54 | files = match.files() | |
55 | if '.' in files: |
|
55 | if '.' in files: | |
56 | files = [] |
|
56 | files = [] | |
57 | try: |
|
57 | try: | |
58 | if not ignored and not self.inotifyserver: |
|
58 | if not ignored and not self.inotifyserver: | |
59 | result = client.query(ui, repo, files, match, False, |
|
59 | result = client.query(ui, repo, files, match, False, | |
60 | clean, unknown) |
|
60 | clean, unknown) | |
61 | if ui.config('inotify', 'debug'): |
|
61 | if result and ui.config('inotify', 'debug'): | |
62 | r2 = super(inotifydirstate, self).status( |
|
62 | r2 = super(inotifydirstate, self).status( | |
63 | match, False, clean, unknown) |
|
63 | match, False, clean, unknown) | |
64 | for c,a,b in zip('LMARDUIC', result, r2): |
|
64 | for c,a,b in zip('LMARDUIC', result, r2): | |
65 | for f in a: |
|
65 | for f in a: | |
66 | if f not in b: |
|
66 | if f not in b: | |
67 | ui.warn('*** inotify: %s +%s\n' % (c, f)) |
|
67 | ui.warn('*** inotify: %s +%s\n' % (c, f)) | |
68 | for f in b: |
|
68 | for f in b: | |
69 | if f not in a: |
|
69 | if f not in a: | |
70 | ui.warn('*** inotify: %s -%s\n' % (c, f)) |
|
70 | ui.warn('*** inotify: %s -%s\n' % (c, f)) | |
71 | result = r2 |
|
71 | result = r2 | |
72 |
|
72 | |||
73 | if result is not None: |
|
73 | if result is not None: | |
74 | return result |
|
74 | return result | |
75 | except (OSError, socket.error), err: |
|
75 | except (OSError, socket.error), err: | |
76 | autostart = ui.configbool('inotify', 'autostart', True) |
|
76 | autostart = ui.configbool('inotify', 'autostart', True) | |
77 |
|
77 | |||
78 | if err[0] == errno.ECONNREFUSED: |
|
78 | if err[0] == errno.ECONNREFUSED: | |
79 | ui.warn(_('(found dead inotify server socket; ' |
|
79 | ui.warn(_('(found dead inotify server socket; ' | |
80 | 'removing it)\n')) |
|
80 | 'removing it)\n')) | |
81 | os.unlink(repo.join('inotify.sock')) |
|
81 | os.unlink(repo.join('inotify.sock')) | |
82 | if err[0] in (errno.ECONNREFUSED, errno.ENOENT) and autostart: |
|
82 | if err[0] in (errno.ECONNREFUSED, errno.ENOENT) and autostart: | |
83 | ui.debug(_('(starting inotify server)\n')) |
|
83 | ui.debug(_('(starting inotify server)\n')) | |
84 | try: |
|
84 | try: | |
85 | try: |
|
85 | try: | |
86 | server.start(ui, repo) |
|
86 | server.start(ui, repo) | |
87 | except server.AlreadyStartedException, inst: |
|
87 | except server.AlreadyStartedException, inst: | |
88 | # another process may have started its own |
|
88 | # another process may have started its own | |
89 | # inotify server while this one was starting. |
|
89 | # inotify server while this one was starting. | |
90 | ui.debug(str(inst)) |
|
90 | ui.debug(str(inst)) | |
91 | except Exception, inst: |
|
91 | except Exception, inst: | |
92 | ui.warn(_('could not start inotify server: ' |
|
92 | ui.warn(_('could not start inotify server: ' | |
93 | '%s\n') % inst) |
|
93 | '%s\n') % inst) | |
94 | else: |
|
94 | else: | |
95 | # server is started, send query again |
|
95 | # server is started, send query again | |
96 | try: |
|
96 | try: | |
97 | return client.query(ui, repo, files, match, |
|
97 | return client.query(ui, repo, files, match, | |
98 | ignored, clean, unknown) |
|
98 | ignored, clean, unknown) | |
99 | except socket.error, err: |
|
99 | except socket.error, err: | |
100 | ui.warn(_('could not talk to new inotify ' |
|
100 | ui.warn(_('could not talk to new inotify ' | |
101 | 'server: %s\n') % err[-1]) |
|
101 | 'server: %s\n') % err[-1]) | |
102 | elif err[0] in (errno.ECONNREFUSED, errno.ENOENT): |
|
102 | elif err[0] in (errno.ECONNREFUSED, errno.ENOENT): | |
103 | # silently ignore normal errors if autostart is False |
|
103 | # silently ignore normal errors if autostart is False | |
104 | ui.debug(_('(inotify server not running)\n')) |
|
104 | ui.debug(_('(inotify server not running)\n')) | |
105 | else: |
|
105 | else: | |
106 | ui.warn(_('failed to contact inotify server: %s\n') |
|
106 | ui.warn(_('failed to contact inotify server: %s\n') | |
107 | % err[-1]) |
|
107 | % err[-1]) | |
108 | ui.print_exc() |
|
108 | ui.print_exc() | |
109 | # replace by old status function |
|
109 | # replace by old status function | |
110 | self.status = super(inotifydirstate, self).status |
|
110 | self.status = super(inotifydirstate, self).status | |
111 |
|
111 | |||
112 | return super(inotifydirstate, self).status( |
|
112 | return super(inotifydirstate, self).status( | |
113 | match, ignored, clean, unknown) |
|
113 | match, ignored, clean, unknown) | |
114 |
|
114 | |||
115 | repo.dirstate.__class__ = inotifydirstate |
|
115 | repo.dirstate.__class__ = inotifydirstate | |
116 |
|
116 | |||
117 | cmdtable = { |
|
117 | cmdtable = { | |
118 | '^inserve': |
|
118 | '^inserve': | |
119 | (serve, |
|
119 | (serve, | |
120 | [('d', 'daemon', None, _('run server in background')), |
|
120 | [('d', 'daemon', None, _('run server in background')), | |
121 | ('', 'daemon-pipefds', '', _('used internally by daemon mode')), |
|
121 | ('', 'daemon-pipefds', '', _('used internally by daemon mode')), | |
122 | ('t', 'idle-timeout', '', _('minutes to sit idle before exiting')), |
|
122 | ('t', 'idle-timeout', '', _('minutes to sit idle before exiting')), | |
123 | ('', 'pid-file', '', _('name of file to write process ID to'))], |
|
123 | ('', 'pid-file', '', _('name of file to write process ID to'))], | |
124 | _('hg inserve [OPT]...')), |
|
124 | _('hg inserve [OPT]...')), | |
125 | } |
|
125 | } |
General Comments 0
You need to be logged in to leave comments.
Login now