Show More
@@ -1,703 +1,738 | |||||
1 | # chgserver.py - command server extension for cHg |
|
1 | # chgserver.py - command server extension for cHg | |
2 | # |
|
2 | # | |
3 | # Copyright 2011 Yuya Nishihara <yuya@tcha.org> |
|
3 | # Copyright 2011 Yuya Nishihara <yuya@tcha.org> | |
4 | # |
|
4 | # | |
5 | # This software may be used and distributed according to the terms of the |
|
5 | # This software may be used and distributed according to the terms of the | |
6 | # GNU General Public License version 2 or any later version. |
|
6 | # GNU General Public License version 2 or any later version. | |
7 |
|
7 | |||
8 | """command server extension for cHg |
|
8 | """command server extension for cHg | |
9 |
|
9 | |||
10 | 'S' channel (read/write) |
|
10 | 'S' channel (read/write) | |
11 | propagate ui.system() request to client |
|
11 | propagate ui.system() request to client | |
12 |
|
12 | |||
13 | 'attachio' command |
|
13 | 'attachio' command | |
14 | attach client's stdio passed by sendmsg() |
|
14 | attach client's stdio passed by sendmsg() | |
15 |
|
15 | |||
16 | 'chdir' command |
|
16 | 'chdir' command | |
17 | change current directory |
|
17 | change current directory | |
18 |
|
18 | |||
19 | 'setenv' command |
|
19 | 'setenv' command | |
20 | replace os.environ completely |
|
20 | replace os.environ completely | |
21 |
|
21 | |||
22 | 'setumask' command (DEPRECATED) |
|
22 | 'setumask' command (DEPRECATED) | |
23 | 'setumask2' command |
|
23 | 'setumask2' command | |
24 | set umask |
|
24 | set umask | |
25 |
|
25 | |||
26 | 'validate' command |
|
26 | 'validate' command | |
27 | reload the config and check if the server is up to date |
|
27 | reload the config and check if the server is up to date | |
28 |
|
28 | |||
29 | Config |
|
29 | Config | |
30 | ------ |
|
30 | ------ | |
31 |
|
31 | |||
32 | :: |
|
32 | :: | |
33 |
|
33 | |||
34 | [chgserver] |
|
34 | [chgserver] | |
35 | # how long (in seconds) should an idle chg server exit |
|
35 | # how long (in seconds) should an idle chg server exit | |
36 | idletimeout = 3600 |
|
36 | idletimeout = 3600 | |
37 |
|
37 | |||
38 | # whether to skip config or env change checks |
|
38 | # whether to skip config or env change checks | |
39 | skiphash = False |
|
39 | skiphash = False | |
40 | """ |
|
40 | """ | |
41 |
|
41 | |||
42 | from __future__ import absolute_import |
|
42 | from __future__ import absolute_import | |
43 |
|
43 | |||
44 | import hashlib |
|
44 | import hashlib | |
45 | import inspect |
|
45 | import inspect | |
46 | import os |
|
46 | import os | |
47 | import re |
|
47 | import re | |
48 | import socket |
|
48 | import socket | |
49 | import stat |
|
49 | import stat | |
50 | import struct |
|
50 | import struct | |
51 | import time |
|
51 | import time | |
52 |
|
52 | |||
53 | from .i18n import _ |
|
53 | from .i18n import _ | |
54 | from .pycompat import ( |
|
54 | from .pycompat import ( | |
55 | getattr, |
|
55 | getattr, | |
56 | setattr, |
|
56 | setattr, | |
57 | ) |
|
57 | ) | |
58 |
|
58 | |||
59 | from . import ( |
|
59 | from . import ( | |
60 | commandserver, |
|
60 | commandserver, | |
61 | encoding, |
|
61 | encoding, | |
62 | error, |
|
62 | error, | |
63 | extensions, |
|
63 | extensions, | |
64 | node, |
|
64 | node, | |
65 | pycompat, |
|
65 | pycompat, | |
66 | util, |
|
66 | util, | |
67 | ) |
|
67 | ) | |
68 |
|
68 | |||
69 | from .utils import ( |
|
69 | from .utils import ( | |
70 | procutil, |
|
70 | procutil, | |
71 | stringutil, |
|
71 | stringutil, | |
72 | ) |
|
72 | ) | |
73 |
|
73 | |||
74 |
|
74 | |||
75 | def _hashlist(items): |
|
75 | def _hashlist(items): | |
76 | """return sha1 hexdigest for a list""" |
|
76 | """return sha1 hexdigest for a list""" | |
77 | return node.hex(hashlib.sha1(stringutil.pprint(items)).digest()) |
|
77 | return node.hex(hashlib.sha1(stringutil.pprint(items)).digest()) | |
78 |
|
78 | |||
79 |
|
79 | |||
80 | # sensitive config sections affecting confighash |
|
80 | # sensitive config sections affecting confighash | |
81 | _configsections = [ |
|
81 | _configsections = [ | |
82 | b'alias', # affects global state commands.table |
|
82 | b'alias', # affects global state commands.table | |
83 | b'eol', # uses setconfig('eol', ...) |
|
83 | b'eol', # uses setconfig('eol', ...) | |
84 | b'extdiff', # uisetup will register new commands |
|
84 | b'extdiff', # uisetup will register new commands | |
85 | b'extensions', |
|
85 | b'extensions', | |
86 | ] |
|
86 | ] | |
87 |
|
87 | |||
88 | _configsectionitems = [ |
|
88 | _configsectionitems = [ | |
89 | (b'commands', b'show.aliasprefix'), # show.py reads it in extsetup |
|
89 | (b'commands', b'show.aliasprefix'), # show.py reads it in extsetup | |
90 | ] |
|
90 | ] | |
91 |
|
91 | |||
92 | # sensitive environment variables affecting confighash |
|
92 | # sensitive environment variables affecting confighash | |
93 | _envre = re.compile( |
|
93 | _envre = re.compile( | |
94 | br'''\A(?: |
|
94 | br'''\A(?: | |
95 | CHGHG |
|
95 | CHGHG | |
96 | |HG(?:DEMANDIMPORT|EMITWARNINGS|MODULEPOLICY|PROF|RCPATH)? |
|
96 | |HG(?:DEMANDIMPORT|EMITWARNINGS|MODULEPOLICY|PROF|RCPATH)? | |
97 | |HG(?:ENCODING|PLAIN).* |
|
97 | |HG(?:ENCODING|PLAIN).* | |
98 | |LANG(?:UAGE)? |
|
98 | |LANG(?:UAGE)? | |
99 | |LC_.* |
|
99 | |LC_.* | |
100 | |LD_.* |
|
100 | |LD_.* | |
101 | |PATH |
|
101 | |PATH | |
102 | |PYTHON.* |
|
102 | |PYTHON.* | |
103 | |TERM(?:INFO)? |
|
103 | |TERM(?:INFO)? | |
104 | |TZ |
|
104 | |TZ | |
105 | )\Z''', |
|
105 | )\Z''', | |
106 | re.X, |
|
106 | re.X, | |
107 | ) |
|
107 | ) | |
108 |
|
108 | |||
109 |
|
109 | |||
110 | def _confighash(ui): |
|
110 | def _confighash(ui): | |
111 | """return a quick hash for detecting config/env changes |
|
111 | """return a quick hash for detecting config/env changes | |
112 |
|
112 | |||
113 | confighash is the hash of sensitive config items and environment variables. |
|
113 | confighash is the hash of sensitive config items and environment variables. | |
114 |
|
114 | |||
115 | for chgserver, it is designed that once confighash changes, the server is |
|
115 | for chgserver, it is designed that once confighash changes, the server is | |
116 | not qualified to serve its client and should redirect the client to a new |
|
116 | not qualified to serve its client and should redirect the client to a new | |
117 | server. different from mtimehash, confighash change will not mark the |
|
117 | server. different from mtimehash, confighash change will not mark the | |
118 | server outdated and exit since the user can have different configs at the |
|
118 | server outdated and exit since the user can have different configs at the | |
119 | same time. |
|
119 | same time. | |
120 | """ |
|
120 | """ | |
121 | sectionitems = [] |
|
121 | sectionitems = [] | |
122 | for section in _configsections: |
|
122 | for section in _configsections: | |
123 | sectionitems.append(ui.configitems(section)) |
|
123 | sectionitems.append(ui.configitems(section)) | |
124 | for section, item in _configsectionitems: |
|
124 | for section, item in _configsectionitems: | |
125 | sectionitems.append(ui.config(section, item)) |
|
125 | sectionitems.append(ui.config(section, item)) | |
126 | sectionhash = _hashlist(sectionitems) |
|
126 | sectionhash = _hashlist(sectionitems) | |
127 | # If $CHGHG is set, the change to $HG should not trigger a new chg server |
|
127 | # If $CHGHG is set, the change to $HG should not trigger a new chg server | |
128 | if b'CHGHG' in encoding.environ: |
|
128 | if b'CHGHG' in encoding.environ: | |
129 | ignored = {b'HG'} |
|
129 | ignored = {b'HG'} | |
130 | else: |
|
130 | else: | |
131 | ignored = set() |
|
131 | ignored = set() | |
132 | envitems = [ |
|
132 | envitems = [ | |
133 | (k, v) |
|
133 | (k, v) | |
134 | for k, v in pycompat.iteritems(encoding.environ) |
|
134 | for k, v in pycompat.iteritems(encoding.environ) | |
135 | if _envre.match(k) and k not in ignored |
|
135 | if _envre.match(k) and k not in ignored | |
136 | ] |
|
136 | ] | |
137 | envhash = _hashlist(sorted(envitems)) |
|
137 | envhash = _hashlist(sorted(envitems)) | |
138 | return sectionhash[:6] + envhash[:6] |
|
138 | return sectionhash[:6] + envhash[:6] | |
139 |
|
139 | |||
140 |
|
140 | |||
141 | def _getmtimepaths(ui): |
|
141 | def _getmtimepaths(ui): | |
142 | """get a list of paths that should be checked to detect change |
|
142 | """get a list of paths that should be checked to detect change | |
143 |
|
143 | |||
144 | The list will include: |
|
144 | The list will include: | |
145 | - extensions (will not cover all files for complex extensions) |
|
145 | - extensions (will not cover all files for complex extensions) | |
146 | - mercurial/__version__.py |
|
146 | - mercurial/__version__.py | |
147 | - python binary |
|
147 | - python binary | |
148 | """ |
|
148 | """ | |
149 | modules = [m for n, m in extensions.extensions(ui)] |
|
149 | modules = [m for n, m in extensions.extensions(ui)] | |
150 | try: |
|
150 | try: | |
151 | from . import __version__ |
|
151 | from . import __version__ | |
152 |
|
152 | |||
153 | modules.append(__version__) |
|
153 | modules.append(__version__) | |
154 | except ImportError: |
|
154 | except ImportError: | |
155 | pass |
|
155 | pass | |
156 | files = [] |
|
156 | files = [] | |
157 | if pycompat.sysexecutable: |
|
157 | if pycompat.sysexecutable: | |
158 | files.append(pycompat.sysexecutable) |
|
158 | files.append(pycompat.sysexecutable) | |
159 | for m in modules: |
|
159 | for m in modules: | |
160 | try: |
|
160 | try: | |
161 | files.append(pycompat.fsencode(inspect.getabsfile(m))) |
|
161 | files.append(pycompat.fsencode(inspect.getabsfile(m))) | |
162 | except TypeError: |
|
162 | except TypeError: | |
163 | pass |
|
163 | pass | |
164 | return sorted(set(files)) |
|
164 | return sorted(set(files)) | |
165 |
|
165 | |||
166 |
|
166 | |||
167 | def _mtimehash(paths): |
|
167 | def _mtimehash(paths): | |
168 | """return a quick hash for detecting file changes |
|
168 | """return a quick hash for detecting file changes | |
169 |
|
169 | |||
170 | mtimehash calls stat on given paths and calculate a hash based on size and |
|
170 | mtimehash calls stat on given paths and calculate a hash based on size and | |
171 | mtime of each file. mtimehash does not read file content because reading is |
|
171 | mtime of each file. mtimehash does not read file content because reading is | |
172 | expensive. therefore it's not 100% reliable for detecting content changes. |
|
172 | expensive. therefore it's not 100% reliable for detecting content changes. | |
173 | it's possible to return different hashes for same file contents. |
|
173 | it's possible to return different hashes for same file contents. | |
174 | it's also possible to return a same hash for different file contents for |
|
174 | it's also possible to return a same hash for different file contents for | |
175 | some carefully crafted situation. |
|
175 | some carefully crafted situation. | |
176 |
|
176 | |||
177 | for chgserver, it is designed that once mtimehash changes, the server is |
|
177 | for chgserver, it is designed that once mtimehash changes, the server is | |
178 | considered outdated immediately and should no longer provide service. |
|
178 | considered outdated immediately and should no longer provide service. | |
179 |
|
179 | |||
180 | mtimehash is not included in confighash because we only know the paths of |
|
180 | mtimehash is not included in confighash because we only know the paths of | |
181 | extensions after importing them (there is imp.find_module but that faces |
|
181 | extensions after importing them (there is imp.find_module but that faces | |
182 | race conditions). We need to calculate confighash without importing. |
|
182 | race conditions). We need to calculate confighash without importing. | |
183 | """ |
|
183 | """ | |
184 |
|
184 | |||
185 | def trystat(path): |
|
185 | def trystat(path): | |
186 | try: |
|
186 | try: | |
187 | st = os.stat(path) |
|
187 | st = os.stat(path) | |
188 | return (st[stat.ST_MTIME], st.st_size) |
|
188 | return (st[stat.ST_MTIME], st.st_size) | |
189 | except OSError: |
|
189 | except OSError: | |
190 | # could be ENOENT, EPERM etc. not fatal in any case |
|
190 | # could be ENOENT, EPERM etc. not fatal in any case | |
191 | pass |
|
191 | pass | |
192 |
|
192 | |||
193 | return _hashlist(pycompat.maplist(trystat, paths))[:12] |
|
193 | return _hashlist(pycompat.maplist(trystat, paths))[:12] | |
194 |
|
194 | |||
195 |
|
195 | |||
196 | class hashstate(object): |
|
196 | class hashstate(object): | |
197 | """a structure storing confighash, mtimehash, paths used for mtimehash""" |
|
197 | """a structure storing confighash, mtimehash, paths used for mtimehash""" | |
198 |
|
198 | |||
199 | def __init__(self, confighash, mtimehash, mtimepaths): |
|
199 | def __init__(self, confighash, mtimehash, mtimepaths): | |
200 | self.confighash = confighash |
|
200 | self.confighash = confighash | |
201 | self.mtimehash = mtimehash |
|
201 | self.mtimehash = mtimehash | |
202 | self.mtimepaths = mtimepaths |
|
202 | self.mtimepaths = mtimepaths | |
203 |
|
203 | |||
204 | @staticmethod |
|
204 | @staticmethod | |
205 | def fromui(ui, mtimepaths=None): |
|
205 | def fromui(ui, mtimepaths=None): | |
206 | if mtimepaths is None: |
|
206 | if mtimepaths is None: | |
207 | mtimepaths = _getmtimepaths(ui) |
|
207 | mtimepaths = _getmtimepaths(ui) | |
208 | confighash = _confighash(ui) |
|
208 | confighash = _confighash(ui) | |
209 | mtimehash = _mtimehash(mtimepaths) |
|
209 | mtimehash = _mtimehash(mtimepaths) | |
210 | ui.log( |
|
210 | ui.log( | |
211 | b'cmdserver', |
|
211 | b'cmdserver', | |
212 | b'confighash = %s mtimehash = %s\n', |
|
212 | b'confighash = %s mtimehash = %s\n', | |
213 | confighash, |
|
213 | confighash, | |
214 | mtimehash, |
|
214 | mtimehash, | |
215 | ) |
|
215 | ) | |
216 | return hashstate(confighash, mtimehash, mtimepaths) |
|
216 | return hashstate(confighash, mtimehash, mtimepaths) | |
217 |
|
217 | |||
218 |
|
218 | |||
219 | def _newchgui(srcui, csystem, attachio): |
|
219 | def _newchgui(srcui, csystem, attachio): | |
220 | class chgui(srcui.__class__): |
|
220 | class chgui(srcui.__class__): | |
221 | def __init__(self, src=None): |
|
221 | def __init__(self, src=None): | |
222 | super(chgui, self).__init__(src) |
|
222 | super(chgui, self).__init__(src) | |
223 | if src: |
|
223 | if src: | |
224 | self._csystem = getattr(src, '_csystem', csystem) |
|
224 | self._csystem = getattr(src, '_csystem', csystem) | |
225 | else: |
|
225 | else: | |
226 | self._csystem = csystem |
|
226 | self._csystem = csystem | |
227 |
|
227 | |||
228 | def _runsystem(self, cmd, environ, cwd, out): |
|
228 | def _runsystem(self, cmd, environ, cwd, out): | |
229 | # fallback to the original system method if |
|
229 | # fallback to the original system method if | |
230 | # a. the output stream is not stdout (e.g. stderr, cStringIO), |
|
230 | # a. the output stream is not stdout (e.g. stderr, cStringIO), | |
231 | # b. or stdout is redirected by protectfinout(), |
|
231 | # b. or stdout is redirected by protectfinout(), | |
232 | # because the chg client is not aware of these situations and |
|
232 | # because the chg client is not aware of these situations and | |
233 | # will behave differently (i.e. write to stdout). |
|
233 | # will behave differently (i.e. write to stdout). | |
234 | if ( |
|
234 | if ( | |
235 | out is not self.fout |
|
235 | out is not self.fout | |
236 | or not util.safehasattr(self.fout, b'fileno') |
|
236 | or not util.safehasattr(self.fout, b'fileno') | |
237 | or self.fout.fileno() != procutil.stdout.fileno() |
|
237 | or self.fout.fileno() != procutil.stdout.fileno() | |
238 | or self._finoutredirected |
|
238 | or self._finoutredirected | |
239 | ): |
|
239 | ): | |
240 | return procutil.system(cmd, environ=environ, cwd=cwd, out=out) |
|
240 | return procutil.system(cmd, environ=environ, cwd=cwd, out=out) | |
241 | self.flush() |
|
241 | self.flush() | |
242 | return self._csystem(cmd, procutil.shellenviron(environ), cwd) |
|
242 | return self._csystem(cmd, procutil.shellenviron(environ), cwd) | |
243 |
|
243 | |||
244 | def _runpager(self, cmd, env=None): |
|
244 | def _runpager(self, cmd, env=None): | |
245 | self._csystem( |
|
245 | self._csystem( | |
246 | cmd, |
|
246 | cmd, | |
247 | procutil.shellenviron(env), |
|
247 | procutil.shellenviron(env), | |
248 | type=b'pager', |
|
248 | type=b'pager', | |
249 | cmdtable={b'attachio': attachio}, |
|
249 | cmdtable={b'attachio': attachio}, | |
250 | ) |
|
250 | ) | |
251 | return True |
|
251 | return True | |
252 |
|
252 | |||
253 | return chgui(srcui) |
|
253 | return chgui(srcui) | |
254 |
|
254 | |||
255 |
|
255 | |||
256 | def _loadnewui(srcui, args, cdebug): |
|
256 | def _loadnewui(srcui, args, cdebug): | |
257 | from . import dispatch # avoid cycle |
|
257 | from . import dispatch # avoid cycle | |
258 |
|
258 | |||
259 | newui = srcui.__class__.load() |
|
259 | newui = srcui.__class__.load() | |
260 | for a in [b'fin', b'fout', b'ferr', b'environ']: |
|
260 | for a in [b'fin', b'fout', b'ferr', b'environ']: | |
261 | setattr(newui, a, getattr(srcui, a)) |
|
261 | setattr(newui, a, getattr(srcui, a)) | |
262 | if util.safehasattr(srcui, b'_csystem'): |
|
262 | if util.safehasattr(srcui, b'_csystem'): | |
263 | newui._csystem = srcui._csystem |
|
263 | newui._csystem = srcui._csystem | |
264 |
|
264 | |||
265 | # command line args |
|
265 | # command line args | |
266 | options = dispatch._earlyparseopts(newui, args) |
|
266 | options = dispatch._earlyparseopts(newui, args) | |
267 | dispatch._parseconfig(newui, options[b'config']) |
|
267 | dispatch._parseconfig(newui, options[b'config']) | |
268 |
|
268 | |||
269 | # stolen from tortoisehg.util.copydynamicconfig() |
|
269 | # stolen from tortoisehg.util.copydynamicconfig() | |
270 | for section, name, value in srcui.walkconfig(): |
|
270 | for section, name, value in srcui.walkconfig(): | |
271 | source = srcui.configsource(section, name) |
|
271 | source = srcui.configsource(section, name) | |
272 | if b':' in source or source == b'--config' or source.startswith(b'$'): |
|
272 | if b':' in source or source == b'--config' or source.startswith(b'$'): | |
273 | # path:line or command line, or environ |
|
273 | # path:line or command line, or environ | |
274 | continue |
|
274 | continue | |
275 | newui.setconfig(section, name, value, source) |
|
275 | newui.setconfig(section, name, value, source) | |
276 |
|
276 | |||
277 | # load wd and repo config, copied from dispatch.py |
|
277 | # load wd and repo config, copied from dispatch.py | |
278 | cwd = options[b'cwd'] |
|
278 | cwd = options[b'cwd'] | |
279 | cwd = cwd and os.path.realpath(cwd) or None |
|
279 | cwd = cwd and os.path.realpath(cwd) or None | |
280 | rpath = options[b'repository'] |
|
280 | rpath = options[b'repository'] | |
281 | path, newlui = dispatch._getlocal(newui, rpath, wd=cwd) |
|
281 | path, newlui = dispatch._getlocal(newui, rpath, wd=cwd) | |
282 |
|
282 | |||
283 | extensions.populateui(newui) |
|
283 | extensions.populateui(newui) | |
284 | commandserver.setuplogging(newui, fp=cdebug) |
|
284 | commandserver.setuplogging(newui, fp=cdebug) | |
285 | if newui is not newlui: |
|
285 | if newui is not newlui: | |
286 | extensions.populateui(newlui) |
|
286 | extensions.populateui(newlui) | |
287 | commandserver.setuplogging(newlui, fp=cdebug) |
|
287 | commandserver.setuplogging(newlui, fp=cdebug) | |
288 |
|
288 | |||
289 | return (newui, newlui) |
|
289 | return (newui, newlui) | |
290 |
|
290 | |||
291 |
|
291 | |||
292 | class channeledsystem(object): |
|
292 | class channeledsystem(object): | |
293 | """Propagate ui.system() request in the following format: |
|
293 | """Propagate ui.system() request in the following format: | |
294 |
|
294 | |||
295 | payload length (unsigned int), |
|
295 | payload length (unsigned int), | |
296 | type, '\0', |
|
296 | type, '\0', | |
297 | cmd, '\0', |
|
297 | cmd, '\0', | |
298 | cwd, '\0', |
|
298 | cwd, '\0', | |
299 | envkey, '=', val, '\0', |
|
299 | envkey, '=', val, '\0', | |
300 | ... |
|
300 | ... | |
301 | envkey, '=', val |
|
301 | envkey, '=', val | |
302 |
|
302 | |||
303 | if type == 'system', waits for: |
|
303 | if type == 'system', waits for: | |
304 |
|
304 | |||
305 | exitcode length (unsigned int), |
|
305 | exitcode length (unsigned int), | |
306 | exitcode (int) |
|
306 | exitcode (int) | |
307 |
|
307 | |||
308 | if type == 'pager', repetitively waits for a command name ending with '\n' |
|
308 | if type == 'pager', repetitively waits for a command name ending with '\n' | |
309 | and executes it defined by cmdtable, or exits the loop if the command name |
|
309 | and executes it defined by cmdtable, or exits the loop if the command name | |
310 | is empty. |
|
310 | is empty. | |
311 | """ |
|
311 | """ | |
312 |
|
312 | |||
313 | def __init__(self, in_, out, channel): |
|
313 | def __init__(self, in_, out, channel): | |
314 | self.in_ = in_ |
|
314 | self.in_ = in_ | |
315 | self.out = out |
|
315 | self.out = out | |
316 | self.channel = channel |
|
316 | self.channel = channel | |
317 |
|
317 | |||
318 | def __call__(self, cmd, environ, cwd=None, type=b'system', cmdtable=None): |
|
318 | def __call__(self, cmd, environ, cwd=None, type=b'system', cmdtable=None): | |
319 | args = [type, procutil.quotecommand(cmd), os.path.abspath(cwd or b'.')] |
|
319 | args = [type, procutil.quotecommand(cmd), os.path.abspath(cwd or b'.')] | |
320 | args.extend(b'%s=%s' % (k, v) for k, v in pycompat.iteritems(environ)) |
|
320 | args.extend(b'%s=%s' % (k, v) for k, v in pycompat.iteritems(environ)) | |
321 | data = b'\0'.join(args) |
|
321 | data = b'\0'.join(args) | |
322 | self.out.write(struct.pack(b'>cI', self.channel, len(data))) |
|
322 | self.out.write(struct.pack(b'>cI', self.channel, len(data))) | |
323 | self.out.write(data) |
|
323 | self.out.write(data) | |
324 | self.out.flush() |
|
324 | self.out.flush() | |
325 |
|
325 | |||
326 | if type == b'system': |
|
326 | if type == b'system': | |
327 | length = self.in_.read(4) |
|
327 | length = self.in_.read(4) | |
328 | (length,) = struct.unpack(b'>I', length) |
|
328 | (length,) = struct.unpack(b'>I', length) | |
329 | if length != 4: |
|
329 | if length != 4: | |
330 | raise error.Abort(_(b'invalid response')) |
|
330 | raise error.Abort(_(b'invalid response')) | |
331 | (rc,) = struct.unpack(b'>i', self.in_.read(4)) |
|
331 | (rc,) = struct.unpack(b'>i', self.in_.read(4)) | |
332 | return rc |
|
332 | return rc | |
333 | elif type == b'pager': |
|
333 | elif type == b'pager': | |
334 | while True: |
|
334 | while True: | |
335 | cmd = self.in_.readline()[:-1] |
|
335 | cmd = self.in_.readline()[:-1] | |
336 | if not cmd: |
|
336 | if not cmd: | |
337 | break |
|
337 | break | |
338 | if cmdtable and cmd in cmdtable: |
|
338 | if cmdtable and cmd in cmdtable: | |
339 | cmdtable[cmd]() |
|
339 | cmdtable[cmd]() | |
340 | else: |
|
340 | else: | |
341 | raise error.Abort(_(b'unexpected command: %s') % cmd) |
|
341 | raise error.Abort(_(b'unexpected command: %s') % cmd) | |
342 | else: |
|
342 | else: | |
343 | raise error.ProgrammingError(b'invalid S channel type: %s' % type) |
|
343 | raise error.ProgrammingError(b'invalid S channel type: %s' % type) | |
344 |
|
344 | |||
345 |
|
345 | |||
346 | _iochannels = [ |
|
346 | _iochannels = [ | |
347 | # server.ch, ui.fp, mode |
|
347 | # server.ch, ui.fp, mode | |
348 | (b'cin', b'fin', 'rb'), |
|
348 | (b'cin', b'fin', 'rb'), | |
349 | (b'cout', b'fout', 'wb'), |
|
349 | (b'cout', b'fout', 'wb'), | |
350 | (b'cerr', b'ferr', 'wb'), |
|
350 | (b'cerr', b'ferr', 'wb'), | |
351 | ] |
|
351 | ] | |
352 |
|
352 | |||
353 |
|
353 | |||
354 | class chgcmdserver(commandserver.server): |
|
354 | class chgcmdserver(commandserver.server): | |
355 | def __init__( |
|
355 | def __init__( | |
356 | self, ui, repo, fin, fout, sock, prereposetups, hashstate, baseaddress |
|
356 | self, ui, repo, fin, fout, sock, prereposetups, hashstate, baseaddress | |
357 | ): |
|
357 | ): | |
358 | super(chgcmdserver, self).__init__( |
|
358 | super(chgcmdserver, self).__init__( | |
359 | _newchgui(ui, channeledsystem(fin, fout, b'S'), self.attachio), |
|
359 | _newchgui(ui, channeledsystem(fin, fout, b'S'), self.attachio), | |
360 | repo, |
|
360 | repo, | |
361 | fin, |
|
361 | fin, | |
362 | fout, |
|
362 | fout, | |
363 | prereposetups, |
|
363 | prereposetups, | |
364 | ) |
|
364 | ) | |
365 | self.clientsock = sock |
|
365 | self.clientsock = sock | |
366 | self._ioattached = False |
|
366 | self._ioattached = False | |
367 | self._oldios = [] # original (self.ch, ui.fp, fd) before "attachio" |
|
367 | self._oldios = [] # original (self.ch, ui.fp, fd) before "attachio" | |
368 | self.hashstate = hashstate |
|
368 | self.hashstate = hashstate | |
369 | self.baseaddress = baseaddress |
|
369 | self.baseaddress = baseaddress | |
370 | if hashstate is not None: |
|
370 | if hashstate is not None: | |
371 | self.capabilities = self.capabilities.copy() |
|
371 | self.capabilities = self.capabilities.copy() | |
372 | self.capabilities[b'validate'] = chgcmdserver.validate |
|
372 | self.capabilities[b'validate'] = chgcmdserver.validate | |
373 |
|
373 | |||
374 | def cleanup(self): |
|
374 | def cleanup(self): | |
375 | super(chgcmdserver, self).cleanup() |
|
375 | super(chgcmdserver, self).cleanup() | |
376 | # dispatch._runcatch() does not flush outputs if exception is not |
|
376 | # dispatch._runcatch() does not flush outputs if exception is not | |
377 | # handled by dispatch._dispatch() |
|
377 | # handled by dispatch._dispatch() | |
378 | self.ui.flush() |
|
378 | self.ui.flush() | |
379 | self._restoreio() |
|
379 | self._restoreio() | |
380 | self._ioattached = False |
|
380 | self._ioattached = False | |
381 |
|
381 | |||
382 | def attachio(self): |
|
382 | def attachio(self): | |
383 | """Attach to client's stdio passed via unix domain socket; all |
|
383 | """Attach to client's stdio passed via unix domain socket; all | |
384 | channels except cresult will no longer be used |
|
384 | channels except cresult will no longer be used | |
385 | """ |
|
385 | """ | |
386 | # tell client to sendmsg() with 1-byte payload, which makes it |
|
386 | # tell client to sendmsg() with 1-byte payload, which makes it | |
387 | # distinctive from "attachio\n" command consumed by client.read() |
|
387 | # distinctive from "attachio\n" command consumed by client.read() | |
388 | self.clientsock.sendall(struct.pack(b'>cI', b'I', 1)) |
|
388 | self.clientsock.sendall(struct.pack(b'>cI', b'I', 1)) | |
389 | clientfds = util.recvfds(self.clientsock.fileno()) |
|
389 | clientfds = util.recvfds(self.clientsock.fileno()) | |
390 | self.ui.log(b'chgserver', b'received fds: %r\n', clientfds) |
|
390 | self.ui.log(b'chgserver', b'received fds: %r\n', clientfds) | |
391 |
|
391 | |||
392 | ui = self.ui |
|
392 | ui = self.ui | |
393 | ui.flush() |
|
393 | ui.flush() | |
394 | self._saveio() |
|
394 | self._saveio() | |
395 | for fd, (cn, fn, mode) in zip(clientfds, _iochannels): |
|
395 | for fd, (cn, fn, mode) in zip(clientfds, _iochannels): | |
396 | assert fd > 0 |
|
396 | assert fd > 0 | |
397 | fp = getattr(ui, fn) |
|
397 | fp = getattr(ui, fn) | |
398 | os.dup2(fd, fp.fileno()) |
|
398 | os.dup2(fd, fp.fileno()) | |
399 | os.close(fd) |
|
399 | os.close(fd) | |
400 | if self._ioattached: |
|
400 | if self._ioattached: | |
401 | continue |
|
401 | continue | |
402 | # reset buffering mode when client is first attached. as we want |
|
402 | # reset buffering mode when client is first attached. as we want | |
403 | # to see output immediately on pager, the mode stays unchanged |
|
403 | # to see output immediately on pager, the mode stays unchanged | |
404 | # when client re-attached. ferr is unchanged because it should |
|
404 | # when client re-attached. ferr is unchanged because it should | |
405 | # be unbuffered no matter if it is a tty or not. |
|
405 | # be unbuffered no matter if it is a tty or not. | |
406 | if fn == b'ferr': |
|
406 | if fn == b'ferr': | |
407 | newfp = fp |
|
407 | newfp = fp | |
408 | else: |
|
408 | else: | |
409 | # make it line buffered explicitly because the default is |
|
409 | # make it line buffered explicitly because the default is | |
410 | # decided on first write(), where fout could be a pager. |
|
410 | # decided on first write(), where fout could be a pager. | |
411 | if fp.isatty(): |
|
411 | if fp.isatty(): | |
412 | bufsize = 1 # line buffered |
|
412 | bufsize = 1 # line buffered | |
413 | else: |
|
413 | else: | |
414 | bufsize = -1 # system default |
|
414 | bufsize = -1 # system default | |
415 | newfp = os.fdopen(fp.fileno(), mode, bufsize) |
|
415 | newfp = os.fdopen(fp.fileno(), mode, bufsize) | |
416 | setattr(ui, fn, newfp) |
|
416 | setattr(ui, fn, newfp) | |
417 | setattr(self, cn, newfp) |
|
417 | setattr(self, cn, newfp) | |
418 |
|
418 | |||
419 | self._ioattached = True |
|
419 | self._ioattached = True | |
420 | self.cresult.write(struct.pack(b'>i', len(clientfds))) |
|
420 | self.cresult.write(struct.pack(b'>i', len(clientfds))) | |
421 |
|
421 | |||
422 | def _saveio(self): |
|
422 | def _saveio(self): | |
423 | if self._oldios: |
|
423 | if self._oldios: | |
424 | return |
|
424 | return | |
425 | ui = self.ui |
|
425 | ui = self.ui | |
426 | for cn, fn, _mode in _iochannels: |
|
426 | for cn, fn, _mode in _iochannels: | |
427 | ch = getattr(self, cn) |
|
427 | ch = getattr(self, cn) | |
428 | fp = getattr(ui, fn) |
|
428 | fp = getattr(ui, fn) | |
429 | fd = os.dup(fp.fileno()) |
|
429 | fd = os.dup(fp.fileno()) | |
430 | self._oldios.append((ch, fp, fd)) |
|
430 | self._oldios.append((ch, fp, fd)) | |
431 |
|
431 | |||
432 | def _restoreio(self): |
|
432 | def _restoreio(self): | |
433 | ui = self.ui |
|
433 | ui = self.ui | |
434 | for (ch, fp, fd), (cn, fn, _mode) in zip(self._oldios, _iochannels): |
|
434 | for (ch, fp, fd), (cn, fn, _mode) in zip(self._oldios, _iochannels): | |
435 | newfp = getattr(ui, fn) |
|
435 | newfp = getattr(ui, fn) | |
436 | # close newfp while it's associated with client; otherwise it |
|
436 | # close newfp while it's associated with client; otherwise it | |
437 | # would be closed when newfp is deleted |
|
437 | # would be closed when newfp is deleted | |
438 | if newfp is not fp: |
|
438 | if newfp is not fp: | |
439 | newfp.close() |
|
439 | newfp.close() | |
440 | # restore original fd: fp is open again |
|
440 | # restore original fd: fp is open again | |
441 | os.dup2(fd, fp.fileno()) |
|
441 | os.dup2(fd, fp.fileno()) | |
442 | os.close(fd) |
|
442 | os.close(fd) | |
443 | setattr(self, cn, ch) |
|
443 | setattr(self, cn, ch) | |
444 | setattr(ui, fn, fp) |
|
444 | setattr(ui, fn, fp) | |
445 | del self._oldios[:] |
|
445 | del self._oldios[:] | |
446 |
|
446 | |||
447 | def validate(self): |
|
447 | def validate(self): | |
448 | """Reload the config and check if the server is up to date |
|
448 | """Reload the config and check if the server is up to date | |
449 |
|
449 | |||
450 | Read a list of '\0' separated arguments. |
|
450 | Read a list of '\0' separated arguments. | |
451 | Write a non-empty list of '\0' separated instruction strings or '\0' |
|
451 | Write a non-empty list of '\0' separated instruction strings or '\0' | |
452 | if the list is empty. |
|
452 | if the list is empty. | |
453 | An instruction string could be either: |
|
453 | An instruction string could be either: | |
454 | - "unlink $path", the client should unlink the path to stop the |
|
454 | - "unlink $path", the client should unlink the path to stop the | |
455 | outdated server. |
|
455 | outdated server. | |
456 | - "redirect $path", the client should attempt to connect to $path |
|
456 | - "redirect $path", the client should attempt to connect to $path | |
457 | first. If it does not work, start a new server. It implies |
|
457 | first. If it does not work, start a new server. It implies | |
458 | "reconnect". |
|
458 | "reconnect". | |
459 | - "exit $n", the client should exit directly with code n. |
|
459 | - "exit $n", the client should exit directly with code n. | |
460 | This may happen if we cannot parse the config. |
|
460 | This may happen if we cannot parse the config. | |
461 | - "reconnect", the client should close the connection and |
|
461 | - "reconnect", the client should close the connection and | |
462 | reconnect. |
|
462 | reconnect. | |
463 | If neither "reconnect" nor "redirect" is included in the instruction |
|
463 | If neither "reconnect" nor "redirect" is included in the instruction | |
464 | list, the client can continue with this server after completing all |
|
464 | list, the client can continue with this server after completing all | |
465 | the instructions. |
|
465 | the instructions. | |
466 | """ |
|
466 | """ | |
467 | from . import dispatch # avoid cycle |
|
467 | from . import dispatch # avoid cycle | |
468 |
|
468 | |||
469 | args = self._readlist() |
|
469 | args = self._readlist() | |
470 | try: |
|
470 | try: | |
471 | self.ui, lui = _loadnewui(self.ui, args, self.cdebug) |
|
471 | self.ui, lui = _loadnewui(self.ui, args, self.cdebug) | |
472 | except error.ParseError as inst: |
|
472 | except error.ParseError as inst: | |
473 | dispatch._formatparse(self.ui.warn, inst) |
|
473 | dispatch._formatparse(self.ui.warn, inst) | |
474 | self.ui.flush() |
|
474 | self.ui.flush() | |
475 | self.cresult.write(b'exit 255') |
|
475 | self.cresult.write(b'exit 255') | |
476 | return |
|
476 | return | |
477 | except error.Abort as inst: |
|
477 | except error.Abort as inst: | |
478 | self.ui.error(_(b"abort: %s\n") % inst) |
|
478 | self.ui.error(_(b"abort: %s\n") % inst) | |
479 | if inst.hint: |
|
479 | if inst.hint: | |
480 | self.ui.error(_(b"(%s)\n") % inst.hint) |
|
480 | self.ui.error(_(b"(%s)\n") % inst.hint) | |
481 | self.ui.flush() |
|
481 | self.ui.flush() | |
482 | self.cresult.write(b'exit 255') |
|
482 | self.cresult.write(b'exit 255') | |
483 | return |
|
483 | return | |
484 | newhash = hashstate.fromui(lui, self.hashstate.mtimepaths) |
|
484 | newhash = hashstate.fromui(lui, self.hashstate.mtimepaths) | |
485 | insts = [] |
|
485 | insts = [] | |
486 | if newhash.mtimehash != self.hashstate.mtimehash: |
|
486 | if newhash.mtimehash != self.hashstate.mtimehash: | |
487 | addr = _hashaddress(self.baseaddress, self.hashstate.confighash) |
|
487 | addr = _hashaddress(self.baseaddress, self.hashstate.confighash) | |
488 | insts.append(b'unlink %s' % addr) |
|
488 | insts.append(b'unlink %s' % addr) | |
489 | # mtimehash is empty if one or more extensions fail to load. |
|
489 | # mtimehash is empty if one or more extensions fail to load. | |
490 | # to be compatible with hg, still serve the client this time. |
|
490 | # to be compatible with hg, still serve the client this time. | |
491 | if self.hashstate.mtimehash: |
|
491 | if self.hashstate.mtimehash: | |
492 | insts.append(b'reconnect') |
|
492 | insts.append(b'reconnect') | |
493 | if newhash.confighash != self.hashstate.confighash: |
|
493 | if newhash.confighash != self.hashstate.confighash: | |
494 | addr = _hashaddress(self.baseaddress, newhash.confighash) |
|
494 | addr = _hashaddress(self.baseaddress, newhash.confighash) | |
495 | insts.append(b'redirect %s' % addr) |
|
495 | insts.append(b'redirect %s' % addr) | |
496 | self.ui.log(b'chgserver', b'validate: %s\n', stringutil.pprint(insts)) |
|
496 | self.ui.log(b'chgserver', b'validate: %s\n', stringutil.pprint(insts)) | |
497 | self.cresult.write(b'\0'.join(insts) or b'\0') |
|
497 | self.cresult.write(b'\0'.join(insts) or b'\0') | |
498 |
|
498 | |||
499 | def chdir(self): |
|
499 | def chdir(self): | |
500 | """Change current directory |
|
500 | """Change current directory | |
501 |
|
501 | |||
502 | Note that the behavior of --cwd option is bit different from this. |
|
502 | Note that the behavior of --cwd option is bit different from this. | |
503 | It does not affect --config parameter. |
|
503 | It does not affect --config parameter. | |
504 | """ |
|
504 | """ | |
505 | path = self._readstr() |
|
505 | path = self._readstr() | |
506 | if not path: |
|
506 | if not path: | |
507 | return |
|
507 | return | |
508 | self.ui.log(b'chgserver', b"chdir to '%s'\n", path) |
|
508 | self.ui.log(b'chgserver', b"chdir to '%s'\n", path) | |
509 | os.chdir(path) |
|
509 | os.chdir(path) | |
510 |
|
510 | |||
511 | def setumask(self): |
|
511 | def setumask(self): | |
512 | """Change umask (DEPRECATED)""" |
|
512 | """Change umask (DEPRECATED)""" | |
513 | # BUG: this does not follow the message frame structure, but kept for |
|
513 | # BUG: this does not follow the message frame structure, but kept for | |
514 | # backward compatibility with old chg clients for some time |
|
514 | # backward compatibility with old chg clients for some time | |
515 | self._setumask(self._read(4)) |
|
515 | self._setumask(self._read(4)) | |
516 |
|
516 | |||
517 | def setumask2(self): |
|
517 | def setumask2(self): | |
518 | """Change umask""" |
|
518 | """Change umask""" | |
519 | data = self._readstr() |
|
519 | data = self._readstr() | |
520 | if len(data) != 4: |
|
520 | if len(data) != 4: | |
521 | raise ValueError(b'invalid mask length in setumask2 request') |
|
521 | raise ValueError(b'invalid mask length in setumask2 request') | |
522 | self._setumask(data) |
|
522 | self._setumask(data) | |
523 |
|
523 | |||
524 | def _setumask(self, data): |
|
524 | def _setumask(self, data): | |
525 | mask = struct.unpack(b'>I', data)[0] |
|
525 | mask = struct.unpack(b'>I', data)[0] | |
526 | self.ui.log(b'chgserver', b'setumask %r\n', mask) |
|
526 | self.ui.log(b'chgserver', b'setumask %r\n', mask) | |
527 | os.umask(mask) |
|
527 | os.umask(mask) | |
528 |
|
528 | |||
529 | def runcommand(self): |
|
529 | def runcommand(self): | |
530 | # pager may be attached within the runcommand session, which should |
|
530 | # pager may be attached within the runcommand session, which should | |
531 | # be detached at the end of the session. otherwise the pager wouldn't |
|
531 | # be detached at the end of the session. otherwise the pager wouldn't | |
532 | # receive EOF. |
|
532 | # receive EOF. | |
533 | globaloldios = self._oldios |
|
533 | globaloldios = self._oldios | |
534 | self._oldios = [] |
|
534 | self._oldios = [] | |
535 | try: |
|
535 | try: | |
536 | return super(chgcmdserver, self).runcommand() |
|
536 | return super(chgcmdserver, self).runcommand() | |
537 | finally: |
|
537 | finally: | |
538 | self._restoreio() |
|
538 | self._restoreio() | |
539 | self._oldios = globaloldios |
|
539 | self._oldios = globaloldios | |
540 |
|
540 | |||
541 | def setenv(self): |
|
541 | def setenv(self): | |
542 | """Clear and update os.environ |
|
542 | """Clear and update os.environ | |
543 |
|
543 | |||
544 | Note that not all variables can make an effect on the running process. |
|
544 | Note that not all variables can make an effect on the running process. | |
545 | """ |
|
545 | """ | |
546 | l = self._readlist() |
|
546 | l = self._readlist() | |
547 | try: |
|
547 | try: | |
548 | newenv = dict(s.split(b'=', 1) for s in l) |
|
548 | newenv = dict(s.split(b'=', 1) for s in l) | |
549 | except ValueError: |
|
549 | except ValueError: | |
550 | raise ValueError(b'unexpected value in setenv request') |
|
550 | raise ValueError(b'unexpected value in setenv request') | |
551 | self.ui.log(b'chgserver', b'setenv: %r\n', sorted(newenv.keys())) |
|
551 | self.ui.log(b'chgserver', b'setenv: %r\n', sorted(newenv.keys())) | |
|
552 | ||||
|
553 | # Python3 has some logic to "coerce" the C locale to a UTF-8 capable | |||
|
554 | # one, and it sets LC_CTYPE in the environment to C.UTF-8 if none of | |||
|
555 | # 'LC_CTYPE', 'LC_ALL' or 'LANG' are set (to any value). This can be | |||
|
556 | # disabled with PYTHONCOERCECLOCALE=0 in the environment. | |||
|
557 | # | |||
|
558 | # When fromui is called via _inithashstate, python has already set | |||
|
559 | # this, so that's in the environment right when we start up the hg | |||
|
560 | # process. Then chg will call us and tell us to set the environment to | |||
|
561 | # the one it has; this might NOT have LC_CTYPE, so we'll need to | |||
|
562 | # carry-forward the LC_CTYPE that was coerced in these situations. | |||
|
563 | # | |||
|
564 | # If this is not handled, we will fail config+env validation and fail | |||
|
565 | # to start chg. If this is just ignored instead of carried forward, we | |||
|
566 | # may have different behavior between chg and non-chg. | |||
|
567 | if pycompat.ispy3: | |||
|
568 | # Rename for wordwrapping purposes | |||
|
569 | oldenv = encoding.environ | |||
|
570 | if not any( | |||
|
571 | e.get(b'PYTHONCOERCECLOCALE') == b'0' for e in [oldenv, newenv] | |||
|
572 | ): | |||
|
573 | keys = [b'LC_CTYPE', b'LC_ALL', b'LANG'] | |||
|
574 | old_keys = [k for k, v in oldenv.items() if k in keys and v] | |||
|
575 | new_keys = [k for k, v in newenv.items() if k in keys and v] | |||
|
576 | # If the user's environment (from chg) doesn't have ANY of the | |||
|
577 | # keys that python looks for, and the environment (from | |||
|
578 | # initialization) has ONLY LC_CTYPE and it's set to C.UTF-8, | |||
|
579 | # carry it forward. | |||
|
580 | if ( | |||
|
581 | not new_keys | |||
|
582 | and old_keys == [b'LC_CTYPE'] | |||
|
583 | and oldenv[b'LC_CTYPE'] == b'C.UTF-8' | |||
|
584 | ): | |||
|
585 | newenv[b'LC_CTYPE'] = oldenv[b'LC_CTYPE'] | |||
|
586 | ||||
552 | encoding.environ.clear() |
|
587 | encoding.environ.clear() | |
553 | encoding.environ.update(newenv) |
|
588 | encoding.environ.update(newenv) | |
554 |
|
589 | |||
555 | capabilities = commandserver.server.capabilities.copy() |
|
590 | capabilities = commandserver.server.capabilities.copy() | |
556 | capabilities.update( |
|
591 | capabilities.update( | |
557 | { |
|
592 | { | |
558 | b'attachio': attachio, |
|
593 | b'attachio': attachio, | |
559 | b'chdir': chdir, |
|
594 | b'chdir': chdir, | |
560 | b'runcommand': runcommand, |
|
595 | b'runcommand': runcommand, | |
561 | b'setenv': setenv, |
|
596 | b'setenv': setenv, | |
562 | b'setumask': setumask, |
|
597 | b'setumask': setumask, | |
563 | b'setumask2': setumask2, |
|
598 | b'setumask2': setumask2, | |
564 | } |
|
599 | } | |
565 | ) |
|
600 | ) | |
566 |
|
601 | |||
567 | if util.safehasattr(procutil, b'setprocname'): |
|
602 | if util.safehasattr(procutil, b'setprocname'): | |
568 |
|
603 | |||
569 | def setprocname(self): |
|
604 | def setprocname(self): | |
570 | """Change process title""" |
|
605 | """Change process title""" | |
571 | name = self._readstr() |
|
606 | name = self._readstr() | |
572 | self.ui.log(b'chgserver', b'setprocname: %r\n', name) |
|
607 | self.ui.log(b'chgserver', b'setprocname: %r\n', name) | |
573 | procutil.setprocname(name) |
|
608 | procutil.setprocname(name) | |
574 |
|
609 | |||
575 | capabilities[b'setprocname'] = setprocname |
|
610 | capabilities[b'setprocname'] = setprocname | |
576 |
|
611 | |||
577 |
|
612 | |||
578 | def _tempaddress(address): |
|
613 | def _tempaddress(address): | |
579 | return b'%s.%d.tmp' % (address, os.getpid()) |
|
614 | return b'%s.%d.tmp' % (address, os.getpid()) | |
580 |
|
615 | |||
581 |
|
616 | |||
582 | def _hashaddress(address, hashstr): |
|
617 | def _hashaddress(address, hashstr): | |
583 | # if the basename of address contains '.', use only the left part. this |
|
618 | # if the basename of address contains '.', use only the left part. this | |
584 | # makes it possible for the client to pass 'server.tmp$PID' and follow by |
|
619 | # makes it possible for the client to pass 'server.tmp$PID' and follow by | |
585 | # an atomic rename to avoid locking when spawning new servers. |
|
620 | # an atomic rename to avoid locking when spawning new servers. | |
586 | dirname, basename = os.path.split(address) |
|
621 | dirname, basename = os.path.split(address) | |
587 | basename = basename.split(b'.', 1)[0] |
|
622 | basename = basename.split(b'.', 1)[0] | |
588 | return b'%s-%s' % (os.path.join(dirname, basename), hashstr) |
|
623 | return b'%s-%s' % (os.path.join(dirname, basename), hashstr) | |
589 |
|
624 | |||
590 |
|
625 | |||
591 | class chgunixservicehandler(object): |
|
626 | class chgunixservicehandler(object): | |
592 | """Set of operations for chg services""" |
|
627 | """Set of operations for chg services""" | |
593 |
|
628 | |||
594 | pollinterval = 1 # [sec] |
|
629 | pollinterval = 1 # [sec] | |
595 |
|
630 | |||
596 | def __init__(self, ui): |
|
631 | def __init__(self, ui): | |
597 | self.ui = ui |
|
632 | self.ui = ui | |
598 | self._idletimeout = ui.configint(b'chgserver', b'idletimeout') |
|
633 | self._idletimeout = ui.configint(b'chgserver', b'idletimeout') | |
599 | self._lastactive = time.time() |
|
634 | self._lastactive = time.time() | |
600 |
|
635 | |||
601 | def bindsocket(self, sock, address): |
|
636 | def bindsocket(self, sock, address): | |
602 | self._inithashstate(address) |
|
637 | self._inithashstate(address) | |
603 | self._checkextensions() |
|
638 | self._checkextensions() | |
604 | self._bind(sock) |
|
639 | self._bind(sock) | |
605 | self._createsymlink() |
|
640 | self._createsymlink() | |
606 | # no "listening at" message should be printed to simulate hg behavior |
|
641 | # no "listening at" message should be printed to simulate hg behavior | |
607 |
|
642 | |||
608 | def _inithashstate(self, address): |
|
643 | def _inithashstate(self, address): | |
609 | self._baseaddress = address |
|
644 | self._baseaddress = address | |
610 | if self.ui.configbool(b'chgserver', b'skiphash'): |
|
645 | if self.ui.configbool(b'chgserver', b'skiphash'): | |
611 | self._hashstate = None |
|
646 | self._hashstate = None | |
612 | self._realaddress = address |
|
647 | self._realaddress = address | |
613 | return |
|
648 | return | |
614 | self._hashstate = hashstate.fromui(self.ui) |
|
649 | self._hashstate = hashstate.fromui(self.ui) | |
615 | self._realaddress = _hashaddress(address, self._hashstate.confighash) |
|
650 | self._realaddress = _hashaddress(address, self._hashstate.confighash) | |
616 |
|
651 | |||
617 | def _checkextensions(self): |
|
652 | def _checkextensions(self): | |
618 | if not self._hashstate: |
|
653 | if not self._hashstate: | |
619 | return |
|
654 | return | |
620 | if extensions.notloaded(): |
|
655 | if extensions.notloaded(): | |
621 | # one or more extensions failed to load. mtimehash becomes |
|
656 | # one or more extensions failed to load. mtimehash becomes | |
622 | # meaningless because we do not know the paths of those extensions. |
|
657 | # meaningless because we do not know the paths of those extensions. | |
623 | # set mtimehash to an illegal hash value to invalidate the server. |
|
658 | # set mtimehash to an illegal hash value to invalidate the server. | |
624 | self._hashstate.mtimehash = b'' |
|
659 | self._hashstate.mtimehash = b'' | |
625 |
|
660 | |||
626 | def _bind(self, sock): |
|
661 | def _bind(self, sock): | |
627 | # use a unique temp address so we can stat the file and do ownership |
|
662 | # use a unique temp address so we can stat the file and do ownership | |
628 | # check later |
|
663 | # check later | |
629 | tempaddress = _tempaddress(self._realaddress) |
|
664 | tempaddress = _tempaddress(self._realaddress) | |
630 | util.bindunixsocket(sock, tempaddress) |
|
665 | util.bindunixsocket(sock, tempaddress) | |
631 | self._socketstat = os.stat(tempaddress) |
|
666 | self._socketstat = os.stat(tempaddress) | |
632 | sock.listen(socket.SOMAXCONN) |
|
667 | sock.listen(socket.SOMAXCONN) | |
633 | # rename will replace the old socket file if exists atomically. the |
|
668 | # rename will replace the old socket file if exists atomically. the | |
634 | # old server will detect ownership change and exit. |
|
669 | # old server will detect ownership change and exit. | |
635 | util.rename(tempaddress, self._realaddress) |
|
670 | util.rename(tempaddress, self._realaddress) | |
636 |
|
671 | |||
637 | def _createsymlink(self): |
|
672 | def _createsymlink(self): | |
638 | if self._baseaddress == self._realaddress: |
|
673 | if self._baseaddress == self._realaddress: | |
639 | return |
|
674 | return | |
640 | tempaddress = _tempaddress(self._baseaddress) |
|
675 | tempaddress = _tempaddress(self._baseaddress) | |
641 | os.symlink(os.path.basename(self._realaddress), tempaddress) |
|
676 | os.symlink(os.path.basename(self._realaddress), tempaddress) | |
642 | util.rename(tempaddress, self._baseaddress) |
|
677 | util.rename(tempaddress, self._baseaddress) | |
643 |
|
678 | |||
644 | def _issocketowner(self): |
|
679 | def _issocketowner(self): | |
645 | try: |
|
680 | try: | |
646 | st = os.stat(self._realaddress) |
|
681 | st = os.stat(self._realaddress) | |
647 | return ( |
|
682 | return ( | |
648 | st.st_ino == self._socketstat.st_ino |
|
683 | st.st_ino == self._socketstat.st_ino | |
649 | and st[stat.ST_MTIME] == self._socketstat[stat.ST_MTIME] |
|
684 | and st[stat.ST_MTIME] == self._socketstat[stat.ST_MTIME] | |
650 | ) |
|
685 | ) | |
651 | except OSError: |
|
686 | except OSError: | |
652 | return False |
|
687 | return False | |
653 |
|
688 | |||
654 | def unlinksocket(self, address): |
|
689 | def unlinksocket(self, address): | |
655 | if not self._issocketowner(): |
|
690 | if not self._issocketowner(): | |
656 | return |
|
691 | return | |
657 | # it is possible to have a race condition here that we may |
|
692 | # it is possible to have a race condition here that we may | |
658 | # remove another server's socket file. but that's okay |
|
693 | # remove another server's socket file. but that's okay | |
659 | # since that server will detect and exit automatically and |
|
694 | # since that server will detect and exit automatically and | |
660 | # the client will start a new server on demand. |
|
695 | # the client will start a new server on demand. | |
661 | util.tryunlink(self._realaddress) |
|
696 | util.tryunlink(self._realaddress) | |
662 |
|
697 | |||
663 | def shouldexit(self): |
|
698 | def shouldexit(self): | |
664 | if not self._issocketowner(): |
|
699 | if not self._issocketowner(): | |
665 | self.ui.log( |
|
700 | self.ui.log( | |
666 | b'chgserver', b'%s is not owned, exiting.\n', self._realaddress |
|
701 | b'chgserver', b'%s is not owned, exiting.\n', self._realaddress | |
667 | ) |
|
702 | ) | |
668 | return True |
|
703 | return True | |
669 | if time.time() - self._lastactive > self._idletimeout: |
|
704 | if time.time() - self._lastactive > self._idletimeout: | |
670 | self.ui.log(b'chgserver', b'being idle too long. exiting.\n') |
|
705 | self.ui.log(b'chgserver', b'being idle too long. exiting.\n') | |
671 | return True |
|
706 | return True | |
672 | return False |
|
707 | return False | |
673 |
|
708 | |||
674 | def newconnection(self): |
|
709 | def newconnection(self): | |
675 | self._lastactive = time.time() |
|
710 | self._lastactive = time.time() | |
676 |
|
711 | |||
677 | def createcmdserver(self, repo, conn, fin, fout, prereposetups): |
|
712 | def createcmdserver(self, repo, conn, fin, fout, prereposetups): | |
678 | return chgcmdserver( |
|
713 | return chgcmdserver( | |
679 | self.ui, |
|
714 | self.ui, | |
680 | repo, |
|
715 | repo, | |
681 | fin, |
|
716 | fin, | |
682 | fout, |
|
717 | fout, | |
683 | conn, |
|
718 | conn, | |
684 | prereposetups, |
|
719 | prereposetups, | |
685 | self._hashstate, |
|
720 | self._hashstate, | |
686 | self._baseaddress, |
|
721 | self._baseaddress, | |
687 | ) |
|
722 | ) | |
688 |
|
723 | |||
689 |
|
724 | |||
690 | def chgunixservice(ui, repo, opts): |
|
725 | def chgunixservice(ui, repo, opts): | |
691 | # CHGINTERNALMARK is set by chg client. It is an indication of things are |
|
726 | # CHGINTERNALMARK is set by chg client. It is an indication of things are | |
692 | # started by chg so other code can do things accordingly, like disabling |
|
727 | # started by chg so other code can do things accordingly, like disabling | |
693 | # demandimport or detecting chg client started by chg client. When executed |
|
728 | # demandimport or detecting chg client started by chg client. When executed | |
694 | # here, CHGINTERNALMARK is no longer useful and hence dropped to make |
|
729 | # here, CHGINTERNALMARK is no longer useful and hence dropped to make | |
695 | # environ cleaner. |
|
730 | # environ cleaner. | |
696 | if b'CHGINTERNALMARK' in encoding.environ: |
|
731 | if b'CHGINTERNALMARK' in encoding.environ: | |
697 | del encoding.environ[b'CHGINTERNALMARK'] |
|
732 | del encoding.environ[b'CHGINTERNALMARK'] | |
698 |
|
733 | |||
699 | if repo: |
|
734 | if repo: | |
700 | # one chgserver can serve multiple repos. drop repo information |
|
735 | # one chgserver can serve multiple repos. drop repo information | |
701 | ui.setconfig(b'bundle', b'mainreporoot', b'', b'repo') |
|
736 | ui.setconfig(b'bundle', b'mainreporoot', b'', b'repo') | |
702 | h = chgunixservicehandler(ui) |
|
737 | h = chgunixservicehandler(ui) | |
703 | return commandserver.unixforkingservice(ui, repo=None, opts=opts, handler=h) |
|
738 | return commandserver.unixforkingservice(ui, repo=None, opts=opts, handler=h) |
@@ -1,333 +1,355 | |||||
1 | #require chg |
|
1 | #require chg | |
2 |
|
2 | |||
3 | $ mkdir log |
|
3 | $ mkdir log | |
4 | $ cp $HGRCPATH $HGRCPATH.unconfigured |
|
4 | $ cp $HGRCPATH $HGRCPATH.unconfigured | |
5 | $ cat <<'EOF' >> $HGRCPATH |
|
5 | $ cat <<'EOF' >> $HGRCPATH | |
6 | > [cmdserver] |
|
6 | > [cmdserver] | |
7 | > log = $TESTTMP/log/server.log |
|
7 | > log = $TESTTMP/log/server.log | |
8 | > max-log-files = 1 |
|
8 | > max-log-files = 1 | |
9 | > max-log-size = 10 kB |
|
9 | > max-log-size = 10 kB | |
10 | > EOF |
|
10 | > EOF | |
11 | $ cp $HGRCPATH $HGRCPATH.orig |
|
11 | $ cp $HGRCPATH $HGRCPATH.orig | |
12 |
|
12 | |||
13 | $ filterlog () { |
|
13 | $ filterlog () { | |
14 | > sed -e 's!^[0-9/]* [0-9:]* ([0-9]*)>!YYYY/MM/DD HH:MM:SS (PID)>!' \ |
|
14 | > sed -e 's!^[0-9/]* [0-9:]* ([0-9]*)>!YYYY/MM/DD HH:MM:SS (PID)>!' \ | |
15 | > -e 's!\(setprocname\|received fds\|setenv\): .*!\1: ...!' \ |
|
15 | > -e 's!\(setprocname\|received fds\|setenv\): .*!\1: ...!' \ | |
16 | > -e 's!\(confighash\|mtimehash\) = [0-9a-f]*!\1 = ...!g' \ |
|
16 | > -e 's!\(confighash\|mtimehash\) = [0-9a-f]*!\1 = ...!g' \ | |
17 | > -e 's!\(in \)[0-9.]*s\b!\1 ...s!g' \ |
|
17 | > -e 's!\(in \)[0-9.]*s\b!\1 ...s!g' \ | |
18 | > -e 's!\(pid\)=[0-9]*!\1=...!g' \ |
|
18 | > -e 's!\(pid\)=[0-9]*!\1=...!g' \ | |
19 | > -e 's!\(/server-\)[0-9a-f]*!\1...!g' |
|
19 | > -e 's!\(/server-\)[0-9a-f]*!\1...!g' | |
20 | > } |
|
20 | > } | |
21 |
|
21 | |||
22 | init repo |
|
22 | init repo | |
23 |
|
23 | |||
24 | $ chg init foo |
|
24 | $ chg init foo | |
25 | $ cd foo |
|
25 | $ cd foo | |
26 |
|
26 | |||
27 | ill-formed config |
|
27 | ill-formed config | |
28 |
|
28 | |||
29 | $ chg status |
|
29 | $ chg status | |
30 | $ echo '=brokenconfig' >> $HGRCPATH |
|
30 | $ echo '=brokenconfig' >> $HGRCPATH | |
31 | $ chg status |
|
31 | $ chg status | |
32 | hg: parse error at * (glob) |
|
32 | hg: parse error at * (glob) | |
33 | [255] |
|
33 | [255] | |
34 |
|
34 | |||
35 | $ cp $HGRCPATH.orig $HGRCPATH |
|
35 | $ cp $HGRCPATH.orig $HGRCPATH | |
36 |
|
36 | |||
37 | long socket path |
|
37 | long socket path | |
38 |
|
38 | |||
39 | $ sockpath=$TESTTMP/this/path/should/be/longer/than/one-hundred-and-seven/characters/where/107/is/the/typical/size/limit/of/unix-domain-socket |
|
39 | $ sockpath=$TESTTMP/this/path/should/be/longer/than/one-hundred-and-seven/characters/where/107/is/the/typical/size/limit/of/unix-domain-socket | |
40 | $ mkdir -p $sockpath |
|
40 | $ mkdir -p $sockpath | |
41 | $ bakchgsockname=$CHGSOCKNAME |
|
41 | $ bakchgsockname=$CHGSOCKNAME | |
42 | $ CHGSOCKNAME=$sockpath/server |
|
42 | $ CHGSOCKNAME=$sockpath/server | |
43 | $ export CHGSOCKNAME |
|
43 | $ export CHGSOCKNAME | |
44 | $ chg root |
|
44 | $ chg root | |
45 | $TESTTMP/foo |
|
45 | $TESTTMP/foo | |
46 | $ rm -rf $sockpath |
|
46 | $ rm -rf $sockpath | |
47 | $ CHGSOCKNAME=$bakchgsockname |
|
47 | $ CHGSOCKNAME=$bakchgsockname | |
48 | $ export CHGSOCKNAME |
|
48 | $ export CHGSOCKNAME | |
49 |
|
49 | |||
50 | $ cd .. |
|
50 | $ cd .. | |
51 |
|
51 | |||
52 | editor |
|
52 | editor | |
53 | ------ |
|
53 | ------ | |
54 |
|
54 | |||
55 | $ cat >> pushbuffer.py <<EOF |
|
55 | $ cat >> pushbuffer.py <<EOF | |
56 | > def reposetup(ui, repo): |
|
56 | > def reposetup(ui, repo): | |
57 | > repo.ui.pushbuffer(subproc=True) |
|
57 | > repo.ui.pushbuffer(subproc=True) | |
58 | > EOF |
|
58 | > EOF | |
59 |
|
59 | |||
60 | $ chg init editor |
|
60 | $ chg init editor | |
61 | $ cd editor |
|
61 | $ cd editor | |
62 |
|
62 | |||
63 | by default, system() should be redirected to the client: |
|
63 | by default, system() should be redirected to the client: | |
64 |
|
64 | |||
65 | $ touch foo |
|
65 | $ touch foo | |
66 | $ CHGDEBUG= HGEDITOR=cat chg ci -Am channeled --edit 2>&1 \ |
|
66 | $ CHGDEBUG= HGEDITOR=cat chg ci -Am channeled --edit 2>&1 \ | |
67 | > | egrep "HG:|run 'cat" |
|
67 | > | egrep "HG:|run 'cat" | |
68 | chg: debug: * run 'cat "*"' at '$TESTTMP/editor' (glob) |
|
68 | chg: debug: * run 'cat "*"' at '$TESTTMP/editor' (glob) | |
69 | HG: Enter commit message. Lines beginning with 'HG:' are removed. |
|
69 | HG: Enter commit message. Lines beginning with 'HG:' are removed. | |
70 | HG: Leave message empty to abort commit. |
|
70 | HG: Leave message empty to abort commit. | |
71 | HG: -- |
|
71 | HG: -- | |
72 | HG: user: test |
|
72 | HG: user: test | |
73 | HG: branch 'default' |
|
73 | HG: branch 'default' | |
74 | HG: added foo |
|
74 | HG: added foo | |
75 |
|
75 | |||
76 | but no redirection should be made if output is captured: |
|
76 | but no redirection should be made if output is captured: | |
77 |
|
77 | |||
78 | $ touch bar |
|
78 | $ touch bar | |
79 | $ CHGDEBUG= HGEDITOR=cat chg ci -Am bufferred --edit \ |
|
79 | $ CHGDEBUG= HGEDITOR=cat chg ci -Am bufferred --edit \ | |
80 | > --config extensions.pushbuffer="$TESTTMP/pushbuffer.py" 2>&1 \ |
|
80 | > --config extensions.pushbuffer="$TESTTMP/pushbuffer.py" 2>&1 \ | |
81 | > | egrep "HG:|run 'cat" |
|
81 | > | egrep "HG:|run 'cat" | |
82 | [1] |
|
82 | [1] | |
83 |
|
83 | |||
84 | check that commit commands succeeded: |
|
84 | check that commit commands succeeded: | |
85 |
|
85 | |||
86 | $ hg log -T '{rev}:{desc}\n' |
|
86 | $ hg log -T '{rev}:{desc}\n' | |
87 | 1:bufferred |
|
87 | 1:bufferred | |
88 | 0:channeled |
|
88 | 0:channeled | |
89 |
|
89 | |||
90 | $ cd .. |
|
90 | $ cd .. | |
91 |
|
91 | |||
92 | pager |
|
92 | pager | |
93 | ----- |
|
93 | ----- | |
94 |
|
94 | |||
95 | $ cat >> fakepager.py <<EOF |
|
95 | $ cat >> fakepager.py <<EOF | |
96 | > import sys |
|
96 | > import sys | |
97 | > for line in sys.stdin: |
|
97 | > for line in sys.stdin: | |
98 | > sys.stdout.write('paged! %r\n' % line) |
|
98 | > sys.stdout.write('paged! %r\n' % line) | |
99 | > EOF |
|
99 | > EOF | |
100 |
|
100 | |||
101 | enable pager extension globally, but spawns the master server with no tty: |
|
101 | enable pager extension globally, but spawns the master server with no tty: | |
102 |
|
102 | |||
103 | $ chg init pager |
|
103 | $ chg init pager | |
104 | $ cd pager |
|
104 | $ cd pager | |
105 | $ cat >> $HGRCPATH <<EOF |
|
105 | $ cat >> $HGRCPATH <<EOF | |
106 | > [extensions] |
|
106 | > [extensions] | |
107 | > pager = |
|
107 | > pager = | |
108 | > [pager] |
|
108 | > [pager] | |
109 | > pager = "$PYTHON" $TESTTMP/fakepager.py |
|
109 | > pager = "$PYTHON" $TESTTMP/fakepager.py | |
110 | > EOF |
|
110 | > EOF | |
111 | $ chg version > /dev/null |
|
111 | $ chg version > /dev/null | |
112 | $ touch foo |
|
112 | $ touch foo | |
113 | $ chg ci -qAm foo |
|
113 | $ chg ci -qAm foo | |
114 |
|
114 | |||
115 | pager should be enabled if the attached client has a tty: |
|
115 | pager should be enabled if the attached client has a tty: | |
116 |
|
116 | |||
117 | $ chg log -l1 -q --config ui.formatted=True |
|
117 | $ chg log -l1 -q --config ui.formatted=True | |
118 | paged! '0:1f7b0de80e11\n' |
|
118 | paged! '0:1f7b0de80e11\n' | |
119 | $ chg log -l1 -q --config ui.formatted=False |
|
119 | $ chg log -l1 -q --config ui.formatted=False | |
120 | 0:1f7b0de80e11 |
|
120 | 0:1f7b0de80e11 | |
121 |
|
121 | |||
122 | chg waits for pager if runcommand raises |
|
122 | chg waits for pager if runcommand raises | |
123 |
|
123 | |||
124 | $ cat > $TESTTMP/crash.py <<EOF |
|
124 | $ cat > $TESTTMP/crash.py <<EOF | |
125 | > from mercurial import registrar |
|
125 | > from mercurial import registrar | |
126 | > cmdtable = {} |
|
126 | > cmdtable = {} | |
127 | > command = registrar.command(cmdtable) |
|
127 | > command = registrar.command(cmdtable) | |
128 | > @command(b'crash') |
|
128 | > @command(b'crash') | |
129 | > def pagercrash(ui, repo, *pats, **opts): |
|
129 | > def pagercrash(ui, repo, *pats, **opts): | |
130 | > ui.write(b'going to crash\n') |
|
130 | > ui.write(b'going to crash\n') | |
131 | > raise Exception('.') |
|
131 | > raise Exception('.') | |
132 | > EOF |
|
132 | > EOF | |
133 |
|
133 | |||
134 | $ cat > $TESTTMP/fakepager.py <<EOF |
|
134 | $ cat > $TESTTMP/fakepager.py <<EOF | |
135 | > from __future__ import absolute_import |
|
135 | > from __future__ import absolute_import | |
136 | > import sys |
|
136 | > import sys | |
137 | > import time |
|
137 | > import time | |
138 | > for line in iter(sys.stdin.readline, ''): |
|
138 | > for line in iter(sys.stdin.readline, ''): | |
139 | > if 'crash' in line: # only interested in lines containing 'crash' |
|
139 | > if 'crash' in line: # only interested in lines containing 'crash' | |
140 | > # if chg exits when pager is sleeping (incorrectly), the output |
|
140 | > # if chg exits when pager is sleeping (incorrectly), the output | |
141 | > # will be captured by the next test case |
|
141 | > # will be captured by the next test case | |
142 | > time.sleep(1) |
|
142 | > time.sleep(1) | |
143 | > sys.stdout.write('crash-pager: %s' % line) |
|
143 | > sys.stdout.write('crash-pager: %s' % line) | |
144 | > EOF |
|
144 | > EOF | |
145 |
|
145 | |||
146 | $ cat >> .hg/hgrc <<EOF |
|
146 | $ cat >> .hg/hgrc <<EOF | |
147 | > [extensions] |
|
147 | > [extensions] | |
148 | > crash = $TESTTMP/crash.py |
|
148 | > crash = $TESTTMP/crash.py | |
149 | > EOF |
|
149 | > EOF | |
150 |
|
150 | |||
151 | $ chg crash --pager=on --config ui.formatted=True 2>/dev/null |
|
151 | $ chg crash --pager=on --config ui.formatted=True 2>/dev/null | |
152 | crash-pager: going to crash |
|
152 | crash-pager: going to crash | |
153 | [255] |
|
153 | [255] | |
154 |
|
154 | |||
155 | $ cd .. |
|
155 | $ cd .. | |
156 |
|
156 | |||
157 | server lifecycle |
|
157 | server lifecycle | |
158 | ---------------- |
|
158 | ---------------- | |
159 |
|
159 | |||
160 | chg server should be restarted on code change, and old server will shut down |
|
160 | chg server should be restarted on code change, and old server will shut down | |
161 | automatically. In this test, we use the following time parameters: |
|
161 | automatically. In this test, we use the following time parameters: | |
162 |
|
162 | |||
163 | - "sleep 1" to make mtime different |
|
163 | - "sleep 1" to make mtime different | |
164 | - "sleep 2" to notice mtime change (polling interval is 1 sec) |
|
164 | - "sleep 2" to notice mtime change (polling interval is 1 sec) | |
165 |
|
165 | |||
166 | set up repository with an extension: |
|
166 | set up repository with an extension: | |
167 |
|
167 | |||
168 | $ chg init extreload |
|
168 | $ chg init extreload | |
169 | $ cd extreload |
|
169 | $ cd extreload | |
170 | $ touch dummyext.py |
|
170 | $ touch dummyext.py | |
171 | $ cat <<EOF >> .hg/hgrc |
|
171 | $ cat <<EOF >> .hg/hgrc | |
172 | > [extensions] |
|
172 | > [extensions] | |
173 | > dummyext = dummyext.py |
|
173 | > dummyext = dummyext.py | |
174 | > EOF |
|
174 | > EOF | |
175 |
|
175 | |||
176 | isolate socket directory for stable result: |
|
176 | isolate socket directory for stable result: | |
177 |
|
177 | |||
178 | $ OLDCHGSOCKNAME=$CHGSOCKNAME |
|
178 | $ OLDCHGSOCKNAME=$CHGSOCKNAME | |
179 | $ mkdir chgsock |
|
179 | $ mkdir chgsock | |
180 | $ CHGSOCKNAME=`pwd`/chgsock/server |
|
180 | $ CHGSOCKNAME=`pwd`/chgsock/server | |
181 |
|
181 | |||
182 | warm up server: |
|
182 | warm up server: | |
183 |
|
183 | |||
184 | $ CHGDEBUG= chg log 2>&1 | egrep 'instruction|start' |
|
184 | $ CHGDEBUG= chg log 2>&1 | egrep 'instruction|start' | |
185 | chg: debug: * start cmdserver at $TESTTMP/extreload/chgsock/server.* (glob) |
|
185 | chg: debug: * start cmdserver at $TESTTMP/extreload/chgsock/server.* (glob) | |
186 |
|
186 | |||
187 | new server should be started if extension modified: |
|
187 | new server should be started if extension modified: | |
188 |
|
188 | |||
189 | $ sleep 1 |
|
189 | $ sleep 1 | |
190 | $ touch dummyext.py |
|
190 | $ touch dummyext.py | |
191 | $ CHGDEBUG= chg log 2>&1 | egrep 'instruction|start' |
|
191 | $ CHGDEBUG= chg log 2>&1 | egrep 'instruction|start' | |
192 | chg: debug: * instruction: unlink $TESTTMP/extreload/chgsock/server-* (glob) |
|
192 | chg: debug: * instruction: unlink $TESTTMP/extreload/chgsock/server-* (glob) | |
193 | chg: debug: * instruction: reconnect (glob) |
|
193 | chg: debug: * instruction: reconnect (glob) | |
194 | chg: debug: * start cmdserver at $TESTTMP/extreload/chgsock/server.* (glob) |
|
194 | chg: debug: * start cmdserver at $TESTTMP/extreload/chgsock/server.* (glob) | |
195 |
|
195 | |||
196 | old server will shut down, while new server should still be reachable: |
|
196 | old server will shut down, while new server should still be reachable: | |
197 |
|
197 | |||
198 | $ sleep 2 |
|
198 | $ sleep 2 | |
199 | $ CHGDEBUG= chg log 2>&1 | (egrep 'instruction|start' || true) |
|
199 | $ CHGDEBUG= chg log 2>&1 | (egrep 'instruction|start' || true) | |
200 |
|
200 | |||
201 | socket file should never be unlinked by old server: |
|
201 | socket file should never be unlinked by old server: | |
202 | (simulates unowned socket by updating mtime, which makes sure server exits |
|
202 | (simulates unowned socket by updating mtime, which makes sure server exits | |
203 | at polling cycle) |
|
203 | at polling cycle) | |
204 |
|
204 | |||
205 | $ ls chgsock/server-* |
|
205 | $ ls chgsock/server-* | |
206 | chgsock/server-* (glob) |
|
206 | chgsock/server-* (glob) | |
207 | $ touch chgsock/server-* |
|
207 | $ touch chgsock/server-* | |
208 | $ sleep 2 |
|
208 | $ sleep 2 | |
209 | $ ls chgsock/server-* |
|
209 | $ ls chgsock/server-* | |
210 | chgsock/server-* (glob) |
|
210 | chgsock/server-* (glob) | |
211 |
|
211 | |||
212 | since no server is reachable from socket file, new server should be started: |
|
212 | since no server is reachable from socket file, new server should be started: | |
213 | (this test makes sure that old server shut down automatically) |
|
213 | (this test makes sure that old server shut down automatically) | |
214 |
|
214 | |||
215 | $ CHGDEBUG= chg log 2>&1 | egrep 'instruction|start' |
|
215 | $ CHGDEBUG= chg log 2>&1 | egrep 'instruction|start' | |
216 | chg: debug: * start cmdserver at $TESTTMP/extreload/chgsock/server.* (glob) |
|
216 | chg: debug: * start cmdserver at $TESTTMP/extreload/chgsock/server.* (glob) | |
217 |
|
217 | |||
218 | shut down servers and restore environment: |
|
218 | shut down servers and restore environment: | |
219 |
|
219 | |||
220 | $ rm -R chgsock |
|
220 | $ rm -R chgsock | |
221 | $ sleep 2 |
|
221 | $ sleep 2 | |
222 | $ CHGSOCKNAME=$OLDCHGSOCKNAME |
|
222 | $ CHGSOCKNAME=$OLDCHGSOCKNAME | |
223 | $ cd .. |
|
223 | $ cd .. | |
224 |
|
224 | |||
225 | check that server events are recorded: |
|
225 | check that server events are recorded: | |
226 |
|
226 | |||
227 | $ ls log |
|
227 | $ ls log | |
228 | server.log |
|
228 | server.log | |
229 | server.log.1 |
|
229 | server.log.1 | |
230 |
|
230 | |||
231 | print only the last 10 lines, since we aren't sure how many records are |
|
231 | print only the last 10 lines, since we aren't sure how many records are | |
232 | preserved (since setprocname isn't available on py3, the 10th-most-recent line |
|
232 | preserved (since setprocname isn't available on py3, the 10th-most-recent line | |
233 | is different when using py3): |
|
233 | is different when using py3): | |
234 |
|
234 | |||
235 | $ cat log/server.log.1 log/server.log | tail -10 | filterlog |
|
235 | $ cat log/server.log.1 log/server.log | tail -10 | filterlog | |
236 | YYYY/MM/DD HH:MM:SS (PID)> confighash = ... mtimehash = ... (py3 !) |
|
236 | YYYY/MM/DD HH:MM:SS (PID)> confighash = ... mtimehash = ... (py3 !) | |
237 | YYYY/MM/DD HH:MM:SS (PID)> forked worker process (pid=...) |
|
237 | YYYY/MM/DD HH:MM:SS (PID)> forked worker process (pid=...) | |
238 | YYYY/MM/DD HH:MM:SS (PID)> setprocname: ... (no-py3 !) |
|
238 | YYYY/MM/DD HH:MM:SS (PID)> setprocname: ... (no-py3 !) | |
239 | YYYY/MM/DD HH:MM:SS (PID)> received fds: ... |
|
239 | YYYY/MM/DD HH:MM:SS (PID)> received fds: ... | |
240 | YYYY/MM/DD HH:MM:SS (PID)> chdir to '$TESTTMP/extreload' |
|
240 | YYYY/MM/DD HH:MM:SS (PID)> chdir to '$TESTTMP/extreload' | |
241 | YYYY/MM/DD HH:MM:SS (PID)> setumask 18 |
|
241 | YYYY/MM/DD HH:MM:SS (PID)> setumask 18 | |
242 | YYYY/MM/DD HH:MM:SS (PID)> setenv: ... |
|
242 | YYYY/MM/DD HH:MM:SS (PID)> setenv: ... | |
243 | YYYY/MM/DD HH:MM:SS (PID)> confighash = ... mtimehash = ... |
|
243 | YYYY/MM/DD HH:MM:SS (PID)> confighash = ... mtimehash = ... | |
244 | YYYY/MM/DD HH:MM:SS (PID)> validate: [] |
|
244 | YYYY/MM/DD HH:MM:SS (PID)> validate: [] | |
245 | YYYY/MM/DD HH:MM:SS (PID)> worker process exited (pid=...) |
|
245 | YYYY/MM/DD HH:MM:SS (PID)> worker process exited (pid=...) | |
246 | YYYY/MM/DD HH:MM:SS (PID)> $TESTTMP/extreload/chgsock/server-... is not owned, exiting. |
|
246 | YYYY/MM/DD HH:MM:SS (PID)> $TESTTMP/extreload/chgsock/server-... is not owned, exiting. | |
247 |
|
247 | |||
248 | repository cache |
|
248 | repository cache | |
249 | ---------------- |
|
249 | ---------------- | |
250 |
|
250 | |||
251 | $ rm log/server.log* |
|
251 | $ rm log/server.log* | |
252 | $ cp $HGRCPATH.unconfigured $HGRCPATH |
|
252 | $ cp $HGRCPATH.unconfigured $HGRCPATH | |
253 | $ cat <<'EOF' >> $HGRCPATH |
|
253 | $ cat <<'EOF' >> $HGRCPATH | |
254 | > [cmdserver] |
|
254 | > [cmdserver] | |
255 | > log = $TESTTMP/log/server.log |
|
255 | > log = $TESTTMP/log/server.log | |
256 | > max-repo-cache = 1 |
|
256 | > max-repo-cache = 1 | |
257 | > track-log = command, repocache |
|
257 | > track-log = command, repocache | |
258 | > EOF |
|
258 | > EOF | |
259 |
|
259 | |||
260 | isolate socket directory for stable result: |
|
260 | isolate socket directory for stable result: | |
261 |
|
261 | |||
262 | $ OLDCHGSOCKNAME=$CHGSOCKNAME |
|
262 | $ OLDCHGSOCKNAME=$CHGSOCKNAME | |
263 | $ mkdir chgsock |
|
263 | $ mkdir chgsock | |
264 | $ CHGSOCKNAME=`pwd`/chgsock/server |
|
264 | $ CHGSOCKNAME=`pwd`/chgsock/server | |
265 |
|
265 | |||
266 | create empty repo and cache it: |
|
266 | create empty repo and cache it: | |
267 |
|
267 | |||
268 | $ hg init cached |
|
268 | $ hg init cached | |
269 | $ hg id -R cached |
|
269 | $ hg id -R cached | |
270 | 000000000000 tip |
|
270 | 000000000000 tip | |
271 | $ sleep 1 |
|
271 | $ sleep 1 | |
272 |
|
272 | |||
273 | modify repo (and cache will be invalidated): |
|
273 | modify repo (and cache will be invalidated): | |
274 |
|
274 | |||
275 | $ touch cached/a |
|
275 | $ touch cached/a | |
276 | $ hg ci -R cached -Am 'add a' |
|
276 | $ hg ci -R cached -Am 'add a' | |
277 | adding a |
|
277 | adding a | |
278 | $ sleep 1 |
|
278 | $ sleep 1 | |
279 |
|
279 | |||
280 | read cached repo: |
|
280 | read cached repo: | |
281 |
|
281 | |||
282 | $ hg log -R cached |
|
282 | $ hg log -R cached | |
283 | changeset: 0:ac82d8b1f7c4 |
|
283 | changeset: 0:ac82d8b1f7c4 | |
284 | tag: tip |
|
284 | tag: tip | |
285 | user: test |
|
285 | user: test | |
286 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
286 | date: Thu Jan 01 00:00:00 1970 +0000 | |
287 | summary: add a |
|
287 | summary: add a | |
288 |
|
288 | |||
289 | $ sleep 1 |
|
289 | $ sleep 1 | |
290 |
|
290 | |||
291 | discard cached from LRU cache: |
|
291 | discard cached from LRU cache: | |
292 |
|
292 | |||
293 | $ hg clone cached cached2 |
|
293 | $ hg clone cached cached2 | |
294 | updating to branch default |
|
294 | updating to branch default | |
295 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
295 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
296 | $ hg id -R cached2 |
|
296 | $ hg id -R cached2 | |
297 | ac82d8b1f7c4 tip |
|
297 | ac82d8b1f7c4 tip | |
298 | $ sleep 1 |
|
298 | $ sleep 1 | |
299 |
|
299 | |||
300 | read uncached repo: |
|
300 | read uncached repo: | |
301 |
|
301 | |||
302 | $ hg log -R cached |
|
302 | $ hg log -R cached | |
303 | changeset: 0:ac82d8b1f7c4 |
|
303 | changeset: 0:ac82d8b1f7c4 | |
304 | tag: tip |
|
304 | tag: tip | |
305 | user: test |
|
305 | user: test | |
306 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
306 | date: Thu Jan 01 00:00:00 1970 +0000 | |
307 | summary: add a |
|
307 | summary: add a | |
308 |
|
308 | |||
309 | $ sleep 1 |
|
309 | $ sleep 1 | |
310 |
|
310 | |||
311 | shut down servers and restore environment: |
|
311 | shut down servers and restore environment: | |
312 |
|
312 | |||
313 | $ rm -R chgsock |
|
313 | $ rm -R chgsock | |
314 | $ sleep 2 |
|
314 | $ sleep 2 | |
315 | $ CHGSOCKNAME=$OLDCHGSOCKNAME |
|
315 | $ CHGSOCKNAME=$OLDCHGSOCKNAME | |
316 |
|
316 | |||
317 | check server log: |
|
317 | check server log: | |
318 |
|
318 | |||
319 | $ cat log/server.log | filterlog |
|
319 | $ cat log/server.log | filterlog | |
320 | YYYY/MM/DD HH:MM:SS (PID)> init cached |
|
320 | YYYY/MM/DD HH:MM:SS (PID)> init cached | |
321 | YYYY/MM/DD HH:MM:SS (PID)> id -R cached |
|
321 | YYYY/MM/DD HH:MM:SS (PID)> id -R cached | |
322 | YYYY/MM/DD HH:MM:SS (PID)> loaded repo into cache: $TESTTMP/cached (in ...s) |
|
322 | YYYY/MM/DD HH:MM:SS (PID)> loaded repo into cache: $TESTTMP/cached (in ...s) | |
323 | YYYY/MM/DD HH:MM:SS (PID)> repo from cache: $TESTTMP/cached |
|
323 | YYYY/MM/DD HH:MM:SS (PID)> repo from cache: $TESTTMP/cached | |
324 | YYYY/MM/DD HH:MM:SS (PID)> ci -R cached -Am 'add a' |
|
324 | YYYY/MM/DD HH:MM:SS (PID)> ci -R cached -Am 'add a' | |
325 | YYYY/MM/DD HH:MM:SS (PID)> loaded repo into cache: $TESTTMP/cached (in ...s) |
|
325 | YYYY/MM/DD HH:MM:SS (PID)> loaded repo into cache: $TESTTMP/cached (in ...s) | |
326 | YYYY/MM/DD HH:MM:SS (PID)> repo from cache: $TESTTMP/cached |
|
326 | YYYY/MM/DD HH:MM:SS (PID)> repo from cache: $TESTTMP/cached | |
327 | YYYY/MM/DD HH:MM:SS (PID)> log -R cached |
|
327 | YYYY/MM/DD HH:MM:SS (PID)> log -R cached | |
328 | YYYY/MM/DD HH:MM:SS (PID)> loaded repo into cache: $TESTTMP/cached (in ...s) |
|
328 | YYYY/MM/DD HH:MM:SS (PID)> loaded repo into cache: $TESTTMP/cached (in ...s) | |
329 | YYYY/MM/DD HH:MM:SS (PID)> clone cached cached2 |
|
329 | YYYY/MM/DD HH:MM:SS (PID)> clone cached cached2 | |
330 | YYYY/MM/DD HH:MM:SS (PID)> id -R cached2 |
|
330 | YYYY/MM/DD HH:MM:SS (PID)> id -R cached2 | |
331 | YYYY/MM/DD HH:MM:SS (PID)> loaded repo into cache: $TESTTMP/cached2 (in ...s) |
|
331 | YYYY/MM/DD HH:MM:SS (PID)> loaded repo into cache: $TESTTMP/cached2 (in ...s) | |
332 | YYYY/MM/DD HH:MM:SS (PID)> log -R cached |
|
332 | YYYY/MM/DD HH:MM:SS (PID)> log -R cached | |
333 | YYYY/MM/DD HH:MM:SS (PID)> loaded repo into cache: $TESTTMP/cached (in ...s) |
|
333 | YYYY/MM/DD HH:MM:SS (PID)> loaded repo into cache: $TESTTMP/cached (in ...s) | |
|
334 | ||||
|
335 | Test that chg works even when python "coerces" the locale (py3.7+, which is done | |||
|
336 | by default if none of LC_ALL, LC_CTYPE, or LANG are set in the environment) | |||
|
337 | ||||
|
338 | $ cat > $TESTTMP/debugenv.py <<EOF | |||
|
339 | > from mercurial import encoding | |||
|
340 | > from mercurial import registrar | |||
|
341 | > cmdtable = {} | |||
|
342 | > command = registrar.command(cmdtable) | |||
|
343 | > @command(b'debugenv', [], b'', norepo=True) | |||
|
344 | > def debugenv(ui): | |||
|
345 | > for k in [b'LC_ALL', b'LC_CTYPE', b'LANG']: | |||
|
346 | > v = encoding.environ.get(k) | |||
|
347 | > if v is not None: | |||
|
348 | > ui.write(b'%s=%s\n' % (k, encoding.environ[k])) | |||
|
349 | > EOF | |||
|
350 | $ LANG= LC_ALL= LC_CTYPE= chg \ | |||
|
351 | > --config extensions.debugenv=$TESTTMP/debugenv.py debugenv | |||
|
352 | LC_ALL= | |||
|
353 | LC_CTYPE=C.UTF-8 (py37 !) | |||
|
354 | LC_CTYPE= (no-py37 !) | |||
|
355 | LANG= |
General Comments 0
You need to be logged in to leave comments.
Login now