mercurial-scm/hg: mercurial/commandserver.py annotate

annotate mercurial/commandserver.py @ 29544:024e8f82f3de

commandserver: add new forking server implemented without using SocketServer SocketServer.ForkingMixIn of Python 2.x has a couple of issues, such as: - race condition that leads to 100% CPU usage (Python 2.6) https://bugs.python.org/issue21491 - can't wait for children belonging to different process groups (Python 2.6) - leaves at least one zombie process (Python 2.6, 2.7) https://bugs.python.org/issue11109 The first two are critical because we do setpgid(0, 0) in child process to isolate terminal signals. The last one isn't, but ForkingMixIn seems to be doing silly. So there are two choices: a) backport and maintain SocketServer until we can drop support for Python 2.x b) replace SocketServer by simpler one and eliminate glue codes I chose (b) because it's great time for getting rid of utterly complicated SocketServer stuff, and preparing for future move towards prefork service. New unixforkingservice is implemented loosely based on chg 531f8ef64be6. It is monolithic but much simpler than SocketServer. unixservicehandler provides customizing points for chg, and it will be shared with future prefork service. Old unixservice class is still used by chgserver. It will be removed later. Thanks to Jun Wu for investigating these issues.

author	Yuya Nishihara <yuya@tcha.org>
date	Sun, 22 May 2016 11:43:18 +0900
parents	d74b8a4fde3b
children	9da1adc18639

