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

annotate hgext/chgserver.py @ 29513:e5b4d79a9140

commandserver: backport handling of forking server from chgserver This is common between chg and vanilla forking server, so move it to commandserver and unify handle(). It would be debatable whether we really need gc.collect() or not, but that is beyond the scope of this series. Maybe we can remove gc.collect() once all resource deallocations are switched to context manager.

author	Yuya Nishihara <yuya@tcha.org>
date	Sat, 21 May 2016 15:23:21 +0900
parents	538d0003c9e0
children	02de1dbd4f6e

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
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	8 """command server extension for cHg (EXPERIMENTAL)
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 'getpager' command
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	20 checks if pager is enabled and which pager should be executed
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	21
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	22 'setenv' command
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	23 replace os.environ completely
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	24
28325 9fec3cb8d128 chgserver: update docs Jun Wu <quark@fb.com> parents: 28277 diff changeset	25 'setumask' command
9fec3cb8d128 chgserver: update docs Jun Wu <quark@fb.com> parents: 28277 diff changeset	26 set umask
9fec3cb8d128 chgserver: update docs Jun Wu <quark@fb.com> parents: 28277 diff changeset	27
28350 8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	28 'validate' command
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	29 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	30
28325 9fec3cb8d128 chgserver: update docs Jun Wu <quark@fb.com> parents: 28277 diff changeset	31 Config
9fec3cb8d128 chgserver: update docs Jun Wu <quark@fb.com> parents: 28277 diff changeset	32 ------
9fec3cb8d128 chgserver: update docs Jun Wu <quark@fb.com> parents: 28277 diff changeset	33
9fec3cb8d128 chgserver: update docs Jun Wu <quark@fb.com> parents: 28277 diff changeset	34 ::
9fec3cb8d128 chgserver: update docs Jun Wu <quark@fb.com> parents: 28277 diff changeset	35
9fec3cb8d128 chgserver: update docs Jun Wu <quark@fb.com> parents: 28277 diff changeset	36 [chgserver]
9fec3cb8d128 chgserver: update docs Jun Wu <quark@fb.com> parents: 28277 diff changeset	37 idletimeout = 3600 # seconds, after which an idle server will exit
28326 ea400a4f32e6 chgserver: mangle server address to include confighash Jun Wu <quark@fb.com> parents: 28325 diff changeset	38 skiphash = False # whether to skip config or env change checks
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
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	43 import errno
29341 0d83ad967bf8 cleanup: replace uses of util.(md5\|sha1\|sha256\|sha512) with hashlib.\1 Augie Fackler <raf@durin42.com> parents: 29101 diff changeset	44 import hashlib
28276 b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	45 import inspect
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	46 import os
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	47 import re
29428 247ea0dfdb94 chgserver: do not ignore SIGPIPE if pager is used Jun Wu <quark@fb.com> parents: 29341 diff changeset	48 import signal
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	49 import struct
28276 b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	50 import sys
28223 0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	51 import threading
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	52 import time
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	53
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	54 from mercurial.i18n import _
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	55
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	56 from mercurial import (
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	57 cmdutil,
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	58 commands,
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	59 commandserver,
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	60 dispatch,
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	61 error,
28276 b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	62 extensions,
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	63 osutil,
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	64 util,
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	65 )
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	66
29433 33770d2b6cf9 py3: conditionalize SocketServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29428 diff changeset	67 socketserver = util.socketserver
33770d2b6cf9 py3: conditionalize SocketServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29428 diff changeset	68
27793 8c9bbf5cd349 chgserver: mark as a built-in extension Yuya Nishihara <yuya@tcha.org> parents: 27792 diff changeset	69 # Note for extension authors: ONLY specify testedwith = 'internal' for
8c9bbf5cd349 chgserver: mark as a built-in extension Yuya Nishihara <yuya@tcha.org> parents: 27792 diff changeset	70 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
8c9bbf5cd349 chgserver: mark as a built-in extension Yuya Nishihara <yuya@tcha.org> parents: 27792 diff changeset	71 # be specifying the version(s) of Mercurial they are tested with, or
8c9bbf5cd349 chgserver: mark as a built-in extension Yuya Nishihara <yuya@tcha.org> parents: 27792 diff changeset	72 # leave the attribute unspecified.
8c9bbf5cd349 chgserver: mark as a built-in extension Yuya Nishihara <yuya@tcha.org> parents: 27792 diff changeset	73 testedwith = 'internal'
8c9bbf5cd349 chgserver: mark as a built-in extension Yuya Nishihara <yuya@tcha.org> parents: 27792 diff changeset	74
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	75 _log = commandserver.log
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	76
28262 53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	77 def _hashlist(items):
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	78 """return sha1 hexdigest for a list"""
29341 0d83ad967bf8 cleanup: replace uses of util.(md5\|sha1\|sha256\|sha512) with hashlib.\1 Augie Fackler <raf@durin42.com> parents: 29101 diff changeset	79 return hashlib.sha1(str(items)).hexdigest()
28262 53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	80
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	81 # sensitive config sections affecting confighash
28478 e6e183687545 chgserver: include [extdiff] in confighash Jun Wu <quark@fb.com> parents: 28454 diff changeset	82 _configsections = [
29101 57a24a85a2bc chgserver: add [alias] to confighash Jun Wu <quark@fb.com> parents: 29088 diff changeset	83 'alias', # affects global state commands.table
28478 e6e183687545 chgserver: include [extdiff] in confighash Jun Wu <quark@fb.com> parents: 28454 diff changeset	84 'extdiff', # uisetup will register new commands
e6e183687545 chgserver: include [extdiff] in confighash Jun Wu <quark@fb.com> parents: 28454 diff changeset	85 'extensions',
e6e183687545 chgserver: include [extdiff] in confighash Jun Wu <quark@fb.com> parents: 28454 diff changeset	86 ]
28262 53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	87
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	88 # sensitive environment variables affecting confighash
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	89 _envre = re.compile(r'''\A(?:
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	90 CHGHG
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	91 \|HG.*
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	92 \|LANG(?:UAGE)?
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	93 \|LC_.*
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	94 \|LD_.*
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	95 \|PATH
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	96 \|PYTHON.*
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	97 \|TERM(?:INFO)?
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	98 \|TZ
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	99 )\Z''', re.X)
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	100
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	101 def _confighash(ui):
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	102 """return a quick hash for detecting config/env changes
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	103
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	104 confighash is the hash of sensitive config items and environment variables.
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	105
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	106 for chgserver, it is designed that once confighash changes, the server is
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	107 not qualified to serve its client and should redirect the client to a new
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	108 server. different from mtimehash, confighash change will not mark the
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	109 server outdated and exit since the user can have different configs at the
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	110 same time.
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	111 """
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	112 sectionitems = []
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	113 for section in _configsections:
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	114 sectionitems.append(ui.configitems(section))
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	115 sectionhash = _hashlist(sectionitems)
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	116 envitems = [(k, v) for k, v in os.environ.iteritems() if _envre.match(k)]
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	117 envhash = _hashlist(sorted(envitems))
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	118 return sectionhash[:6] + envhash[:6]
53dc4aada2d9 chgserver: add utilities to calculate confighash Jun Wu <quark@fb.com> parents: 28261 diff changeset	119
28276 b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	120 def _getmtimepaths(ui):
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	121 """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	122
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	123 The list will include:
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	124 - 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	125 - mercurial/__version__.py
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	126 - python binary
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	127 """
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	128 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	129 try:
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	130 from mercurial import __version__
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	131 modules.append(__version__)
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	132 except ImportError:
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	133 pass
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	134 files = [sys.executable]
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	135 for m in modules:
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	136 try:
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	137 files.append(inspect.getabsfile(m))
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	138 except TypeError:
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	139 pass
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	140 return sorted(set(files))
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	141
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	142 def _mtimehash(paths):
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	143 """return a quick hash for detecting file changes
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	144
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	145 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	146 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	147 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	148 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	149 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	150 some carefully crafted situation.
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 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	153 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	154
71ed5a3ef8a9 chgserver: document why we don't merge mtimehash and confighash Jun Wu <quark@fb.com> parents: 29433 diff changeset	155 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	156 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	157 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	158 """
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	159 def trystat(path):
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	160 try:
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	161 st = os.stat(path)
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	162 return (st.st_mtime, st.st_size)
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	163 except OSError:
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	164 # 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	165 pass
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	166 return _hashlist(map(trystat, paths))[:12]
b4ceadb2c439 chgserver: add utilities to calculate mtimehash Jun Wu <quark@fb.com> parents: 28264 diff changeset	167
28277 cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	168 class hashstate(object):
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	169 """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	170 def __init__(self, confighash, mtimehash, mtimepaths):
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	171 self.confighash = confighash
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	172 self.mtimehash = mtimehash
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	173 self.mtimepaths = mtimepaths
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	174
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	175 @staticmethod
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	176 def fromui(ui, mtimepaths=None):
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	177 if mtimepaths is None:
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	178 mtimepaths = _getmtimepaths(ui)
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	179 confighash = _confighash(ui)
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	180 mtimehash = _mtimehash(mtimepaths)
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	181 _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	182 return hashstate(confighash, mtimehash, mtimepaths)
cdc6319f6a7d chgserver: add a structure for confighash and mtimehash Jun Wu <quark@fb.com> parents: 28276 diff changeset	183
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	184 # copied from hgext/pager.py:uisetup()
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	185 def _setuppagercmd(ui, options, cmd):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	186 if not ui.formatted():
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	187 return
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	188
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	189 p = ui.config("pager", "pager", os.environ.get("PAGER"))
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	190 usepager = False
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	191 always = util.parsebool(options['pager'])
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	192 auto = options['pager'] == 'auto'
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	193
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	194 if not p:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	195 pass
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	196 elif always:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	197 usepager = True
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	198 elif not auto:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	199 usepager = False
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	200 else:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	201 attended = ['annotate', 'cat', 'diff', 'export', 'glog', 'log', 'qdiff']
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	202 attend = ui.configlist('pager', 'attend', attended)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	203 ignore = ui.configlist('pager', 'ignore')
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	204 cmds, _ = cmdutil.findcmd(cmd, commands.table)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	205
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	206 for cmd in cmds:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	207 var = 'attend-%s' % cmd
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	208 if ui.config('pager', var):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	209 usepager = ui.configbool('pager', var)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	210 break
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	211 if (cmd in attend or
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	212 (cmd not in ignore and not attend)):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	213 usepager = True
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	214 break
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	215
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	216 if usepager:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	217 ui.setconfig('ui', 'formatted', ui.formatted(), 'pager')
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	218 ui.setconfig('ui', 'interactive', False, 'pager')
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	219 return p
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	220
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	221 def _newchgui(srcui, csystem):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	222 class chgui(srcui.__class__):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	223 def __init__(self, src=None):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	224 super(chgui, self).__init__(src)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	225 if src:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	226 self._csystem = getattr(src, '_csystem', csystem)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	227 else:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	228 self._csystem = csystem
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	229
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	230 def system(self, cmd, environ=None, cwd=None, onerr=None,
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	231 errprefix=None):
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	232 # fallback to the original system method if the output needs to be
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	233 # captured (to self._buffers), or the output stream is not stdout
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	234 # (e.g. stderr, cStringIO), because the chg client is not aware of
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	235 # these situations and will behave differently (write to stdout).
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	236 if (any(s[1] for s in self._bufferstates)
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	237 or not util.safehasattr(self.fout, 'fileno')
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	238 or self.fout.fileno() != sys.stdout.fileno()):
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	239 return super(chgui, self).system(cmd, environ, cwd, onerr,
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	240 errprefix)
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	241 # copied from mercurial/util.py:system()
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	242 self.flush()
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	243 def py2shell(val):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	244 if val is None or val is False:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	245 return '0'
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	246 if val is True:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	247 return '1'
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	248 return str(val)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	249 env = os.environ.copy()
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	250 if environ:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	251 env.update((k, py2shell(v)) for k, v in environ.iteritems())
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	252 env['HG'] = util.hgexecutable()
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	253 rc = self._csystem(cmd, env, cwd)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	254 if rc and onerr:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	255 errmsg = '%s %s' % (os.path.basename(cmd.split(None, 1)[0]),
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	256 util.explainexit(rc)[0])
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	257 if errprefix:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	258 errmsg = '%s: %s' % (errprefix, errmsg)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	259 raise onerr(errmsg)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	260 return rc
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	261
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	262 return chgui(srcui)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	263
28602 83127a9fe76e chgserver: drop old hack to recreate ui on HGPLAIN change Yuya Nishihara <yuya@tcha.org> parents: 28599 diff changeset	264 def _loadnewui(srcui, args):
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	265 newui = srcui.__class__()
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	266 for a in ['fin', 'fout', 'ferr', 'environ']:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	267 setattr(newui, a, getattr(srcui, a))
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	268 if util.safehasattr(srcui, '_csystem'):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	269 newui._csystem = srcui._csystem
28264 3682e201cce6 chgserver: make _renewui load repo and command line configs Jun Wu <quark@fb.com> parents: 28262 diff changeset	270
3682e201cce6 chgserver: make _renewui load repo and command line configs Jun Wu <quark@fb.com> parents: 28262 diff changeset	271 # internal config: extensions.chgserver
3682e201cce6 chgserver: make _renewui load repo and command line configs Jun Wu <quark@fb.com> parents: 28262 diff changeset	272 newui.setconfig('extensions', 'chgserver',
3682e201cce6 chgserver: make _renewui load repo and command line configs Jun Wu <quark@fb.com> parents: 28262 diff changeset	273 srcui.config('extensions', 'chgserver'), '--config')
3682e201cce6 chgserver: make _renewui load repo and command line configs Jun Wu <quark@fb.com> parents: 28262 diff changeset	274
3682e201cce6 chgserver: make _renewui load repo and command line configs Jun Wu <quark@fb.com> parents: 28262 diff changeset	275 # command line args
28767 73bfd9a54a5c chgserver: move args copying logic to the correct place Jun Wu <quark@fb.com> parents: 28603 diff changeset	276 args = args[:]
28264 3682e201cce6 chgserver: make _renewui load repo and command line configs Jun Wu <quark@fb.com> parents: 28262 diff changeset	277 dispatch._parseconfig(newui, dispatch._earlygetopt(['--config'], args))
3682e201cce6 chgserver: make _renewui load repo and command line configs Jun Wu <quark@fb.com> parents: 28262 diff changeset	278
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	279 # stolen from tortoisehg.util.copydynamicconfig()
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	280 for section, name, value in srcui.walkconfig():
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	281 source = srcui.configsource(section, name)
28264 3682e201cce6 chgserver: make _renewui load repo and command line configs Jun Wu <quark@fb.com> parents: 28262 diff changeset	282 if ':' in source or source == '--config':
3682e201cce6 chgserver: make _renewui load repo and command line configs Jun Wu <quark@fb.com> parents: 28262 diff changeset	283 # path:line or command line
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	284 continue
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	285 if source == 'none':
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	286 # ui.configsource returns 'none' by default
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	287 source = ''
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	288 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	289
0e7a929754aa chgserver: use global ui instead of repo ui for dispatch.request.ui Jun Wu <quark@fb.com> parents: 28586 diff changeset	290 # load wd and repo config, copied from dispatch.py
0e7a929754aa chgserver: use global ui instead of repo ui for dispatch.request.ui Jun Wu <quark@fb.com> parents: 28586 diff changeset	291 cwds = dispatch._earlygetopt(['--cwd'], args)
0e7a929754aa chgserver: use global ui instead of repo ui for dispatch.request.ui Jun Wu <quark@fb.com> parents: 28586 diff changeset	292 cwd = cwds and os.path.realpath(cwds[-1]) or None
0e7a929754aa chgserver: use global ui instead of repo ui for dispatch.request.ui Jun Wu <quark@fb.com> parents: 28586 diff changeset	293 rpath = dispatch._earlygetopt(["-R", "--repository", "--repo"], args)
0e7a929754aa chgserver: use global ui instead of repo ui for dispatch.request.ui Jun Wu <quark@fb.com> parents: 28586 diff changeset	294 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	295
0e7a929754aa chgserver: use global ui instead of repo ui for dispatch.request.ui Jun Wu <quark@fb.com> parents: 28586 diff changeset	296 return (newui, newlui)
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	297
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	298 class channeledsystem(object):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	299 """Propagate ui.system() request in the following format:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	300
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	301 payload length (unsigned int),
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	302 cmd, '\0',
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	303 cwd, '\0',
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	304 envkey, '=', val, '\0',
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	305 ...
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	306 envkey, '=', val
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	307
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	308 and waits:
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 exitcode length (unsigned int),
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	311 exitcode (int)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	312 """
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	313 def __init__(self, in_, out, channel):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	314 self.in_ = in_
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	315 self.out = out
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	316 self.channel = channel
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	317
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	318 def __call__(self, cmd, environ, cwd):
28514 0747ef2c4ab2 chgserver: resolve relative path before sending via system channel Jun Wu <quark@fb.com> parents: 28511 diff changeset	319 args = [util.quotecommand(cmd), os.path.abspath(cwd or '.')]
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	320 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	321 data = '\0'.join(args)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	322 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	323 self.out.write(data)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	324 self.out.flush()
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	325
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	326 length = self.in_.read(4)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	327 length, = struct.unpack('>I', length)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	328 if length != 4:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	329 raise error.Abort(_('invalid response'))
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	330 rc, = struct.unpack('>i', self.in_.read(4))
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	331 return rc
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	332
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	333 _iochannels = [
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	334 # server.ch, ui.fp, mode
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	335 ('cin', 'fin', 'rb'),
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	336 ('cout', 'fout', 'wb'),
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	337 ('cerr', 'ferr', 'wb'),
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	338 ]
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 class chgcmdserver(commandserver.server):
28328 e00e57d83653 chgserver: pass hashstate and base server address to chgcmdserver Jun Wu <quark@fb.com> parents: 28327 diff changeset	341 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	342 super(chgcmdserver, self).__init__(
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	343 _newchgui(ui, channeledsystem(fin, fout, 'S')), repo, fin, fout)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	344 self.clientsock = sock
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	345 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	346 self.hashstate = hashstate
e00e57d83653 chgserver: pass hashstate and base server address to chgcmdserver Jun Wu <quark@fb.com> parents: 28327 diff changeset	347 self.baseaddress = baseaddress
28350 8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	348 if hashstate is not None:
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	349 self.capabilities = self.capabilities.copy()
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	350 self.capabilities['validate'] = chgcmdserver.validate
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	351
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	352 def cleanup(self):
29512 538d0003c9e0 commandserver: promote .cleanup() hook from chgserver Yuya Nishihara <yuya@tcha.org> parents: 29511 diff changeset	353 super(chgcmdserver, self).cleanup()
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	354 # 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	355 # handled by dispatch._dispatch()
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	356 self.ui.flush()
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	357 self._restoreio()
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	358
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	359 def attachio(self):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	360 """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	361 channels except cresult will no longer be used
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	362 """
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	363 # 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	364 # 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	365 self.clientsock.sendall(struct.pack('>cI', 'I', 1))
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	366 clientfds = osutil.recvfds(self.clientsock.fileno())
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	367 _log('received fds: %r\n' % 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 ui = self.ui
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	370 ui.flush()
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	371 first = self._saveio()
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	372 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	373 assert fd > 0
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	374 fp = getattr(ui, fn)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	375 os.dup2(fd, fp.fileno())
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	376 os.close(fd)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	377 if not first:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	378 continue
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	379 # 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	380 # 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	381 # 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	382 # 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	383 if fn == 'ferr':
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	384 newfp = fp
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	385 else:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	386 # 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	387 # 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	388 if fp.isatty():
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	389 bufsize = 1 # line buffered
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	390 else:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	391 bufsize = -1 # system default
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	392 newfp = os.fdopen(fp.fileno(), mode, bufsize)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	393 setattr(ui, fn, newfp)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	394 setattr(self, cn, newfp)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	395
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	396 self.cresult.write(struct.pack('>i', len(clientfds)))
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	397
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	398 def _saveio(self):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	399 if self._oldios:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	400 return False
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	401 ui = self.ui
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	402 for cn, fn, _mode in _iochannels:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	403 ch = getattr(self, cn)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	404 fp = getattr(ui, fn)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	405 fd = os.dup(fp.fileno())
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	406 self._oldios.append((ch, fp, fd))
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	407 return True
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	408
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	409 def _restoreio(self):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	410 ui = self.ui
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	411 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	412 newfp = getattr(ui, fn)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	413 # 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	414 # would be closed when newfp is deleted
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	415 if newfp is not fp:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	416 newfp.close()
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	417 # restore original fd: fp is open again
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	418 os.dup2(fd, fp.fileno())
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	419 os.close(fd)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	420 setattr(self, cn, ch)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	421 setattr(ui, fn, fp)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	422 del self._oldios[:]
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	423
28350 8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	424 def validate(self):
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	425 """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	426
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	427 Read a list of '\0' separated arguments.
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	428 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	429 if the list is empty.
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	430 An instruction string could be either:
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	431 - "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	432 outdated server.
28535 aa082a8125da chgserver: add an explicit "reconnect" instruction to validate Jun Wu <quark@fb.com> parents: 28516 diff changeset	433 - "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	434 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	435 "reconnect".
28516 3bf2892f685f chgserver: handle ParseError during validate Jun Wu <quark@fb.com> parents: 28514 diff changeset	436 - "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	437 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	438 - "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	439 reconnect.
aa082a8125da chgserver: add an explicit "reconnect" instruction to validate Jun Wu <quark@fb.com> parents: 28516 diff changeset	440 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	441 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	442 the instructions.
28350 8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	443 """
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	444 args = self._readlist()
28516 3bf2892f685f chgserver: handle ParseError during validate Jun Wu <quark@fb.com> parents: 28514 diff changeset	445 try:
28599 0e7a929754aa chgserver: use global ui instead of repo ui for dispatch.request.ui Jun Wu <quark@fb.com> parents: 28586 diff changeset	446 self.ui, lui = _loadnewui(self.ui, args)
28516 3bf2892f685f chgserver: handle ParseError during validate Jun Wu <quark@fb.com> parents: 28514 diff changeset	447 except error.ParseError as inst:
3bf2892f685f chgserver: handle ParseError during validate Jun Wu <quark@fb.com> parents: 28514 diff changeset	448 dispatch._formatparse(self.ui.warn, inst)
3bf2892f685f chgserver: handle ParseError during validate Jun Wu <quark@fb.com> parents: 28514 diff changeset	449 self.ui.flush()
3bf2892f685f chgserver: handle ParseError during validate Jun Wu <quark@fb.com> parents: 28514 diff changeset	450 self.cresult.write('exit 255')
3bf2892f685f chgserver: handle ParseError during validate Jun Wu <quark@fb.com> parents: 28514 diff changeset	451 return
28599 0e7a929754aa chgserver: use global ui instead of repo ui for dispatch.request.ui Jun Wu <quark@fb.com> parents: 28586 diff changeset	452 newhash = hashstate.fromui(lui, self.hashstate.mtimepaths)
28350 8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	453 insts = []
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	454 if newhash.mtimehash != self.hashstate.mtimehash:
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	455 addr = _hashaddress(self.baseaddress, self.hashstate.confighash)
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	456 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	457 # 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	458 # 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	459 if self.hashstate.mtimehash:
a979f5b03320 chgserver: invalidate the server if extensions fail to load Jun Wu <quark@fb.com> parents: 28535 diff changeset	460 insts.append('reconnect')
28350 8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	461 if newhash.confighash != self.hashstate.confighash:
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	462 addr = _hashaddress(self.baseaddress, newhash.confighash)
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	463 insts.append('redirect %s' % addr)
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	464 _log('validate: %s\n' % insts)
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	465 self.cresult.write('\0'.join(insts) or '\0')
8f9661d1637b chgserver: implement validate command Jun Wu <quark@fb.com> parents: 28342 diff changeset	466
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	467 def chdir(self):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	468 """Change current directory
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	469
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	470 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	471 It does not affect --config parameter.
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	472 """
28158 7cc57a531f0c chgserver: use _readlist and _readstr Jun Wu <quark@fb.com> parents: 28014 diff changeset	473 path = self._readstr()
7cc57a531f0c chgserver: use _readlist and _readstr Jun Wu <quark@fb.com> parents: 28014 diff changeset	474 if not path:
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	475 return
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	476 _log('chdir to %r\n' % path)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	477 os.chdir(path)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	478
28159 d2d04d1d2f92 chgserver: add setumask method Jun Wu <quark@fb.com> parents: 28158 diff changeset	479 def setumask(self):
d2d04d1d2f92 chgserver: add setumask method Jun Wu <quark@fb.com> parents: 28158 diff changeset	480 """Change umask"""
d2d04d1d2f92 chgserver: add setumask method Jun Wu <quark@fb.com> parents: 28158 diff changeset	481 mask = struct.unpack('>I', self._read(4))[0]
d2d04d1d2f92 chgserver: add setumask method Jun Wu <quark@fb.com> parents: 28158 diff changeset	482 _log('setumask %r\n' % mask)
d2d04d1d2f92 chgserver: add setumask method Jun Wu <quark@fb.com> parents: 28158 diff changeset	483 os.umask(mask)
d2d04d1d2f92 chgserver: add setumask method Jun Wu <quark@fb.com> parents: 28158 diff changeset	484
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	485 def getpager(self):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	486 """Read cmdargs and write pager command to r-channel if enabled
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	487
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	488 If pager isn't enabled, this writes '\0' because channeledoutput
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	489 does not allow to write empty data.
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	490 """
28158 7cc57a531f0c chgserver: use _readlist and _readstr Jun Wu <quark@fb.com> parents: 28014 diff changeset	491 args = self._readlist()
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	492 try:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	493 cmd, _func, args, options, _cmdoptions = dispatch._parse(self.ui,
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	494 args)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	495 except (error.Abort, error.AmbiguousCommand, error.CommandError,
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	496 error.UnknownCommand):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	497 cmd = None
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	498 options = {}
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	499 if not cmd or 'pager' not in options:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	500 self.cresult.write('\0')
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	501 return
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	502
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	503 pagercmd = _setuppagercmd(self.ui, options, cmd)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	504 if pagercmd:
29428 247ea0dfdb94 chgserver: do not ignore SIGPIPE if pager is used Jun Wu <quark@fb.com> parents: 29341 diff changeset	505 # Python's SIGPIPE is SIG_IGN by default. change to SIG_DFL so
247ea0dfdb94 chgserver: do not ignore SIGPIPE if pager is used Jun Wu <quark@fb.com> parents: 29341 diff changeset	506 # we can exit if the pipe to the pager is closed
247ea0dfdb94 chgserver: do not ignore SIGPIPE if pager is used Jun Wu <quark@fb.com> parents: 29341 diff changeset	507 if util.safehasattr(signal, 'SIGPIPE') and \
247ea0dfdb94 chgserver: do not ignore SIGPIPE if pager is used Jun Wu <quark@fb.com> parents: 29341 diff changeset	508 signal.getsignal(signal.SIGPIPE) == signal.SIG_IGN:
247ea0dfdb94 chgserver: do not ignore SIGPIPE if pager is used Jun Wu <quark@fb.com> parents: 29341 diff changeset	509 signal.signal(signal.SIGPIPE, signal.SIG_DFL)
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	510 self.cresult.write(pagercmd)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	511 else:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	512 self.cresult.write('\0')
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	513
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	514 def setenv(self):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	515 """Clear and update os.environ
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	516
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	517 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	518 """
28158 7cc57a531f0c chgserver: use _readlist and _readstr Jun Wu <quark@fb.com> parents: 28014 diff changeset	519 l = self._readlist()
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	520 try:
28158 7cc57a531f0c chgserver: use _readlist and _readstr Jun Wu <quark@fb.com> parents: 28014 diff changeset	521 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	522 except ValueError:
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	523 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	524 _log('setenv: %r\n' % sorted(newenv.keys()))
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	525 os.environ.clear()
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	526 os.environ.update(newenv)
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	527
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	528 capabilities = commandserver.server.capabilities.copy()
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	529 capabilities.update({'attachio': attachio,
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	530 'chdir': chdir,
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	531 'getpager': getpager,
28159 d2d04d1d2f92 chgserver: add setumask method Jun Wu <quark@fb.com> parents: 28158 diff changeset	532 'setenv': setenv,
d2d04d1d2f92 chgserver: add setumask method Jun Wu <quark@fb.com> parents: 28158 diff changeset	533 'setumask': setumask})
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	534
29513 e5b4d79a9140 commandserver: backport handling of forking server from chgserver Yuya Nishihara <yuya@tcha.org> parents: 29512 diff changeset	535 class _requesthandler(commandserver._requesthandler):
29511 540c01a18bb7 commandserver: extract method to create commandserver instance per request Yuya Nishihara <yuya@tcha.org> parents: 29462 diff changeset	536 def _createcmdserver(self):
540c01a18bb7 commandserver: extract method to create commandserver instance per request Yuya Nishihara <yuya@tcha.org> parents: 29462 diff changeset	537 ui = self.server.ui
540c01a18bb7 commandserver: extract method to create commandserver instance per request Yuya Nishihara <yuya@tcha.org> parents: 29462 diff changeset	538 repo = self.server.repo
540c01a18bb7 commandserver: extract method to create commandserver instance per request Yuya Nishihara <yuya@tcha.org> parents: 29462 diff changeset	539 return chgcmdserver(ui, repo, self.rfile, self.wfile, self.connection,
540c01a18bb7 commandserver: extract method to create commandserver instance per request Yuya Nishihara <yuya@tcha.org> parents: 29462 diff changeset	540 self.server.hashstate, self.server.baseaddress)
540c01a18bb7 commandserver: extract method to create commandserver instance per request Yuya Nishihara <yuya@tcha.org> parents: 29462 diff changeset	541
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	542 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	543 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	544
28326 ea400a4f32e6 chgserver: mangle server address to include confighash Jun Wu <quark@fb.com> parents: 28325 diff changeset	545 def _hashaddress(address, hashstr):
ea400a4f32e6 chgserver: mangle server address to include confighash Jun Wu <quark@fb.com> parents: 28325 diff changeset	546 return '%s-%s' % (address, hashstr)
ea400a4f32e6 chgserver: mangle server address to include confighash Jun Wu <quark@fb.com> parents: 28325 diff changeset	547
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	548 class AutoExitMixIn: # use old-style to comply with SocketServer design
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	549 lastactive = time.time()
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	550 idletimeout = 3600 # default 1 hour
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	551
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	552 def startautoexitthread(self):
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	553 # note: the auto-exit check here is cheap enough to not use a thread,
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	554 # be done in serve_forever. however SocketServer is hook-unfriendly,
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 # you simply cannot hook serve_forever without copying a lot of code.
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	556 # besides, serve_forever's docstring suggests using thread.
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	557 thread = threading.Thread(target=self._autoexitloop)
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	558 thread.daemon = True
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 thread.start()
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
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 def _autoexitloop(self, interval=1):
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	562 while True:
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	563 time.sleep(interval)
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 if not self.issocketowner():
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 _log('%s is not owned, exiting.\n' % self.server_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	566 break
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 if time.time() - self.lastactive > self.idletimeout:
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 _log('being idle too long. exiting.\n')
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	569 break
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 self.shutdown()
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	571
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	572 def process_request(self, request, 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	573 self.lastactive = time.time()
29433 33770d2b6cf9 py3: conditionalize SocketServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29428 diff changeset	574 return socketserver.ForkingMixIn.process_request(
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	575 self, request, 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	576
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	577 def server_bind(self):
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	578 # 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	579 # check later
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	580 tempaddress = _tempaddress(self.server_address)
28768 2461f33c9f97 chgserver: use relative path at socket.bind Jun Wu <quark@fb.com> parents: 28767 diff changeset	581 # use relative path instead of full path at bind() if possible, since
2461f33c9f97 chgserver: use relative path at socket.bind Jun Wu <quark@fb.com> parents: 28767 diff changeset	582 # AF_UNIX path has very small length limit (107 chars) on common
2461f33c9f97 chgserver: use relative path at socket.bind Jun Wu <quark@fb.com> parents: 28767 diff changeset	583 # platforms (see sys/un.h)
2461f33c9f97 chgserver: use relative path at socket.bind Jun Wu <quark@fb.com> parents: 28767 diff changeset	584 dirname, basename = os.path.split(tempaddress)
2461f33c9f97 chgserver: use relative path at socket.bind Jun Wu <quark@fb.com> parents: 28767 diff changeset	585 bakwdfd = None
2461f33c9f97 chgserver: use relative path at socket.bind Jun Wu <quark@fb.com> parents: 28767 diff changeset	586 if dirname:
2461f33c9f97 chgserver: use relative path at socket.bind Jun Wu <quark@fb.com> parents: 28767 diff changeset	587 bakwdfd = os.open('.', os.O_DIRECTORY)
2461f33c9f97 chgserver: use relative path at socket.bind Jun Wu <quark@fb.com> parents: 28767 diff changeset	588 os.chdir(dirname)
2461f33c9f97 chgserver: use relative path at socket.bind Jun Wu <quark@fb.com> parents: 28767 diff changeset	589 self.socket.bind(basename)
2461f33c9f97 chgserver: use relative path at socket.bind Jun Wu <quark@fb.com> parents: 28767 diff changeset	590 self._socketstat = os.stat(basename)
28223 0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	591 # rename will replace the old socket file if exists atomically. the
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	592 # old server will detect ownership change and exit.
28768 2461f33c9f97 chgserver: use relative path at socket.bind Jun Wu <quark@fb.com> parents: 28767 diff changeset	593 util.rename(basename, self.server_address)
2461f33c9f97 chgserver: use relative path at socket.bind Jun Wu <quark@fb.com> parents: 28767 diff changeset	594 if bakwdfd:
2461f33c9f97 chgserver: use relative path at socket.bind Jun Wu <quark@fb.com> parents: 28767 diff changeset	595 os.fchdir(bakwdfd)
2461f33c9f97 chgserver: use relative path at socket.bind Jun Wu <quark@fb.com> parents: 28767 diff changeset	596 os.close(bakwdfd)
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	597
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	598 def issocketowner(self):
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	599 try:
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	600 stat = os.stat(self.server_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	601 return (stat.st_ino == self._socketstat.st_ino 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	602 stat.st_mtime == self._socketstat.st_mtime)
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	603 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	604 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	605
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	606 def unlinksocketfile(self):
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	607 if not self.issocketowner():
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	608 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	609 # 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	610 # 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	611 # 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	612 # the client will start a new server on demand.
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	613 try:
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	614 os.unlink(self.server_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	615 except OSError as exc:
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	616 if exc.errno != errno.ENOENT:
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	617 raise
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	618
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	619 class chgunixservice(commandserver.unixservice):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	620 def init(self):
28603 f467073cd798 chgserver: drop bundle.mainreporoot config Jun Wu <quark@fb.com> parents: 28602 diff changeset	621 if self.repo:
f467073cd798 chgserver: drop bundle.mainreporoot config Jun Wu <quark@fb.com> parents: 28602 diff changeset	622 # one chgserver can serve multiple repos. drop repo infomation
f467073cd798 chgserver: drop bundle.mainreporoot config Jun Wu <quark@fb.com> parents: 28602 diff changeset	623 self.ui.setconfig('bundle', 'mainreporoot', '', 'repo')
f467073cd798 chgserver: drop bundle.mainreporoot config Jun Wu <quark@fb.com> parents: 28602 diff changeset	624 self.repo = None
28326 ea400a4f32e6 chgserver: mangle server address to include confighash Jun Wu <quark@fb.com> parents: 28325 diff changeset	625 self._inithashstate()
28536 a979f5b03320 chgserver: invalidate the server if extensions fail to load Jun Wu <quark@fb.com> parents: 28535 diff changeset	626 self._checkextensions()
29433 33770d2b6cf9 py3: conditionalize SocketServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29428 diff changeset	627 class cls(AutoExitMixIn, socketserver.ForkingMixIn,
33770d2b6cf9 py3: conditionalize SocketServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29428 diff changeset	628 socketserver.UnixStreamServer):
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	629 ui = self.ui
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	630 repo = self.repo
28328 e00e57d83653 chgserver: pass hashstate and base server address to chgcmdserver Jun Wu <quark@fb.com> parents: 28327 diff changeset	631 hashstate = self.hashstate
e00e57d83653 chgserver: pass hashstate and base server address to chgcmdserver Jun Wu <quark@fb.com> parents: 28327 diff changeset	632 baseaddress = self.baseaddress
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	633 self.server = cls(self.address, _requesthandler)
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	634 self.server.idletimeout = self.ui.configint(
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	635 'chgserver', 'idletimeout', self.server.idletimeout)
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	636 self.server.startautoexitthread()
28326 ea400a4f32e6 chgserver: mangle server address to include confighash Jun Wu <quark@fb.com> parents: 28325 diff changeset	637 self._createsymlink()
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	638
28326 ea400a4f32e6 chgserver: mangle server address to include confighash Jun Wu <quark@fb.com> parents: 28325 diff changeset	639 def _inithashstate(self):
ea400a4f32e6 chgserver: mangle server address to include confighash Jun Wu <quark@fb.com> parents: 28325 diff changeset	640 self.baseaddress = self.address
ea400a4f32e6 chgserver: mangle server address to include confighash Jun Wu <quark@fb.com> parents: 28325 diff changeset	641 if self.ui.configbool('chgserver', 'skiphash', False):
ea400a4f32e6 chgserver: mangle server address to include confighash Jun Wu <quark@fb.com> parents: 28325 diff changeset	642 self.hashstate = None
ea400a4f32e6 chgserver: mangle server address to include confighash Jun Wu <quark@fb.com> parents: 28325 diff changeset	643 return
ea400a4f32e6 chgserver: mangle server address to include confighash Jun Wu <quark@fb.com> parents: 28325 diff changeset	644 self.hashstate = hashstate.fromui(self.ui)
ea400a4f32e6 chgserver: mangle server address to include confighash Jun Wu <quark@fb.com> parents: 28325 diff changeset	645 self.address = _hashaddress(self.address, self.hashstate.confighash)
ea400a4f32e6 chgserver: mangle server address to include confighash Jun Wu <quark@fb.com> parents: 28325 diff changeset	646
28536 a979f5b03320 chgserver: invalidate the server if extensions fail to load Jun Wu <quark@fb.com> parents: 28535 diff changeset	647 def _checkextensions(self):
a979f5b03320 chgserver: invalidate the server if extensions fail to load Jun Wu <quark@fb.com> parents: 28535 diff changeset	648 if not self.hashstate:
a979f5b03320 chgserver: invalidate the server if extensions fail to load Jun Wu <quark@fb.com> parents: 28535 diff changeset	649 return
a979f5b03320 chgserver: invalidate the server if extensions fail to load Jun Wu <quark@fb.com> parents: 28535 diff changeset	650 if extensions.notloaded():
a979f5b03320 chgserver: invalidate the server if extensions fail to load Jun Wu <quark@fb.com> parents: 28535 diff changeset	651 # one or more extensions failed to load. mtimehash becomes
a979f5b03320 chgserver: invalidate the server if extensions fail to load Jun Wu <quark@fb.com> parents: 28535 diff changeset	652 # meaningless because we do not know the paths of those extensions.
a979f5b03320 chgserver: invalidate the server if extensions fail to load Jun Wu <quark@fb.com> parents: 28535 diff changeset	653 # set mtimehash to an illegal hash value to invalidate the server.
a979f5b03320 chgserver: invalidate the server if extensions fail to load Jun Wu <quark@fb.com> parents: 28535 diff changeset	654 self.hashstate.mtimehash = ''
a979f5b03320 chgserver: invalidate the server if extensions fail to load Jun Wu <quark@fb.com> parents: 28535 diff changeset	655
28326 ea400a4f32e6 chgserver: mangle server address to include confighash Jun Wu <quark@fb.com> parents: 28325 diff changeset	656 def _createsymlink(self):
ea400a4f32e6 chgserver: mangle server address to include confighash Jun Wu <quark@fb.com> parents: 28325 diff changeset	657 if self.baseaddress == self.address:
ea400a4f32e6 chgserver: mangle server address to include confighash Jun Wu <quark@fb.com> parents: 28325 diff changeset	658 return
ea400a4f32e6 chgserver: mangle server address to include confighash Jun Wu <quark@fb.com> parents: 28325 diff changeset	659 tempaddress = _tempaddress(self.baseaddress)
28342 bd05d38a1002 chgserver: use basename for socket symlink Jun Wu <quark@fb.com> parents: 28328 diff changeset	660 os.symlink(os.path.basename(self.address), tempaddress)
28326 ea400a4f32e6 chgserver: mangle server address to include confighash Jun Wu <quark@fb.com> parents: 28325 diff changeset	661 util.rename(tempaddress, self.baseaddress)
ea400a4f32e6 chgserver: mangle server address to include confighash Jun Wu <quark@fb.com> parents: 28325 diff changeset	662
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	663 def run(self):
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	664 try:
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	665 self.server.serve_forever()
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	666 finally:
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	667 self.server.unlinksocketfile()
0a853dc9b306 chgserver: auto exit after being idle for too long or lose the socket file Jun Wu <quark@fb.com> parents: 28159 diff changeset	668
27792 980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	669 def uisetup(ui):
980957333cfa chgserver: import background server extension from cHg Yuya Nishihara <yuya@tcha.org> parents: diff changeset	670 commandserver._servicemap['chgunix'] = chgunixservice
28261 2ab59ac06b76 chg: detect chg started by chg Jun Wu <quark@fb.com> parents: 28223 diff changeset	671
2ab59ac06b76 chg: detect chg started by chg Jun Wu <quark@fb.com> parents: 28223 diff changeset	672 # CHGINTERNALMARK is temporarily set by chg client to detect if chg will
2ab59ac06b76 chg: detect chg started by chg Jun Wu <quark@fb.com> parents: 28223 diff changeset	673 # start another chg. drop it to avoid possible side effects.
2ab59ac06b76 chg: detect chg started by chg Jun Wu <quark@fb.com> parents: 28223 diff changeset	674 if 'CHGINTERNALMARK' in os.environ:
2ab59ac06b76 chg: detect chg started by chg Jun Wu <quark@fb.com> parents: 28223 diff changeset	675 del os.environ['CHGINTERNALMARK']

Mercurial > public > mercurial-scm > hg

annotate hgext/chgserver.py @ 29513:e5b4d79a9140