##// END OF EJS Templates
perf: change the way we approach revlog reading...
perf: change the way we approach revlog reading If the `reading` context manager is available, we should use it over explicit file handle management. This will help us to make file handle management a matter more internal to the revlog.

File last commit:

r51890:def6f1a4 default
r51901:2f1967ff default
Show More
procutil.py
798 lines | 22.5 KiB | text/x-python | PythonLexer
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 # procutil.py - utility for managing processes and executable environment
#
# Copyright 2005 K. Thananchayan <thananck@yahoo.com>
Raphaël Gomès
contributor: change mentions of mpm to olivia...
r47575 # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com>
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
Yuya Nishihara
procutil: introduce context-manager interface for protect/restorestdio...
r37142 import contextlib
Augie Fackler
remotefilelog: transplant runbgcommand to procutil...
r40532 import errno
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 import io
import os
import signal
import subprocess
import sys
Rodrigo Damazio Bovendorp
procutil: always waiting on child processes to prevent zombies with 'hg serve'...
r45304 import threading
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 import time
Matt Harbison
pytype: stop excluding mercurial/ui.py...
r50688 from typing import (
BinaryIO,
)
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 from ..i18n import _
Gregory Szorc
py3: manually import getattr where it is needed...
r43359 from ..pycompat import (
open,
)
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136
from .. import (
encoding,
error,
policy,
pycompat,
Matt Harbison
pytype: stop excluding mercurial/ui.py...
r50688 typelib,
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 )
Martin von Zweigbergk
procutil: move mainfrozen() to new resourceutil.py...
r44067 # Import like this to keep import-checker happy
from ..utils import resourceutil
Augie Fackler
cleanup: remove pointless r-prefixes on single-quoted strings...
r43906 osutil = policy.importmod('osutil')
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136
Manuel Jacob
procutil: split import and reassignment...
r45587 if pycompat.iswindows:
from .. import windows as platform
else:
from .. import posix as platform
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 def isatty(fp):
try:
return fp.isatty()
except AttributeError:
return False
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
procutil: introduce pseudo file object that just raises EBADF...
r46790 class BadFile(io.RawIOBase):
"""Dummy file object to simulate closed stdio behavior"""
def readinto(self, b):
raise IOError(errno.EBADF, 'Bad file descriptor')
def write(self, b):
raise IOError(errno.EBADF, 'Bad file descriptor')
Gregory Szorc
py3: use class X: instead of class X(object):...
r49801 class LineBufferedWrapper:
Manuel Jacob
procutil: define LineBufferedWrapper on all Python versions...
r45584 def __init__(self, orig):
self.orig = orig
Manuel Jacob
py3: make stdout line-buffered if connected to a TTY...
r45477
Manuel Jacob
procutil: define LineBufferedWrapper on all Python versions...
r45584 def __getattr__(self, attr):
return getattr(self.orig, attr)
Manuel Jacob
py3: make stdout line-buffered if connected to a TTY...
r45477
Manuel Jacob
procutil: define LineBufferedWrapper on all Python versions...
r45584 def write(self, s):
orig = self.orig
res = orig.write(s)
if s.endswith(b'\n'):
orig.flush()
return res
Manuel Jacob
py3: make stdout line-buffered if connected to a TTY...
r45477
Manuel Jacob
procutil: define LineBufferedWrapper on all Python versions...
r45584
Matt Harbison
pytype: stop excluding procutil.py...
r49318 # pytype: disable=attribute-error
Manuel Jacob
procutil: define LineBufferedWrapper on all Python versions...
r45584 io.BufferedIOBase.register(LineBufferedWrapper)
Matt Harbison
pytype: stop excluding procutil.py...
r49318 # pytype: enable=attribute-error
Manuel Jacob
py3: make stdout line-buffered if connected to a TTY...
r45477
Manuel Jacob
procutil: factor out conditional creation of LineBufferedWrapper...
r45585 def make_line_buffered(stream):
Manuel Jacob
procutil: make stream detection in make_line_buffered more correct and strict...
r50273 # First, check if we need to wrap the stream.
check_stream = stream
while True:
if isinstance(check_stream, WriteAllWrapper):
check_stream = check_stream.orig
elif pycompat.iswindows and isinstance(
check_stream,
# pytype: disable=module-attr
platform.winstdout
# pytype: enable=module-attr
):
check_stream = check_stream.fp
else:
break
if isinstance(check_stream, io.RawIOBase):
# The stream is unbuffered, we don't need to emulate line buffering.
Manuel Jacob
procutil: factor out conditional creation of LineBufferedWrapper...
r45585 return stream
Manuel Jacob
procutil: make stream detection in make_line_buffered more correct and strict...
r50273 elif isinstance(check_stream, io.BufferedIOBase):
# The stream supports some kind of buffering. We can't assume that
# lines are flushed. Fall back to wrapping the stream.
pass
else:
raise NotImplementedError(
"can't determine whether stream is buffered or not"
)
Manuel Jacob
procutil: factor out conditional creation of LineBufferedWrapper...
r45585 if isinstance(stream, LineBufferedWrapper):
return stream
return LineBufferedWrapper(stream)
Yuya Nishihara
chgserver: backport py3 buffered I/O workarounds from procutil...
r46452 def unwrap_line_buffered(stream):
if isinstance(stream, LineBufferedWrapper):
assert not isinstance(stream.orig, LineBufferedWrapper)
return stream.orig
return stream
Matt Harbison
pytype: stop excluding mercurial/ui.py...
r50688 class WriteAllWrapper(typelib.BinaryIO_Proxy):
def __init__(self, orig: BinaryIO):
Manuel Jacob
procutil: ensure that procutil.std{out,err}.write() writes all bytes...
r45655 self.orig = orig
def __getattr__(self, attr):
return getattr(self.orig, attr)
def write(self, s):
write1 = self.orig.write
m = memoryview(s)
total_to_write = len(s)
total_written = 0
while total_written < total_to_write:
Matt Harbison
procutil: avoid `+= None` when writing to full std{err,out} descriptor on py3...
r49958 c = write1(m[total_written:])
if c:
total_written += c
Manuel Jacob
procutil: ensure that procutil.std{out,err}.write() writes all bytes...
r45655 return total_written
Matt Harbison
pytype: stop excluding procutil.py...
r49318 # pytype: disable=attribute-error
Manuel Jacob
procutil: ensure that procutil.std{out,err}.write() writes all bytes...
r45655 io.IOBase.register(WriteAllWrapper)
Matt Harbison
pytype: stop excluding procutil.py...
r49318 # pytype: enable=attribute-error
Manuel Jacob
procutil: ensure that procutil.std{out,err}.write() writes all bytes...
r45655
Manuel Jacob
procutil: make _make_write_all() function private...
r45663 def _make_write_all(stream):
Manuel Jacob
procutil: ensure that procutil.std{out,err}.write() writes all bytes...
r45655 if isinstance(stream, WriteAllWrapper):
return stream
if isinstance(stream, io.BufferedIOBase):
# The io.BufferedIOBase.write() contract guarantees that all data is
# written.
return stream
# In general, the write() method of streams is free to write only part of
# the data.
return WriteAllWrapper(stream)
Gregory Szorc
procutil: delete Python 2 support code...
r49765 # Python 3 implements its own I/O streams. Unlike stdio of C library,
# sys.stdin/stdout/stderr may be None if underlying fd is closed.
Pulkit Goyal
procutils: don't try to get `.buffer` if sys.stdin is None...
r46699
Gregory Szorc
procutil: delete Python 2 support code...
r49765 # TODO: .buffer might not exist if std streams were replaced; we'll need
# a silly wrapper to make a bytes stream backed by a unicode one.
Yuya Nishihara
procutil: assign pseudo file object if sys.stdout/stderr is missing...
r46791
Gregory Szorc
procutil: delete Python 2 support code...
r49765 if sys.stdin is None:
stdin = BadFile()
else:
stdin = sys.stdin.buffer
if sys.stdout is None:
stdout = BadFile()
Manuel Jacob
pycompat: remove pycompat.{stdin,stdout,stderr}...
r45599 else:
Gregory Szorc
procutil: delete Python 2 support code...
r49765 stdout = _make_write_all(sys.stdout.buffer)
if sys.stderr is None:
stderr = BadFile()
else:
stderr = _make_write_all(sys.stderr.buffer)
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136
Gregory Szorc
procutil: delete Python 2 support code...
r49765 if pycompat.iswindows:
# Work around Windows bugs.
stdout = platform.winstdout(stdout) # pytype: disable=module-attr
stderr = platform.winstdout(stderr) # pytype: disable=module-attr
Jean-Francois Pieronne
openvms: make process spawning works on OpenVMS...
r51890 if isatty(stdout) and pycompat.sysplatform != b'OpenVMS':
Gregory Szorc
procutil: delete Python 2 support code...
r49765 # The standard library doesn't offer line-buffered binary streams.
stdout = make_line_buffered(stdout)
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136
findexe = platform.findexe
_gethgcmd = platform.gethgcmd
getuser = platform.getuser
getpid = os.getpid
hidewindow = platform.hidewindow
readpipe = platform.readpipe
setbinary = platform.setbinary
setsignalhandler = platform.setsignalhandler
shellquote = platform.shellquote
shellsplit = platform.shellsplit
spawndetached = platform.spawndetached
sshargs = platform.sshargs
testpid = platform.testpid
try:
setprocname = osutil.setprocname
except AttributeError:
pass
try:
unblocksignal = osutil.unblocksignal
except AttributeError:
pass
Jean-Francois Pieronne
openvms: make process spawning works on OpenVMS...
r51890 closefds = pycompat.isposix and pycompat.sysplatform != b'OpenVMS'
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
procutil: unify platform.explainexit()...
r37478 def explainexit(code):
Yuya Nishihara
procutil: make explainexit() simply return a message (API)...
r37481 """return a message describing a subprocess status
Yuya Nishihara
procutil: unify platform.explainexit()...
r37478 (codes from kill are negative - not os.system/wait encoding)"""
if code >= 0:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return _(b"exited with status %d") % code
return _(b"killed by signal %d") % -code
Yuya Nishihara
procutil: unify platform.explainexit()...
r37478
Augie Fackler
formatting: blacken the codebase...
r43346
Gregory Szorc
py3: use class X: instead of class X(object):...
r49801 class _pfile:
Yuya Nishihara
procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API)...
r37477 """File-like wrapper for a stream opened by subprocess.Popen()"""
def __init__(self, proc, fp):
self._proc = proc
self._fp = fp
def close(self):
# unlike os.popen(), this returns an integer in subprocess coding
self._fp.close()
return self._proc.wait()
def __iter__(self):
return iter(self._fp)
def __getattr__(self, attr):
return getattr(self._fp, attr)
def __enter__(self):
return self
def __exit__(self, exc_type, exc_value, exc_tb):
self.close()
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 def popen(cmd, mode=b'rb', bufsize=-1):
if mode == b'rb':
Yuya Nishihara
procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API)...
r37477 return _popenreader(cmd, bufsize)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 elif mode == b'wb':
Yuya Nishihara
procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API)...
r37477 return _popenwriter(cmd, bufsize)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 raise error.ProgrammingError(b'unsupported mode: %r' % mode)
Yuya Nishihara
procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API)...
r37477
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API)...
r37477 def _popenreader(cmd, bufsize):
Augie Fackler
formatting: blacken the codebase...
r43346 p = subprocess.Popen(
Manuel Jacob
cleanup: eliminate procutil.quotecommand()...
r45403 tonativestr(cmd),
Augie Fackler
formatting: blacken the codebase...
r43346 shell=True,
bufsize=bufsize,
close_fds=closefds,
stdout=subprocess.PIPE,
)
Yuya Nishihara
procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API)...
r37477 return _pfile(p, p.stdout)
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API)...
r37477 def _popenwriter(cmd, bufsize):
Augie Fackler
formatting: blacken the codebase...
r43346 p = subprocess.Popen(
Manuel Jacob
cleanup: eliminate procutil.quotecommand()...
r45403 tonativestr(cmd),
Augie Fackler
formatting: blacken the codebase...
r43346 shell=True,
bufsize=bufsize,
close_fds=closefds,
stdin=subprocess.PIPE,
)
Yuya Nishihara
procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API)...
r37477 return _pfile(p, p.stdin)
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
procutil: drop unused 'newlines' option from popen*() (API)...
r37482 def popen2(cmd, env=None):
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 # Setting bufsize to -1 lets the system decide the buffer size.
# The default for bufsize is 0, meaning unbuffered. This leads to
# poor performance on Mac OS X: http://bugs.python.org/issue4194
Augie Fackler
formatting: blacken the codebase...
r43346 p = subprocess.Popen(
tonativestr(cmd),
shell=True,
bufsize=-1,
close_fds=closefds,
stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
env=tonativeenv(env),
)
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 return p.stdin, p.stdout
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
procutil: drop unused 'newlines' option from popen*() (API)...
r37482 def popen3(cmd, env=None):
stdin, stdout, stderr, p = popen4(cmd, env)
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 return stdin, stdout, stderr
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
procutil: drop unused 'newlines' option from popen*() (API)...
r37482 def popen4(cmd, env=None, bufsize=-1):
Augie Fackler
formatting: blacken the codebase...
r43346 p = subprocess.Popen(
tonativestr(cmd),
shell=True,
bufsize=bufsize,
close_fds=closefds,
stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
env=tonativeenv(env),
)
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 return p.stdin, p.stdout, p.stderr, p
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 def pipefilter(s, cmd):
'''filter string S through command CMD, returning its output'''
Augie Fackler
formatting: blacken the codebase...
r43346 p = subprocess.Popen(
tonativestr(cmd),
shell=True,
close_fds=closefds,
stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
)
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 pout, perr = p.communicate(s)
return pout
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 def tempfilter(s, cmd):
Augie Fackler
formating: upgrade to black 20.8b1...
r46554 """filter string S through a pair of temporary files with CMD.
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 CMD is used as a template to create the real command to be run,
with the strings INFILE and OUTFILE replaced by the real names of
Augie Fackler
formating: upgrade to black 20.8b1...
r46554 the temporary files generated."""
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 inname, outname = None, None
try:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 infd, inname = pycompat.mkstemp(prefix=b'hg-filter-in-')
Augie Fackler
cleanup: remove pointless r-prefixes on single-quoted strings...
r43906 fp = os.fdopen(infd, 'wb')
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 fp.write(s)
fp.close()
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 outfd, outname = pycompat.mkstemp(prefix=b'hg-filter-out-')
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 os.close(outfd)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 cmd = cmd.replace(b'INFILE', inname)
cmd = cmd.replace(b'OUTFILE', outname)
Yuya Nishihara
procutil: fix error message of tempfile filter...
r37479 code = system(cmd)
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 if code:
Augie Fackler
formatting: blacken the codebase...
r43346 raise error.Abort(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _(b"command '%s' failed: %s") % (cmd, explainexit(code))
Augie Fackler
formatting: blacken the codebase...
r43346 )
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 with open(outname, b'rb') as fp:
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 return fp.read()
finally:
try:
if inname:
os.unlink(inname)
except OSError:
pass
try:
if outname:
os.unlink(outname)
except OSError:
pass
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 _filtertable = {
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'tempfile:': tempfilter,
b'pipe:': pipefilter,
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 }
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 def filter(s, cmd):
Matt Harbison
cleanup: fix docstring formatting...
r44226 """filter a string through a command that transforms its input to its
output"""
Gregory Szorc
global: bulk replace simple pycompat.iteritems(x) with x.items()...
r49768 for name, fn in _filtertable.items():
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 if cmd.startswith(name):
Augie Fackler
formatting: blacken the codebase...
r43346 return fn(s, cmd[len(name) :].lstrip())
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 return pipefilter(s, cmd)
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 _hgexecutable = None
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 def hgexecutable():
"""return location of the 'hg' executable.
Defaults to $HG or 'hg' in the search path.
"""
if _hgexecutable is None:
Jean-Francois Pieronne
openvms: make process spawning works on OpenVMS...
r51890 hg = encoding.environ.get(b'HG', '')
Augie Fackler
cleanup: remove pointless r-prefixes on single-quoted strings...
r43906 mainmod = sys.modules['__main__']
Jean-Francois Pieronne
openvms: make process spawning works on OpenVMS...
r51890 if pycompat.sysplatform == b'OpenVMS' and hg[0:1] == '$':
hg = 'mcr ' + hg[1:]
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 if hg:
_sethgexecutable(hg)
Martin von Zweigbergk
procutil: move mainfrozen() to new resourceutil.py...
r44067 elif resourceutil.mainfrozen():
Martin von Zweigbergk
py3: use native string for 'macosx_app'...
r44056 if getattr(sys, 'frozen', None) == 'macosx_app':
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 # Env variable set by py2app
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _sethgexecutable(encoding.environ[b'EXECUTABLEPATH'])
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 else:
_sethgexecutable(pycompat.sysexecutable)
Augie Fackler
formatting: blacken the codebase...
r43346 elif (
not pycompat.iswindows
Martin von Zweigbergk
py3: drop an unnecessary fsencode() before comparing with constant...
r44055 and os.path.basename(getattr(mainmod, '__file__', '')) == 'hg'
Augie Fackler
formatting: blacken the codebase...
r43346 ):
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 _sethgexecutable(pycompat.fsencode(mainmod.__file__))
else:
Augie Fackler
formatting: blacken the codebase...
r43346 _sethgexecutable(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 findexe(b'hg') or os.path.basename(pycompat.sysargv[0])
Augie Fackler
formatting: blacken the codebase...
r43346 )
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 return _hgexecutable
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 def _sethgexecutable(path):
"""set location of the 'hg' executable"""
global _hgexecutable
_hgexecutable = path
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 def _testfileno(f, stdf):
fileno = getattr(f, 'fileno', None)
try:
return fileno and fileno() == stdf.fileno()
except io.UnsupportedOperation:
Augie Fackler
formatting: blacken the codebase...
r43346 return False # fileno() raised UnsupportedOperation
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136
def isstdin(f):
return _testfileno(f, sys.__stdin__)
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 def isstdout(f):
return _testfileno(f, sys.__stdout__)
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
procutil: move protectio/restoreio from commandserver...
r37141 def protectstdio(uin, uout):
Yuya Nishihara
procutil: redirect ui.fout to stderr while stdio is protected...
r37237 """Duplicate streams and redirect original if (uin, uout) are stdio
If uin is stdin, it's redirected to /dev/null. If uout is stdout, it's
redirected to stderr so the output is still readable.
Yuya Nishihara
procutil: move protectio/restoreio from commandserver...
r37141
Returns (fin, fout) which point to the original (uin, uout) fds, but
may be copy of (uin, uout). The returned streams can be considered
"owned" in that print(), exec(), etc. never reach to them.
"""
uout.flush()
Yuya Nishihara
procutil: unroll uin/uout loop in protectstdio()...
r37236 fin, fout = uin, uout
Yuya Nishihara
procutil: compare fd number to see if stdio protection is needed (issue5992)...
r39873 if _testfileno(uin, stdin):
Yuya Nishihara
procutil: unroll uin/uout loop in protectstdio()...
r37236 newfd = os.dup(uin.fileno())
Yuya Nishihara
procutil: redirect ui.fout to stderr while stdio is protected...
r37237 nullfd = os.open(os.devnull, os.O_RDONLY)
Yuya Nishihara
procutil: unroll uin/uout loop in protectstdio()...
r37236 os.dup2(nullfd, uin.fileno())
Yuya Nishihara
procutil: redirect ui.fout to stderr while stdio is protected...
r37237 os.close(nullfd)
Augie Fackler
cleanup: remove pointless r-prefixes on single-quoted strings...
r43906 fin = os.fdopen(newfd, 'rb')
Yuya Nishihara
procutil: compare fd number to see if stdio protection is needed (issue5992)...
r39873 if _testfileno(uout, stdout):
Yuya Nishihara
procutil: unroll uin/uout loop in protectstdio()...
r37236 newfd = os.dup(uout.fileno())
Yuya Nishihara
procutil: redirect ui.fout to stderr while stdio is protected...
r37237 os.dup2(stderr.fileno(), uout.fileno())
Augie Fackler
cleanup: remove pointless r-prefixes on single-quoted strings...
r43906 fout = os.fdopen(newfd, 'wb')
Yuya Nishihara
procutil: unroll uin/uout loop in protectstdio()...
r37236 return fin, fout
Yuya Nishihara
procutil: move protectio/restoreio from commandserver...
r37141
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
procutil: move protectio/restoreio from commandserver...
r37141 def restorestdio(uin, uout, fin, fout):
"""Restore (uin, uout) streams from possibly duplicated (fin, fout)"""
uout.flush()
for f, uif in [(fin, uin), (fout, uout)]:
if f is not uif:
os.dup2(f.fileno(), uif.fileno())
f.close()
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 def shellenviron(environ=None):
"""return environ with optional override, useful for shelling out"""
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 def py2shell(val):
Matt Harbison
cleanup: fix docstring formatting...
r44226 """convert python object into string that is useful to shell"""
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 if val is None or val is False:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return b'0'
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 if val is True:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return b'1'
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 return pycompat.bytestr(val)
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 env = dict(encoding.environ)
if environ:
Gregory Szorc
global: bulk replace simple pycompat.iteritems(x) with x.items()...
r49768 env.update((k, py2shell(v)) for k, v in environ.items())
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 env[b'HG'] = hgexecutable()
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 return env
Augie Fackler
formatting: blacken the codebase...
r43346
Matt Harbison
procutil: add a shim for translating shell commands to native commands
r38510 if pycompat.iswindows:
Augie Fackler
formatting: blacken the codebase...
r43346
Matt Harbison
procutil: add a shim for translating shell commands to native commands
r38510 def shelltonative(cmd, env):
Augie Fackler
procutil: suppress pytype warnings around windows-only attributes...
r43779 return platform.shelltocmdexe( # pytype: disable=module-attr
cmd, shellenviron(env)
)
Matt Harbison
py3: partially fix pager spawning on Windows...
r39698
tonativestr = encoding.strfromlocal
Matt Harbison
procutil: add a shim for translating shell commands to native commands
r38510 else:
Augie Fackler
formatting: blacken the codebase...
r43346
Matt Harbison
procutil: add a shim for translating shell commands to native commands
r38510 def shelltonative(cmd, env):
return cmd
Matt Harbison
py3: partially fix pager spawning on Windows...
r39698 tonativestr = pycompat.identity
Augie Fackler
formatting: blacken the codebase...
r43346
Matt Harbison
py3: partially fix pager spawning on Windows...
r39698 def tonativeenv(env):
Augie Fackler
formating: upgrade to black 20.8b1...
r46554 """convert the environment from bytes to strings suitable for Popen(), etc."""
Matt Harbison
py3: partially fix pager spawning on Windows...
r39698 return pycompat.rapply(tonativestr, env)
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 def system(cmd, environ=None, cwd=None, out=None):
Augie Fackler
formating: upgrade to black 20.8b1...
r46554 """enhanced shell command execution.
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 run with environment maybe modified, maybe in different dir.
if out is specified, it is assumed to be a file-like object that has a
Augie Fackler
formating: upgrade to black 20.8b1...
r46554 write() method. stdout and stderr will be redirected to out."""
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 try:
stdout.flush()
except Exception:
pass
env = shellenviron(environ)
if out is None or isstdout(out):
Augie Fackler
formatting: blacken the codebase...
r43346 rc = subprocess.call(
tonativestr(cmd),
shell=True,
close_fds=closefds,
env=tonativeenv(env),
cwd=pycompat.rapply(tonativestr, cwd),
)
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 else:
Augie Fackler
formatting: blacken the codebase...
r43346 proc = subprocess.Popen(
tonativestr(cmd),
shell=True,
close_fds=closefds,
env=tonativeenv(env),
cwd=pycompat.rapply(tonativestr, cwd),
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 for line in iter(proc.stdout.readline, b''):
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 out.write(line)
proc.wait()
rc = proc.returncode
return rc
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
procutil: try and avoid angering CoreFoundation on macOS...
r44364 _is_gui = None
def _gui():
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 '''Are we running in a GUI?'''
if pycompat.isdarwin:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if b'SSH_CONNECTION' in encoding.environ:
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 # handle SSH access to a box where the user is logged in
return False
elif getattr(osutil, 'isgui', None):
# check if a CoreGraphics session is available
return osutil.isgui()
else:
# pure build; use a safe default
return True
else:
Yuya Nishihara
procutil: extend gui test to detect wayland session (issue6479)
r47201 return (
pycompat.iswindows
or encoding.environ.get(b"DISPLAY")
or encoding.environ.get(b"WAYLAND_DISPLAY")
)
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
procutil: try and avoid angering CoreFoundation on macOS...
r44364 def gui():
global _is_gui
if _is_gui is None:
_is_gui = _gui()
return _is_gui
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 def hgcmd():
"""Return the command used to execute current hg
This is different from hgexecutable() because on Windows we want
to avoid things opening new shell windows like batch files, so we
get either the python call or current executable.
"""
Martin von Zweigbergk
procutil: move mainfrozen() to new resourceutil.py...
r44067 if resourceutil.mainfrozen():
Martin von Zweigbergk
py3: use native string for 'macosx_app'...
r44056 if getattr(sys, 'frozen', None) == 'macosx_app':
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 # Env variable set by py2app
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return [encoding.environ[b'EXECUTABLEPATH']]
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 else:
return [pycompat.sysexecutable]
return _gethgcmd()
Augie Fackler
formatting: blacken the codebase...
r43346
Matt Harbison
typing: add type hints to mercurial/win32.py...
r50705 def rundetached(args, condfn) -> int:
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 """Execute the argument list in a detached process.
condfn is a callable which is called repeatedly and should return
True once the child process is known to have started successfully.
At this point, the child process PID is returned. If the child
process fails to start or finishes before condfn() evaluates to
True, return -1.
"""
# Windows case is easier because the child process is either
# successfully starting and validating the condition or exiting
# on failure. We just poll on its PID. On Unix, if the child
# process fails to start, it will be left in a zombie state until
# the parent wait on it, which we cannot do since we expect a long
# running process on success. Instead we listen for SIGCHLD telling
# us our child process terminated.
terminated = set()
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 def handler(signum, frame):
terminated.add(os.wait())
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 prevhandler = None
SIGCHLD = getattr(signal, 'SIGCHLD', None)
if SIGCHLD is not None:
prevhandler = signal.signal(SIGCHLD, handler)
try:
pid = spawndetached(args)
while not condfn():
Augie Fackler
formatting: blacken the codebase...
r43346 if (pid in terminated or not testpid(pid)) and not condfn():
Yuya Nishihara
procutil: move process/executable management functions to new module...
r37136 return -1
time.sleep(0.1)
return pid
finally:
if prevhandler is not None:
signal.signal(signal.SIGCHLD, prevhandler)
Augie Fackler
ui: add an uninterruptable context manager that can block SIGINT...
r38545
Matt Harbison
typing: add type hints to mercurial/win32.py...
r50705 # pytype seems to get confused by not having a return in the finally
# block, and thinks the return value should be Optional[int] here. It
# appears to be https://github.com/google/pytype/issues/938, without
# the `with` clause.
pass # pytype: disable=bad-return-type
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
ui: add an uninterruptable context manager that can block SIGINT...
r38545 @contextlib.contextmanager
Kyle Lippincott
procutil: correct spelling of uninterruptable -> uninterruptible...
r41106 def uninterruptible(warn):
Augie Fackler
ui: add an uninterruptable context manager that can block SIGINT...
r38545 """Inhibit SIGINT handling on a region of code.
Note that if this is called in a non-main thread, it turns into a no-op.
Args:
warn: A callable which takes no arguments, and returns True if the
previous signal handling should be restored.
"""
oldsiginthandler = [signal.getsignal(signal.SIGINT)]
shouldbail = []
def disabledsiginthandler(*args):
if warn():
signal.signal(signal.SIGINT, oldsiginthandler[0])
del oldsiginthandler[0]
shouldbail.append(True)
try:
try:
signal.signal(signal.SIGINT, disabledsiginthandler)
except ValueError:
# wrong thread, oh well, we tried
del oldsiginthandler[0]
yield
finally:
if oldsiginthandler:
signal.signal(signal.SIGINT, oldsiginthandler[0])
if shouldbail:
raise KeyboardInterrupt
Augie Fackler
remotefilelog: transplant runbgcommand to procutil...
r40532
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
remotefilelog: transplant runbgcommand to procutil...
r40532 if pycompat.iswindows:
# no fork on Windows, but we can create a detached process
# https://msdn.microsoft.com/en-us/library/windows/desktop/ms684863.aspx
# No stdlib constant exists for this value
DETACHED_PROCESS = 0x00000008
Boris Feld
procutil: import concerns about creationflags on Windows from D1701...
r40572 # Following creation flags might create a console GUI window.
# Using subprocess.CREATE_NEW_CONSOLE might helps.
# See https://phab.mercurial-scm.org/D1701 for discussion
Augie Fackler
procutil: suppress pytype warnings around windows-only attributes...
r43779 _creationflags = (
DETACHED_PROCESS
| subprocess.CREATE_NEW_PROCESS_GROUP # pytype: disable=module-attr
)
Augie Fackler
remotefilelog: transplant runbgcommand to procutil...
r40532
Augie Fackler
procutil: allow callers of runbgcommand to assume the process starts...
r42696 def runbgcommand(
procutil: add a option to not fully detach background process...
r44297 script,
env,
shell=False,
stdout=None,
stderr=None,
ensurestart=True,
record_wait=None,
procutil: allow to specify arbitrary stdin bytes to runbgcommand...
r46371 stdin_bytes=None,
Augie Fackler
formatting: blacken the codebase...
r43346 ):
Augie Fackler
remotefilelog: transplant runbgcommand to procutil...
r40532 '''Spawn a command without waiting for it to finish.'''
# we can't use close_fds *and* redirect stdin. I'm not sure that we
# need to because the detached process has no console connection.
procutil: allow to specify arbitrary stdin bytes to runbgcommand...
r46371
try:
stdin = None
if stdin_bytes is not None:
stdin = pycompat.unnamedtempfile()
stdin.write(stdin_bytes)
stdin.flush()
stdin.seek(0)
p = subprocess.Popen(
Augie Fackler
merge with stable
r46644 pycompat.rapply(tonativestr, script),
procutil: allow to specify arbitrary stdin bytes to runbgcommand...
r46371 shell=shell,
env=tonativeenv(env),
close_fds=True,
creationflags=_creationflags,
stdin=stdin,
stdout=stdout,
stderr=stderr,
)
if record_wait is not None:
record_wait(p.wait)
finally:
if stdin is not None:
stdin.close()
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
remotefilelog: transplant runbgcommand to procutil...
r40532 else:
Augie Fackler
formatting: blacken the codebase...
r43346
Gregory Szorc
procutil: delete Python 2 support code...
r49765 def runbgcommand(
Valentin Gatien-Baron
procutil: avoid using os.fork() to implement runbgcommand...
r47651 cmd,
env,
shell=False,
stdout=None,
stderr=None,
ensurestart=True,
record_wait=None,
stdin_bytes=None,
):
"""Spawn a command without waiting for it to finish.
When `record_wait` is not None, the spawned process will not be fully
detached and the `record_wait` argument will be called with a the
`Subprocess.wait` function for the spawned process. This is mostly
useful for developers that need to make sure the spawned process
finished before a certain point. (eg: writing test)"""
if pycompat.isdarwin:
# avoid crash in CoreFoundation in case another thread
# calls gui() while we're calling fork().
gui()
if shell:
script = cmd
else:
if isinstance(cmd, bytes):
cmd = [cmd]
script = b' '.join(shellquote(x) for x in cmd)
if record_wait is None:
# double-fork to completely detach from the parent process
script = b'( %s ) &' % script
start_new_session = True
else:
start_new_session = False
ensurestart = True
Matt Harbison
procutil: avoid an uninitialized variable usage on tempfile exception...
r49319 stdin = None
Valentin Gatien-Baron
procutil: avoid using os.fork() to implement runbgcommand...
r47651 try:
if stdin_bytes is None:
stdin = subprocess.DEVNULL
else:
stdin = pycompat.unnamedtempfile()
stdin.write(stdin_bytes)
stdin.flush()
stdin.seek(0)
if stdout is None:
stdout = subprocess.DEVNULL
if stderr is None:
stderr = subprocess.DEVNULL
p = subprocess.Popen(
script,
shell=True,
env=env,
close_fds=True,
stdin=stdin,
stdout=stdout,
stderr=stderr,
start_new_session=start_new_session,
)
except Exception:
if record_wait is not None:
record_wait(255)
raise
finally:
Matt Harbison
procutil: avoid an uninitialized variable usage on tempfile exception...
r49319 if stdin_bytes is not None and stdin is not None:
Matt Harbison
pytype: stop excluding procutil.py...
r49318 assert not isinstance(stdin, int)
Valentin Gatien-Baron
procutil: avoid using os.fork() to implement runbgcommand...
r47651 stdin.close()
if not ensurestart:
# Even though we're not waiting on the child process,
# we still must call waitpid() on it at some point so
# it's not a zombie/defunct. This is especially relevant for
# chg since the parent process won't die anytime soon.
# We use a thread to make the overhead tiny.
t = threading.Thread(target=lambda: p.wait)
t.daemon = True
t.start()
else:
returncode = p.wait
if record_wait is not None:
record_wait(returncode)