rev	line source
14647 2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	1 # commandserver.py - communicate with Mercurial's API over a pipe
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	2 #
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	3 # Copyright Matt Mackall <mpm@selenic.com>
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	4 #
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	5 # This software may be used and distributed according to the terms of the
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	6 # GNU General Public License version 2 or any later version.
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	7
27351 28e50c4b15ed commandserver: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 26587 diff changeset	8 from __future__ import absolute_import
28e50c4b15ed commandserver: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 26587 diff changeset	9
28e50c4b15ed commandserver: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 26587 diff changeset	10 import errno
29513 e5b4d79a9140 commandserver: backport handling of forking server from chgserver Yuya Nishihara <yuya@tcha.org> parents: 29512 diff changeset	11 import gc
27351 28e50c4b15ed commandserver: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 26587 diff changeset	12 import os
29513 e5b4d79a9140 commandserver: backport handling of forking server from chgserver Yuya Nishihara <yuya@tcha.org> parents: 29512 diff changeset	13 import random
29544 024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	14 import select
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	15 import signal
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	16 import socket
14647 2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	17 import struct
27351 28e50c4b15ed commandserver: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 26587 diff changeset	18 import sys
28e50c4b15ed commandserver: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 26587 diff changeset	19 import traceback
28e50c4b15ed commandserver: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 26587 diff changeset	20
28e50c4b15ed commandserver: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 26587 diff changeset	21 from .i18n import _
28e50c4b15ed commandserver: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 26587 diff changeset	22 from . import (
28e50c4b15ed commandserver: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 26587 diff changeset	23 encoding,
28e50c4b15ed commandserver: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 26587 diff changeset	24 error,
28e50c4b15ed commandserver: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 26587 diff changeset	25 util,
28e50c4b15ed commandserver: use absolute_import Yuya Nishihara <yuya@tcha.org> parents: 26587 diff changeset	26 )
14647 2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	27
29433 33770d2b6cf9 py3: conditionalize SocketServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29366 diff changeset	28 socketserver = util.socketserver
33770d2b6cf9 py3: conditionalize SocketServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29366 diff changeset	29
14647 2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	30 logfile = None
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	31
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	32 def log(*args):
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	33 if not logfile:
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	34 return
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	35
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	36 for a in args:
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	37 logfile.write(str(a))
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	38
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	39 logfile.flush()
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	40
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	41 class channeledoutput(object):
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	42 """
22561 1120b1e2f975 cmdserver: correct doc of channeledoutput Yuya Nishihara <yuya@tcha.org> parents: 21195 diff changeset	43 Write data to out in the following format:
14647 2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	44
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	45 data length (unsigned int),
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	46 data
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	47 """
22563 8cc5e673cac0 cmdserver: drop useless in_ attribute from channeledoutput Yuya Nishihara <yuya@tcha.org> parents: 22562 diff changeset	48 def __init__(self, out, channel):
14647 2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	49 self.out = out
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	50 self.channel = channel
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	51
27415 f4ca33e33781 commandserver: implement name() to clarify channel is not a plain file Yuya Nishihara <yuya@tcha.org> parents: 27352 diff changeset	52 @property
f4ca33e33781 commandserver: implement name() to clarify channel is not a plain file Yuya Nishihara <yuya@tcha.org> parents: 27352 diff changeset	53 def name(self):
f4ca33e33781 commandserver: implement name() to clarify channel is not a plain file Yuya Nishihara <yuya@tcha.org> parents: 27352 diff changeset	54 return '<%c-channel>' % self.channel
f4ca33e33781 commandserver: implement name() to clarify channel is not a plain file Yuya Nishihara <yuya@tcha.org> parents: 27352 diff changeset	55
14647 2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	56 def write(self, data):
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	57 if not data:
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	58 return
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	59 self.out.write(struct.pack('>cI', self.channel, len(data)))
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	60 self.out.write(data)
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	61 self.out.flush()
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	62
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	63 def __getattr__(self, attr):
27915 5f2a308bac94 commandserver: drop tell() and seek() from channels (issue5049) Yuya Nishihara <yuya@tcha.org> parents: 27566 diff changeset	64 if attr in ('isatty', 'fileno', 'tell', 'seek'):
18174 56ef99fbd6f2 commandserver: clean up use of two-argument raise Augie Fackler <raf@durin42.com> parents: 17425 diff changeset	65 raise AttributeError(attr)
22563 8cc5e673cac0 cmdserver: drop useless in_ attribute from channeledoutput Yuya Nishihara <yuya@tcha.org> parents: 22562 diff changeset	66 return getattr(self.out, attr)
14647 2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	67
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	68 class channeledinput(object):
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	69 """
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	70 Read data from in_.
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	71
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	72 Requests for input are written to out in the following format:
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	73 channel identifier - 'I' for plain input, 'L' line based (1 byte)
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	74 how many bytes to send at most (unsigned int),
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	75
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	76 The client replies with:
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	77 data length (unsigned int), 0 meaning EOF
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	78 data
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	79 """
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	80
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	81 maxchunksize = 4 * 1024
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	82
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	83 def __init__(self, in_, out, channel):
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	84 self.in_ = in_
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	85 self.out = out
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	86 self.channel = channel
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	87
27415 f4ca33e33781 commandserver: implement name() to clarify channel is not a plain file Yuya Nishihara <yuya@tcha.org> parents: 27352 diff changeset	88 @property
f4ca33e33781 commandserver: implement name() to clarify channel is not a plain file Yuya Nishihara <yuya@tcha.org> parents: 27352 diff changeset	89 def name(self):
f4ca33e33781 commandserver: implement name() to clarify channel is not a plain file Yuya Nishihara <yuya@tcha.org> parents: 27352 diff changeset	90 return '<%c-channel>' % self.channel
f4ca33e33781 commandserver: implement name() to clarify channel is not a plain file Yuya Nishihara <yuya@tcha.org> parents: 27352 diff changeset	91
14647 2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	92 def read(self, size=-1):
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	93 if size < 0:
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	94 # if we need to consume all the clients input, ask for 4k chunks
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	95 # so the pipe doesn't fill up risking a deadlock
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	96 size = self.maxchunksize
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	97 s = self._read(size, self.channel)
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	98 buf = s
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	99 while s:
14728 350dcd481410 cmdserver: fix read-loop string concatenation Idan Kamara <idankk86@gmail.com> parents: 14719 diff changeset	100 s = self._read(size, self.channel)
14647 2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	101 buf += s
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	102
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	103 return buf
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	104 else:
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	105 return self._read(size, self.channel)
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	106
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	107 def _read(self, size, channel):
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	108 if not size:
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	109 return ''
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	110 assert size > 0
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	111
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	112 # tell the client we need at most size bytes
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	113 self.out.write(struct.pack('>cI', channel, size))
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	114 self.out.flush()
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	115
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	116 length = self.in_.read(4)
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	117 length = struct.unpack('>I', length)[0]
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	118 if not length:
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	119 return ''
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	120 else:
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	121 return self.in_.read(length)
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	122
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	123 def readline(self, size=-1):
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	124 if size < 0:
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	125 size = self.maxchunksize
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	126 s = self._read(size, 'L')
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	127 buf = s
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	128 # keep asking for more until there's either no more or
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	129 # we got a full line
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	130 while s and s[-1] != '\n':
14728 350dcd481410 cmdserver: fix read-loop string concatenation Idan Kamara <idankk86@gmail.com> parents: 14719 diff changeset	131 s = self._read(size, 'L')
14647 2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	132 buf += s
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	133
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	134 return buf
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	135 else:
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	136 return self._read(size, 'L')
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	137
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	138 def __iter__(self):
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	139 return self
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	140
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	141 def next(self):
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	142 l = self.readline()
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	143 if not l:
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	144 raise StopIteration
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	145 return l
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	146
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	147 def __getattr__(self, attr):
27915 5f2a308bac94 commandserver: drop tell() and seek() from channels (issue5049) Yuya Nishihara <yuya@tcha.org> parents: 27566 diff changeset	148 if attr in ('isatty', 'fileno', 'tell', 'seek'):
18174 56ef99fbd6f2 commandserver: clean up use of two-argument raise Augie Fackler <raf@durin42.com> parents: 17425 diff changeset	149 raise AttributeError(attr)
14647 2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	150 return getattr(self.in_, attr)
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	151
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	152 class server(object):
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	153 """
22990 a0e81aa94125 cmdserver: make server streams switchable Yuya Nishihara <yuya@tcha.org> parents: 22989 diff changeset	154 Listens for commands on fin, runs them and writes the output on a channel
a0e81aa94125 cmdserver: make server streams switchable Yuya Nishihara <yuya@tcha.org> parents: 22989 diff changeset	155 based stream to fout.
14647 2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	156 """
22990 a0e81aa94125 cmdserver: make server streams switchable Yuya Nishihara <yuya@tcha.org> parents: 22989 diff changeset	157 def __init__(self, ui, repo, fin, fout):
14864 1b872599f39f cmdserver: restore old working dir after dispatch when we have --cwd Idan Kamara <idankk86@gmail.com> parents: 14751 diff changeset	158 self.cwd = os.getcwd()
14647 2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	159
25832 5857be01962e commandserver: mark developer-only logging option Matt Mackall <mpm@selenic.com> parents: 25660 diff changeset	160 # developer config: cmdserver.log
14647 2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	161 logpath = ui.config("cmdserver", "log", None)
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	162 if logpath:
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	163 global logfile
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	164 if logpath == '-':
17425 e95ec38f86b0 fix wording and not-completely-trivial spelling errors and bad docstrings Mads Kiilerich <mads@kiilerich.com> parents: 16687 diff changeset	165 # write log on a special 'd' (debug) channel
22990 a0e81aa94125 cmdserver: make server streams switchable Yuya Nishihara <yuya@tcha.org> parents: 22989 diff changeset	166 logfile = channeledoutput(fout, 'd')
14647 2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	167 else:
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	168 logfile = open(logpath, 'a')
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	169
20650 e811b93f2cb1 cmdserver: allow to start server without repository Yuya Nishihara <yuya@tcha.org> parents: 20631 diff changeset	170 if repo:
e811b93f2cb1 cmdserver: allow to start server without repository Yuya Nishihara <yuya@tcha.org> parents: 20631 diff changeset	171 # the ui here is really the repo ui so take its baseui so we don't
e811b93f2cb1 cmdserver: allow to start server without repository Yuya Nishihara <yuya@tcha.org> parents: 20631 diff changeset	172 # end up with its local configuration
e811b93f2cb1 cmdserver: allow to start server without repository Yuya Nishihara <yuya@tcha.org> parents: 20631 diff changeset	173 self.ui = repo.baseui
e811b93f2cb1 cmdserver: allow to start server without repository Yuya Nishihara <yuya@tcha.org> parents: 20631 diff changeset	174 self.repo = repo
e811b93f2cb1 cmdserver: allow to start server without repository Yuya Nishihara <yuya@tcha.org> parents: 20631 diff changeset	175 self.repoui = repo.ui
e811b93f2cb1 cmdserver: allow to start server without repository Yuya Nishihara <yuya@tcha.org> parents: 20631 diff changeset	176 else:
e811b93f2cb1 cmdserver: allow to start server without repository Yuya Nishihara <yuya@tcha.org> parents: 20631 diff changeset	177 self.ui = ui
e811b93f2cb1 cmdserver: allow to start server without repository Yuya Nishihara <yuya@tcha.org> parents: 20631 diff changeset	178 self.repo = self.repoui = None
14647 2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	179
22990 a0e81aa94125 cmdserver: make server streams switchable Yuya Nishihara <yuya@tcha.org> parents: 22989 diff changeset	180 self.cerr = channeledoutput(fout, 'e')
a0e81aa94125 cmdserver: make server streams switchable Yuya Nishihara <yuya@tcha.org> parents: 22989 diff changeset	181 self.cout = channeledoutput(fout, 'o')
a0e81aa94125 cmdserver: make server streams switchable Yuya Nishihara <yuya@tcha.org> parents: 22989 diff changeset	182 self.cin = channeledinput(fin, fout, 'I')
a0e81aa94125 cmdserver: make server streams switchable Yuya Nishihara <yuya@tcha.org> parents: 22989 diff changeset	183 self.cresult = channeledoutput(fout, 'r')
14647 2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	184
22990 a0e81aa94125 cmdserver: make server streams switchable Yuya Nishihara <yuya@tcha.org> parents: 22989 diff changeset	185 self.client = fin
14647 2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	186
29512 538d0003c9e0 commandserver: promote .cleanup() hook from chgserver Yuya Nishihara <yuya@tcha.org> parents: 29511 diff changeset	187 def cleanup(self):
538d0003c9e0 commandserver: promote .cleanup() hook from chgserver Yuya Nishihara <yuya@tcha.org> parents: 29511 diff changeset	188 """release and restore resources taken during server session"""
538d0003c9e0 commandserver: promote .cleanup() hook from chgserver Yuya Nishihara <yuya@tcha.org> parents: 29511 diff changeset	189 pass
538d0003c9e0 commandserver: promote .cleanup() hook from chgserver Yuya Nishihara <yuya@tcha.org> parents: 29511 diff changeset	190
14647 2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	191 def _read(self, size):
14706 5fd5dd9a610a cmdserver: don't raise EOFError when trying to read 0 bytes from the client Idan Kamara <idankk86@gmail.com> parents: 14647 diff changeset	192 if not size:
5fd5dd9a610a cmdserver: don't raise EOFError when trying to read 0 bytes from the client Idan Kamara <idankk86@gmail.com> parents: 14647 diff changeset	193 return ''
5fd5dd9a610a cmdserver: don't raise EOFError when trying to read 0 bytes from the client Idan Kamara <idankk86@gmail.com> parents: 14647 diff changeset	194
14647 2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	195 data = self.client.read(size)
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	196
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	197 # is the other end closed?
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	198 if not data:
16687 e34106fa0dc3 cleanup: "raise SomeException()" -> "raise SomeException" Brodie Rao <brodie@sf.io> parents: 16683 diff changeset	199 raise EOFError
14647 2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	200
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	201 return data
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	202
28156 75f586a1bf55 commandserver: add _readstr and _readlist Jun Wu <quark@fb.com> parents: 28027 diff changeset	203 def _readstr(self):
75f586a1bf55 commandserver: add _readstr and _readlist Jun Wu <quark@fb.com> parents: 28027 diff changeset	204 """read a string from the channel
75f586a1bf55 commandserver: add _readstr and _readlist Jun Wu <quark@fb.com> parents: 28027 diff changeset	205
75f586a1bf55 commandserver: add _readstr and _readlist Jun Wu <quark@fb.com> parents: 28027 diff changeset	206 format:
75f586a1bf55 commandserver: add _readstr and _readlist Jun Wu <quark@fb.com> parents: 28027 diff changeset	207 data length (uint32), data
75f586a1bf55 commandserver: add _readstr and _readlist Jun Wu <quark@fb.com> parents: 28027 diff changeset	208 """
75f586a1bf55 commandserver: add _readstr and _readlist Jun Wu <quark@fb.com> parents: 28027 diff changeset	209 length = struct.unpack('>I', self._read(4))[0]
75f586a1bf55 commandserver: add _readstr and _readlist Jun Wu <quark@fb.com> parents: 28027 diff changeset	210 if not length:
75f586a1bf55 commandserver: add _readstr and _readlist Jun Wu <quark@fb.com> parents: 28027 diff changeset	211 return ''
75f586a1bf55 commandserver: add _readstr and _readlist Jun Wu <quark@fb.com> parents: 28027 diff changeset	212 return self._read(length)
75f586a1bf55 commandserver: add _readstr and _readlist Jun Wu <quark@fb.com> parents: 28027 diff changeset	213
75f586a1bf55 commandserver: add _readstr and _readlist Jun Wu <quark@fb.com> parents: 28027 diff changeset	214 def _readlist(self):
75f586a1bf55 commandserver: add _readstr and _readlist Jun Wu <quark@fb.com> parents: 28027 diff changeset	215 """read a list of NULL separated strings from the channel"""
75f586a1bf55 commandserver: add _readstr and _readlist Jun Wu <quark@fb.com> parents: 28027 diff changeset	216 s = self._readstr()
75f586a1bf55 commandserver: add _readstr and _readlist Jun Wu <quark@fb.com> parents: 28027 diff changeset	217 if s:
75f586a1bf55 commandserver: add _readstr and _readlist Jun Wu <quark@fb.com> parents: 28027 diff changeset	218 return s.split('\0')
75f586a1bf55 commandserver: add _readstr and _readlist Jun Wu <quark@fb.com> parents: 28027 diff changeset	219 else:
75f586a1bf55 commandserver: add _readstr and _readlist Jun Wu <quark@fb.com> parents: 28027 diff changeset	220 return []
75f586a1bf55 commandserver: add _readstr and _readlist Jun Wu <quark@fb.com> parents: 28027 diff changeset	221
14647 2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	222 def runcommand(self):
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	223 """ reads a list of \0 terminated arguments, executes
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	224 and writes the return code to the result channel """
27352 9fd8f1552369 commandserver: cut import cycle by itself Yuya Nishihara <yuya@tcha.org> parents: 27351 diff changeset	225 from . import dispatch # avoid cycle
14647 2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	226
28157 e7c9b59dbbcf commandserver: use _readlist Jun Wu <quark@fb.com> parents: 28156 diff changeset	227 args = self._readlist()
14647 2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	228
14750 f5f97a0f983f cmdserver: copy repo.ui before running commands Idan Kamara <idankk86@gmail.com> parents: 14728 diff changeset	229 # copy the uis so changes (e.g. --config or --verbose) don't
f5f97a0f983f cmdserver: copy repo.ui before running commands Idan Kamara <idankk86@gmail.com> parents: 14728 diff changeset	230 # persist between requests
14751 712954a67be3 cmdserver: assign repo.baseui before running commands Idan Kamara <idankk86@gmail.com> parents: 14750 diff changeset	231 copiedui = self.ui.copy()
21195 9336bc7dca8e cmdserver: forcibly use L channel to read password input (issue3161) Yuya Nishihara <yuya@tcha.org> parents: 20650 diff changeset	232 uis = [copiedui]
20650 e811b93f2cb1 cmdserver: allow to start server without repository Yuya Nishihara <yuya@tcha.org> parents: 20631 diff changeset	233 if self.repo:
e811b93f2cb1 cmdserver: allow to start server without repository Yuya Nishihara <yuya@tcha.org> parents: 20631 diff changeset	234 self.repo.baseui = copiedui
e811b93f2cb1 cmdserver: allow to start server without repository Yuya Nishihara <yuya@tcha.org> parents: 20631 diff changeset	235 # clone ui without using ui.copy because this is protected
e811b93f2cb1 cmdserver: allow to start server without repository Yuya Nishihara <yuya@tcha.org> parents: 20631 diff changeset	236 repoui = self.repoui.__class__(self.repoui)
e811b93f2cb1 cmdserver: allow to start server without repository Yuya Nishihara <yuya@tcha.org> parents: 20631 diff changeset	237 repoui.copy = copiedui.copy # redo copy protection
21195 9336bc7dca8e cmdserver: forcibly use L channel to read password input (issue3161) Yuya Nishihara <yuya@tcha.org> parents: 20650 diff changeset	238 uis.append(repoui)
20650 e811b93f2cb1 cmdserver: allow to start server without repository Yuya Nishihara <yuya@tcha.org> parents: 20631 diff changeset	239 self.repo.ui = self.repo.dirstate._ui = repoui
e811b93f2cb1 cmdserver: allow to start server without repository Yuya Nishihara <yuya@tcha.org> parents: 20631 diff changeset	240 self.repo.invalidateall()
14751 712954a67be3 cmdserver: assign repo.baseui before running commands Idan Kamara <idankk86@gmail.com> parents: 14750 diff changeset	241
21195 9336bc7dca8e cmdserver: forcibly use L channel to read password input (issue3161) Yuya Nishihara <yuya@tcha.org> parents: 20650 diff changeset	242 for ui in uis:
29366 d269e7db2f55 ui: provide official way to reset internal state per command Yuya Nishihara <yuya@tcha.org> parents: 28511 diff changeset	243 ui.resetstate()
27565 e7937438e3f7 commandserver: do not set nontty flag if channel is replaced by a real file Yuya Nishihara <yuya@tcha.org> parents: 27415 diff changeset	244 # any kind of interaction must use server channels, but chg may
e7937438e3f7 commandserver: do not set nontty flag if channel is replaced by a real file Yuya Nishihara <yuya@tcha.org> parents: 27415 diff changeset	245 # replace channels by fully functional tty files. so nontty is
e7937438e3f7 commandserver: do not set nontty flag if channel is replaced by a real file Yuya Nishihara <yuya@tcha.org> parents: 27415 diff changeset	246 # enforced only if cin is a channel.
e7937438e3f7 commandserver: do not set nontty flag if channel is replaced by a real file Yuya Nishihara <yuya@tcha.org> parents: 27415 diff changeset	247 if not util.safehasattr(self.cin, 'fileno'):
e7937438e3f7 commandserver: do not set nontty flag if channel is replaced by a real file Yuya Nishihara <yuya@tcha.org> parents: 27415 diff changeset	248 ui.setconfig('ui', 'nontty', 'true', 'commandserver')
21195 9336bc7dca8e cmdserver: forcibly use L channel to read password input (issue3161) Yuya Nishihara <yuya@tcha.org> parents: 20650 diff changeset	249
14864 1b872599f39f cmdserver: restore old working dir after dispatch when we have --cwd Idan Kamara <idankk86@gmail.com> parents: 14751 diff changeset	250 req = dispatch.request(args[:], copiedui, self.repo, self.cin,
14647 2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	251 self.cout, self.cerr)
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	252
20631 5d4606bec54c cmdserver: mask return code of runcommand in the same way as dispatch.run Yuya Nishihara <yuya@tcha.org> parents: 20627 diff changeset	253 ret = (dispatch.dispatch(req) or 0) & 255 # might return None
14647 2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	254
14864 1b872599f39f cmdserver: restore old working dir after dispatch when we have --cwd Idan Kamara <idankk86@gmail.com> parents: 14751 diff changeset	255 # restore old cwd
1b872599f39f cmdserver: restore old working dir after dispatch when we have --cwd Idan Kamara <idankk86@gmail.com> parents: 14751 diff changeset	256 if '--cwd' in args:
1b872599f39f cmdserver: restore old working dir after dispatch when we have --cwd Idan Kamara <idankk86@gmail.com> parents: 14751 diff changeset	257 os.chdir(self.cwd)
1b872599f39f cmdserver: restore old working dir after dispatch when we have --cwd Idan Kamara <idankk86@gmail.com> parents: 14751 diff changeset	258
14647 2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	259 self.cresult.write(struct.pack('>i', int(ret)))
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	260
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	261 def getencoding(self):
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	262 """ writes the current encoding to the result channel """
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	263 self.cresult.write(encoding.encoding)
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	264
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	265 def serveone(self):
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	266 cmd = self.client.readline()[:-1]
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	267 if cmd:
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	268 handler = self.capabilities.get(cmd)
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	269 if handler:
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	270 handler(self)
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	271 else:
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	272 # clients are expected to check what commands are supported by
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	273 # looking at the servers capabilities
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 25832 diff changeset	274 raise error.Abort(_('unknown command %s') % cmd)
14647 2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	275
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	276 return cmd != ''
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	277
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	278 capabilities = {'runcommand' : runcommand,
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	279 'getencoding' : getencoding}
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	280
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	281 def serve(self):
18359 4b09e6f7d7de commandserver: report capabilities sorted Mads Kiilerich <mads@kiilerich.com> parents: 18174 diff changeset	282 hellomsg = 'capabilities: ' + ' '.join(sorted(self.capabilities))
14719 c19de7f32961 cmdserver: write the hello message as one chunk on the 'o' channel Idan Kamara <idankk86@gmail.com> parents: 14707 diff changeset	283 hellomsg += '\n'
c19de7f32961 cmdserver: write the hello message as one chunk on the 'o' channel Idan Kamara <idankk86@gmail.com> parents: 14707 diff changeset	284 hellomsg += 'encoding: ' + encoding.encoding
23036 19f5273c9f3e cmdserver: include pid of server handling requests in hello message Yuya Nishihara <yuya@tcha.org> parents: 22994 diff changeset	285 hellomsg += '\n'
28027 14033c5dd261 util: enable getpid to be replaced timeless <timeless@mozdev.org> parents: 27915 diff changeset	286 hellomsg += 'pid: %d' % util.getpid()
14719 c19de7f32961 cmdserver: write the hello message as one chunk on the 'o' channel Idan Kamara <idankk86@gmail.com> parents: 14707 diff changeset	287
c19de7f32961 cmdserver: write the hello message as one chunk on the 'o' channel Idan Kamara <idankk86@gmail.com> parents: 14707 diff changeset	288 # write the hello msg in -one- chunk
c19de7f32961 cmdserver: write the hello message as one chunk on the 'o' channel Idan Kamara <idankk86@gmail.com> parents: 14707 diff changeset	289 self.cout.write(hellomsg)
14647 2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	290
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	291 try:
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	292 while self.serveone():
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	293 pass
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	294 except EOFError:
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	295 # we'll get here if the client disconnected while we were reading
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	296 # its request
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	297 return 1
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	298
2e9f379de0ac serve: add --cmdserver option to communicate with hg over a pipe Idan Kamara <idankk86@gmail.com> parents: diff changeset	299 return 0
22988 32b77aba2772 cmdserver: wrap 'pipe' mode server by service object Yuya Nishihara <yuya@tcha.org> parents: 22563 diff changeset	300
23324 69f86b937035 cmdserver: protect pipe server streams against corruption caused by direct io Yuya Nishihara <yuya@tcha.org> parents: 23323 diff changeset	301 def _protectio(ui):
69f86b937035 cmdserver: protect pipe server streams against corruption caused by direct io Yuya Nishihara <yuya@tcha.org> parents: 23323 diff changeset	302 """ duplicates streams and redirect original to null if ui uses stdio """
69f86b937035 cmdserver: protect pipe server streams against corruption caused by direct io Yuya Nishihara <yuya@tcha.org> parents: 23323 diff changeset	303 ui.flush()
69f86b937035 cmdserver: protect pipe server streams against corruption caused by direct io Yuya Nishihara <yuya@tcha.org> parents: 23323 diff changeset	304 newfiles = []
69f86b937035 cmdserver: protect pipe server streams against corruption caused by direct io Yuya Nishihara <yuya@tcha.org> parents: 23323 diff changeset	305 nullfd = os.open(os.devnull, os.O_RDWR)
69f86b937035 cmdserver: protect pipe server streams against corruption caused by direct io Yuya Nishihara <yuya@tcha.org> parents: 23323 diff changeset	306 for f, sysf, mode in [(ui.fin, sys.stdin, 'rb'),
69f86b937035 cmdserver: protect pipe server streams against corruption caused by direct io Yuya Nishihara <yuya@tcha.org> parents: 23323 diff changeset	307 (ui.fout, sys.stdout, 'wb')]:
69f86b937035 cmdserver: protect pipe server streams against corruption caused by direct io Yuya Nishihara <yuya@tcha.org> parents: 23323 diff changeset	308 if f is sysf:
69f86b937035 cmdserver: protect pipe server streams against corruption caused by direct io Yuya Nishihara <yuya@tcha.org> parents: 23323 diff changeset	309 newfd = os.dup(f.fileno())
69f86b937035 cmdserver: protect pipe server streams against corruption caused by direct io Yuya Nishihara <yuya@tcha.org> parents: 23323 diff changeset	310 os.dup2(nullfd, f.fileno())
69f86b937035 cmdserver: protect pipe server streams against corruption caused by direct io Yuya Nishihara <yuya@tcha.org> parents: 23323 diff changeset	311 f = os.fdopen(newfd, mode)
69f86b937035 cmdserver: protect pipe server streams against corruption caused by direct io Yuya Nishihara <yuya@tcha.org> parents: 23323 diff changeset	312 newfiles.append(f)
69f86b937035 cmdserver: protect pipe server streams against corruption caused by direct io Yuya Nishihara <yuya@tcha.org> parents: 23323 diff changeset	313 os.close(nullfd)
69f86b937035 cmdserver: protect pipe server streams against corruption caused by direct io Yuya Nishihara <yuya@tcha.org> parents: 23323 diff changeset	314 return tuple(newfiles)
69f86b937035 cmdserver: protect pipe server streams against corruption caused by direct io Yuya Nishihara <yuya@tcha.org> parents: 23323 diff changeset	315
69f86b937035 cmdserver: protect pipe server streams against corruption caused by direct io Yuya Nishihara <yuya@tcha.org> parents: 23323 diff changeset	316 def _restoreio(ui, fin, fout):
69f86b937035 cmdserver: protect pipe server streams against corruption caused by direct io Yuya Nishihara <yuya@tcha.org> parents: 23323 diff changeset	317 """ restores streams from duplicated ones """
69f86b937035 cmdserver: protect pipe server streams against corruption caused by direct io Yuya Nishihara <yuya@tcha.org> parents: 23323 diff changeset	318 ui.flush()
69f86b937035 cmdserver: protect pipe server streams against corruption caused by direct io Yuya Nishihara <yuya@tcha.org> parents: 23323 diff changeset	319 for f, uif in [(fin, ui.fin), (fout, ui.fout)]:
69f86b937035 cmdserver: protect pipe server streams against corruption caused by direct io Yuya Nishihara <yuya@tcha.org> parents: 23323 diff changeset	320 if f is not uif:
69f86b937035 cmdserver: protect pipe server streams against corruption caused by direct io Yuya Nishihara <yuya@tcha.org> parents: 23323 diff changeset	321 os.dup2(f.fileno(), uif.fileno())
69f86b937035 cmdserver: protect pipe server streams against corruption caused by direct io Yuya Nishihara <yuya@tcha.org> parents: 23323 diff changeset	322 f.close()
69f86b937035 cmdserver: protect pipe server streams against corruption caused by direct io Yuya Nishihara <yuya@tcha.org> parents: 23323 diff changeset	323
22988 32b77aba2772 cmdserver: wrap 'pipe' mode server by service object Yuya Nishihara <yuya@tcha.org> parents: 22563 diff changeset	324 class pipeservice(object):
32b77aba2772 cmdserver: wrap 'pipe' mode server by service object Yuya Nishihara <yuya@tcha.org> parents: 22563 diff changeset	325 def __init__(self, ui, repo, opts):
23323 bc374458688b cmdserver: postpone creation of pipe server until run() Yuya Nishihara <yuya@tcha.org> parents: 23322 diff changeset	326 self.ui = ui
bc374458688b cmdserver: postpone creation of pipe server until run() Yuya Nishihara <yuya@tcha.org> parents: 23322 diff changeset	327 self.repo = repo
22988 32b77aba2772 cmdserver: wrap 'pipe' mode server by service object Yuya Nishihara <yuya@tcha.org> parents: 22563 diff changeset	328
32b77aba2772 cmdserver: wrap 'pipe' mode server by service object Yuya Nishihara <yuya@tcha.org> parents: 22563 diff changeset	329 def init(self):
32b77aba2772 cmdserver: wrap 'pipe' mode server by service object Yuya Nishihara <yuya@tcha.org> parents: 22563 diff changeset	330 pass
32b77aba2772 cmdserver: wrap 'pipe' mode server by service object Yuya Nishihara <yuya@tcha.org> parents: 22563 diff changeset	331
32b77aba2772 cmdserver: wrap 'pipe' mode server by service object Yuya Nishihara <yuya@tcha.org> parents: 22563 diff changeset	332 def run(self):
23323 bc374458688b cmdserver: postpone creation of pipe server until run() Yuya Nishihara <yuya@tcha.org> parents: 23322 diff changeset	333 ui = self.ui
23324 69f86b937035 cmdserver: protect pipe server streams against corruption caused by direct io Yuya Nishihara <yuya@tcha.org> parents: 23323 diff changeset	334 # redirect stdio to null device so that broken extensions or in-process
69f86b937035 cmdserver: protect pipe server streams against corruption caused by direct io Yuya Nishihara <yuya@tcha.org> parents: 23323 diff changeset	335 # hooks will never cause corruption of channel protocol.
69f86b937035 cmdserver: protect pipe server streams against corruption caused by direct io Yuya Nishihara <yuya@tcha.org> parents: 23323 diff changeset	336 fin, fout = _protectio(ui)
69f86b937035 cmdserver: protect pipe server streams against corruption caused by direct io Yuya Nishihara <yuya@tcha.org> parents: 23323 diff changeset	337 try:
69f86b937035 cmdserver: protect pipe server streams against corruption caused by direct io Yuya Nishihara <yuya@tcha.org> parents: 23323 diff changeset	338 sv = server(ui, self.repo, fin, fout)
69f86b937035 cmdserver: protect pipe server streams against corruption caused by direct io Yuya Nishihara <yuya@tcha.org> parents: 23323 diff changeset	339 return sv.serve()
69f86b937035 cmdserver: protect pipe server streams against corruption caused by direct io Yuya Nishihara <yuya@tcha.org> parents: 23323 diff changeset	340 finally:
29512 538d0003c9e0 commandserver: promote .cleanup() hook from chgserver Yuya Nishihara <yuya@tcha.org> parents: 29511 diff changeset	341 sv.cleanup()
23324 69f86b937035 cmdserver: protect pipe server streams against corruption caused by direct io Yuya Nishihara <yuya@tcha.org> parents: 23323 diff changeset	342 _restoreio(ui, fin, fout)
22989 dc8803ce3dfe cmdserver: switch service objects by mode Yuya Nishihara <yuya@tcha.org> parents: 22988 diff changeset	343
29543 d74b8a4fde3b commandserver: extract function that serves for the current connection Yuya Nishihara <yuya@tcha.org> parents: 29542 diff changeset	344 def _serverequest(ui, repo, conn, createcmdserver):
d74b8a4fde3b commandserver: extract function that serves for the current connection Yuya Nishihara <yuya@tcha.org> parents: 29542 diff changeset	345 if True: # TODO: unindent
29513 e5b4d79a9140 commandserver: backport handling of forking server from chgserver Yuya Nishihara <yuya@tcha.org> parents: 29512 diff changeset	346 # use a different process group from the master process, making this
e5b4d79a9140 commandserver: backport handling of forking server from chgserver Yuya Nishihara <yuya@tcha.org> parents: 29512 diff changeset	347 # process pass kernel "is_current_pgrp_orphaned" check so signals like
e5b4d79a9140 commandserver: backport handling of forking server from chgserver Yuya Nishihara <yuya@tcha.org> parents: 29512 diff changeset	348 # SIGTSTP, SIGTTIN, SIGTTOU are not ignored.
e5b4d79a9140 commandserver: backport handling of forking server from chgserver Yuya Nishihara <yuya@tcha.org> parents: 29512 diff changeset	349 os.setpgid(0, 0)
e5b4d79a9140 commandserver: backport handling of forking server from chgserver Yuya Nishihara <yuya@tcha.org> parents: 29512 diff changeset	350 # change random state otherwise forked request handlers would have a
e5b4d79a9140 commandserver: backport handling of forking server from chgserver Yuya Nishihara <yuya@tcha.org> parents: 29512 diff changeset	351 # same state inherited from parent.
e5b4d79a9140 commandserver: backport handling of forking server from chgserver Yuya Nishihara <yuya@tcha.org> parents: 29512 diff changeset	352 random.seed()
29542 6011ad3b0a42 commandserver: manually create file objects from socket Yuya Nishihara <yuya@tcha.org> parents: 29532 diff changeset	353
6011ad3b0a42 commandserver: manually create file objects from socket Yuya Nishihara <yuya@tcha.org> parents: 29532 diff changeset	354 fin = conn.makefile('rb')
6011ad3b0a42 commandserver: manually create file objects from socket Yuya Nishihara <yuya@tcha.org> parents: 29532 diff changeset	355 fout = conn.makefile('wb')
28511 ff5f923fca3c cmdserver: write early exception to 'e' channel in 'unix' mode Yuya Nishihara <yuya@tcha.org> parents: 28157 diff changeset	356 sv = None
22994 840be5ca03e1 cmdserver: add service that listens on unix domain socket and forks process Yuya Nishihara <yuya@tcha.org> parents: 22990 diff changeset	357 try:
29543 d74b8a4fde3b commandserver: extract function that serves for the current connection Yuya Nishihara <yuya@tcha.org> parents: 29542 diff changeset	358 sv = createcmdserver(repo, conn, fin, fout)
22994 840be5ca03e1 cmdserver: add service that listens on unix domain socket and forks process Yuya Nishihara <yuya@tcha.org> parents: 22990 diff changeset	359 try:
840be5ca03e1 cmdserver: add service that listens on unix domain socket and forks process Yuya Nishihara <yuya@tcha.org> parents: 22990 diff changeset	360 sv.serve()
840be5ca03e1 cmdserver: add service that listens on unix domain socket and forks process Yuya Nishihara <yuya@tcha.org> parents: 22990 diff changeset	361 # handle exceptions that may be raised by command server. most of
840be5ca03e1 cmdserver: add service that listens on unix domain socket and forks process Yuya Nishihara <yuya@tcha.org> parents: 22990 diff changeset	362 # known exceptions are caught by dispatch.
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 25832 diff changeset	363 except error.Abort as inst:
22994 840be5ca03e1 cmdserver: add service that listens on unix domain socket and forks process Yuya Nishihara <yuya@tcha.org> parents: 22990 diff changeset	364 ui.warn(_('abort: %s\n') % inst)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 23324 diff changeset	365 except IOError as inst:
22994 840be5ca03e1 cmdserver: add service that listens on unix domain socket and forks process Yuya Nishihara <yuya@tcha.org> parents: 22990 diff changeset	366 if inst.errno != errno.EPIPE:
840be5ca03e1 cmdserver: add service that listens on unix domain socket and forks process Yuya Nishihara <yuya@tcha.org> parents: 22990 diff changeset	367 raise
840be5ca03e1 cmdserver: add service that listens on unix domain socket and forks process Yuya Nishihara <yuya@tcha.org> parents: 22990 diff changeset	368 except KeyboardInterrupt:
840be5ca03e1 cmdserver: add service that listens on unix domain socket and forks process Yuya Nishihara <yuya@tcha.org> parents: 22990 diff changeset	369 pass
29512 538d0003c9e0 commandserver: promote .cleanup() hook from chgserver Yuya Nishihara <yuya@tcha.org> parents: 29511 diff changeset	370 finally:
538d0003c9e0 commandserver: promote .cleanup() hook from chgserver Yuya Nishihara <yuya@tcha.org> parents: 29511 diff changeset	371 sv.cleanup()
22994 840be5ca03e1 cmdserver: add service that listens on unix domain socket and forks process Yuya Nishihara <yuya@tcha.org> parents: 22990 diff changeset	372 except: # re-raises
840be5ca03e1 cmdserver: add service that listens on unix domain socket and forks process Yuya Nishihara <yuya@tcha.org> parents: 22990 diff changeset	373 # also write traceback to error channel. otherwise client cannot
840be5ca03e1 cmdserver: add service that listens on unix domain socket and forks process Yuya Nishihara <yuya@tcha.org> parents: 22990 diff changeset	374 # see it because it is written to server's stderr by default.
28511 ff5f923fca3c cmdserver: write early exception to 'e' channel in 'unix' mode Yuya Nishihara <yuya@tcha.org> parents: 28157 diff changeset	375 if sv:
ff5f923fca3c cmdserver: write early exception to 'e' channel in 'unix' mode Yuya Nishihara <yuya@tcha.org> parents: 28157 diff changeset	376 cerr = sv.cerr
ff5f923fca3c cmdserver: write early exception to 'e' channel in 'unix' mode Yuya Nishihara <yuya@tcha.org> parents: 28157 diff changeset	377 else:
29542 6011ad3b0a42 commandserver: manually create file objects from socket Yuya Nishihara <yuya@tcha.org> parents: 29532 diff changeset	378 cerr = channeledoutput(fout, 'e')
28511 ff5f923fca3c cmdserver: write early exception to 'e' channel in 'unix' mode Yuya Nishihara <yuya@tcha.org> parents: 28157 diff changeset	379 traceback.print_exc(file=cerr)
22994 840be5ca03e1 cmdserver: add service that listens on unix domain socket and forks process Yuya Nishihara <yuya@tcha.org> parents: 22990 diff changeset	380 raise
29513 e5b4d79a9140 commandserver: backport handling of forking server from chgserver Yuya Nishihara <yuya@tcha.org> parents: 29512 diff changeset	381 finally:
29542 6011ad3b0a42 commandserver: manually create file objects from socket Yuya Nishihara <yuya@tcha.org> parents: 29532 diff changeset	382 fin.close()
6011ad3b0a42 commandserver: manually create file objects from socket Yuya Nishihara <yuya@tcha.org> parents: 29532 diff changeset	383 try:
6011ad3b0a42 commandserver: manually create file objects from socket Yuya Nishihara <yuya@tcha.org> parents: 29532 diff changeset	384 fout.close() # implicit flush() may cause another EPIPE
6011ad3b0a42 commandserver: manually create file objects from socket Yuya Nishihara <yuya@tcha.org> parents: 29532 diff changeset	385 except IOError as inst:
6011ad3b0a42 commandserver: manually create file objects from socket Yuya Nishihara <yuya@tcha.org> parents: 29532 diff changeset	386 if inst.errno != errno.EPIPE:
6011ad3b0a42 commandserver: manually create file objects from socket Yuya Nishihara <yuya@tcha.org> parents: 29532 diff changeset	387 raise
29513 e5b4d79a9140 commandserver: backport handling of forking server from chgserver Yuya Nishihara <yuya@tcha.org> parents: 29512 diff changeset	388 # trigger __del__ since ForkingMixIn uses os._exit
e5b4d79a9140 commandserver: backport handling of forking server from chgserver Yuya Nishihara <yuya@tcha.org> parents: 29512 diff changeset	389 gc.collect()
22994 840be5ca03e1 cmdserver: add service that listens on unix domain socket and forks process Yuya Nishihara <yuya@tcha.org> parents: 22990 diff changeset	390
29544 024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	391 class unixservicehandler(object):
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	392 """Set of pluggable operations for unix-mode services
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	393
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	394 Almost all methods except for createcmdserver() are called in the main
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	395 process. You can't pass mutable resource back from createcmdserver().
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	396 """
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	397
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	398 pollinterval = None
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	399
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	400 def __init__(self, ui):
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	401 self.ui = ui
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	402
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	403 def bindsocket(self, sock, address):
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	404 util.bindunixsocket(sock, address)
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	405
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	406 def unlinksocket(self, address):
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	407 os.unlink(address)
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	408
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	409 def printbanner(self, address):
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	410 self.ui.status(_('listening at %s\n') % address)
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	411 self.ui.flush() # avoid buffering of status message
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	412
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	413 def shouldexit(self):
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	414 """True if server should shut down; checked per pollinterval"""
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	415 return False
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	416
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	417 def newconnection(self):
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	418 """Called when main process notices new connection"""
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	419 pass
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	420
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	421 def createcmdserver(self, repo, conn, fin, fout):
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	422 """Create new command server instance; called in the process that
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	423 serves for the current connection"""
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	424 return server(self.ui, repo, fin, fout)
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	425
29543 d74b8a4fde3b commandserver: extract function that serves for the current connection Yuya Nishihara <yuya@tcha.org> parents: 29542 diff changeset	426 class _requesthandler(socketserver.BaseRequestHandler):
d74b8a4fde3b commandserver: extract function that serves for the current connection Yuya Nishihara <yuya@tcha.org> parents: 29542 diff changeset	427 def handle(self):
d74b8a4fde3b commandserver: extract function that serves for the current connection Yuya Nishihara <yuya@tcha.org> parents: 29542 diff changeset	428 _serverequest(self.server.ui, self.server.repo, self.request,
d74b8a4fde3b commandserver: extract function that serves for the current connection Yuya Nishihara <yuya@tcha.org> parents: 29542 diff changeset	429 self._createcmdserver)
d74b8a4fde3b commandserver: extract function that serves for the current connection Yuya Nishihara <yuya@tcha.org> parents: 29542 diff changeset	430
d74b8a4fde3b commandserver: extract function that serves for the current connection Yuya Nishihara <yuya@tcha.org> parents: 29542 diff changeset	431 def _createcmdserver(self, repo, conn, fin, fout):
29511 540c01a18bb7 commandserver: extract method to create commandserver instance per request Yuya Nishihara <yuya@tcha.org> parents: 29433 diff changeset	432 ui = self.server.ui
29542 6011ad3b0a42 commandserver: manually create file objects from socket Yuya Nishihara <yuya@tcha.org> parents: 29532 diff changeset	433 return server(ui, repo, fin, fout)
29511 540c01a18bb7 commandserver: extract method to create commandserver instance per request Yuya Nishihara <yuya@tcha.org> parents: 29433 diff changeset	434
22994 840be5ca03e1 cmdserver: add service that listens on unix domain socket and forks process Yuya Nishihara <yuya@tcha.org> parents: 22990 diff changeset	435 class unixservice(object):
840be5ca03e1 cmdserver: add service that listens on unix domain socket and forks process Yuya Nishihara <yuya@tcha.org> parents: 22990 diff changeset	436 """
840be5ca03e1 cmdserver: add service that listens on unix domain socket and forks process Yuya Nishihara <yuya@tcha.org> parents: 22990 diff changeset	437 Listens on unix domain socket and forks server per connection
840be5ca03e1 cmdserver: add service that listens on unix domain socket and forks process Yuya Nishihara <yuya@tcha.org> parents: 22990 diff changeset	438 """
840be5ca03e1 cmdserver: add service that listens on unix domain socket and forks process Yuya Nishihara <yuya@tcha.org> parents: 22990 diff changeset	439 def __init__(self, ui, repo, opts):
840be5ca03e1 cmdserver: add service that listens on unix domain socket and forks process Yuya Nishihara <yuya@tcha.org> parents: 22990 diff changeset	440 self.ui = ui
840be5ca03e1 cmdserver: add service that listens on unix domain socket and forks process Yuya Nishihara <yuya@tcha.org> parents: 22990 diff changeset	441 self.repo = repo
840be5ca03e1 cmdserver: add service that listens on unix domain socket and forks process Yuya Nishihara <yuya@tcha.org> parents: 22990 diff changeset	442 self.address = opts['address']
29433 33770d2b6cf9 py3: conditionalize SocketServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29366 diff changeset	443 if not util.safehasattr(socketserver, 'UnixStreamServer'):
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 25832 diff changeset	444 raise error.Abort(_('unsupported platform'))
22994 840be5ca03e1 cmdserver: add service that listens on unix domain socket and forks process Yuya Nishihara <yuya@tcha.org> parents: 22990 diff changeset	445 if not self.address:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 25832 diff changeset	446 raise error.Abort(_('no socket path specified with --address'))
22994 840be5ca03e1 cmdserver: add service that listens on unix domain socket and forks process Yuya Nishihara <yuya@tcha.org> parents: 22990 diff changeset	447
840be5ca03e1 cmdserver: add service that listens on unix domain socket and forks process Yuya Nishihara <yuya@tcha.org> parents: 22990 diff changeset	448 def init(self):
29433 33770d2b6cf9 py3: conditionalize SocketServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29366 diff changeset	449 class cls(socketserver.ForkingMixIn, socketserver.UnixStreamServer):
22994 840be5ca03e1 cmdserver: add service that listens on unix domain socket and forks process Yuya Nishihara <yuya@tcha.org> parents: 22990 diff changeset	450 ui = self.ui
840be5ca03e1 cmdserver: add service that listens on unix domain socket and forks process Yuya Nishihara <yuya@tcha.org> parents: 22990 diff changeset	451 repo = self.repo
840be5ca03e1 cmdserver: add service that listens on unix domain socket and forks process Yuya Nishihara <yuya@tcha.org> parents: 22990 diff changeset	452 self.server = cls(self.address, _requesthandler)
840be5ca03e1 cmdserver: add service that listens on unix domain socket and forks process Yuya Nishihara <yuya@tcha.org> parents: 22990 diff changeset	453 self.ui.status(_('listening at %s\n') % self.address)
840be5ca03e1 cmdserver: add service that listens on unix domain socket and forks process Yuya Nishihara <yuya@tcha.org> parents: 22990 diff changeset	454 self.ui.flush() # avoid buffering of status message
840be5ca03e1 cmdserver: add service that listens on unix domain socket and forks process Yuya Nishihara <yuya@tcha.org> parents: 22990 diff changeset	455
29532 dda6bf886839 commandserver: extract _cleanup() hook to clarify chg is doing differently Yuya Nishihara <yuya@tcha.org> parents: 29513 diff changeset	456 def _cleanup(self):
dda6bf886839 commandserver: extract _cleanup() hook to clarify chg is doing differently Yuya Nishihara <yuya@tcha.org> parents: 29513 diff changeset	457 os.unlink(self.address)
dda6bf886839 commandserver: extract _cleanup() hook to clarify chg is doing differently Yuya Nishihara <yuya@tcha.org> parents: 29513 diff changeset	458
22994 840be5ca03e1 cmdserver: add service that listens on unix domain socket and forks process Yuya Nishihara <yuya@tcha.org> parents: 22990 diff changeset	459 def run(self):
840be5ca03e1 cmdserver: add service that listens on unix domain socket and forks process Yuya Nishihara <yuya@tcha.org> parents: 22990 diff changeset	460 try:
840be5ca03e1 cmdserver: add service that listens on unix domain socket and forks process Yuya Nishihara <yuya@tcha.org> parents: 22990 diff changeset	461 self.server.serve_forever()
840be5ca03e1 cmdserver: add service that listens on unix domain socket and forks process Yuya Nishihara <yuya@tcha.org> parents: 22990 diff changeset	462 finally:
29532 dda6bf886839 commandserver: extract _cleanup() hook to clarify chg is doing differently Yuya Nishihara <yuya@tcha.org> parents: 29513 diff changeset	463 self._cleanup()
22994 840be5ca03e1 cmdserver: add service that listens on unix domain socket and forks process Yuya Nishihara <yuya@tcha.org> parents: 22990 diff changeset	464
29544 024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	465 class unixforkingservice(unixservice):
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	466 def __init__(self, ui, repo, opts, handler=None):
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	467 super(unixforkingservice, self).__init__(ui, repo, opts)
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	468 self._servicehandler = handler or unixservicehandler(ui)
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	469 self._sock = None
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	470 self._oldsigchldhandler = None
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	471 self._workerpids = set() # updated by signal handler; do not iterate
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	472
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	473 def init(self):
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	474 self._sock = socket.socket(socket.AF_UNIX)
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	475 self._servicehandler.bindsocket(self._sock, self.address)
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	476 self._sock.listen(5)
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	477 o = signal.signal(signal.SIGCHLD, self._sigchldhandler)
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	478 self._oldsigchldhandler = o
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	479 self._servicehandler.printbanner(self.address)
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	480
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	481 def _cleanup(self):
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	482 signal.signal(signal.SIGCHLD, self._oldsigchldhandler)
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	483 self._sock.close()
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	484 self._servicehandler.unlinksocket(self.address)
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	485 # don't kill child processes as they have active clients, just wait
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	486 self._reapworkers(0)
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	487
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	488 def run(self):
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	489 try:
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	490 self._mainloop()
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	491 finally:
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	492 self._cleanup()
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	493
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	494 def _mainloop(self):
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	495 h = self._servicehandler
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	496 while not h.shouldexit():
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	497 try:
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	498 ready = select.select([self._sock], [], [], h.pollinterval)[0]
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	499 if not ready:
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	500 continue
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	501 conn, _addr = self._sock.accept()
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	502 except (select.error, socket.error) as inst:
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	503 if inst.args[0] == errno.EINTR:
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	504 continue
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	505 raise
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	506
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	507 pid = os.fork()
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	508 if pid:
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	509 try:
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	510 self.ui.debug('forked worker process (pid=%d)\n' % pid)
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	511 self._workerpids.add(pid)
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	512 h.newconnection()
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	513 finally:
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	514 conn.close() # release handle in parent process
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	515 else:
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	516 try:
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	517 self._serveworker(conn)
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	518 conn.close()
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	519 os._exit(0)
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	520 except: # never return, hence no re-raises
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	521 try:
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	522 self.ui.traceback(force=True)
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	523 finally:
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	524 os._exit(255)
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	525
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	526 def _sigchldhandler(self, signal, frame):
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	527 self._reapworkers(os.WNOHANG)
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	528
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	529 def _reapworkers(self, options):
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	530 while self._workerpids:
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	531 try:
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	532 pid, _status = os.waitpid(-1, options)
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	533 except OSError as inst:
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	534 if inst.errno == errno.EINTR:
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	535 continue
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	536 if inst.errno != errno.ECHILD:
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	537 raise
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	538 # no child processes at all (reaped by other waitpid()?)
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	539 self._workerpids.clear()
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	540 return
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	541 if pid == 0:
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	542 # no waitable child processes
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	543 return
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	544 self.ui.debug('worker process exited (pid=%d)\n' % pid)
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	545 self._workerpids.discard(pid)
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	546
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	547 def _serveworker(self, conn):
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	548 signal.signal(signal.SIGCHLD, self._oldsigchldhandler)
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	549 h = self._servicehandler
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	550 _serverequest(self.ui, self.repo, conn, h.createcmdserver)
024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	551
22989 dc8803ce3dfe cmdserver: switch service objects by mode Yuya Nishihara <yuya@tcha.org> parents: 22988 diff changeset	552 _servicemap = {
dc8803ce3dfe cmdserver: switch service objects by mode Yuya Nishihara <yuya@tcha.org> parents: 22988 diff changeset	553 'pipe': pipeservice,
29544 024e8f82f3de commandserver: add new forking server implemented without using SocketServer Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	554 'unix': unixforkingservice,
22989 dc8803ce3dfe cmdserver: switch service objects by mode Yuya Nishihara <yuya@tcha.org> parents: 22988 diff changeset	555 }
dc8803ce3dfe cmdserver: switch service objects by mode Yuya Nishihara <yuya@tcha.org> parents: 22988 diff changeset	556
dc8803ce3dfe cmdserver: switch service objects by mode Yuya Nishihara <yuya@tcha.org> parents: 22988 diff changeset	557 def createservice(ui, repo, opts):
dc8803ce3dfe cmdserver: switch service objects by mode Yuya Nishihara <yuya@tcha.org> parents: 22988 diff changeset	558 mode = opts['cmdserver']
dc8803ce3dfe cmdserver: switch service objects by mode Yuya Nishihara <yuya@tcha.org> parents: 22988 diff changeset	559 try:
dc8803ce3dfe cmdserver: switch service objects by mode Yuya Nishihara <yuya@tcha.org> parents: 22988 diff changeset	560 return _servicemap[mode](ui, repo, opts)
dc8803ce3dfe cmdserver: switch service objects by mode Yuya Nishihara <yuya@tcha.org> parents: 22988 diff changeset	561 except KeyError:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 25832 diff changeset	562 raise error.Abort(_('unknown mode %s') % mode)

Mercurial > public > mercurial-scm > hg

annotate mercurial/commandserver.py @ 29544:024e8f82f3de