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

annotate mercurial/chgserver.py @ 38801:23a00bc90a3c stable

chgserver: do not send system() back to client if stdio redirected (issue5992) As the chg client doesn't know server-side stdio redirection, the server shouldn't upcall on "runsystem" request if the stdio streams are redirected. This patch teaches ui to remember the redirection flag, which is updated by the caller right now. Future patches (for default) will add ui methods to manage this flag internally.

author	Yuya Nishihara <yuya@tcha.org>
date	Wed, 26 Sep 2018 21:24:14 +0900
parents	1b9be0b26511
children	a9f56e4501c1

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
30522 ff7df4bb75de chgserver: make it a core module and drop extension flags Yuya Nishihara <yuya@tcha.org> parents: 30521 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
28325 9fec3cb8d128 chgserver: update docs Jun Wu <quark@fb.com> parents: 28277 diff changeset	22 'setumask' command
9fec3cb8d128 chgserver: update docs Jun Wu <quark@fb.com> parents: 28277 diff changeset	23 set umask
9fec3cb8d128 chgserver: update docs Jun Wu <quark@fb.com> parents: 28277 diff changeset	24
28350 8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	25 'validate' command
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	26 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	27
28325 9fec3cb8d128 chgserver: update docs Jun Wu <quark@fb.com> parents: 28277 diff changeset	28 Config
9fec3cb8d128 chgserver: update docs Jun Wu <quark@fb.com> parents: 28277 diff changeset	29 ------
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 [chgserver]
31010 cb899ee133d8 chgserver: move comments in config example Jun Wu <quark@fb.com> parents: 30944 diff changeset	34 # how long (in seconds) should an idle chg server exit
cb899ee133d8 chgserver: move comments in config example Jun Wu <quark@fb.com> parents: 30944 diff changeset	35 idletimeout = 3600
cb899ee133d8 chgserver: move comments in config example Jun Wu <quark@fb.com> parents: 30944 diff changeset	36
cb899ee133d8 chgserver: move comments in config example Jun Wu <quark@fb.com> parents: 30944 diff changeset	37 # whether to skip config or env change checks
cb899ee133d8 chgserver: move comments in config example Jun Wu <quark@fb.com> parents: 30944 diff changeset	38 skiphash = False
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	39 """
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 from __future__ import absolute_import
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	42
29341 0d83ad967bf8 cleanup: replace uses of util.(md5\|sha1\|sha256\|sha512) with hashlib.\1 Augie Fackler <raf@durin42.com> parents: 29101 diff changeset	43 import hashlib
28276 b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	44 import inspect
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	45 import os
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	46 import re
32276 c8b9943c07eb commandserver: move "listen" responsibility from service to handler Jun Wu <quark@fb.com> parents: 32248 diff changeset	47 import socket
36789 ffa3026d4196 cleanup: use stat_result[stat.ST_MTIME] instead of stat_result.st_mtime Augie Fackler <augie@google.com> parents: 35582 diff changeset	48 import stat
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	49 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	50 import time
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	51
30522 ff7df4bb75de chgserver: make it a core module and drop extension flags Yuya Nishihara <yuya@tcha.org> parents: 30521 diff changeset	52 from .i18n import _
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	53
30522 ff7df4bb75de chgserver: make it a core module and drop extension flags Yuya Nishihara <yuya@tcha.org> parents: 30521 diff changeset	54 from . import (
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	55 commandserver,
30640 a150173da1c1 py3: replace os.environ with encoding.environ (part 2 of 5) Pulkit Goyal <7895pulkit@gmail.com> parents: 30624 diff changeset	56 encoding,
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	57 error,
28276 b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	58 extensions,
35582 72b91f905065 py3: use node.hex(h.digest()) instead of h.hexdigest() Pulkit Goyal <7895pulkit@gmail.com> parents: 35233 diff changeset	59 node,
30672 10b17ed9b591 py3: replace sys.executable with pycompat.sysexecutable Pulkit Goyal <7895pulkit@gmail.com> parents: 30650 diff changeset	60 pycompat,
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	61 util,
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	62 )
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	63
37122 d4a2e0d5d042 procutil: bulk-replace util.std* to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36843 diff changeset	64 from .utils import (
d4a2e0d5d042 procutil: bulk-replace util.std* to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36843 diff changeset	65 procutil,
d4a2e0d5d042 procutil: bulk-replace util.std* to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36843 diff changeset	66 )
d4a2e0d5d042 procutil: bulk-replace util.std* to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36843 diff changeset	67
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	68 _log = commandserver.log
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	69
28262 53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	70 def _hashlist(items):
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	71 """return sha1 hexdigest for a list"""
35582 72b91f905065 py3: use node.hex(h.digest()) instead of h.hexdigest() Pulkit Goyal <7895pulkit@gmail.com> parents: 35233 diff changeset	72 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	73
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	74 # sensitive config sections affecting confighash
28478 e6e183687545 chgserver: include [extdiff] in confighash Jun Wu <quark@fb.com> parents: 28454 diff changeset	75 _configsections = [
29101 57a24a85a2bc chgserver: add [alias] to confighash Jun Wu <quark@fb.com> parents: 29088 diff changeset	76 'alias', # affects global state commands.table
34485 37b7581e5737 eol: make [eol] config section sensitive for chg confighash Jun Wu <quark@fb.com> parents: 33881 diff changeset	77 'eol', # uses setconfig('eol', ...)
28478 e6e183687545 chgserver: include [extdiff] in confighash Jun Wu <quark@fb.com> parents: 28454 diff changeset	78 'extdiff', # uisetup will register new commands
e6e183687545 chgserver: include [extdiff] in confighash Jun Wu <quark@fb.com> parents: 28454 diff changeset	79 'extensions',
e6e183687545 chgserver: include [extdiff] in confighash Jun Wu <quark@fb.com> parents: 28454 diff changeset	80 ]
28262 53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	81
34839 110040e715c9 test-show: make it compatible with chg Jun Wu <quark@fb.com> parents: 34485 diff changeset	82 _configsectionitems = [
110040e715c9 test-show: make it compatible with chg Jun Wu <quark@fb.com> parents: 34485 diff changeset	83 ('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	84 ]
110040e715c9 test-show: make it compatible with chg Jun Wu <quark@fb.com> parents: 34485 diff changeset	85
28262 53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	86 # sensitive environment variables affecting confighash
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	87 _envre = re.compile(r'''\A(?:
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	88 CHGHG
32311 6096d27dc119 chgserver: more explicit about sensitive environ variables Jun Wu <quark@fb.com> parents: 32277 diff changeset	89 \|HG(?:DEMANDIMPORT\|EMITWARNINGS\|MODULEPOLICY\|PROF\|RCPATH)?
6096d27dc119 chgserver: more explicit about sensitive environ variables Jun Wu <quark@fb.com> parents: 32277 diff changeset	90 \|HG(?:ENCODING\|PLAIN).*
28262 53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	91 \|LANG(?:UAGE)?
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	92 \|LC_.*
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	93 \|LD_.*
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	94 \|PATH
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	95 \|PYTHON.*
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	96 \|TERM(?:INFO)?
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	97 \|TZ
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	98 )\Z''', re.X)
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	99
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	100 def _confighash(ui):
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	101 """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	102
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	103 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	104
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	105 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	106 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	107 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	108 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	109 same time.
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	110 """
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	111 sectionitems = []
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	112 for section in _configsections:
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	113 sectionitems.append(ui.configitems(section))
34839 110040e715c9 test-show: make it compatible with chg Jun Wu <quark@fb.com> parents: 34485 diff changeset	114 for section, item in _configsectionitems:
110040e715c9 test-show: make it compatible with chg Jun Wu <quark@fb.com> parents: 34485 diff changeset	115 sectionitems.append(ui.config(section, item))
28262 53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	116 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	117 # 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	118 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	119 ignored = {'HG'}
7bf7544fd6cc chgserver: do not treat HG as sensitive environ when CHGHG is set Jun Wu <quark@fb.com> parents: 34839 diff changeset	120 else:
7bf7544fd6cc chgserver: do not treat HG as sensitive environ when CHGHG is set Jun Wu <quark@fb.com> parents: 34839 diff changeset	121 ignored = set()
30640 a150173da1c1 py3: replace os.environ with encoding.environ (part 2 of 5) Pulkit Goyal <7895pulkit@gmail.com> parents: 30624 diff changeset	122 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	123 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	124 envhash = _hashlist(sorted(envitems))
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	125 return sectionhash[:6] + envhash[:6]
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	126
28276 b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	127 def _getmtimepaths(ui):
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	128 """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	129
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	130 The list will include:
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	131 - 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	132 - mercurial/__version__.py
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	133 - python binary
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	134 """
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	135 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	136 try:
30522 ff7df4bb75de chgserver: make it a core module and drop extension flags Yuya Nishihara <yuya@tcha.org> parents: 30521 diff changeset	137 from . import __version__
28276 b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	138 modules.append(__version__)
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	139 except ImportError:
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	140 pass
30672 10b17ed9b591 py3: replace sys.executable with pycompat.sysexecutable Pulkit Goyal <7895pulkit@gmail.com> parents: 30650 diff changeset	141 files = [pycompat.sysexecutable]
28276 b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	142 for m in modules:
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	143 try:
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	144 files.append(inspect.getabsfile(m))
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	145 except TypeError:
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	146 pass
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	147 return sorted(set(files))
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	148
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	149 def _mtimehash(paths):
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	150 """return a quick hash for detecting file changes
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	151
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	152 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	153 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	154 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	155 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	156 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	157 some carefully crafted situation.
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	158
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	159 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	160 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	161
71ed5a3ef8a9 chgserver: document why we don't merge mtimehash and confighash Jun Wu <quark@fb.com> parents: 29433 diff changeset	162 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	163 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	164 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	165 """
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	166 def trystat(path):
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	167 try:
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	168 st = os.stat(path)
36789 ffa3026d4196 cleanup: use stat_result[stat.ST_MTIME] instead of stat_result.st_mtime Augie Fackler <augie@google.com> parents: 35582 diff changeset	169 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	170 except OSError:
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	171 # 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	172 pass
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	173 return _hashlist(map(trystat, paths))[:12]
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	174
28277 cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	175 class hashstate(object):
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	176 """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	177 def __init__(self, confighash, mtimehash, mtimepaths):
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	178 self.confighash = confighash
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	179 self.mtimehash = mtimehash
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	180 self.mtimepaths = mtimepaths
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	181
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	182 @staticmethod
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	183 def fromui(ui, mtimepaths=None):
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	184 if mtimepaths is None:
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	185 mtimepaths = _getmtimepaths(ui)
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	186 confighash = _confighash(ui)
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	187 mtimehash = _mtimehash(mtimepaths)
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	188 _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	189 return hashstate(confighash, mtimehash, mtimepaths)
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	190
30740 493935e0327a chgserver: implement chgui._runpager Jun Wu <quark@fb.com> parents: 30739 diff changeset	191 def _newchgui(srcui, csystem, attachio):
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	192 class chgui(srcui.__class__):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	193 def __init__(self, src=None):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	194 super(chgui, self).__init__(src)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	195 if src:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	196 self._csystem = getattr(src, '_csystem', csystem)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	197 else:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	198 self._csystem = csystem
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	199
31125 3f8f53190d6a chg: deduplicate error handling of ui.system() Yuya Nishihara <yuya@tcha.org> parents: 31124 diff changeset	200 def _runsystem(self, cmd, environ, cwd, out):
38800 1b9be0b26511 chgserver: update comment describing when to fall back to core _runsystem() Yuya Nishihara <yuya@tcha.org> parents: 37123 diff changeset	201 # 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: 37123 diff changeset	202 # a. the output stream is not stdout (e.g. stderr, cStringIO),
38801 23a00bc90a3c chgserver: do not send system() back to client if stdio redirected (issue5992) Yuya Nishihara <yuya@tcha.org> parents: 38800 diff changeset	203 # b. or stdout is redirected by protectstdio(),
38800 1b9be0b26511 chgserver: update comment describing when to fall back to core _runsystem() Yuya Nishihara <yuya@tcha.org> parents: 37123 diff changeset	204 # 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: 37123 diff changeset	205 # will behave differently (i.e. write to stdout).
31124 fbce78c58f1e chg: refactor ui.system() to be partly overridden Yuya Nishihara <yuya@tcha.org> parents: 31010 diff changeset	206 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	207 or not util.safehasattr(self.fout, 'fileno')
38801 23a00bc90a3c chgserver: do not send system() back to client if stdio redirected (issue5992) Yuya Nishihara <yuya@tcha.org> parents: 38800 diff changeset	208 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: 38800 diff changeset	209 or self._finoutredirected):
37123 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37122 diff changeset	210 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	211 self.flush()
37123 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37122 diff changeset	212 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	213
31954 e518192d6bac pager: set some environment variables if they're not set Jun Wu <quark@fb.com> parents: 31700 diff changeset	214 def _runpager(self, cmd, env=None):
37123 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37122 diff changeset	215 self._csystem(cmd, procutil.shellenviron(env), type='pager',
30740 493935e0327a chgserver: implement chgui._runpager Jun Wu <quark@fb.com> parents: 30739 diff changeset	216 cmdtable={'attachio': attachio})
31695 2d11d278279a ui: defer setting pager related properties until the pager has spawned Matt Harbison <matt_harbison@yahoo.com> parents: 31551 diff changeset	217 return True
30740 493935e0327a chgserver: implement chgui._runpager Jun Wu <quark@fb.com> parents: 30739 diff changeset	218
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	219 return chgui(srcui)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	220
28602 83127a9fe76e chgserver: drop old hack to recreate ui on HGPLAIN change Yuya Nishihara <yuya@tcha.org> parents: 28599 diff changeset	221 def _loadnewui(srcui, args):
30522 ff7df4bb75de chgserver: make it a core module and drop extension flags Yuya Nishihara <yuya@tcha.org> parents: 30521 diff changeset	222 from . import dispatch # avoid cycle
30521 cc374292a561 chgserver: delay importing commands and dispatch modules Yuya Nishihara <yuya@tcha.org> parents: 30520 diff changeset	223
30577 cfb227016d01 chgserver: call "load" for new ui objects Jun Wu <quark@fb.com> parents: 30522 diff changeset	224 newui = srcui.__class__.load()
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	225 for a in ['fin', 'fout', 'ferr', 'environ']:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	226 setattr(newui, a, getattr(srcui, a))
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	227 if util.safehasattr(srcui, '_csystem'):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	228 newui._csystem = srcui._csystem
28264 3682e201cce6 chgserver: make _renewui load repo and command line configs Jun Wu <quark@fb.com> parents: 28262 diff changeset	229
3682e201cce6 chgserver: make _renewui load repo and command line configs Jun Wu <quark@fb.com> parents: 28262 diff changeset	230 # command line args
35233 6e6d0a5b88e6 dispatch: replace _earlyreq() with new fancyopts-based parser Yuya Nishihara <yuya@tcha.org>* parents: 34996 diff changeset	231 options = dispatch._earlyparseopts(newui, args)
34996 c9740b69b9b7 dispatch: add HGPLAIN=+strictflags to restrict early parsing of global options Yuya Nishihara <yuya@tcha.org> parents: 34985 diff changeset	232 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	233
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	234 # stolen from tortoisehg.util.copydynamicconfig()
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	235 for section, name, value in srcui.walkconfig():
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	236 source = srcui.configsource(section, name)
31700 d73490957d61 chgserver: do not copy configs set by environment variables Jun Wu <quark@fb.com> parents: 31695 diff changeset	237 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: 31695 diff changeset	238 # path:line or command line, or environ
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	239 continue
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	240 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	241
0e7a929754aa chgserver: use global ui instead of repo ui for dispatch.request.ui Jun Wu <quark@fb.com> parents: 28586 diff changeset	242 # load wd and repo config, copied from dispatch.py
34996 c9740b69b9b7 dispatch: add HGPLAIN=+strictflags to restrict early parsing of global options Yuya Nishihara <yuya@tcha.org> parents: 34985 diff changeset	243 cwd = options['cwd']
c9740b69b9b7 dispatch: add HGPLAIN=+strictflags to restrict early parsing of global options Yuya Nishihara <yuya@tcha.org> parents: 34985 diff changeset	244 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: 34985 diff changeset	245 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	246 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	247
0e7a929754aa chgserver: use global ui instead of repo ui for dispatch.request.ui Jun Wu <quark@fb.com> parents: 28586 diff changeset	248 return (newui, newlui)
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	249
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	250 class channeledsystem(object):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	251 """Propagate ui.system() request in the following format:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	252
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	253 payload length (unsigned int),
30726 dd897eb1699e chg: send type information via S channel (BC) Jun Wu <quark@fb.com> parents: 30672 diff changeset	254 type, '\0',
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	255 cmd, '\0',
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	256 cwd, '\0',
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	257 envkey, '=', val, '\0',
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	258 ...
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	259 envkey, '=', val
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	260
30726 dd897eb1699e chg: send type information via S channel (BC) Jun Wu <quark@fb.com> parents: 30672 diff changeset	261 if type == 'system', waits for:
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	262
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	263 exitcode length (unsigned int),
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	264 exitcode (int)
30739 815e1cefd082 chgserver: make S channel support pager request Jun Wu <quark@fb.com> parents: 30737 diff changeset	265
815e1cefd082 chgserver: make S channel support pager request Jun Wu <quark@fb.com> parents: 30737 diff changeset	266 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	267 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	268 is empty.
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	269 """
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	270 def __init__(self, in_, out, channel):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	271 self.in_ = in_
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	272 self.out = out
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	273 self.channel = channel
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	274
30739 815e1cefd082 chgserver: make S channel support pager request Jun Wu <quark@fb.com> parents: 30737 diff changeset	275 def __call__(self, cmd, environ, cwd=None, type='system', cmdtable=None):
37123 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37122 diff changeset	276 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	277 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	278 data = '\0'.join(args)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	279 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	280 self.out.write(data)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	281 self.out.flush()
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	282
30727 18eb63ec8475 chgserver: check type passed to S channel Jun Wu <quark@fb.com> parents: 30726 diff changeset	283 if type == 'system':
18eb63ec8475 chgserver: check type passed to S channel Jun Wu <quark@fb.com> parents: 30726 diff changeset	284 length = self.in_.read(4)
18eb63ec8475 chgserver: check type passed to S channel Jun Wu <quark@fb.com> parents: 30726 diff changeset	285 length, = struct.unpack('>I', length)
18eb63ec8475 chgserver: check type passed to S channel Jun Wu <quark@fb.com> parents: 30726 diff changeset	286 if length != 4:
18eb63ec8475 chgserver: check type passed to S channel Jun Wu <quark@fb.com> parents: 30726 diff changeset	287 raise error.Abort(_('invalid response'))
18eb63ec8475 chgserver: check type passed to S channel Jun Wu <quark@fb.com> parents: 30726 diff changeset	288 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	289 return rc
30739 815e1cefd082 chgserver: make S channel support pager request Jun Wu <quark@fb.com> parents: 30737 diff changeset	290 elif type == 'pager':
815e1cefd082 chgserver: make S channel support pager request Jun Wu <quark@fb.com> parents: 30737 diff changeset	291 while True:
815e1cefd082 chgserver: make S channel support pager request Jun Wu <quark@fb.com> parents: 30737 diff changeset	292 cmd = self.in_.readline()[:-1]
815e1cefd082 chgserver: make S channel support pager request Jun Wu <quark@fb.com> parents: 30737 diff changeset	293 if not cmd:
815e1cefd082 chgserver: make S channel support pager request Jun Wu <quark@fb.com> parents: 30737 diff changeset	294 break
815e1cefd082 chgserver: make S channel support pager request Jun Wu <quark@fb.com> parents: 30737 diff changeset	295 if cmdtable and cmd in cmdtable:
815e1cefd082 chgserver: make S channel support pager request Jun Wu <quark@fb.com> parents: 30737 diff changeset	296 _log('pager subcommand: %s' % cmd)
815e1cefd082 chgserver: make S channel support pager request Jun Wu <quark@fb.com> parents: 30737 diff changeset	297 cmdtable[cmd]()
815e1cefd082 chgserver: make S channel support pager request Jun Wu <quark@fb.com> parents: 30737 diff changeset	298 else:
815e1cefd082 chgserver: make S channel support pager request Jun Wu <quark@fb.com> parents: 30737 diff changeset	299 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	300 else:
18eb63ec8475 chgserver: check type passed to S channel Jun Wu <quark@fb.com> parents: 30726 diff changeset	301 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	302
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	303 _iochannels = [
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	304 # server.ch, ui.fp, mode
36843 5bc7ff103081 py3: use r'' instead of sysstr('') to get around code transformer Yuya Nishihara <yuya@tcha.org> parents: 36789 diff changeset	305 ('cin', 'fin', r'rb'),
5bc7ff103081 py3: use r'' instead of sysstr('') to get around code transformer Yuya Nishihara <yuya@tcha.org> parents: 36789 diff changeset	306 ('cout', 'fout', r'wb'),
5bc7ff103081 py3: use r'' instead of sysstr('') to get around code transformer Yuya Nishihara <yuya@tcha.org> parents: 36789 diff changeset	307 ('cerr', 'ferr', r'wb'),
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	308 ]
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 class chgcmdserver(commandserver.server):
28328 e00e57d83653 chgserver: pass hashstate and base server address to chgcmdserver Jun Wu <quark@fb.com> parents: 28327 diff changeset	311 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	312 super(chgcmdserver, self).__init__(
30740 493935e0327a chgserver: implement chgui._runpager Jun Wu <quark@fb.com> parents: 30739 diff changeset	313 _newchgui(ui, channeledsystem(fin, fout, 'S'), self.attachio),
493935e0327a chgserver: implement chgui._runpager Jun Wu <quark@fb.com> parents: 30739 diff changeset	314 repo, fin, fout)
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	315 self.clientsock = sock
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	316 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	317 self.hashstate = hashstate
e00e57d83653 chgserver: pass hashstate and base server address to chgcmdserver Jun Wu <quark@fb.com> parents: 28327 diff changeset	318 self.baseaddress = baseaddress
28350 8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	319 if hashstate is not None:
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	320 self.capabilities = self.capabilities.copy()
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	321 self.capabilities['validate'] = chgcmdserver.validate
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	322
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	323 def cleanup(self):
29512 538d0003c9e0 commandserver: promote .cleanup() hook from chgserver Yuya Nishihara <yuya@tcha.org> parents: 29511 diff changeset	324 super(chgcmdserver, self).cleanup()
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	325 # 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	326 # handled by dispatch._dispatch()
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	327 self.ui.flush()
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	328 self._restoreio()
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	329
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	330 def attachio(self):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	331 """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	332 channels except cresult will no longer be used
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	333 """
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	334 # 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	335 # 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	336 self.clientsock.sendall(struct.pack('>cI', 'I', 1))
32248 d74b0cff94a9 osutil: proxy through util (and platform) modules (API) Yuya Nishihara <yuya@tcha.org> parents: 31954 diff changeset	337 clientfds = util.recvfds(self.clientsock.fileno())
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	338 _log('received fds: %r\n' % clientfds)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	339
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	340 ui = self.ui
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	341 ui.flush()
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	342 first = self._saveio()
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	343 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	344 assert fd > 0
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	345 fp = getattr(ui, fn)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	346 os.dup2(fd, fp.fileno())
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	347 os.close(fd)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	348 if not first:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	349 continue
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	350 # 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	351 # 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	352 # 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	353 # 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	354 if fn == 'ferr':
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	355 newfp = fp
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	356 else:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	357 # 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	358 # 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	359 if fp.isatty():
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	360 bufsize = 1 # line buffered
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	361 else:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	362 bufsize = -1 # system default
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	363 newfp = os.fdopen(fp.fileno(), mode, bufsize)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	364 setattr(ui, fn, newfp)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	365 setattr(self, cn, newfp)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	366
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	367 self.cresult.write(struct.pack('>i', len(clientfds)))
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	368
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	369 def _saveio(self):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	370 if self._oldios:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	371 return False
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	372 ui = self.ui
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	373 for cn, fn, _mode in _iochannels:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	374 ch = getattr(self, cn)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	375 fp = getattr(ui, fn)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	376 fd = os.dup(fp.fileno())
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	377 self._oldios.append((ch, fp, fd))
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	378 return True
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	379
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	380 def _restoreio(self):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	381 ui = self.ui
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	382 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	383 newfp = getattr(ui, fn)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	384 # 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	385 # would be closed when newfp is deleted
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	386 if newfp is not fp:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	387 newfp.close()
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	388 # restore original fd: fp is open again
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	389 os.dup2(fd, fp.fileno())
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	390 os.close(fd)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	391 setattr(self, cn, ch)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	392 setattr(ui, fn, fp)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	393 del self._oldios[:]
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	394
28350 8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	395 def validate(self):
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	396 """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	397
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	398 Read a list of '\0' separated arguments.
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	399 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	400 if the list is empty.
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	401 An instruction string could be either:
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	402 - "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	403 outdated server.
28535 aa082a8125da chgserver: add an explicit "reconnect" instruction to validate Jun Wu <quark@fb.com> parents: 28516 diff changeset	404 - "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	405 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	406 "reconnect".
28516 3bf2892f685f chgserver: handle ParseError during validate Jun Wu <quark@fb.com> parents: 28514 diff changeset	407 - "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	408 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	409 - "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	410 reconnect.
aa082a8125da chgserver: add an explicit "reconnect" instruction to validate Jun Wu <quark@fb.com> parents: 28516 diff changeset	411 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	412 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	413 the instructions.
28350 8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	414 """
30522 ff7df4bb75de chgserver: make it a core module and drop extension flags Yuya Nishihara <yuya@tcha.org> parents: 30521 diff changeset	415 from . import dispatch # avoid cycle
30521 cc374292a561 chgserver: delay importing commands and dispatch modules Yuya Nishihara <yuya@tcha.org> parents: 30520 diff changeset	416
28350 8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	417 args = self._readlist()
28516 3bf2892f685f chgserver: handle ParseError during validate Jun Wu <quark@fb.com> parents: 28514 diff changeset	418 try:
28599 0e7a929754aa chgserver: use global ui instead of repo ui for dispatch.request.ui Jun Wu <quark@fb.com> parents: 28586 diff changeset	419 self.ui, lui = _loadnewui(self.ui, args)
28516 3bf2892f685f chgserver: handle ParseError during validate Jun Wu <quark@fb.com> parents: 28514 diff changeset	420 except error.ParseError as inst:
3bf2892f685f chgserver: handle ParseError during validate Jun Wu <quark@fb.com> parents: 28514 diff changeset	421 dispatch._formatparse(self.ui.warn, inst)
3bf2892f685f chgserver: handle ParseError during validate Jun Wu <quark@fb.com> parents: 28514 diff changeset	422 self.ui.flush()
3bf2892f685f chgserver: handle ParseError during validate Jun Wu <quark@fb.com> parents: 28514 diff changeset	423 self.cresult.write('exit 255')
3bf2892f685f chgserver: handle ParseError during validate Jun Wu <quark@fb.com> parents: 28514 diff changeset	424 return
28599 0e7a929754aa chgserver: use global ui instead of repo ui for dispatch.request.ui Jun Wu <quark@fb.com> parents: 28586 diff changeset	425 newhash = hashstate.fromui(lui, self.hashstate.mtimepaths)
28350 8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	426 insts = []
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	427 if newhash.mtimehash != self.hashstate.mtimehash:
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	428 addr = _hashaddress(self.baseaddress, self.hashstate.confighash)
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	429 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	430 # 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	431 # 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	432 if self.hashstate.mtimehash:
a979f5b03320 chgserver: invalidate the server if extensions fail to load Jun Wu <quark@fb.com> parents: 28535 diff changeset	433 insts.append('reconnect')
28350 8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	434 if newhash.confighash != self.hashstate.confighash:
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	435 addr = _hashaddress(self.baseaddress, newhash.confighash)
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	436 insts.append('redirect %s' % addr)
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	437 _log('validate: %s\n' % insts)
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	438 self.cresult.write('\0'.join(insts) or '\0')
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	439
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	440 def chdir(self):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	441 """Change current directory
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	442
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	443 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	444 It does not affect --config parameter.
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	445 """
28158 7cc57a531f0c chgserver: use _readlist and _readstr Jun Wu <quark@fb.com> parents: 28014 diff changeset	446 path = self._readstr()
7cc57a531f0c chgserver: use _readlist and _readstr Jun Wu <quark@fb.com> parents: 28014 diff changeset	447 if not path:
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	448 return
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	449 _log('chdir to %r\n' % path)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	450 os.chdir(path)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	451
28159 d2d04d1d2f92 chgserver: add setumask method Jun Wu <quark@fb.com> parents: 28158 diff changeset	452 def setumask(self):
d2d04d1d2f92 chgserver: add setumask method Jun Wu <quark@fb.com> parents: 28158 diff changeset	453 """Change umask"""
d2d04d1d2f92 chgserver: add setumask method Jun Wu <quark@fb.com> parents: 28158 diff changeset	454 mask = struct.unpack('>I', self._read(4))[0]
d2d04d1d2f92 chgserver: add setumask method Jun Wu <quark@fb.com> parents: 28158 diff changeset	455 _log('setumask %r\n' % mask)
d2d04d1d2f92 chgserver: add setumask method Jun Wu <quark@fb.com> parents: 28158 diff changeset	456 os.umask(mask)
d2d04d1d2f92 chgserver: add setumask method Jun Wu <quark@fb.com> parents: 28158 diff changeset	457
30649 2bb8c53be961 chgserver: override runcommand Jun Wu <quark@fb.com> parents: 30648 diff changeset	458 def runcommand(self):
2bb8c53be961 chgserver: override runcommand Jun Wu <quark@fb.com> parents: 30648 diff changeset	459 return super(chgcmdserver, self).runcommand()
2bb8c53be961 chgserver: override runcommand Jun Wu <quark@fb.com> parents: 30648 diff changeset	460
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	461 def setenv(self):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	462 """Clear and update os.environ
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	463
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	464 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	465 """
28158 7cc57a531f0c chgserver: use _readlist and _readstr Jun Wu <quark@fb.com> parents: 28014 diff changeset	466 l = self._readlist()
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	467 try:
28158 7cc57a531f0c chgserver: use _readlist and _readstr Jun Wu <quark@fb.com> parents: 28014 diff changeset	468 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	469 except ValueError:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	470 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	471 _log('setenv: %r\n' % sorted(newenv.keys()))
30640 a150173da1c1 py3: replace os.environ with encoding.environ (part 2 of 5) Pulkit Goyal <7895pulkit@gmail.com> parents: 30624 diff changeset	472 encoding.environ.clear()
a150173da1c1 py3: replace os.environ with encoding.environ (part 2 of 5) Pulkit Goyal <7895pulkit@gmail.com> parents: 30624 diff changeset	473 encoding.environ.update(newenv)
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	474
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	475 capabilities = commandserver.server.capabilities.copy()
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	476 capabilities.update({'attachio': attachio,
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	477 'chdir': chdir,
30649 2bb8c53be961 chgserver: override runcommand Jun Wu <quark@fb.com> parents: 30648 diff changeset	478 'runcommand': runcommand,
28159 d2d04d1d2f92 chgserver: add setumask method Jun Wu <quark@fb.com> parents: 28158 diff changeset	479 'setenv': setenv,
d2d04d1d2f92 chgserver: add setumask method Jun Wu <quark@fb.com> parents: 28158 diff changeset	480 'setumask': setumask})
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	481
37123 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37122 diff changeset	482 if util.safehasattr(procutil, 'setprocname'):
30750 378686afca52 chgserver: add the setprocname interface Jun Wu <quark@fb.com> parents: 30741 diff changeset	483 def setprocname(self):
378686afca52 chgserver: add the setprocname interface Jun Wu <quark@fb.com> parents: 30741 diff changeset	484 """Change process title"""
378686afca52 chgserver: add the setprocname interface Jun Wu <quark@fb.com> parents: 30741 diff changeset	485 name = self._readstr()
378686afca52 chgserver: add the setprocname interface Jun Wu <quark@fb.com> parents: 30741 diff changeset	486 _log('setprocname: %r\n' % name)
37123 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37122 diff changeset	487 procutil.setprocname(name)
30750 378686afca52 chgserver: add the setprocname interface Jun Wu <quark@fb.com> parents: 30741 diff changeset	488 capabilities['setprocname'] = setprocname
378686afca52 chgserver: add the setprocname interface Jun Wu <quark@fb.com> parents: 30741 diff changeset	489
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	490 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	491 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	492
28326 ea400a4f32e6 chgserver: mangle server address to include confighash Jun Wu <quark@fb.com> parents: 28325 diff changeset	493 def _hashaddress(address, hashstr):
30624 88efb4fb1975 chgserver: truncate base address at "." for hash address Jun Wu <quark@fb.com> parents: 30623 diff changeset	494 # 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: 30623 diff changeset	495 # 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: 30623 diff changeset	496 # 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: 30623 diff changeset	497 dirname, basename = os.path.split(address)
88efb4fb1975 chgserver: truncate base address at "." for hash address Jun Wu <quark@fb.com> parents: 30623 diff changeset	498 basename = basename.split('.', 1)[0]
88efb4fb1975 chgserver: truncate base address at "." for hash address Jun Wu <quark@fb.com> parents: 30623 diff changeset	499 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	500
29547 300318b7d66d chgserver: switch to new forking service Yuya Nishihara <yuya@tcha.org> parents: 29546 diff changeset	501 class chgunixservicehandler(object):
300318b7d66d chgserver: switch to new forking service Yuya Nishihara <yuya@tcha.org> parents: 29546 diff changeset	502 """Set of operations for chg services"""
300318b7d66d chgserver: switch to new forking service Yuya Nishihara <yuya@tcha.org> parents: 29546 diff changeset	503
300318b7d66d chgserver: switch to new forking service Yuya Nishihara <yuya@tcha.org> parents: 29546 diff changeset	504 pollinterval = 1 # [sec]
300318b7d66d chgserver: switch to new forking service Yuya Nishihara <yuya@tcha.org> parents: 29546 diff changeset	505
300318b7d66d chgserver: switch to new forking service Yuya Nishihara <yuya@tcha.org> parents: 29546 diff changeset	506 def __init__(self, ui):
300318b7d66d chgserver: switch to new forking service Yuya Nishihara <yuya@tcha.org> parents: 29546 diff changeset	507 self.ui = ui
33499 0407a51b9d8c codemod: register core configitems using a script Jun Wu <quark@fb.com> parents: 32311 diff changeset	508 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	509 self._lastactive = time.time()
29547 300318b7d66d chgserver: switch to new forking service Yuya Nishihara <yuya@tcha.org> parents: 29546 diff changeset	510
300318b7d66d chgserver: switch to new forking service Yuya Nishihara <yuya@tcha.org> parents: 29546 diff changeset	511 def bindsocket(self, sock, address):
29597 581c0c7cb258 chgserver: refactor initialization of real/base addresses Yuya Nishihara <yuya@tcha.org> parents: 29596 diff changeset	512 self._inithashstate(address)
29545 28aca3fafc2a chgserver: reorder service classes to make future patches readable Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	513 self._checkextensions()
29547 300318b7d66d chgserver: switch to new forking service Yuya Nishihara <yuya@tcha.org> parents: 29546 diff changeset	514 self._bind(sock)
29545 28aca3fafc2a chgserver: reorder service classes to make future patches readable Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	515 self._createsymlink()
32277 1ada3d18e7fb commandserver: move printbanner logic to bindsocket Jun Wu <quark@fb.com> parents: 32276 diff changeset	516 # 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	517
29597 581c0c7cb258 chgserver: refactor initialization of real/base addresses Yuya Nishihara <yuya@tcha.org> parents: 29596 diff changeset	518 def _inithashstate(self, address):
29598 a67398726747 chgserver: rename private functions and variables of chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29597 diff changeset	519 self._baseaddress = address
33499 0407a51b9d8c codemod: register core configitems using a script Jun Wu <quark@fb.com> parents: 32311 diff changeset	520 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	521 self._hashstate = None
a67398726747 chgserver: rename private functions and variables of chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29597 diff changeset	522 self._realaddress = address
29545 28aca3fafc2a chgserver: reorder service classes to make future patches readable Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	523 return
29598 a67398726747 chgserver: rename private functions and variables of chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29597 diff changeset	524 self._hashstate = hashstate.fromui(self.ui)
a67398726747 chgserver: rename private functions and variables of chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29597 diff changeset	525 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	526
28aca3fafc2a chgserver: reorder service classes to make future patches readable Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	527 def _checkextensions(self):
29598 a67398726747 chgserver: rename private functions and variables of chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29597 diff changeset	528 if not self._hashstate:
29545 28aca3fafc2a chgserver: reorder service classes to make future patches readable Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	529 return
28aca3fafc2a chgserver: reorder service classes to make future patches readable Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	530 if extensions.notloaded():
28aca3fafc2a chgserver: reorder service classes to make future patches readable Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	531 # 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	532 # 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	533 # 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	534 self._hashstate.mtimehash = ''
29545 28aca3fafc2a chgserver: reorder service classes to make future patches readable Yuya Nishihara <yuya@tcha.org> parents: 29543 diff changeset	535
29547 300318b7d66d chgserver: switch to new forking service Yuya Nishihara <yuya@tcha.org> parents: 29546 diff changeset	536 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	537 # 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	538 # check later
29598 a67398726747 chgserver: rename private functions and variables of chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29597 diff changeset	539 tempaddress = _tempaddress(self._realaddress)
29547 300318b7d66d chgserver: switch to new forking service Yuya Nishihara <yuya@tcha.org> parents: 29546 diff changeset	540 util.bindunixsocket(sock, tempaddress)
29529 02de1dbd4f6e chgserver: narrow scope of chdir() to socket.bind() Yuya Nishihara <yuya@tcha.org> parents: 29513 diff changeset	541 self._socketstat = os.stat(tempaddress)
32276 c8b9943c07eb commandserver: move "listen" responsibility from service to handler Jun Wu <quark@fb.com> parents: 32248 diff changeset	542 sock.listen(socket.SOMAXCONN)
29529 02de1dbd4f6e chgserver: narrow scope of chdir() to socket.bind() Yuya Nishihara <yuya@tcha.org> parents: 29513 diff changeset	543 # 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	544 # 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	545 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	546
29596 71c197d82b7e chgserver: reorder functions in chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29595 diff changeset	547 def _createsymlink(self):
29598 a67398726747 chgserver: rename private functions and variables of chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29597 diff changeset	548 if self._baseaddress == self._realaddress:
29596 71c197d82b7e chgserver: reorder functions in chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29595 diff changeset	549 return
29598 a67398726747 chgserver: rename private functions and variables of chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29597 diff changeset	550 tempaddress = _tempaddress(self._baseaddress)
a67398726747 chgserver: rename private functions and variables of chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29597 diff changeset	551 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	552 util.rename(tempaddress, self._baseaddress)
29596 71c197d82b7e chgserver: reorder functions in chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29595 diff changeset	553
29598 a67398726747 chgserver: rename private functions and variables of chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29597 diff changeset	554 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	555 try:
36789 ffa3026d4196 cleanup: use stat_result[stat.ST_MTIME] instead of stat_result.st_mtime Augie Fackler <augie@google.com> parents: 35582 diff changeset	556 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	557 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	558 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	559 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	560 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	561
29547 300318b7d66d chgserver: switch to new forking service Yuya Nishihara <yuya@tcha.org> parents: 29546 diff changeset	562 def unlinksocket(self, address):
29598 a67398726747 chgserver: rename private functions and variables of chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29597 diff changeset	563 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	564 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	565 # 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	566 # 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	567 # 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	568 # the client will start a new server on demand.
31551 82b3ec04b652 chgserver: use tryunlink Ryan McElroy <rmcelroy@fb.com> parents: 31125 diff changeset	569 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	570
29596 71c197d82b7e chgserver: reorder functions in chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29595 diff changeset	571 def shouldexit(self):
29598 a67398726747 chgserver: rename private functions and variables of chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29597 diff changeset	572 if not self._issocketowner():
a67398726747 chgserver: rename private functions and variables of chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29597 diff changeset	573 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	574 return True
29598 a67398726747 chgserver: rename private functions and variables of chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29597 diff changeset	575 if time.time() - self._lastactive > self._idletimeout:
29596 71c197d82b7e chgserver: reorder functions in chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29595 diff changeset	576 self.ui.debug('being idle too long. exiting.\n')
71c197d82b7e chgserver: reorder functions in chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29595 diff changeset	577 return True
71c197d82b7e chgserver: reorder functions in chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29595 diff changeset	578 return False
71c197d82b7e chgserver: reorder functions in chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29595 diff changeset	579
71c197d82b7e chgserver: reorder functions in chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29595 diff changeset	580 def newconnection(self):
29598 a67398726747 chgserver: rename private functions and variables of chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29597 diff changeset	581 self._lastactive = time.time()
29596 71c197d82b7e chgserver: reorder functions in chgunixservicehandler Yuya Nishihara <yuya@tcha.org> parents: 29595 diff changeset	582
29547 300318b7d66d chgserver: switch to new forking service Yuya Nishihara <yuya@tcha.org> parents: 29546 diff changeset	583 def createcmdserver(self, repo, conn, fin, fout):
300318b7d66d chgserver: switch to new forking service Yuya Nishihara <yuya@tcha.org> parents: 29546 diff changeset	584 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	585 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	586
29546 a7513390a9db chgserver: extract stub factory of service object Yuya Nishihara <yuya@tcha.org> parents: 29545 diff changeset	587 def chgunixservice(ui, repo, opts):
33881 3cfc9070245f demandimport: disable if chg is being used Jun Wu <quark@fb.com> parents: 33499 diff changeset	588 # 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	589 # 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	590 # 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	591 # 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	592 # environ cleaner.
30640 a150173da1c1 py3: replace os.environ with encoding.environ (part 2 of 5) Pulkit Goyal <7895pulkit@gmail.com> parents: 30624 diff changeset	593 if 'CHGINTERNALMARK' in encoding.environ:
a150173da1c1 py3: replace os.environ with encoding.environ (part 2 of 5) Pulkit Goyal <7895pulkit@gmail.com> parents: 30624 diff changeset	594 del encoding.environ['CHGINTERNALMARK']
30520 1873563e1ede chgserver: drop CHGINTERNALMARK by chgunixservice() Yuya Nishihara <yuya@tcha.org> parents: 30516 diff changeset	595
29546 a7513390a9db chgserver: extract stub factory of service object Yuya Nishihara <yuya@tcha.org> parents: 29545 diff changeset	596 if repo:
30342 318a24b52eeb spelling: fixes of non-dictionary words Mads Kiilerich <madski@unity3d.com> parents: 29852 diff changeset	597 # 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	598 ui.setconfig('bundle', 'mainreporoot', '', 'repo')
29547 300318b7d66d chgserver: switch to new forking service Yuya Nishihara <yuya@tcha.org> parents: 29546 diff changeset	599 h = chgunixservicehandler(ui)
300318b7d66d chgserver: switch to new forking service Yuya Nishihara <yuya@tcha.org> parents: 29546 diff changeset	600 return commandserver.unixforkingservice(ui, repo=None, opts=opts, handler=h)

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/chgserver.py @ 38801:23a00bc90a3c stable