mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 00:14:35 +03:00
f1c575a099
Summary: This check is useful and detects real errors (ex. fbconduit). Unfortunately `arc lint` will run it with both py2 and py3 so a lot of py2 builtins will still be warned. I didn't find a clean way to disable py3 check. So this diff tries to fix them. For `xrange`, the change was done by a script: ``` import sys import redbaron headertypes = {'comment', 'endl', 'from_import', 'import', 'string', 'assignment', 'atomtrailers'} xrangefix = '''try: xrange(0) except NameError: xrange = range ''' def isxrange(x): try: return x[0].value == 'xrange' except Exception: return False def main(argv): for i, path in enumerate(argv): print('(%d/%d) scanning %s' % (i + 1, len(argv), path)) content = open(path).read() try: red = redbaron.RedBaron(content) except Exception: print(' warning: failed to parse') continue hasxrange = red.find('atomtrailersnode', value=isxrange) hasxrangefix = 'xrange = range' in content if hasxrangefix or not hasxrange: print(' no need to change') continue # find a place to insert the compatibility statement changed = False for node in red: if node.type in headertypes: continue # node.insert_before is an easier API, but it has bugs changing # other "finally" and "except" positions. So do the insert # manually. # # node.insert_before(xrangefix) line = node.absolute_bounding_box.top_left.line - 1 lines = content.splitlines(1) content = ''.join(lines[:line]) + xrangefix + ''.join(lines[line:]) changed = True break if changed: # "content" is faster than "red.dumps()" open(path, 'w').write(content) print(' updated') if __name__ == "__main__": sys.exit(main(sys.argv[1:])) ``` For other py2 builtins that do not have a py3 equivalent, some `# noqa` were added as a workaround for now. Reviewed By: DurhamG Differential Revision: D6934535 fbshipit-source-id: 546b62830af144bc8b46788d2e0fd00496838939
181 lines
5.3 KiB
Python
181 lines
5.3 KiB
Python
# server.py - utility and factory of server
|
|
#
|
|
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
|
|
#
|
|
# This software may be used and distributed according to the terms of the
|
|
# GNU General Public License version 2 or any later version.
|
|
|
|
from __future__ import absolute_import
|
|
|
|
import os
|
|
import tempfile
|
|
|
|
from .i18n import _
|
|
|
|
from . import (
|
|
chgserver,
|
|
cmdutil,
|
|
commandserver,
|
|
error,
|
|
hgweb,
|
|
pycompat,
|
|
util,
|
|
)
|
|
|
|
try:
|
|
xrange(0)
|
|
except NameError:
|
|
xrange = range
|
|
|
|
def runservice(opts, parentfn=None, initfn=None, runfn=None, logfile=None,
|
|
runargs=None, appendpid=False):
|
|
'''Run a command as a service.'''
|
|
|
|
def writepid(pid):
|
|
if opts['pid_file']:
|
|
if appendpid:
|
|
mode = 'ab'
|
|
else:
|
|
mode = 'wb'
|
|
fp = open(opts['pid_file'], mode)
|
|
fp.write('%d\n' % pid)
|
|
fp.close()
|
|
|
|
if opts['daemon'] and not opts['daemon_postexec']:
|
|
# Signal child process startup with file removal
|
|
lockfd, lockpath = tempfile.mkstemp(prefix='hg-service-')
|
|
os.close(lockfd)
|
|
portpath = opts.get('port_file')
|
|
if portpath:
|
|
util.tryunlink(portpath)
|
|
try:
|
|
if not runargs:
|
|
runargs = util.hgcmd() + pycompat.sysargv[1:]
|
|
runargs.append('--daemon-postexec=unlink:%s' % lockpath)
|
|
# Don't pass --cwd to the child process, because we've already
|
|
# changed directory.
|
|
for i in xrange(1, len(runargs)):
|
|
if runargs[i].startswith('--cwd='):
|
|
del runargs[i]
|
|
break
|
|
elif runargs[i].startswith('--cwd'):
|
|
del runargs[i:i + 2]
|
|
break
|
|
def condfn():
|
|
if portpath and not os.path.exists(portpath):
|
|
return False
|
|
return not os.path.exists(lockpath)
|
|
pid = util.rundetached(runargs, condfn)
|
|
if pid < 0:
|
|
raise error.Abort(_('child process failed to start'))
|
|
writepid(pid)
|
|
finally:
|
|
util.tryunlink(lockpath)
|
|
if parentfn:
|
|
return parentfn(pid)
|
|
else:
|
|
return
|
|
|
|
if initfn:
|
|
initfn()
|
|
|
|
if not opts['daemon']:
|
|
writepid(util.getpid())
|
|
|
|
if opts['daemon_postexec']:
|
|
try:
|
|
os.setsid()
|
|
except AttributeError:
|
|
pass
|
|
for inst in opts['daemon_postexec']:
|
|
if inst.startswith('unlink:'):
|
|
lockpath = inst[7:]
|
|
os.unlink(lockpath)
|
|
elif inst.startswith('chdir:'):
|
|
os.chdir(inst[6:])
|
|
elif inst != 'none':
|
|
raise error.Abort(_('invalid value for --daemon-postexec: %s')
|
|
% inst)
|
|
util.hidewindow()
|
|
util.stdout.flush()
|
|
util.stderr.flush()
|
|
|
|
nullfd = os.open(os.devnull, os.O_RDWR)
|
|
logfilefd = nullfd
|
|
if logfile:
|
|
logfilefd = os.open(logfile, os.O_RDWR | os.O_CREAT | os.O_APPEND,
|
|
0o666)
|
|
os.dup2(nullfd, 0)
|
|
os.dup2(logfilefd, 1)
|
|
os.dup2(logfilefd, 2)
|
|
if nullfd not in (0, 1, 2):
|
|
os.close(nullfd)
|
|
if logfile and logfilefd not in (0, 1, 2):
|
|
os.close(logfilefd)
|
|
|
|
if runfn:
|
|
return runfn()
|
|
|
|
_cmdservicemap = {
|
|
'chgunix': chgserver.chgunixservice,
|
|
'pipe': commandserver.pipeservice,
|
|
'unix': commandserver.unixforkingservice,
|
|
}
|
|
|
|
def _createcmdservice(ui, repo, opts):
|
|
mode = opts['cmdserver']
|
|
try:
|
|
return _cmdservicemap[mode](ui, repo, opts)
|
|
except KeyError:
|
|
raise error.Abort(_('unknown mode %s') % mode)
|
|
|
|
def _createhgwebservice(ui, repo, opts):
|
|
# this way we can check if something was given in the command-line
|
|
if opts.get('port'):
|
|
opts['port'] = util.getport(opts.get('port'))
|
|
|
|
alluis = {ui}
|
|
if repo:
|
|
baseui = repo.baseui
|
|
alluis.update([repo.baseui, repo.ui])
|
|
else:
|
|
baseui = ui
|
|
webconf = opts.get('web_conf') or opts.get('webdir_conf')
|
|
if webconf:
|
|
if opts.get('subrepos'):
|
|
raise error.Abort(_('--web-conf cannot be used with --subrepos'))
|
|
|
|
# load server settings (e.g. web.port) to "copied" ui, which allows
|
|
# hgwebdir to reload webconf cleanly
|
|
servui = ui.copy()
|
|
servui.readconfig(webconf, sections=['web'])
|
|
alluis.add(servui)
|
|
elif opts.get('subrepos'):
|
|
servui = ui
|
|
|
|
# If repo is None, hgweb.createapp() already raises a proper abort
|
|
# message as long as webconf is None.
|
|
if repo:
|
|
webconf = dict()
|
|
cmdutil.addwebdirpath(repo, "", webconf)
|
|
else:
|
|
servui = ui
|
|
|
|
optlist = ("name templates style address port prefix ipv6"
|
|
" accesslog errorlog certificate encoding")
|
|
for o in optlist.split():
|
|
val = opts.get(o, '')
|
|
if val in (None, ''): # should check against default options instead
|
|
continue
|
|
for u in alluis:
|
|
u.setconfig("web", o, val, 'serve')
|
|
|
|
app = hgweb.createapp(baseui, repo, webconf)
|
|
return hgweb.httpservice(servui, app, opts)
|
|
|
|
def createservice(ui, repo, opts):
|
|
if opts["cmdserver"]:
|
|
return _createcmdservice(ui, repo, opts)
|
|
else:
|
|
return _createhgwebservice(ui, repo, opts)
|