Show More
@@ -191,7 +191,6 b' class channeledinput(object):' | |||||
191 |
|
191 | |||
192 |
|
192 | |||
193 | def _selectmessageencoder(ui): |
|
193 | def _selectmessageencoder(ui): | |
194 | # experimental config: cmdserver.message-encodings |
|
|||
195 | encnames = ui.configlist(b'cmdserver', b'message-encodings') |
|
194 | encnames = ui.configlist(b'cmdserver', b'message-encodings') | |
196 | for n in encnames: |
|
195 | for n in encnames: | |
197 | f = _messageencoders.get(n) |
|
196 | f = _messageencoders.get(n) | |
@@ -234,9 +233,6 b' class server(object):' | |||||
234 | self.ui = self.ui.copy() |
|
233 | self.ui = self.ui.copy() | |
235 | setuplogging(self.ui, repo=None, fp=self.cdebug) |
|
234 | setuplogging(self.ui, repo=None, fp=self.cdebug) | |
236 |
|
235 | |||
237 | # TODO: add this to help/config.txt when stabilized |
|
|||
238 | # ``channel`` |
|
|||
239 | # Use separate channel for structured output. (Command-server only) |
|
|||
240 | self.cmsg = None |
|
236 | self.cmsg = None | |
241 | if ui.config(b'ui', b'message-output') == b'channel': |
|
237 | if ui.config(b'ui', b'message-output') == b'channel': | |
242 | encname, encfn = _selectmessageencoder(ui) |
|
238 | encname, encfn = _selectmessageencoder(ui) |
@@ -204,7 +204,7 b' coreconfigitem(' | |||||
204 | b'cmdserver', b'max-repo-cache', default=0, experimental=True, |
|
204 | b'cmdserver', b'max-repo-cache', default=0, experimental=True, | |
205 | ) |
|
205 | ) | |
206 | coreconfigitem( |
|
206 | coreconfigitem( | |
207 |
b'cmdserver', b'message-encodings', default=list, |
|
207 | b'cmdserver', b'message-encodings', default=list, | |
208 | ) |
|
208 | ) | |
209 | coreconfigitem( |
|
209 | coreconfigitem( | |
210 | b'cmdserver', |
|
210 | b'cmdserver', |
@@ -413,6 +413,12 b' for credentials as usual if required by ' | |||||
413 |
|
413 | |||
414 | Controls command server settings. (ADVANCED) |
|
414 | Controls command server settings. (ADVANCED) | |
415 |
|
415 | |||
|
416 | ``message-encodings`` | |||
|
417 | List of encodings for the ``m`` (message) channel. The first encoding | |||
|
418 | supported by the server will be selected and advertised in the hello | |||
|
419 | message. This is useful only when ``ui.message-output`` is set to | |||
|
420 | ``channel``. Supported encodings are ``cbor``. | |||
|
421 | ||||
416 | ``shutdown-on-interrupt`` |
|
422 | ``shutdown-on-interrupt`` | |
417 | If set to false, the server's main loop will continue running after |
|
423 | If set to false, the server's main loop will continue running after | |
418 | SIGINT received. ``runcommand`` requests can still be interrupted by |
|
424 | SIGINT received. ``runcommand`` requests can still be interrupted by | |
@@ -2383,6 +2389,8 b' User interface controls.' | |||||
2383 | ``message-output`` |
|
2389 | ``message-output`` | |
2384 | Where to write status and error messages. (default: ``stdio``) |
|
2390 | Where to write status and error messages. (default: ``stdio``) | |
2385 |
|
2391 | |||
|
2392 | ``channel`` | |||
|
2393 | Use separate channel for structured output. (Command-server only) | |||
2386 | ``stderr`` |
|
2394 | ``stderr`` | |
2387 | Everything to stderr. |
|
2395 | Everything to stderr. | |
2388 | ``stdio`` |
|
2396 | ``stdio`` |
General Comments 0
You need to be logged in to leave comments.
Login now