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

annotate mercurial/chgserver.py @ 40110:d1338b4e39d0

chgserver: catch Abort while parsing early args to shut down cleanly _loadnewui() calls dispatcher functions, which may raise Abort if unparsable arguments are passed in. The server should catch such errors and translate them to the "exit 255" instruction so the client can finish the IPC session cleanly. Spotted while porting the chg client to Rust.

author	Yuya Nishihara <yuya@tcha.org>
date	Sun, 07 Oct 2018 17:35:25 +0900
parents	e5fbdc3659fc
children	c93d046d4300

rev	line source
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	1 # chgserver.py - command server extension for cHg
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	2 #
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	3 # Copyright 2011 Yuya Nishihara <yuya@tcha.org>
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	4 #
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	5 # This software may be used and distributed according to the terms of the
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	6 # GNU General Public License version 2 or any later version.
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	7
30513 ff7df4bb75de chgserver: make it a core module and drop extension flags Yuya Nishihara <yuya@tcha.org> parents: 30512 diff changeset	8 """command server extension for cHg
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	9
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	10 'S' channel (read/write)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	11 propagate ui.system() request to client
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	12
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	13 'attachio' command
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	14 attach client's stdio passed by sendmsg()
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	15
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	16 'chdir' command
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	17 change current directory
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	18
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	19 'setenv' command
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	20 replace os.environ completely
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	21
40108 e5fbdc3659fc chgserver: add "setumask2" command which uses correct message frame Yuya Nishihara <yuya@tcha.org> parents: 39840 diff changeset	22 'setumask' command (DEPRECATED)
e5fbdc3659fc chgserver: add "setumask2" command which uses correct message frame Yuya Nishihara <yuya@tcha.org> parents: 39840 diff changeset	23 'setumask2' command
28325 9fec3cb8d128 chgserver: update docs Jun Wu <quark@fb.com> parents: 28277 diff changeset	24 set umask
9fec3cb8d128 chgserver: update docs Jun Wu <quark@fb.com> parents: 28277 diff changeset	25
28350 8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	26 'validate' command
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	27 reload the config and check if the server is up to date
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	28
28325 9fec3cb8d128 chgserver: update docs Jun Wu <quark@fb.com> parents: 28277 diff changeset	29 Config
9fec3cb8d128 chgserver: update docs Jun Wu <quark@fb.com> parents: 28277 diff changeset	30 ------
9fec3cb8d128 chgserver: update docs Jun Wu <quark@fb.com> parents: 28277 diff changeset	31
9fec3cb8d128 chgserver: update docs Jun Wu <quark@fb.com> parents: 28277 diff changeset	32 ::
9fec3cb8d128 chgserver: update docs Jun Wu <quark@fb.com> parents: 28277 diff changeset	33
9fec3cb8d128 chgserver: update docs Jun Wu <quark@fb.com> parents: 28277 diff changeset	34 [chgserver]
30990 cb899ee133d8 chgserver: move comments in config example Jun Wu <quark@fb.com> parents: 30924 diff changeset	35 # how long (in seconds) should an idle chg server exit
cb899ee133d8 chgserver: move comments in config example Jun Wu <quark@fb.com> parents: 30924 diff changeset	36 idletimeout = 3600
cb899ee133d8 chgserver: move comments in config example Jun Wu <quark@fb.com> parents: 30924 diff changeset	37
cb899ee133d8 chgserver: move comments in config example Jun Wu <quark@fb.com> parents: 30924 diff changeset	38 # whether to skip config or env change checks
cb899ee133d8 chgserver: move comments in config example Jun Wu <quark@fb.com> parents: 30924 diff changeset	39 skiphash = False
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	40 """
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	41
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	42 from __future__ import absolute_import
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	43
29341 0d83ad967bf8 cleanup: replace uses of util.(md5\|sha1\|sha256\|sha512) with hashlib.\1 Augie Fackler <raf@durin42.com> parents: 29101 diff changeset	44 import hashlib
28276 b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	45 import inspect
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	46 import os
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	47 import re
32236 c8b9943c07eb commandserver: move "listen" responsibility from service to handler Jun Wu <quark@fb.com> parents: 32208 diff changeset	48 import socket
36781 ffa3026d4196 cleanup: use stat_result[stat.ST_MTIME] instead of stat_result.st_mtime Augie Fackler <augie@google.com> parents: 35582 diff changeset	49 import stat
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	50 import struct
28223 0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	51 import time
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	52
30513 ff7df4bb75de chgserver: make it a core module and drop extension flags Yuya Nishihara <yuya@tcha.org> parents: 30512 diff changeset	53 from .i18n import _
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	54
30513 ff7df4bb75de chgserver: make it a core module and drop extension flags Yuya Nishihara <yuya@tcha.org> parents: 30512 diff changeset	55 from . import (
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	56 commandserver,
30635 a150173da1c1 py3: replace os.environ with encoding.environ (part 2 of 5) Pulkit Goyal <7895pulkit@gmail.com> parents: 30619 diff changeset	57 encoding,
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	58 error,
28276 b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	59 extensions,
35582 72b91f905065 py3: use node.hex(h.digest()) instead of h.hexdigest() Pulkit Goyal <7895pulkit@gmail.com> parents: 35224 diff changeset	60 node,
30669 10b17ed9b591 py3: replace sys.executable with pycompat.sysexecutable Pulkit Goyal <7895pulkit@gmail.com> parents: 30645 diff changeset	61 pycompat,
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	62 util,
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	63 )
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	64
37119 d4a2e0d5d042 procutil: bulk-replace util.std* to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36835 diff changeset	65 from .utils import (
d4a2e0d5d042 procutil: bulk-replace util.std* to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36835 diff changeset	66 procutil,
d4a2e0d5d042 procutil: bulk-replace util.std* to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36835 diff changeset	67 )
d4a2e0d5d042 procutil: bulk-replace util.std* to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36835 diff changeset	68
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	69 _log = commandserver.log
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	70
28262 53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	71 def _hashlist(items):
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	72 """return sha1 hexdigest for a list"""
35582 72b91f905065 py3: use node.hex(h.digest()) instead of h.hexdigest() Pulkit Goyal <7895pulkit@gmail.com> parents: 35224 diff changeset	73 return node.hex(hashlib.sha1(str(items)).digest())
28262 53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	74
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	75 # sensitive config sections affecting confighash
28478 e6e183687545 chgserver: include [extdiff] in confighash Jun Wu <quark@fb.com> parents: 28454 diff changeset	76 _configsections = [
29101 57a24a85a2bc chgserver: add [alias] to confighash Jun Wu <quark@fb.com> parents: 29088 diff changeset	77 'alias', # affects global state commands.table
34485 37b7581e5737 eol: make [eol] config section sensitive for chg confighash Jun Wu <quark@fb.com> parents: 33860 diff changeset	78 'eol', # uses setconfig('eol', ...)
28478 e6e183687545 chgserver: include [extdiff] in confighash Jun Wu <quark@fb.com> parents: 28454 diff changeset	79 'extdiff', # uisetup will register new commands
e6e183687545 chgserver: include [extdiff] in confighash Jun Wu <quark@fb.com> parents: 28454 diff changeset	80 'extensions',
e6e183687545 chgserver: include [extdiff] in confighash Jun Wu <quark@fb.com> parents: 28454 diff changeset	81 ]
28262 53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	82
34839 110040e715c9 test-show: make it compatible with chg Jun Wu <quark@fb.com> parents: 34485 diff changeset	83 _configsectionitems = [
110040e715c9 test-show: make it compatible with chg Jun Wu <quark@fb.com> parents: 34485 diff changeset	84 ('commands', 'show.aliasprefix'), # show.py reads it in extsetup
110040e715c9 test-show: make it compatible with chg Jun Wu <quark@fb.com> parents: 34485 diff changeset	85 ]
110040e715c9 test-show: make it compatible with chg Jun Wu <quark@fb.com> parents: 34485 diff changeset	86
28262 53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	87 # sensitive environment variables affecting confighash
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	88 _envre = re.compile(r'''\A(?:
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	89 CHGHG
32271 6096d27dc119 chgserver: more explicit about sensitive environ variables Jun Wu <quark@fb.com> parents: 32237 diff changeset	90 \|HG(?:DEMANDIMPORT\|EMITWARNINGS\|MODULEPOLICY\|PROF\|RCPATH)?
6096d27dc119 chgserver: more explicit about sensitive environ variables Jun Wu <quark@fb.com> parents: 32237 diff changeset	91 \|HG(?:ENCODING\|PLAIN).*
28262 53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	92 \|LANG(?:UAGE)?
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	93 \|LC_.*
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	94 \|LD_.*
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	95 \|PATH
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	96 \|PYTHON.*
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	97 \|TERM(?:INFO)?
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	98 \|TZ
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	99 )\Z''', re.X)
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	100
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	101 def _confighash(ui):
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	102 """return a quick hash for detecting config/env changes
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	103
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	104 confighash is the hash of sensitive config items and environment variables.
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	105
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	106 for chgserver, it is designed that once confighash changes, the server is
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	107 not qualified to serve its client and should redirect the client to a new
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	108 server. different from mtimehash, confighash change will not mark the
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	109 server outdated and exit since the user can have different configs at the
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	110 same time.
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	111 """
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	112 sectionitems = []
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	113 for section in _configsections:
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	114 sectionitems.append(ui.configitems(section))
34839 110040e715c9 test-show: make it compatible with chg Jun Wu <quark@fb.com> parents: 34485 diff changeset	115 for section, item in _configsectionitems:
110040e715c9 test-show: make it compatible with chg Jun Wu <quark@fb.com> parents: 34485 diff changeset	116 sectionitems.append(ui.config(section, item))
28262 53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	117 sectionhash = _hashlist(sectionitems)
34887 7bf7544fd6cc chgserver: do not treat HG as sensitive environ when CHGHG is set Jun Wu <quark@fb.com> parents: 34839 diff changeset	118 # If $CHGHG is set, the change to $HG should not trigger a new chg server
7bf7544fd6cc chgserver: do not treat HG as sensitive environ when CHGHG is set Jun Wu <quark@fb.com> parents: 34839 diff changeset	119 if 'CHGHG' in encoding.environ:
7bf7544fd6cc chgserver: do not treat HG as sensitive environ when CHGHG is set Jun Wu <quark@fb.com> parents: 34839 diff changeset	120 ignored = {'HG'}
7bf7544fd6cc chgserver: do not treat HG as sensitive environ when CHGHG is set Jun Wu <quark@fb.com> parents: 34839 diff changeset	121 else:
7bf7544fd6cc chgserver: do not treat HG as sensitive environ when CHGHG is set Jun Wu <quark@fb.com> parents: 34839 diff changeset	122 ignored = set()
30635 a150173da1c1 py3: replace os.environ with encoding.environ (part 2 of 5) Pulkit Goyal <7895pulkit@gmail.com> parents: 30619 diff changeset	123 envitems = [(k, v) for k, v in encoding.environ.iteritems()
34887 7bf7544fd6cc chgserver: do not treat HG as sensitive environ when CHGHG is set Jun Wu <quark@fb.com> parents: 34839 diff changeset	124 if _envre.match(k) and k not in ignored]
28262 53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	125 envhash = _hashlist(sorted(envitems))
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	126 return sectionhash[:6] + envhash[:6]
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	127
28276 b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	128 def _getmtimepaths(ui):
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	129 """get a list of paths that should be checked to detect change
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	130
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	131 The list will include:
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	132 - extensions (will not cover all files for complex extensions)
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	133 - mercurial/__version__.py
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	134 - python binary
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	135 """
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	136 modules = [m for n, m in extensions.extensions(ui)]
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	137 try:
30513 ff7df4bb75de chgserver: make it a core module and drop extension flags Yuya Nishihara <yuya@tcha.org> parents: 30512 diff changeset	138 from . import __version__
28276 b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	139 modules.append(__version__)
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	140 except ImportError:
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	141 pass
30669 10b17ed9b591 py3: replace sys.executable with pycompat.sysexecutable Pulkit Goyal <7895pulkit@gmail.com> parents: 30645 diff changeset	142 files = [pycompat.sysexecutable]
28276 b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	143 for m in modules:
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	144 try:
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	145 files.append(inspect.getabsfile(m))
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	146 except TypeError:
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	147 pass
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	148 return sorted(set(files))
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	149
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	150 def _mtimehash(paths):
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	151 """return a quick hash for detecting file changes
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	152
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	153 mtimehash calls stat on given paths and calculate a hash based on size and
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	154 mtime of each file. mtimehash does not read file content because reading is
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	155 expensive. therefore it's not 100% reliable for detecting content changes.
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	156 it's possible to return different hashes for same file contents.
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	157 it's also possible to return a same hash for different file contents for
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	158 some carefully crafted situation.
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	159
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	160 for chgserver, it is designed that once mtimehash changes, the server is
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	161 considered outdated immediately and should no longer provide service.
29462 71ed5a3ef8a9 chgserver: document why we don't merge mtimehash and confighash Jun Wu <quark@fb.com> parents: 29433 diff changeset	162
71ed5a3ef8a9 chgserver: document why we don't merge mtimehash and confighash Jun Wu <quark@fb.com> parents: 29433 diff changeset	163 mtimehash is not included in confighash because we only know the paths of
71ed5a3ef8a9 chgserver: document why we don't merge mtimehash and confighash Jun Wu <quark@fb.com> parents: 29433 diff changeset	164 extensions after importing them (there is imp.find_module but that faces
71ed5a3ef8a9 chgserver: document why we don't merge mtimehash and confighash Jun Wu <quark@fb.com> parents: 29433 diff changeset	165 race conditions). We need to calculate confighash without importing.
28276 b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	166 """
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	167 def trystat(path):
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	168 try:
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	169 st = os.stat(path)
36781 ffa3026d4196 cleanup: use stat_result[stat.ST_MTIME] instead of stat_result.st_mtime Augie Fackler <augie@google.com> parents: 35582 diff changeset	170 return (st[stat.ST_MTIME], st.st_size)
28276 b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	171 except OSError:
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	172 # could be ENOENT, EPERM etc. not fatal in any case
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	173 pass
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	174 return _hashlist(map(trystat, paths))[:12]
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	175
28277 cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	176 class hashstate(object):
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	177 """a structure storing confighash, mtimehash, paths used for mtimehash"""
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	178 def __init__(self, confighash, mtimehash, mtimepaths):
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	179 self.confighash = confighash
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	180 self.mtimehash = mtimehash
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	181 self.mtimepaths = mtimepaths
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	182
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	183 @staticmethod
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	184 def fromui(ui, mtimepaths=None):
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	185 if mtimepaths is None:
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	186 mtimepaths = _getmtimepaths(ui)
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	187 confighash = _confighash(ui)
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	188 mtimehash = _mtimehash(mtimepaths)
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	189 _log('confighash = %s mtimehash = %s\n' % (confighash, mtimehash))
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	190 return hashstate(confighash, mtimehash, mtimepaths)
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	191
30740 493935e0327a chgserver: implement chgui._runpager Jun Wu <quark@fb.com> parents: 30739 diff changeset	192 def _newchgui(srcui, csystem, attachio):
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	193 class chgui(srcui.__class__):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	194 def __init__(self, src=None):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	195 super(chgui, self).__init__(src)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	196 if src:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	197 self._csystem = getattr(src, '_csystem', csystem)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	198 else:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	199 self._csystem = csystem
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	200
31108 3f8f53190d6a chg: deduplicate error handling of ui.system() Yuya Nishihara <yuya@tcha.org> parents: 31107 diff changeset	201 def _runsystem(self, cmd, environ, cwd, out):
39808 1b9be0b26511 chgserver: update comment describing when to fall back to core _runsystem() Yuya Nishihara <yuya@tcha.org> parents: 37120 diff changeset	202 # fallback to the original system method if
1b9be0b26511 chgserver: update comment describing when to fall back to core _runsystem() Yuya Nishihara <yuya@tcha.org> parents: 37120 diff changeset	203 # a. the output stream is not stdout (e.g. stderr, cStringIO),
39809 23a00bc90a3c chgserver: do not send system() back to client if stdio redirected (issue5992) Yuya Nishihara <yuya@tcha.org> parents: 39808 diff changeset	204 # b. or stdout is redirected by protectstdio(),
39808 1b9be0b26511 chgserver: update comment describing when to fall back to core _runsystem() Yuya Nishihara <yuya@tcha.org> parents: 37120 diff changeset	205 # because the chg client is not aware of these situations and
1b9be0b26511 chgserver: update comment describing when to fall back to core _runsystem() Yuya Nishihara <yuya@tcha.org> parents: 37120 diff changeset	206 # will behave differently (i.e. write to stdout).
31107 fbce78c58f1e chg: refactor ui.system() to be partly overridden Yuya Nishihara <yuya@tcha.org> parents: 30990 diff changeset	207 if (out is not self.fout
28586 82cee85d5274 chgserver: use old ui.system if fout is not stdout or needs to be captured Jun Wu <quark@fb.com> parents: 28553 diff changeset	208 or not util.safehasattr(self.fout, 'fileno')
39809 23a00bc90a3c chgserver: do not send system() back to client if stdio redirected (issue5992) Yuya Nishihara <yuya@tcha.org> parents: 39808 diff changeset	209 or self.fout.fileno() != procutil.stdout.fileno()
23a00bc90a3c chgserver: do not send system() back to client if stdio redirected (issue5992) Yuya Nishihara <yuya@tcha.org> parents: 39808 diff changeset	210 or self._finoutredirected):
37120 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37119 diff changeset	211 return procutil.system(cmd, environ=environ, cwd=cwd, out=out)
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	212 self.flush()
37120 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37119 diff changeset	213 return self._csystem(cmd, procutil.shellenviron(environ), cwd)
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	214
31954 e518192d6bac pager: set some environment variables if they're not set Jun Wu <quark@fb.com> parents: 31695 diff changeset	215 def _runpager(self, cmd, env=None):
37120 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37119 diff changeset	216 self._csystem(cmd, procutil.shellenviron(env), type='pager',
30740 493935e0327a chgserver: implement chgui._runpager Jun Wu <quark@fb.com> parents: 30739 diff changeset	217 cmdtable={'attachio': attachio})
31690 2d11d278279a ui: defer setting pager related properties until the pager has spawned Matt Harbison <matt_harbison@yahoo.com> parents: 31545 diff changeset	218 return True
30740 493935e0327a chgserver: implement chgui._runpager Jun Wu <quark@fb.com> parents: 30739 diff changeset	219
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	220 return chgui(srcui)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	221
28602 83127a9fe76e chgserver: drop old hack to recreate ui on HGPLAIN change Yuya Nishihara <yuya@tcha.org> parents: 28599 diff changeset	222 def _loadnewui(srcui, args):
30513 ff7df4bb75de chgserver: make it a core module and drop extension flags Yuya Nishihara <yuya@tcha.org> parents: 30512 diff changeset	223 from . import dispatch # avoid cycle
30512 cc374292a561 chgserver: delay importing commands and dispatch modules Yuya Nishihara <yuya@tcha.org> parents: 30511 diff changeset	224
30572 cfb227016d01 chgserver: call "load" for new ui objects Jun Wu <quark@fb.com> parents: 30513 diff changeset	225 newui = srcui.__class__.load()
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	226 for a in ['fin', 'fout', 'ferr', 'environ']:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	227 setattr(newui, a, getattr(srcui, a))
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	228 if util.safehasattr(srcui, '_csystem'):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	229 newui._csystem = srcui._csystem
28264 3682e201cce6 chgserver: make _renewui load repo and command line configs Jun Wu <quark@fb.com> parents: 28262 diff changeset	230
3682e201cce6 chgserver: make _renewui load repo and command line configs Jun Wu <quark@fb.com> parents: 28262 diff changeset	231 # command line args
35224 6e6d0a5b88e6 dispatch: replace _earlyreq() with new fancyopts-based parser Yuya Nishihara <yuya@tcha.org>* parents: 35170 diff changeset	232 options = dispatch._earlyparseopts(newui, args)
35170 c9740b69b9b7 dispatch: add HGPLAIN=+strictflags to restrict early parsing of global options Yuya Nishihara <yuya@tcha.org> parents: 35033 diff changeset	233 dispatch._parseconfig(newui, options['config'])
28264 3682e201cce6 chgserver: make _renewui load repo and command line configs Jun Wu <quark@fb.com> parents: 28262 diff changeset	234
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	235 # stolen from tortoisehg.util.copydynamicconfig()
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	236 for section, name, value in srcui.walkconfig():
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	237 source = srcui.configsource(section, name)
31695 d73490957d61 chgserver: do not copy configs set by environment variables Jun Wu <quark@fb.com> parents: 31690 diff changeset	238 if ':' in source or source == '--config' or source.startswith('$'):
d73490957d61 chgserver: do not copy configs set by environment variables Jun Wu <quark@fb.com> parents: 31690 diff changeset	239 # path:line or command line, or environ
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	240 continue
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	241 newui.setconfig(section, name, value, source)
28599 0e7a929754aa chgserver: use global ui instead of repo ui for dispatch.request.ui Jun Wu <quark@fb.com> parents: 28586 diff changeset	242
0e7a929754aa chgserver: use global ui instead of repo ui for dispatch.request.ui Jun Wu <quark@fb.com> parents: 28586 diff changeset	243 # load wd and repo config, copied from dispatch.py
35170 c9740b69b9b7 dispatch: add HGPLAIN=+strictflags to restrict early parsing of global options Yuya Nishihara <yuya@tcha.org> parents: 35033 diff changeset	244 cwd = options['cwd']
c9740b69b9b7 dispatch: add HGPLAIN=+strictflags to restrict early parsing of global options Yuya Nishihara <yuya@tcha.org> parents: 35033 diff changeset	245 cwd = cwd and os.path.realpath(cwd) or None
c9740b69b9b7 dispatch: add HGPLAIN=+strictflags to restrict early parsing of global options Yuya Nishihara <yuya@tcha.org> parents: 35033 diff changeset	246 rpath = options['repository']
28599 0e7a929754aa chgserver: use global ui instead of repo ui for dispatch.request.ui Jun Wu <quark@fb.com> parents: 28586 diff changeset	247 path, newlui = dispatch._getlocal(newui, rpath, wd=cwd)
0e7a929754aa chgserver: use global ui instead of repo ui for dispatch.request.ui Jun Wu <quark@fb.com> parents: 28586 diff changeset	248
0e7a929754aa chgserver: use global ui instead of repo ui for dispatch.request.ui Jun Wu <quark@fb.com> parents: 28586 diff changeset	249 return (newui, newlui)
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	250
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	251 class channeledsystem(object):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	252 """Propagate ui.system() request in the following format:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	253
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	254 payload length (unsigned int),
30726 dd897eb1699e chg: send type information via S channel (BC) Jun Wu <quark@fb.com> parents: 30669 diff changeset	255 type, '\0',
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	256 cmd, '\0',
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	257 cwd, '\0',
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	258 envkey, '=', val, '\0',
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	259 ...
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	260 envkey, '=', val
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	261
30726 dd897eb1699e chg: send type information via S channel (BC) Jun Wu <quark@fb.com> parents: 30669 diff changeset	262 if type == 'system', waits for:
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	263
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	264 exitcode length (unsigned int),
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	265 exitcode (int)
30739 815e1cefd082 chgserver: make S channel support pager request Jun Wu <quark@fb.com> parents: 30737 diff changeset	266
815e1cefd082 chgserver: make S channel support pager request Jun Wu <quark@fb.com> parents: 30737 diff changeset	267 if type == 'pager', repetitively waits for a command name ending with '\n'
815e1cefd082 chgserver: make S channel support pager request Jun Wu <quark@fb.com> parents: 30737 diff changeset	268 and executes it defined by cmdtable, or exits the loop if the command name
815e1cefd082 chgserver: make S channel support pager request Jun Wu <quark@fb.com> parents: 30737 diff changeset	269 is empty.
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	270 """
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	271 def __init__(self, in_, out, channel):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	272 self.in_ = in_
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	273 self.out = out
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	274 self.channel = channel
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	275
30739 815e1cefd082 chgserver: make S channel support pager request Jun Wu <quark@fb.com> parents: 30737 diff changeset	276 def __call__(self, cmd, environ, cwd=None, type='system', cmdtable=None):
37120 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37119 diff changeset	277 args = [type, procutil.quotecommand(cmd), os.path.abspath(cwd or '.')]
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	278 args.extend('%s=%s' % (k, v) for k, v in environ.iteritems())
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	279 data = '\0'.join(args)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	280 self.out.write(struct.pack('>cI', self.channel, len(data)))
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	281 self.out.write(data)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	282 self.out.flush()
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	283
30727 18eb63ec8475 chgserver: check type passed to S channel Jun Wu <quark@fb.com> parents: 30726 diff changeset	284 if type == 'system':
18eb63ec8475 chgserver: check type passed to S channel Jun Wu <quark@fb.com> parents: 30726 diff changeset	285 length = self.in_.read(4)
18eb63ec8475 chgserver: check type passed to S channel Jun Wu <quark@fb.com> parents: 30726 diff changeset	286 length, = struct.unpack('>I', length)
18eb63ec8475 chgserver: check type passed to S channel Jun Wu <quark@fb.com> parents: 30726 diff changeset	287 if length != 4:
18eb63ec8475 chgserver: check type passed to S channel Jun Wu <quark@fb.com> parents: 30726 diff changeset	288 raise error.Abort(_('invalid response'))
18eb63ec8475 chgserver: check type passed to S channel Jun Wu <quark@fb.com> parents: 30726 diff changeset	289 rc, = struct.unpack('>i', self.in_.read(4))
18eb63ec8475 chgserver: check type passed to S channel Jun Wu <quark@fb.com> parents: 30726 diff changeset	290 return rc
30739 815e1cefd082 chgserver: make S channel support pager request Jun Wu <quark@fb.com> parents: 30737 diff changeset	291 elif type == 'pager':
815e1cefd082 chgserver: make S channel support pager request Jun Wu <quark@fb.com> parents: 30737 diff changeset	292 while True:
815e1cefd082 chgserver: make S channel support pager request Jun Wu <quark@fb.com> parents: 30737 diff changeset	293 cmd = self.in_.readline()[:-1]
815e1cefd082 chgserver: make S channel support pager request Jun Wu <quark@fb.com> parents: 30737 diff changeset	294 if not cmd:
815e1cefd082 chgserver: make S channel support pager request Jun Wu <quark@fb.com> parents: 30737 diff changeset	295 break
815e1cefd082 chgserver: make S channel support pager request Jun Wu <quark@fb.com> parents: 30737 diff changeset	296 if cmdtable and cmd in cmdtable:
815e1cefd082 chgserver: make S channel support pager request Jun Wu <quark@fb.com> parents: 30737 diff changeset	297 _log('pager subcommand: %s' % cmd)
815e1cefd082 chgserver: make S channel support pager request Jun Wu <quark@fb.com> parents: 30737 diff changeset	298 cmdtable[cmd]()
815e1cefd082 chgserver: make S channel support pager request Jun Wu <quark@fb.com> parents: 30737 diff changeset	299 else:
815e1cefd082 chgserver: make S channel support pager request Jun Wu <quark@fb.com> parents: 30737 diff changeset	300 raise error.Abort(_('unexpected command: %s') % cmd)
30727 18eb63ec8475 chgserver: check type passed to S channel Jun Wu <quark@fb.com> parents: 30726 diff changeset	301 else:
18eb63ec8475 chgserver: check type passed to S channel Jun Wu <quark@fb.com> parents: 30726 diff changeset	302 raise error.ProgrammingError('invalid S channel type: %s' % type)
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	303
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	304 _iochannels = [
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	305 # server.ch, ui.fp, mode
36835 5bc7ff103081 py3: use r'' instead of sysstr('') to get around code transformer Yuya Nishihara <yuya@tcha.org> parents: 36781 diff changeset	306 ('cin', 'fin', r'rb'),
5bc7ff103081 py3: use r'' instead of sysstr('') to get around code transformer Yuya Nishihara <yuya@tcha.org> parents: 36781 diff changeset	307 ('cout', 'fout', r'wb'),
5bc7ff103081 py3: use r'' instead of sysstr('') to get around code transformer Yuya Nishihara <yuya@tcha.org> parents: 36781 diff changeset	308 ('cerr', 'ferr', r'wb'),
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	309 ]
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	310
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	311 class chgcmdserver(commandserver.server):
28328 e00e57d83653 chgserver: pass hashstate and base server address to chgcmdserver Jun Wu <quark@fb.com> parents: 28327 diff changeset	312 def __init__(self, ui, repo, fin, fout, sock, hashstate, baseaddress):
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	313 super(chgcmdserver, self).__init__(
30740 493935e0327a chgserver: implement chgui._runpager Jun Wu <quark@fb.com> parents: 30739 diff changeset	314 _newchgui(ui, channeledsystem(fin, fout, 'S'), self.attachio),
493935e0327a chgserver: implement chgui._runpager Jun Wu <quark@fb.com> parents: 30739 diff changeset	315 repo, fin, fout)
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	316 self.clientsock = sock
39738 a93fe297dfb3 chgserver: add separate flag to remember if stdio fds are replaced Yuya Nishihara <yuya@tcha.org> parents: 37120 diff changeset	317 self._ioattached = False
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	318 self._oldios = [] # original (self.ch, ui.fp, fd) before "attachio"
28328 e00e57d83653 chgserver: pass hashstate and base server address to chgcmdserver Jun Wu <quark@fb.com> parents: 28327 diff changeset	319 self.hashstate = hashstate
e00e57d83653 chgserver: pass hashstate and base server address to chgcmdserver Jun Wu <quark@fb.com> parents: 28327 diff changeset	320 self.baseaddress = baseaddress
28350 8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	321 if hashstate is not None:
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	322 self.capabilities = self.capabilities.copy()
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	323 self.capabilities['validate'] = chgcmdserver.validate
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	324
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	325 def cleanup(self):
29512 538d0003c9e0 commandserver: promote .cleanup() hook from chgserver Yuya Nishihara <yuya@tcha.org> parents: 29511 diff changeset	326 super(chgcmdserver, self).cleanup()
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	327 # dispatch._runcatch() does not flush outputs if exception is not
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	328 # handled by dispatch._dispatch()
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	329 self.ui.flush()
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	330 self._restoreio()
39738 a93fe297dfb3 chgserver: add separate flag to remember if stdio fds are replaced Yuya Nishihara <yuya@tcha.org> parents: 37120 diff changeset	331 self._ioattached = False
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	332
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	333 def attachio(self):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	334 """Attach to client's stdio passed via unix domain socket; all
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	335 channels except cresult will no longer be used
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	336 """
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	337 # tell client to sendmsg() with 1-byte payload, which makes it
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	338 # distinctive from "attachio\n" command consumed by client.read()
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	339 self.clientsock.sendall(struct.pack('>cI', 'I', 1))
32208 d74b0cff94a9 osutil: proxy through util (and platform) modules (API) Yuya Nishihara <yuya@tcha.org> parents: 31954 diff changeset	340 clientfds = util.recvfds(self.clientsock.fileno())
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	341 _log('received fds: %r\n' % clientfds)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	342
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	343 ui = self.ui
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	344 ui.flush()
39738 a93fe297dfb3 chgserver: add separate flag to remember if stdio fds are replaced Yuya Nishihara <yuya@tcha.org> parents: 37120 diff changeset	345 self._saveio()
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	346 for fd, (cn, fn, mode) in zip(clientfds, _iochannels):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	347 assert fd > 0
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	348 fp = getattr(ui, fn)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	349 os.dup2(fd, fp.fileno())
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	350 os.close(fd)
39738 a93fe297dfb3 chgserver: add separate flag to remember if stdio fds are replaced Yuya Nishihara <yuya@tcha.org> parents: 37120 diff changeset	351 if self._ioattached:
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	352 continue
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	353 # reset buffering mode when client is first attached. as we want
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	354 # to see output immediately on pager, the mode stays unchanged
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	355 # when client re-attached. ferr is unchanged because it should
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	356 # be unbuffered no matter if it is a tty or not.
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	357 if fn == 'ferr':
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	358 newfp = fp
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	359 else:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	360 # make it line buffered explicitly because the default is
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	361 # decided on first write(), where fout could be a pager.
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	362 if fp.isatty():
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	363 bufsize = 1 # line buffered
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	364 else:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	365 bufsize = -1 # system default
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	366 newfp = os.fdopen(fp.fileno(), mode, bufsize)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	367 setattr(ui, fn, newfp)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	368 setattr(self, cn, newfp)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	369
39738 a93fe297dfb3 chgserver: add separate flag to remember if stdio fds are replaced Yuya Nishihara <yuya@tcha.org> parents: 37120 diff changeset	370 self._ioattached = True
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	371 self.cresult.write(struct.pack('>i', len(clientfds)))
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	372
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	373 def _saveio(self):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	374 if self._oldios:
39738 a93fe297dfb3 chgserver: add separate flag to remember if stdio fds are replaced Yuya Nishihara <yuya@tcha.org> parents: 37120 diff changeset	375 return
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	376 ui = self.ui
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	377 for cn, fn, _mode in _iochannels:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	378 ch = getattr(self, cn)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	379 fp = getattr(ui, fn)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	380 fd = os.dup(fp.fileno())
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	381 self._oldios.append((ch, fp, fd))
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	382
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	383 def _restoreio(self):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	384 ui = self.ui
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	385 for (ch, fp, fd), (cn, fn, _mode) in zip(self._oldios, _iochannels):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	386 newfp = getattr(ui, fn)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	387 # close newfp while it's associated with client; otherwise it
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	388 # would be closed when newfp is deleted
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	389 if newfp is not fp:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	390 newfp.close()
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	391 # restore original fd: fp is open again
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	392 os.dup2(fd, fp.fileno())
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	393 os.close(fd)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	394 setattr(self, cn, ch)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	395 setattr(ui, fn, fp)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	396 del self._oldios[:]
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	397
28350 8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	398 def validate(self):
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	399 """Reload the config and check if the server is up to date
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	400
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	401 Read a list of '\0' separated arguments.
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	402 Write a non-empty list of '\0' separated instruction strings or '\0'
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	403 if the list is empty.
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	404 An instruction string could be either:
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	405 - "unlink $path", the client should unlink the path to stop the
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	406 outdated server.
28535 aa082a8125da chgserver: add an explicit "reconnect" instruction to validate Jun Wu <quark@fb.com> parents: 28516 diff changeset	407 - "redirect $path", the client should attempt to connect to $path
aa082a8125da chgserver: add an explicit "reconnect" instruction to validate Jun Wu <quark@fb.com> parents: 28516 diff changeset	408 first. If it does not work, start a new server. It implies
aa082a8125da chgserver: add an explicit "reconnect" instruction to validate Jun Wu <quark@fb.com> parents: 28516 diff changeset	409 "reconnect".
28516 3bf2892f685f chgserver: handle ParseError during validate Jun Wu <quark@fb.com> parents: 28514 diff changeset	410 - "exit $n", the client should exit directly with code n.
3bf2892f685f chgserver: handle ParseError during validate Jun Wu <quark@fb.com> parents: 28514 diff changeset	411 This may happen if we cannot parse the config.
28535 aa082a8125da chgserver: add an explicit "reconnect" instruction to validate Jun Wu <quark@fb.com> parents: 28516 diff changeset	412 - "reconnect", the client should close the connection and
aa082a8125da chgserver: add an explicit "reconnect" instruction to validate Jun Wu <quark@fb.com> parents: 28516 diff changeset	413 reconnect.
aa082a8125da chgserver: add an explicit "reconnect" instruction to validate Jun Wu <quark@fb.com> parents: 28516 diff changeset	414 If neither "reconnect" nor "redirect" is included in the instruction
aa082a8125da chgserver: add an explicit "reconnect" instruction to validate Jun Wu <quark@fb.com> parents: 28516 diff changeset	415 list, the client can continue with this server after completing all
aa082a8125da chgserver: add an explicit "reconnect" instruction to validate Jun Wu <quark@fb.com> parents: 28516 diff changeset	416 the instructions.
28350 8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	417 """
30513 ff7df4bb75de chgserver: make it a core module and drop extension flags Yuya Nishihara <yuya@tcha.org> parents: 30512 diff changeset	418 from . import dispatch # avoid cycle
30512 cc374292a561 chgserver: delay importing commands and dispatch modules Yuya Nishihara <yuya@tcha.org> parents: 30511 diff changeset	419
28350 8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	420 args = self._readlist()
28516 3bf2892f685f chgserver: handle ParseError during validate Jun Wu <quark@fb.com> parents: 28514 diff changeset	421 try:
28599 0e7a929754aa chgserver: use global ui instead of repo ui for dispatch.request.ui Jun Wu <quark@fb.com> parents: 28586 diff changeset	422 self.ui, lui = _loadnewui(self.ui, args)
28516 3bf2892f685f chgserver: handle ParseError during validate Jun Wu <quark@fb.com> parents: 28514 diff changeset	423 except error.ParseError as inst:
3bf2892f685f chgserver: handle ParseError during validate Jun Wu <quark@fb.com> parents: 28514 diff changeset	424 dispatch._formatparse(self.ui.warn, inst)
3bf2892f685f chgserver: handle ParseError during validate Jun Wu <quark@fb.com> parents: 28514 diff changeset	425 self.ui.flush()
3bf2892f685f chgserver: handle ParseError during validate Jun Wu <quark@fb.com> parents: 28514 diff changeset	426 self.cresult.write('exit 255')
3bf2892f685f chgserver: handle ParseError during validate Jun Wu <quark@fb.com> parents: 28514 diff changeset	427 return
40110 d1338b4e39d0 chgserver: catch Abort while parsing early args to shut down cleanly Yuya Nishihara <yuya@tcha.org> parents: 40108 diff changeset	428 except error.Abort as inst:
d1338b4e39d0 chgserver: catch Abort while parsing early args to shut down cleanly Yuya Nishihara <yuya@tcha.org> parents: 40108 diff changeset	429 self.ui.error(_("abort: %s\n") % inst)
d1338b4e39d0 chgserver: catch Abort while parsing early args to shut down cleanly Yuya Nishihara <yuya@tcha.org> parents: 40108 diff changeset	430 if inst.hint:
d1338b4e39d0 chgserver: catch Abort while parsing early args to shut down cleanly Yuya Nishihara <yuya@tcha.org> parents: 40108 diff changeset	431 self.ui.error(_("(%s)\n") % inst.hint)
d1338b4e39d0 chgserver: catch Abort while parsing early args to shut down cleanly Yuya Nishihara <yuya@tcha.org> parents: 40108 diff changeset	432 self.ui.flush()
d1338b4e39d0 chgserver: catch Abort while parsing early args to shut down cleanly Yuya Nishihara <yuya@tcha.org> parents: 40108 diff changeset	433 self.cresult.write('exit 255')
d1338b4e39d0 chgserver: catch Abort while parsing early args to shut down cleanly Yuya Nishihara <yuya@tcha.org> parents: 40108 diff changeset	434 return
28599 0e7a929754aa chgserver: use global ui instead of repo ui for dispatch.request.ui Jun Wu <quark@fb.com> parents: 28586 diff changeset	435 newhash = hashstate.fromui(lui, self.hashstate.mtimepaths)
28350 8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	436 insts = []
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	437 if newhash.mtimehash != self.hashstate.mtimehash:
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	438 addr = _hashaddress(self.baseaddress, self.hashstate.confighash)
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	439 insts.append('unlink %s' % addr)
28536 a979f5b03320 chgserver: invalidate the server if extensions fail to load Jun Wu <quark@fb.com> parents: 28535 diff changeset	440 # mtimehash is empty if one or more extensions fail to load.
a979f5b03320 chgserver: invalidate the server if extensions fail to load Jun Wu <quark@fb.com> parents: 28535 diff changeset	441 # to be compatible with hg, still serve the client this time.
a979f5b03320 chgserver: invalidate the server if extensions fail to load Jun Wu <quark@fb.com> parents: 28535 diff changeset	442 if self.hashstate.mtimehash:
a979f5b03320 chgserver: invalidate the server if extensions fail to load Jun Wu <quark@fb.com> parents: 28535 diff changeset	443 insts.append('reconnect')
28350 8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	444 if newhash.confighash != self.hashstate.confighash:
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	445 addr = _hashaddress(self.baseaddress, newhash.confighash)
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	446 insts.append('redirect %s' % addr)
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	447 _log('validate: %s\n' % insts)
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	448 self.cresult.write('\0'.join(insts) or '\0')
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	449
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	450 def chdir(self):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	451 """Change current directory
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	452
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	453 Note that the behavior of --cwd option is bit different from this.
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	454 It does not affect --config parameter.
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	455 """
28158 7cc57a531f0c chgserver: use _readlist and _readstr Jun Wu <quark@fb.com> parents: 28014 diff changeset	456 path = self._readstr()
7cc57a531f0c chgserver: use _readlist and _readstr Jun Wu <quark@fb.com> parents: 28014 diff changeset	457 if not path:
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	458 return
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	459 _log('chdir to %r\n' % path)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	460 os.chdir(path)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	461
28159 d2d04d1d2f92 chgserver: add setumask method Jun Wu <quark@fb.com> parents: 28158 diff changeset	462 def setumask(self):
40108 e5fbdc3659fc chgserver: add "setumask2" command which uses correct message frame Yuya Nishihara <yuya@tcha.org> parents: 39840 diff changeset	463 """Change umask (DEPRECATED)"""
e5fbdc3659fc chgserver: add "setumask2" command which uses correct message frame Yuya Nishihara <yuya@tcha.org> parents: 39840 diff changeset	464 # BUG: this does not follow the message frame structure, but kept for
e5fbdc3659fc chgserver: add "setumask2" command which uses correct message frame Yuya Nishihara <yuya@tcha.org> parents: 39840 diff changeset	465 # backward compatibility with old chg clients for some time
e5fbdc3659fc chgserver: add "setumask2" command which uses correct message frame Yuya Nishihara <yuya@tcha.org> parents: 39840 diff changeset	466 self._setumask(self._read(4))
e5fbdc3659fc chgserver: add "setumask2" command which uses correct message frame Yuya Nishihara <yuya@tcha.org> parents: 39840 diff changeset	467
e5fbdc3659fc chgserver: add "setumask2" command which uses correct message frame Yuya Nishihara <yuya@tcha.org> parents: 39840 diff changeset	468 def setumask2(self):
28159 d2d04d1d2f92 chgserver: add setumask method Jun Wu <quark@fb.com> parents: 28158 diff changeset	469 """Change umask"""
40108 e5fbdc3659fc chgserver: add "setumask2" command which uses correct message frame Yuya Nishihara <yuya@tcha.org> parents: 39840 diff changeset	470 data = self._readstr()
e5fbdc3659fc chgserver: add "setumask2" command which uses correct message frame Yuya Nishihara <yuya@tcha.org> parents: 39840 diff changeset	471 if len(data) != 4:
e5fbdc3659fc chgserver: add "setumask2" command which uses correct message frame Yuya Nishihara <yuya@tcha.org> parents: 39840 diff changeset	472 raise ValueError('invalid mask length in setumask2 request')
e5fbdc3659fc chgserver: add "setumask2" command which uses correct message frame Yuya Nishihara <yuya@tcha.org> parents: 39840 diff changeset	473 self._setumask(data)
e5fbdc3659fc chgserver: add "setumask2" command which uses correct message frame Yuya Nishihara <yuya@tcha.org> parents: 39840 diff changeset	474
e5fbdc3659fc chgserver: add "setumask2" command which uses correct message frame Yuya Nishihara <yuya@tcha.org> parents: 39840 diff changeset	475 def _setumask(self, data):
e5fbdc3659fc chgserver: add "setumask2" command which uses correct message frame Yuya Nishihara <yuya@tcha.org> parents: 39840 diff changeset	476 mask = struct.unpack('>I', data)[0]
28159 d2d04d1d2f92 chgserver: add setumask method Jun Wu <quark@fb.com> parents: 28158 diff changeset	477 _log('setumask %r\n' % mask)
d2d04d1d2f92 chgserver: add setumask method Jun Wu <quark@fb.com> parents: 28158 diff changeset	478 os.umask(mask)
d2d04d1d2f92 chgserver: add setumask method Jun Wu <quark@fb.com> parents: 28158 diff changeset	479
30644 2bb8c53be961 chgserver: override runcommand Jun Wu <quark@fb.com> parents: 30643 diff changeset	480 def runcommand(self):
39739 7cdd47d9ccf8 chgserver: restore pager fds attached within runcommand session Yuya Nishihara <yuya@tcha.org> parents: 39738 diff changeset	481 # pager may be attached within the runcommand session, which should
7cdd47d9ccf8 chgserver: restore pager fds attached within runcommand session Yuya Nishihara <yuya@tcha.org> parents: 39738 diff changeset	482 # be detached at the end of the session. otherwise the pager wouldn't
7cdd47d9ccf8 chgserver: restore pager fds attached within runcommand session Yuya Nishihara <yuya@tcha.org> parents: 39738 diff changeset	483 # receive EOF.
7cdd47d9ccf8 chgserver: restore pager fds attached within runcommand session Yuya Nishihara <yuya@tcha.org> parents: 39738 diff changeset	484 globaloldios = self._oldios
7cdd47d9ccf8 chgserver: restore pager fds attached within runcommand session Yuya Nishihara <yuya@tcha.org> parents: 39738 diff changeset	485 self._oldios = []
7cdd47d9ccf8 chgserver: restore pager fds attached within runcommand session Yuya Nishihara <yuya@tcha.org> parents: 39738 diff changeset	486 try:
7cdd47d9ccf8 chgserver: restore pager fds attached within runcommand session Yuya Nishihara <yuya@tcha.org> parents: 39738 diff changeset	487 return super(chgcmdserver, self).runcommand()
7cdd47d9ccf8 chgserver: restore pager fds attached within runcommand session Yuya Nishihara <yuya@tcha.org> parents: 39738 diff changeset	488 finally:
7cdd47d9ccf8 chgserver: restore pager fds attached within runcommand session Yuya Nishihara <yuya@tcha.org> parents: 39738 diff changeset	489 self._restoreio()
7cdd47d9ccf8 chgserver: restore pager fds attached within runcommand session Yuya Nishihara <yuya@tcha.org> parents: 39738 diff changeset	490 self._oldios = globaloldios
30644 2bb8c53be961 chgserver: override runcommand Jun Wu <quark@fb.com> parents: 30643 diff changeset	491
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	492 def setenv(self):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	493 """Clear and update os.environ
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	494
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	495 Note that not all variables can make an effect on the running process.
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	496 """
28158 7cc57a531f0c chgserver: use _readlist and _readstr Jun Wu <quark@fb.com> parents: 28014 diff changeset	497 l = self._readlist()
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	498 try:
28158 7cc57a531f0c chgserver: use _readlist and _readstr Jun Wu <quark@fb.com> parents: 28014 diff changeset	499 newenv = dict(s.split('=', 1) for s in l)
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	500 except ValueError:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	501 raise ValueError('unexpected value in setenv request')
28602 83127a9fe76e chgserver: drop old hack to recreate ui on HGPLAIN change Yuya Nishihara <yuya@tcha.org> parents: 28599 diff changeset	502 _log('setenv: %r\n' % sorted(newenv.keys()))
30635 a150173da1c1 py3: replace os.environ with encoding.environ (part 2 of 5) Pulkit Goyal <7895pulkit@gmail.com> parents: 30619 diff changeset	503 encoding.environ.clear()
a150173da1c1 py3: replace os.environ with encoding.environ (part 2 of 5) Pulkit Goyal <7895pulkit@gmail.com> parents: 30619 diff changeset	504 encoding.environ.update(newenv)
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	505
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	506 capabilities = commandserver.server.capabilities.copy()
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	507 capabilities.update({'attachio': attachio,
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	508 'chdir': chdir,
30644 2bb8c53be961 chgserver: override runcommand Jun Wu <quark@fb.com> parents: 30643 diff changeset	509 'runcommand': runcommand,
28159 d2d04d1d2f92 chgserver: add setumask method Jun Wu <quark@fb.com> parents: 28158 diff changeset	510 'setenv': setenv,
40108 e5fbdc3659fc chgserver: add "setumask2" command which uses correct message frame Yuya Nishihara <yuya@tcha.org> parents: 39840 diff changeset	511 'setumask': setumask,
e5fbdc3659fc chgserver: add "setumask2" command which uses correct message frame Yuya Nishihara <yuya@tcha.org> parents: 39840 diff changeset	512 'setumask2': setumask2})
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	513
37120 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37119 diff changeset	514 if util.safehasattr(procutil, 'setprocname'):
30750 378686afca52 chgserver: add the setprocname interface Jun Wu <quark@fb.com> parents: 30741 diff changeset	515 def setprocname(self):
378686afca52 chgserver: add the setprocname interface Jun Wu <quark@fb.com> parents: 30741 diff changeset	516 """Change process title"""
378686afca52 chgserver: add the setprocname interface Jun Wu <quark@fb.com> parents: 30741 diff changeset	517 name = self._readstr()
378686afca52 chgserver: add the setprocname interface Jun Wu <quark@fb.com> parents: 30741 diff changeset	518 _log('setprocname: %r\n' % name)
37120 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37119 diff changeset	519 procutil.setprocname(name)
30750 378686afca52 chgserver: add the setprocname interface Jun Wu <quark@fb.com> parents: 30741 diff changeset	520 capabilities['setprocname'] = setprocname
378686afca52 chgserver: add the setprocname interface Jun Wu <quark@fb.com> parents: 30741 diff changeset	521
28223 0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	522 def _tempaddress(address):
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	523 return '%s.%d.tmp' % (address, os.getpid())
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	524
28326 ea400a4f32e6 chgserver: mangle server address to include confighash Jun Wu <quark@fb.com> parents: 28325 diff changeset	525 def _hashaddress(address, hashstr):
30619 88efb4fb1975 chgserver: truncate base address at "." for hash address Jun Wu <quark@fb.com> parents: 30618 diff changeset	526 # if the basename of address contains '.', use only the left part. this
88efb4fb1975 chgserver: truncate base address at "." for hash address Jun Wu <quark@fb.com> parents: 30618 diff changeset	527 # makes it possible for the client to pass 'server.tmp$PID' and follow by
88efb4fb1975 chgserver: truncate base address at "." for hash address Jun Wu <quark@fb.com> parents: 30618 diff changeset	528 # an atomic rename to avoid locking when spawning new servers.
88efb4fb1975 chgserver: truncate base address at "." for hash address Jun Wu <quark@fb.com> parents: 30618 diff changeset	529 dirname, basename = os.path.split(address)
88efb4fb1975 chgserver: truncate base address at "." for hash address Jun Wu <quark@fb.com> parents: 30618 diff changeset	530 basename = basename.split('.', 1)[0]
88efb4fb1975 chgserver: truncate base address at "." for hash address Jun Wu <quark@fb.com> parents: 30618 diff changeset	531 return '%s-%s' % (os.path.join(dirname, basename), hashstr)
28326 ea400a4f32e6 chgserver: mangle server address to include confighash Jun Wu <quark@fb.com> parents: 28325 diff changeset	532
29547 300318b7d66d chgserver: switch to new forking service Yuya Nishihara <yuya@tcha.org> parents: 29546 diff changeset	533 class chgunixservicehandler(object):
300318b7d66d chgserver: switch to new forking service Yuya Nishihara <yuya@tcha.org> parents: 29546 diff changeset	534 """Set of operations for chg services"""
300318b7d66d chgserver: switch to new forking service Yuya Nishihara <yuya@tcha.org> parents: 29546 diff changeset	535
300318b7d66d chgserver: switch to new forking service Yuya Nishihara <yuya@tcha.org> parents: 29546 diff changeset	536 pollinterval = 1 # [sec]
300318b7d66d chgserver: switch to new forking service Yuya Nishihara <yuya@tcha.org> parents: 29546 diff changeset	537
300318b7d66d chgserver: switch to new forking service Yuya Nishihara <yuya@tcha.org> parents: 29546 diff changeset	538 def __init__(self, ui):
300318b7d66d chgserver: switch to new forking service Yuya Nishihara <yuya@tcha.org> parents: 29546 diff changeset	539 self.ui = ui
33499 0407a51b9d8c codemod: register core configitems using a script Jun Wu <quark@fb.com> parents: 32271 diff changeset	540 self._idletimeout = ui.configint('chgserver', 'idletimeout')
29598 a67398726747 chgserver: rename private functions and variables of chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29597 diff changeset	541 self._lastactive = time.time()
29547 300318b7d66d chgserver: switch to new forking service Yuya Nishihara <yuya@tcha.org> parents: 29546 diff changeset	542
300318b7d66d chgserver: switch to new forking service Yuya Nishihara <yuya@tcha.org> parents: 29546 diff changeset	543 def bindsocket(self, sock, address):
29597 581c0c7cb258 chgserver: refactor initialization of real/base addresses Yuya Nishihara <yuya@tcha.org> parents: 29596 diff changeset	544 self._inithashstate(address)
29545 28aca3fafc2a chgserver: reorder service classes to make future patches readable Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	545 self._checkextensions()
29547 300318b7d66d chgserver: switch to new forking service Yuya Nishihara <yuya@tcha.org> parents: 29546 diff changeset	546 self._bind(sock)
29545 28aca3fafc2a chgserver: reorder service classes to make future patches readable Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	547 self._createsymlink()
32237 1ada3d18e7fb commandserver: move printbanner logic to bindsocket Jun Wu <quark@fb.com> parents: 32236 diff changeset	548 # no "listening at" message should be printed to simulate hg behavior
29545 28aca3fafc2a chgserver: reorder service classes to make future patches readable Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	549
29597 581c0c7cb258 chgserver: refactor initialization of real/base addresses Yuya Nishihara <yuya@tcha.org> parents: 29596 diff changeset	550 def _inithashstate(self, address):
29598 a67398726747 chgserver: rename private functions and variables of chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29597 diff changeset	551 self._baseaddress = address
33499 0407a51b9d8c codemod: register core configitems using a script Jun Wu <quark@fb.com> parents: 32271 diff changeset	552 if self.ui.configbool('chgserver', 'skiphash'):
29598 a67398726747 chgserver: rename private functions and variables of chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29597 diff changeset	553 self._hashstate = None
a67398726747 chgserver: rename private functions and variables of chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29597 diff changeset	554 self._realaddress = address
29545 28aca3fafc2a chgserver: reorder service classes to make future patches readable Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	555 return
29598 a67398726747 chgserver: rename private functions and variables of chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29597 diff changeset	556 self._hashstate = hashstate.fromui(self.ui)
a67398726747 chgserver: rename private functions and variables of chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29597 diff changeset	557 self._realaddress = _hashaddress(address, self._hashstate.confighash)
29545 28aca3fafc2a chgserver: reorder service classes to make future patches readable Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	558
28aca3fafc2a chgserver: reorder service classes to make future patches readable Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	559 def _checkextensions(self):
29598 a67398726747 chgserver: rename private functions and variables of chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29597 diff changeset	560 if not self._hashstate:
29545 28aca3fafc2a chgserver: reorder service classes to make future patches readable Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	561 return
28aca3fafc2a chgserver: reorder service classes to make future patches readable Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	562 if extensions.notloaded():
28aca3fafc2a chgserver: reorder service classes to make future patches readable Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	563 # one or more extensions failed to load. mtimehash becomes
28aca3fafc2a chgserver: reorder service classes to make future patches readable Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	564 # meaningless because we do not know the paths of those extensions.
28aca3fafc2a chgserver: reorder service classes to make future patches readable Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	565 # set mtimehash to an illegal hash value to invalidate the server.
29598 a67398726747 chgserver: rename private functions and variables of chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29597 diff changeset	566 self._hashstate.mtimehash = ''
29545 28aca3fafc2a chgserver: reorder service classes to make future patches readable Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	567
29547 300318b7d66d chgserver: switch to new forking service Yuya Nishihara <yuya@tcha.org> parents: 29546 diff changeset	568 def _bind(self, sock):
28223 0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	569 # use a unique temp address so we can stat the file and do ownership
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	570 # check later
29598 a67398726747 chgserver: rename private functions and variables of chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29597 diff changeset	571 tempaddress = _tempaddress(self._realaddress)
29547 300318b7d66d chgserver: switch to new forking service Yuya Nishihara <yuya@tcha.org> parents: 29546 diff changeset	572 util.bindunixsocket(sock, tempaddress)
29529 02de1dbd4f6e chgserver: narrow scope of chdir() to socket.bind() Yuya Nishihara <yuya@tcha.org> parents: 29513 diff changeset	573 self._socketstat = os.stat(tempaddress)
32236 c8b9943c07eb commandserver: move "listen" responsibility from service to handler Jun Wu <quark@fb.com> parents: 32208 diff changeset	574 sock.listen(socket.SOMAXCONN)
29529 02de1dbd4f6e chgserver: narrow scope of chdir() to socket.bind() Yuya Nishihara <yuya@tcha.org> parents: 29513 diff changeset	575 # rename will replace the old socket file if exists atomically. the
02de1dbd4f6e chgserver: narrow scope of chdir() to socket.bind() Yuya Nishihara <yuya@tcha.org> parents: 29513 diff changeset	576 # old server will detect ownership change and exit.
29598 a67398726747 chgserver: rename private functions and variables of chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29597 diff changeset	577 util.rename(tempaddress, self._realaddress)
28223 0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	578
29596 71c197d82b7e chgserver: reorder functions in chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29595 diff changeset	579 def _createsymlink(self):
29598 a67398726747 chgserver: rename private functions and variables of chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29597 diff changeset	580 if self._baseaddress == self._realaddress:
29596 71c197d82b7e chgserver: reorder functions in chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29595 diff changeset	581 return
29598 a67398726747 chgserver: rename private functions and variables of chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29597 diff changeset	582 tempaddress = _tempaddress(self._baseaddress)
a67398726747 chgserver: rename private functions and variables of chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29597 diff changeset	583 os.symlink(os.path.basename(self._realaddress), tempaddress)
a67398726747 chgserver: rename private functions and variables of chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29597 diff changeset	584 util.rename(tempaddress, self._baseaddress)
29596 71c197d82b7e chgserver: reorder functions in chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29595 diff changeset	585
29598 a67398726747 chgserver: rename private functions and variables of chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29597 diff changeset	586 def _issocketowner(self):
28223 0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	587 try:
36781 ffa3026d4196 cleanup: use stat_result[stat.ST_MTIME] instead of stat_result.st_mtime Augie Fackler <augie@google.com> parents: 35582 diff changeset	588 st = os.stat(self._realaddress)
ffa3026d4196 cleanup: use stat_result[stat.ST_MTIME] instead of stat_result.st_mtime Augie Fackler <augie@google.com> parents: 35582 diff changeset	589 return (st.st_ino == self._socketstat.st_ino and
ffa3026d4196 cleanup: use stat_result[stat.ST_MTIME] instead of stat_result.st_mtime Augie Fackler <augie@google.com> parents: 35582 diff changeset	590 st[stat.ST_MTIME] == self._socketstat[stat.ST_MTIME])
28223 0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	591 except OSError:
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	592 return False
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	593
29547 300318b7d66d chgserver: switch to new forking service Yuya Nishihara <yuya@tcha.org> parents: 29546 diff changeset	594 def unlinksocket(self, address):
29598 a67398726747 chgserver: rename private functions and variables of chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29597 diff changeset	595 if not self._issocketowner():
28223 0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	596 return
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	597 # it is possible to have a race condition here that we may
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	598 # remove another server's socket file. but that's okay
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	599 # since that server will detect and exit automatically and
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	600 # the client will start a new server on demand.
31545 82b3ec04b652 chgserver: use tryunlink Ryan McElroy <rmcelroy@fb.com> parents: 31108 diff changeset	601 util.tryunlink(self._realaddress)
28223 0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	602
29596 71c197d82b7e chgserver: reorder functions in chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29595 diff changeset	603 def shouldexit(self):
29598 a67398726747 chgserver: rename private functions and variables of chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29597 diff changeset	604 if not self._issocketowner():
a67398726747 chgserver: rename private functions and variables of chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29597 diff changeset	605 self.ui.debug('%s is not owned, exiting.\n' % self._realaddress)
29596 71c197d82b7e chgserver: reorder functions in chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29595 diff changeset	606 return True
29598 a67398726747 chgserver: rename private functions and variables of chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29597 diff changeset	607 if time.time() - self._lastactive > self._idletimeout:
29596 71c197d82b7e chgserver: reorder functions in chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29595 diff changeset	608 self.ui.debug('being idle too long. exiting.\n')
71c197d82b7e chgserver: reorder functions in chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29595 diff changeset	609 return True
71c197d82b7e chgserver: reorder functions in chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29595 diff changeset	610 return False
71c197d82b7e chgserver: reorder functions in chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29595 diff changeset	611
71c197d82b7e chgserver: reorder functions in chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29595 diff changeset	612 def newconnection(self):
29598 a67398726747 chgserver: rename private functions and variables of chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29597 diff changeset	613 self._lastactive = time.time()
29596 71c197d82b7e chgserver: reorder functions in chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29595 diff changeset	614
29547 300318b7d66d chgserver: switch to new forking service Yuya Nishihara <yuya@tcha.org> parents: 29546 diff changeset	615 def createcmdserver(self, repo, conn, fin, fout):
300318b7d66d chgserver: switch to new forking service Yuya Nishihara <yuya@tcha.org> parents: 29546 diff changeset	616 return chgcmdserver(self.ui, repo, fin, fout, conn,
29598 a67398726747 chgserver: rename private functions and variables of chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29597 diff changeset	617 self._hashstate, self._baseaddress)
28223 0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	618
29546 a7513390a9db chgserver: extract stub factory of service object Yuya Nishihara <yuya@tcha.org> parents: 29545 diff changeset	619 def chgunixservice(ui, repo, opts):
33860 3cfc9070245f demandimport: disable if chg is being used Jun Wu <quark@fb.com> parents: 33499 diff changeset	620 # CHGINTERNALMARK is set by chg client. It is an indication of things are
3cfc9070245f demandimport: disable if chg is being used Jun Wu <quark@fb.com> parents: 33499 diff changeset	621 # started by chg so other code can do things accordingly, like disabling
3cfc9070245f demandimport: disable if chg is being used Jun Wu <quark@fb.com> parents: 33499 diff changeset	622 # demandimport or detecting chg client started by chg client. When executed
3cfc9070245f demandimport: disable if chg is being used Jun Wu <quark@fb.com> parents: 33499 diff changeset	623 # here, CHGINTERNALMARK is no longer useful and hence dropped to make
3cfc9070245f demandimport: disable if chg is being used Jun Wu <quark@fb.com> parents: 33499 diff changeset	624 # environ cleaner.
30635 a150173da1c1 py3: replace os.environ with encoding.environ (part 2 of 5) Pulkit Goyal <7895pulkit@gmail.com> parents: 30619 diff changeset	625 if 'CHGINTERNALMARK' in encoding.environ:
a150173da1c1 py3: replace os.environ with encoding.environ (part 2 of 5) Pulkit Goyal <7895pulkit@gmail.com> parents: 30619 diff changeset	626 del encoding.environ['CHGINTERNALMARK']
30511 1873563e1ede chgserver: drop CHGINTERNALMARK by chgunixservice() Yuya Nishihara <yuya@tcha.org> parents: 30507 diff changeset	627
29546 a7513390a9db chgserver: extract stub factory of service object Yuya Nishihara <yuya@tcha.org> parents: 29545 diff changeset	628 if repo:
30332 318a24b52eeb spelling: fixes of non-dictionary words Mads Kiilerich <madski@unity3d.com> parents: 29841 diff changeset	629 # one chgserver can serve multiple repos. drop repo information
29546 a7513390a9db chgserver: extract stub factory of service object Yuya Nishihara <yuya@tcha.org> parents: 29545 diff changeset	630 ui.setconfig('bundle', 'mainreporoot', '', 'repo')
29547 300318b7d66d chgserver: switch to new forking service Yuya Nishihara <yuya@tcha.org> parents: 29546 diff changeset	631 h = chgunixservicehandler(ui)
300318b7d66d chgserver: switch to new forking service Yuya Nishihara <yuya@tcha.org> parents: 29546 diff changeset	632 return commandserver.unixforkingservice(ui, repo=None, opts=opts, handler=h)

Mercurial > public > mercurial-scm > hg

annotate mercurial/chgserver.py @ 40110:d1338b4e39d0