mercurial-scm/hg-stable: mercurial/utils/procutil.py annotate

annotate mercurial/utils/procutil.py @ 43165:227ba1afcb65

py3: keep stdout as defined by pycompat in procutil According to https://docs.python.org/3/library/functions.html#open, it's not possible to use 1 as buffering argument value in binary mode. This is probably why line buffering does not work well in python3. On the other hand, sys.stdout.buffer appears to be line-buffered already on python3. So by not replacing it, there should be no behavior change. This fixes buffering issue in "hg email" (confirmation prompt shown before information to be confirmed).

author	Denis Laxalde <denis.laxalde@logilab.fr>
date	Thu, 10 Oct 2019 16:00:02 +0200
parents	4aa72cdf616f
children	15a6c6783060 54f4d094bab1

rev	line source
37121 5be286db5fb5 procutil: move process/executable management functions to new module Yuya Nishihara <yuya@tcha.org> parents: 37120 diff changeset	1 # procutil.py - utility for managing processes and executable environment
8226 8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	2 #
8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	3 # Copyright 2005 K. Thananchayan <thananck@yahoo.com>
8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	4 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	5 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	6 #
8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	7 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 9996 diff changeset	8 # GNU General Public License version 2 or any later version.
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	9
37121 5be286db5fb5 procutil: move process/executable management functions to new module Yuya Nishihara <yuya@tcha.org> parents: 37120 diff changeset	10 from __future__ import absolute_import
27358 ac839ee45b6a util: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27357 diff changeset	11
37127 6715e8035b4f procutil: introduce context-manager interface for protect/restorestdio Yuya Nishihara <yuya@tcha.org> parents: 37126 diff changeset	12 import contextlib
40547 3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	13 import errno
27358 ac839ee45b6a util: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27357 diff changeset	14 import imp
36462 1ca4e86c7265 util: handle fileno() on Python 3 throwing io.UnsupportedOperation Augie Fackler <augie@google.com> parents: 36452 diff changeset	15 import io
27358 ac839ee45b6a util: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27357 diff changeset	16 import os
ac839ee45b6a util: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27357 diff changeset	17 import signal
ac839ee45b6a util: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27357 diff changeset	18 import subprocess
ac839ee45b6a util: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27357 diff changeset	19 import sys
ac839ee45b6a util: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27357 diff changeset	20 import time
3769 96095d9ff1f8 Add encoding detection Matt Mackall <mpm@selenic.com> parents: 3767 diff changeset	21
37121 5be286db5fb5 procutil: move process/executable management functions to new module Yuya Nishihara <yuya@tcha.org> parents: 37120 diff changeset	22 from ..i18n import _
43089 c59eb1560c44 py3: manually import getattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43085 diff changeset	23 from ..pycompat import (
c59eb1560c44 py3: manually import getattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43085 diff changeset	24 getattr,
c59eb1560c44 py3: manually import getattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43085 diff changeset	25 open,
c59eb1560c44 py3: manually import getattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43085 diff changeset	26 )
37121 5be286db5fb5 procutil: move process/executable management functions to new module Yuya Nishihara <yuya@tcha.org> parents: 37120 diff changeset	27
5be286db5fb5 procutil: move process/executable management functions to new module Yuya Nishihara <yuya@tcha.org> parents: 37120 diff changeset	28 from .. import (
27358 ac839ee45b6a util: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27357 diff changeset	29 encoding,
ac839ee45b6a util: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27357 diff changeset	30 error,
32406 a9c71d578a1c osutil: switch to policy importer Yuya Nishihara <yuya@tcha.org> parents: 32346 diff changeset	31 policy,
28818 6041fb8f2da8 pycompat: add empty and queue to handle py3 divergence timeless <timeless@mozdev.org> parents: 28497 diff changeset	32 pycompat,
37086 f99d64e8a4e4 stringutil: move generic string helpers to new module Yuya Nishihara <yuya@tcha.org> parents: 37085 diff changeset	33 )
3769 96095d9ff1f8 Add encoding detection Matt Mackall <mpm@selenic.com> parents: 3767 diff changeset	34
32406 a9c71d578a1c osutil: switch to policy importer Yuya Nishihara <yuya@tcha.org> parents: 32346 diff changeset	35 osutil = policy.importmod(r'osutil')
32245 4462a981e8df base85: proxy through util module Yuya Nishihara <yuya@tcha.org> parents: 32203 diff changeset	36
30481 277f4fe6d01a py3: provide bytes stdin/out/err through util module Yuya Nishihara <yuya@tcha.org> parents: 30480 diff changeset	37 stderr = pycompat.stderr
277f4fe6d01a py3: provide bytes stdin/out/err through util module Yuya Nishihara <yuya@tcha.org> parents: 30480 diff changeset	38 stdin = pycompat.stdin
277f4fe6d01a py3: provide bytes stdin/out/err through util module Yuya Nishihara <yuya@tcha.org> parents: 30480 diff changeset	39 stdout = pycompat.stdout
32131 377c74ef008d win32mbcs: avoid unintentional failure at colorization FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31952 diff changeset	40
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	41
30908 3a4c0905f357 util: always force line buffered stdout when stdout is a tty (BC) Simon Farnsworth <simonfar@fb.com> parents: 30854 diff changeset	42 def isatty(fp):
3a4c0905f357 util: always force line buffered stdout when stdout is a tty (BC) Simon Farnsworth <simonfar@fb.com> parents: 30854 diff changeset	43 try:
3a4c0905f357 util: always force line buffered stdout when stdout is a tty (BC) Simon Farnsworth <simonfar@fb.com> parents: 30854 diff changeset	44 return fp.isatty()
3a4c0905f357 util: always force line buffered stdout when stdout is a tty (BC) Simon Farnsworth <simonfar@fb.com> parents: 30854 diff changeset	45 except AttributeError:
3a4c0905f357 util: always force line buffered stdout when stdout is a tty (BC) Simon Farnsworth <simonfar@fb.com> parents: 30854 diff changeset	46 return False
3a4c0905f357 util: always force line buffered stdout when stdout is a tty (BC) Simon Farnsworth <simonfar@fb.com> parents: 30854 diff changeset	47
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	48
30908 3a4c0905f357 util: always force line buffered stdout when stdout is a tty (BC) Simon Farnsworth <simonfar@fb.com> parents: 30854 diff changeset	49 # glibc determines buffering on first write to stdout - if we replace a TTY
3a4c0905f357 util: always force line buffered stdout when stdout is a tty (BC) Simon Farnsworth <simonfar@fb.com> parents: 30854 diff changeset	50 # destined stdout with a pipe destined stdout (e.g. pager), we want line
37879 0b63a6743010 procutil: use unbuffered stdout on Windows Sune Foldager <cryo@cyanite.org> parents: 37464 diff changeset	51 # buffering (or unbuffered, on Windows)
30908 3a4c0905f357 util: always force line buffered stdout when stdout is a tty (BC) Simon Farnsworth <simonfar@fb.com> parents: 30854 diff changeset	52 if isatty(stdout):
37879 0b63a6743010 procutil: use unbuffered stdout on Windows Sune Foldager <cryo@cyanite.org> parents: 37464 diff changeset	53 if pycompat.iswindows:
0b63a6743010 procutil: use unbuffered stdout on Windows Sune Foldager <cryo@cyanite.org> parents: 37464 diff changeset	54 # Windows doesn't support line buffering
0b63a6743010 procutil: use unbuffered stdout on Windows Sune Foldager <cryo@cyanite.org> parents: 37464 diff changeset	55 stdout = os.fdopen(stdout.fileno(), r'wb', 0)
43165 227ba1afcb65 py3: keep stdout as defined by pycompat in procutil Denis Laxalde <denis.laxalde@logilab.fr> parents: 43115 diff changeset	56 elif not pycompat.ispy3:
227ba1afcb65 py3: keep stdout as defined by pycompat in procutil Denis Laxalde <denis.laxalde@logilab.fr> parents: 43115 diff changeset	57 # on Python 3, stdout (sys.stdout.buffer) is already line buffered and
227ba1afcb65 py3: keep stdout as defined by pycompat in procutil Denis Laxalde <denis.laxalde@logilab.fr> parents: 43115 diff changeset	58 # buffering=1 is not handled in binary mode
37879 0b63a6743010 procutil: use unbuffered stdout on Windows Sune Foldager <cryo@cyanite.org> parents: 37464 diff changeset	59 stdout = os.fdopen(stdout.fileno(), r'wb', 1)
30908 3a4c0905f357 util: always force line buffered stdout when stdout is a tty (BC) Simon Farnsworth <simonfar@fb.com> parents: 30854 diff changeset	60
34645 75979c8d4572 codemod: use pycompat.iswindows Jun Wu <quark@fb.com> parents: 34554 diff changeset	61 if pycompat.iswindows:
37121 5be286db5fb5 procutil: move process/executable management functions to new module Yuya Nishihara <yuya@tcha.org> parents: 37120 diff changeset	62 from .. import windows as platform
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	63
30908 3a4c0905f357 util: always force line buffered stdout when stdout is a tty (BC) Simon Farnsworth <simonfar@fb.com> parents: 30854 diff changeset	64 stdout = platform.winstdout(stdout)
14912 ec46a7da9f2c util: move windows and posix wildcard imports to begin of file Adrian Buehlmann <adrian@cadifra.com> parents: 14911 diff changeset	65 else:
37121 5be286db5fb5 procutil: move process/executable management functions to new module Yuya Nishihara <yuya@tcha.org> parents: 37120 diff changeset	66 from .. import posix as platform
14926 4e7e63fc685a util: eliminate wildcard imports Adrian Buehlmann <adrian@cadifra.com> parents: 14918 diff changeset	67
4e7e63fc685a util: eliminate wildcard imports Adrian Buehlmann <adrian@cadifra.com> parents: 14918 diff changeset	68 findexe = platform.findexe
37118 49d6ba67c93f util: mark platform-specific gethgcmd() as private Yuya Nishihara <yuya@tcha.org> parents: 37102 diff changeset	69 _gethgcmd = platform.gethgcmd
14926 4e7e63fc685a util: eliminate wildcard imports Adrian Buehlmann <adrian@cadifra.com> parents: 14918 diff changeset	70 getuser = platform.getuser
28027 14033c5dd261 util: enable getpid to be replaced timeless <timeless@mozdev.org> parents: 27785 diff changeset	71 getpid = os.getpid
14926 4e7e63fc685a util: eliminate wildcard imports Adrian Buehlmann <adrian@cadifra.com> parents: 14918 diff changeset	72 hidewindow = platform.hidewindow
4e7e63fc685a util: eliminate wildcard imports Adrian Buehlmann <adrian@cadifra.com> parents: 14918 diff changeset	73 quotecommand = platform.quotecommand
22245 234e4c24b980 platform: implement readpipe() Gregory Szorc <gregory.szorc@gmail.com> parents: 21914 diff changeset	74 readpipe = platform.readpipe
14926 4e7e63fc685a util: eliminate wildcard imports Adrian Buehlmann <adrian@cadifra.com> parents: 14918 diff changeset	75 setbinary = platform.setbinary
4e7e63fc685a util: eliminate wildcard imports Adrian Buehlmann <adrian@cadifra.com> parents: 14918 diff changeset	76 setsignalhandler = platform.setsignalhandler
4e7e63fc685a util: eliminate wildcard imports Adrian Buehlmann <adrian@cadifra.com> parents: 14918 diff changeset	77 shellquote = platform.shellquote
36445 0cb09c322647 util: factor out shellsplit() function Yuya Nishihara <yuya@tcha.org> parents: 36395 diff changeset	78 shellsplit = platform.shellsplit
14926 4e7e63fc685a util: eliminate wildcard imports Adrian Buehlmann <adrian@cadifra.com> parents: 14918 diff changeset	79 spawndetached = platform.spawndetached
4e7e63fc685a util: eliminate wildcard imports Adrian Buehlmann <adrian@cadifra.com> parents: 14918 diff changeset	80 sshargs = platform.sshargs
4e7e63fc685a util: eliminate wildcard imports Adrian Buehlmann <adrian@cadifra.com> parents: 14918 diff changeset	81 testpid = platform.testpid
14912 ec46a7da9f2c util: move windows and posix wildcard imports to begin of file Adrian Buehlmann <adrian@cadifra.com> parents: 14911 diff changeset	82
32248 d74b0cff94a9 osutil: proxy through util (and platform) modules (API) Yuya Nishihara <yuya@tcha.org> parents: 32245 diff changeset	83 try:
d74b0cff94a9 osutil: proxy through util (and platform) modules (API) Yuya Nishihara <yuya@tcha.org> parents: 32245 diff changeset	84 setprocname = osutil.setprocname
d74b0cff94a9 osutil: proxy through util (and platform) modules (API) Yuya Nishihara <yuya@tcha.org> parents: 32245 diff changeset	85 except AttributeError:
d74b0cff94a9 osutil: proxy through util (and platform) modules (API) Yuya Nishihara <yuya@tcha.org> parents: 32245 diff changeset	86 pass
35464 8652ab4046e4 osutil: add a function to unblock signals Jun Wu <quark@fb.com> parents: 35166 diff changeset	87 try:
8652ab4046e4 osutil: add a function to unblock signals Jun Wu <quark@fb.com> parents: 35166 diff changeset	88 unblocksignal = osutil.unblocksignal
8652ab4046e4 osutil: add a function to unblock signals Jun Wu <quark@fb.com> parents: 35166 diff changeset	89 except AttributeError:
8652ab4046e4 osutil: add a function to unblock signals Jun Wu <quark@fb.com> parents: 35166 diff changeset	90 pass
32248 d74b0cff94a9 osutil: proxy through util (and platform) modules (API) Yuya Nishihara <yuya@tcha.org> parents: 32245 diff changeset	91
34646 238abf65a8ad codemod: use pycompat.isposix Jun Wu <quark@fb.com> parents: 34645 diff changeset	92 closefds = pycompat.isposix
10197 29e3c4a7699b subrepo: normalize svn output line-endings Patrick Mezard <pmezard@gmail.com> parents: 9996 diff changeset	93
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	94
37460 a6c6b7beb025 procutil: unify platform.explainexit() Yuya Nishihara <yuya@tcha.org> parents: 37459 diff changeset	95 def explainexit(code):
37463 bbd240f81ac5 procutil: make explainexit() simply return a message (API) Yuya Nishihara <yuya@tcha.org> parents: 37462 diff changeset	96 """return a message describing a subprocess status
37460 a6c6b7beb025 procutil: unify platform.explainexit() Yuya Nishihara <yuya@tcha.org> parents: 37459 diff changeset	97 (codes from kill are negative - not os.system/wait encoding)"""
a6c6b7beb025 procutil: unify platform.explainexit() Yuya Nishihara <yuya@tcha.org> parents: 37459 diff changeset	98 if code >= 0:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	99 return _(b"exited with status %d") % code
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	100 return _(b"killed by signal %d") % -code
37460 a6c6b7beb025 procutil: unify platform.explainexit() Yuya Nishihara <yuya@tcha.org> parents: 37459 diff changeset	101
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	102
37459 90c5ca718781 procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API) Yuya Nishihara <yuya@tcha.org> parents: 37222 diff changeset	103 class _pfile(object):
90c5ca718781 procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API) Yuya Nishihara <yuya@tcha.org> parents: 37222 diff changeset	104 """File-like wrapper for a stream opened by subprocess.Popen()"""
90c5ca718781 procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API) Yuya Nishihara <yuya@tcha.org> parents: 37222 diff changeset	105
90c5ca718781 procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API) Yuya Nishihara <yuya@tcha.org> parents: 37222 diff changeset	106 def __init__(self, proc, fp):
90c5ca718781 procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API) Yuya Nishihara <yuya@tcha.org> parents: 37222 diff changeset	107 self._proc = proc
90c5ca718781 procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API) Yuya Nishihara <yuya@tcha.org> parents: 37222 diff changeset	108 self._fp = fp
90c5ca718781 procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API) Yuya Nishihara <yuya@tcha.org> parents: 37222 diff changeset	109
90c5ca718781 procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API) Yuya Nishihara <yuya@tcha.org> parents: 37222 diff changeset	110 def close(self):
90c5ca718781 procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API) Yuya Nishihara <yuya@tcha.org> parents: 37222 diff changeset	111 # unlike os.popen(), this returns an integer in subprocess coding
90c5ca718781 procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API) Yuya Nishihara <yuya@tcha.org> parents: 37222 diff changeset	112 self._fp.close()
90c5ca718781 procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API) Yuya Nishihara <yuya@tcha.org> parents: 37222 diff changeset	113 return self._proc.wait()
90c5ca718781 procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API) Yuya Nishihara <yuya@tcha.org> parents: 37222 diff changeset	114
90c5ca718781 procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API) Yuya Nishihara <yuya@tcha.org> parents: 37222 diff changeset	115 def __iter__(self):
90c5ca718781 procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API) Yuya Nishihara <yuya@tcha.org> parents: 37222 diff changeset	116 return iter(self._fp)
90c5ca718781 procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API) Yuya Nishihara <yuya@tcha.org> parents: 37222 diff changeset	117
90c5ca718781 procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API) Yuya Nishihara <yuya@tcha.org> parents: 37222 diff changeset	118 def __getattr__(self, attr):
90c5ca718781 procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API) Yuya Nishihara <yuya@tcha.org> parents: 37222 diff changeset	119 return getattr(self._fp, attr)
90c5ca718781 procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API) Yuya Nishihara <yuya@tcha.org> parents: 37222 diff changeset	120
90c5ca718781 procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API) Yuya Nishihara <yuya@tcha.org> parents: 37222 diff changeset	121 def __enter__(self):
90c5ca718781 procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API) Yuya Nishihara <yuya@tcha.org> parents: 37222 diff changeset	122 return self
90c5ca718781 procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API) Yuya Nishihara <yuya@tcha.org> parents: 37222 diff changeset	123
90c5ca718781 procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API) Yuya Nishihara <yuya@tcha.org> parents: 37222 diff changeset	124 def __exit__(self, exc_type, exc_value, exc_tb):
90c5ca718781 procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API) Yuya Nishihara <yuya@tcha.org> parents: 37222 diff changeset	125 self.close()
90c5ca718781 procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API) Yuya Nishihara <yuya@tcha.org> parents: 37222 diff changeset	126
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	127
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	128 def popen(cmd, mode=b'rb', bufsize=-1):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	129 if mode == b'rb':
37459 90c5ca718781 procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API) Yuya Nishihara <yuya@tcha.org> parents: 37222 diff changeset	130 return _popenreader(cmd, bufsize)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	131 elif mode == b'wb':
37459 90c5ca718781 procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API) Yuya Nishihara <yuya@tcha.org> parents: 37222 diff changeset	132 return _popenwriter(cmd, bufsize)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	133 raise error.ProgrammingError(b'unsupported mode: %r' % mode)
37459 90c5ca718781 procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API) Yuya Nishihara <yuya@tcha.org> parents: 37222 diff changeset	134
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	135
37459 90c5ca718781 procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API) Yuya Nishihara <yuya@tcha.org> parents: 37222 diff changeset	136 def _popenreader(cmd, bufsize):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	137 p = subprocess.Popen(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	138 tonativestr(quotecommand(cmd)),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	139 shell=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	140 bufsize=bufsize,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	141 close_fds=closefds,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	142 stdout=subprocess.PIPE,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	143 )
37459 90c5ca718781 procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API) Yuya Nishihara <yuya@tcha.org> parents: 37222 diff changeset	144 return _pfile(p, p.stdout)
90c5ca718781 procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API) Yuya Nishihara <yuya@tcha.org> parents: 37222 diff changeset	145
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	146
37459 90c5ca718781 procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API) Yuya Nishihara <yuya@tcha.org> parents: 37222 diff changeset	147 def _popenwriter(cmd, bufsize):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	148 p = subprocess.Popen(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	149 tonativestr(quotecommand(cmd)),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	150 shell=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	151 bufsize=bufsize,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	152 close_fds=closefds,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	153 stdin=subprocess.PIPE,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	154 )
37459 90c5ca718781 procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API) Yuya Nishihara <yuya@tcha.org> parents: 37222 diff changeset	155 return _pfile(p, p.stdin)
90c5ca718781 procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API) Yuya Nishihara <yuya@tcha.org> parents: 37222 diff changeset	156
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	157
37464 632b92899203 procutil: drop unused 'newlines' option from popen() (API) Yuya Nishihara <yuya@tcha.org>* parents: 37463 diff changeset	158 def popen2(cmd, env=None):
9089 8ec39725d966 util: remove unused bufsize argument Martin Geisler <mg@lazybytes.net> parents: 9084 diff changeset	159 # Setting bufsize to -1 lets the system decide the buffer size.
8ec39725d966 util: remove unused bufsize argument Martin Geisler <mg@lazybytes.net> parents: 9084 diff changeset	160 # The default for bufsize is 0, meaning unbuffered. This leads to
8ec39725d966 util: remove unused bufsize argument Martin Geisler <mg@lazybytes.net> parents: 9084 diff changeset	161 # poor performance on Mac OS X: http://bugs.python.org/issue4194
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	162 p = subprocess.Popen(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	163 tonativestr(cmd),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	164 shell=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	165 bufsize=-1,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	166 close_fds=closefds,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	167 stdin=subprocess.PIPE,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	168 stdout=subprocess.PIPE,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	169 env=tonativeenv(env),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	170 )
8280 0b02d98d44d0 util: always use subprocess Martin Geisler <mg@lazybytes.net> parents: 8257 diff changeset	171 return p.stdin, p.stdout
10197 29e3c4a7699b subrepo: normalize svn output line-endings Patrick Mezard <pmezard@gmail.com> parents: 9996 diff changeset	172
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	173
37464 632b92899203 procutil: drop unused 'newlines' option from popen() (API) Yuya Nishihara <yuya@tcha.org>* parents: 37463 diff changeset	174 def popen3(cmd, env=None):
632b92899203 procutil: drop unused 'newlines' option from popen() (API) Yuya Nishihara <yuya@tcha.org>* parents: 37463 diff changeset	175 stdin, stdout, stderr, p = popen4(cmd, env)
18759 9baf4330d88f sshpeer: store subprocess so it cleans up correctly Durham Goode <durham@fb.com> parents: 18736 diff changeset	176 return stdin, stdout, stderr
9baf4330d88f sshpeer: store subprocess so it cleans up correctly Durham Goode <durham@fb.com> parents: 18736 diff changeset	177
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	178
37464 632b92899203 procutil: drop unused 'newlines' option from popen() (API) Yuya Nishihara <yuya@tcha.org>* parents: 37463 diff changeset	179 def popen4(cmd, env=None, bufsize=-1):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	180 p = subprocess.Popen(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	181 tonativestr(cmd),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	182 shell=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	183 bufsize=bufsize,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	184 close_fds=closefds,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	185 stdin=subprocess.PIPE,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	186 stdout=subprocess.PIPE,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	187 stderr=subprocess.PIPE,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	188 env=tonativeenv(env),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	189 )
18759 9baf4330d88f sshpeer: store subprocess so it cleans up correctly Durham Goode <durham@fb.com> parents: 18736 diff changeset	190 return p.stdin, p.stdout, p.stderr, p
7106 4674706b5b95 python2.6: use subprocess if available Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6884 diff changeset	191
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	192
1293 a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	193 def pipefilter(s, cmd):
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	194 '''filter string S through command CMD, returning its output'''
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	195 p = subprocess.Popen(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	196 tonativestr(cmd),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	197 shell=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	198 close_fds=closefds,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	199 stdin=subprocess.PIPE,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	200 stdout=subprocess.PIPE,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	201 )
8302 d2ad8c066676 util: simplify pipefilter and avoid subprocess race Martin Geisler <mg@lazybytes.net> parents: 8299 diff changeset	202 pout, perr = p.communicate(s)
d2ad8c066676 util: simplify pipefilter and avoid subprocess race Martin Geisler <mg@lazybytes.net> parents: 8299 diff changeset	203 return pout
419 28511fc21073 [PATCH] file seperator handling for the other 'OS' mpm@selenic.com parents: diff changeset	204
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	205
1293 a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	206 def tempfilter(s, cmd):
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	207 '''filter string S through a pair of temporary files with CMD.
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	208 CMD is used as a template to create the real command to be run,
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	209 with the strings INFILE and OUTFILE replaced by the real names of
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	210 the temporary files generated.'''
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	211 inname, outname = None, None
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	212 try:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	213 infd, inname = pycompat.mkstemp(prefix=b'hg-filter-in-')
36843 5bc7ff103081 py3: use r'' instead of sysstr('') to get around code transformer Yuya Nishihara <yuya@tcha.org> parents: 36840 diff changeset	214 fp = os.fdopen(infd, r'wb')
1293 a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	215 fp.write(s)
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	216 fp.close()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	217 outfd, outname = pycompat.mkstemp(prefix=b'hg-filter-out-')
1293 a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	218 os.close(outfd)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	219 cmd = cmd.replace(b'INFILE', inname)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	220 cmd = cmd.replace(b'OUTFILE', outname)
37461 538353b80676 procutil: fix error message of tempfile filter Yuya Nishihara <yuya@tcha.org> parents: 37460 diff changeset	221 code = system(cmd)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	222 if pycompat.sysplatform == b'OpenVMS' and code & 1:
4720 72fb6f10fac1 OpenVMS patches Jean-Francois PIERONNE <jf.pieronne@laposte.net> parents: 4708 diff changeset	223 code = 0
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	224 if code:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	225 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	226 _(b"command '%s' failed: %s") % (cmd, explainexit(code))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	227 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	228 with open(outname, b'rb') as fp:
37120 e7b517809ebc util: stop using readfile() in tempfilter() Yuya Nishihara <yuya@tcha.org> parents: 37119 diff changeset	229 return fp.read()
1293 a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	230 finally:
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	231 try:
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	232 if inname:
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	233 os.unlink(inname)
14004 97ed99d1f419 eliminate various naked except clauses Idan Kamara <idankk86@gmail.com> parents: 13985 diff changeset	234 except OSError:
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	235 pass
1293 a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	236 try:
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	237 if outname:
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	238 os.unlink(outname)
14004 97ed99d1f419 eliminate various naked except clauses Idan Kamara <idankk86@gmail.com> parents: 13985 diff changeset	239 except OSError:
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	240 pass
1293 a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	241
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	242
37119 7ccc9b8aca4c util: mark filtertable as private constant Yuya Nishihara <yuya@tcha.org> parents: 37118 diff changeset	243 _filtertable = {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	244 b'tempfile:': tempfilter,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	245 b'pipe:': pipefilter,
37119 7ccc9b8aca4c util: mark filtertable as private constant Yuya Nishihara <yuya@tcha.org> parents: 37118 diff changeset	246 }
1293 a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	247
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	248
1293 a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	249 def filter(s, cmd):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	250 b"filter a string through a command that transforms its input to its output"
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43096 diff changeset	251 for name, fn in pycompat.iteritems(_filtertable):
1293 a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	252 if cmd.startswith(name):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	253 return fn(s, cmd[len(name) :].lstrip())
1293 a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	254 return pipefilter(s, cmd)
a6ffcebd3315 Enhance the file filtering capabilities. Bryan O'Sullivan <bos@serpentine.com> parents: 1292 diff changeset	255
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	256
14228 116de1da2154 rename util.main_is_frozen to mainfrozen Adrian Buehlmann <adrian@cadifra.com> parents: 14167 diff changeset	257 def mainfrozen():
6499 479847ccabe0 Added hgexecutable support for py2exe/frozen scripts "Paul Moore <p.f.moore@gmail.com>" parents: 5659 diff changeset	258 """return True if we are a frozen executable.
479847ccabe0 Added hgexecutable support for py2exe/frozen scripts "Paul Moore <p.f.moore@gmail.com>" parents: 5659 diff changeset	259
479847ccabe0 Added hgexecutable support for py2exe/frozen scripts "Paul Moore <p.f.moore@gmail.com>" parents: 5659 diff changeset	260 The code supports py2exe (most common, Windows only) and tools/freeze
479847ccabe0 Added hgexecutable support for py2exe/frozen scripts "Paul Moore <p.f.moore@gmail.com>" parents: 5659 diff changeset	261 (portable, not much used).
479847ccabe0 Added hgexecutable support for py2exe/frozen scripts "Paul Moore <p.f.moore@gmail.com>" parents: 5659 diff changeset	262 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	263 return (
43115 4aa72cdf616f py3: delete b'' prefix from safehasattr arguments Martin von Zweigbergk <martinvonz@google.com> parents: 43106 diff changeset	264 pycompat.safehasattr(sys, "frozen")
4aa72cdf616f py3: delete b'' prefix from safehasattr arguments Martin von Zweigbergk <martinvonz@google.com> parents: 43106 diff changeset	265 or pycompat.safehasattr(sys, "importers") # new py2exe
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	266 or imp.is_frozen(r"__main__") # old py2exe
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	267 ) # tools/freeze
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	268
6499 479847ccabe0 Added hgexecutable support for py2exe/frozen scripts "Paul Moore <p.f.moore@gmail.com>" parents: 5659 diff changeset	269
22632 db15bb2d6323 util: move _hgexecutable a few lines, closer to where it is used Mads Kiilerich <madski@unity3d.com> parents: 22245 diff changeset	270 _hgexecutable = None
db15bb2d6323 util: move _hgexecutable a few lines, closer to where it is used Mads Kiilerich <madski@unity3d.com> parents: 22245 diff changeset	271
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	272
5062 3d35c8cb5eb4 Simplify/correct finding the hg executable (fixes issue644) Thomas Arendsen Hein <thomas@intevation.de> parents: 4832 diff changeset	273 def hgexecutable():
3d35c8cb5eb4 Simplify/correct finding the hg executable (fixes issue644) Thomas Arendsen Hein <thomas@intevation.de> parents: 4832 diff changeset	274 """return location of the 'hg' executable.
3d35c8cb5eb4 Simplify/correct finding the hg executable (fixes issue644) Thomas Arendsen Hein <thomas@intevation.de> parents: 4832 diff changeset	275
3d35c8cb5eb4 Simplify/correct finding the hg executable (fixes issue644) Thomas Arendsen Hein <thomas@intevation.de> parents: 4832 diff changeset	276 Defaults to $HG or 'hg' in the search path.
3d35c8cb5eb4 Simplify/correct finding the hg executable (fixes issue644) Thomas Arendsen Hein <thomas@intevation.de> parents: 4832 diff changeset	277 """
3d35c8cb5eb4 Simplify/correct finding the hg executable (fixes issue644) Thomas Arendsen Hein <thomas@intevation.de> parents: 4832 diff changeset	278 if _hgexecutable is None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	279 hg = encoding.environ.get(b'HG')
36843 5bc7ff103081 py3: use r'' instead of sysstr('') to get around code transformer Yuya Nishihara <yuya@tcha.org> parents: 36840 diff changeset	280 mainmod = sys.modules[r'__main__']
6500 a3175cd7dbec Tidy code, fix typo Bryan O'Sullivan <bos@serpentine.com> parents: 6499 diff changeset	281 if hg:
14229 85fd8402cbc4 rename util.set_hgexecutable to _sethgexecutable Adrian Buehlmann <adrian@cadifra.com> parents: 14228 diff changeset	282 _sethgexecutable(hg)
14228 116de1da2154 rename util.main_is_frozen to mainfrozen Adrian Buehlmann <adrian@cadifra.com> parents: 14167 diff changeset	283 elif mainfrozen():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	284 if getattr(sys, 'frozen', None) == b'macosx_app':
27765 f1fb93eebb1d util: adjust hgexecutable() to handle frozen Mercurial on OS X Matt Harbison <matt_harbison@yahoo.com> parents: 27764 diff changeset	285 # Env variable set by py2app
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	286 _sethgexecutable(encoding.environ[b'EXECUTABLEPATH'])
27765 f1fb93eebb1d util: adjust hgexecutable() to handle frozen Mercurial on OS X Matt Harbison <matt_harbison@yahoo.com> parents: 27764 diff changeset	287 else:
30672 10b17ed9b591 py3: replace sys.executable with pycompat.sysexecutable Pulkit Goyal <7895pulkit@gmail.com> parents: 30647 diff changeset	288 _sethgexecutable(pycompat.sysexecutable)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	289 elif (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	290 not pycompat.iswindows
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	291 and os.path.basename(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	292 pycompat.fsencode(getattr(mainmod, '__file__', b''))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	293 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	294 == b'hg'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	295 ):
31091 2912b06905dc py3: use pycompat.fsencode() to convert __file__ to bytes Pulkit Goyal <7895pulkit@gmail.com> parents: 31008 diff changeset	296 _sethgexecutable(pycompat.fsencode(mainmod.__file__))
6499 479847ccabe0 Added hgexecutable support for py2exe/frozen scripts "Paul Moore <p.f.moore@gmail.com>" parents: 5659 diff changeset	297 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	298 _sethgexecutable(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	299 findexe(b'hg') or os.path.basename(pycompat.sysargv[0])
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	300 )
5062 3d35c8cb5eb4 Simplify/correct finding the hg executable (fixes issue644) Thomas Arendsen Hein <thomas@intevation.de> parents: 4832 diff changeset	301 return _hgexecutable
4686 849f011dbf79 Remember path to 'hg' executable and pass to external tools and hooks as $HG. Thomas Arendsen Hein <thomas@intevation.de> parents: 4673 diff changeset	302
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	303
14229 85fd8402cbc4 rename util.set_hgexecutable to _sethgexecutable Adrian Buehlmann <adrian@cadifra.com> parents: 14228 diff changeset	304 def _sethgexecutable(path):
5062 3d35c8cb5eb4 Simplify/correct finding the hg executable (fixes issue644) Thomas Arendsen Hein <thomas@intevation.de> parents: 4832 diff changeset	305 """set location of the 'hg' executable"""
4686 849f011dbf79 Remember path to 'hg' executable and pass to external tools and hooks as $HG. Thomas Arendsen Hein <thomas@intevation.de> parents: 4673 diff changeset	306 global _hgexecutable
5062 3d35c8cb5eb4 Simplify/correct finding the hg executable (fixes issue644) Thomas Arendsen Hein <thomas@intevation.de> parents: 4832 diff changeset	307 _hgexecutable = path
4686 849f011dbf79 Remember path to 'hg' executable and pass to external tools and hooks as $HG. Thomas Arendsen Hein <thomas@intevation.de> parents: 4673 diff changeset	308
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	309
36801 eca1051e6c22 util: add public isstdin/isstdout() functions Yuya Nishihara <yuya@tcha.org> parents: 36799 diff changeset	310 def _testfileno(f, stdf):
26450 1138e1d05207 util.system: compare fileno to see if it needs stdout redirection Yuya Nishihara <yuya@tcha.org> parents: 26392 diff changeset	311 fileno = getattr(f, 'fileno', None)
36462 1ca4e86c7265 util: handle fileno() on Python 3 throwing io.UnsupportedOperation Augie Fackler <augie@google.com> parents: 36452 diff changeset	312 try:
36801 eca1051e6c22 util: add public isstdin/isstdout() functions Yuya Nishihara <yuya@tcha.org> parents: 36799 diff changeset	313 return fileno and fileno() == stdf.fileno()
36462 1ca4e86c7265 util: handle fileno() on Python 3 throwing io.UnsupportedOperation Augie Fackler <augie@google.com> parents: 36452 diff changeset	314 except io.UnsupportedOperation:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	315 return False # fileno() raised UnsupportedOperation
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	316
26450 1138e1d05207 util.system: compare fileno to see if it needs stdout redirection Yuya Nishihara <yuya@tcha.org> parents: 26392 diff changeset	317
36801 eca1051e6c22 util: add public isstdin/isstdout() functions Yuya Nishihara <yuya@tcha.org> parents: 36799 diff changeset	318 def isstdin(f):
eca1051e6c22 util: add public isstdin/isstdout() functions Yuya Nishihara <yuya@tcha.org> parents: 36799 diff changeset	319 return _testfileno(f, sys.__stdin__)
eca1051e6c22 util: add public isstdin/isstdout() functions Yuya Nishihara <yuya@tcha.org> parents: 36799 diff changeset	320
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	321
36801 eca1051e6c22 util: add public isstdin/isstdout() functions Yuya Nishihara <yuya@tcha.org> parents: 36799 diff changeset	322 def isstdout(f):
eca1051e6c22 util: add public isstdin/isstdout() functions Yuya Nishihara <yuya@tcha.org> parents: 36799 diff changeset	323 return _testfileno(f, sys.__stdout__)
eca1051e6c22 util: add public isstdin/isstdout() functions Yuya Nishihara <yuya@tcha.org> parents: 36799 diff changeset	324
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	325
37126 0216232f21ab procutil: move protectio/restoreio from commandserver Yuya Nishihara <yuya@tcha.org> parents: 37121 diff changeset	326 def protectstdio(uin, uout):
37222 7f78de1c93aa procutil: redirect ui.fout to stderr while stdio is protected Yuya Nishihara <yuya@tcha.org> parents: 37221 diff changeset	327 """Duplicate streams and redirect original if (uin, uout) are stdio
7f78de1c93aa procutil: redirect ui.fout to stderr while stdio is protected Yuya Nishihara <yuya@tcha.org> parents: 37221 diff changeset	328
7f78de1c93aa procutil: redirect ui.fout to stderr while stdio is protected Yuya Nishihara <yuya@tcha.org> parents: 37221 diff changeset	329 If uin is stdin, it's redirected to /dev/null. If uout is stdout, it's
7f78de1c93aa procutil: redirect ui.fout to stderr while stdio is protected Yuya Nishihara <yuya@tcha.org> parents: 37221 diff changeset	330 redirected to stderr so the output is still readable.
37126 0216232f21ab procutil: move protectio/restoreio from commandserver Yuya Nishihara <yuya@tcha.org> parents: 37121 diff changeset	331
0216232f21ab procutil: move protectio/restoreio from commandserver Yuya Nishihara <yuya@tcha.org> parents: 37121 diff changeset	332 Returns (fin, fout) which point to the original (uin, uout) fds, but
0216232f21ab procutil: move protectio/restoreio from commandserver Yuya Nishihara <yuya@tcha.org> parents: 37121 diff changeset	333 may be copy of (uin, uout). The returned streams can be considered
0216232f21ab procutil: move protectio/restoreio from commandserver Yuya Nishihara <yuya@tcha.org> parents: 37121 diff changeset	334 "owned" in that print(), exec(), etc. never reach to them.
0216232f21ab procutil: move protectio/restoreio from commandserver Yuya Nishihara <yuya@tcha.org> parents: 37121 diff changeset	335 """
0216232f21ab procutil: move protectio/restoreio from commandserver Yuya Nishihara <yuya@tcha.org> parents: 37121 diff changeset	336 uout.flush()
37221 ac71cbad5da3 procutil: unroll uin/uout loop in protectstdio() Yuya Nishihara <yuya@tcha.org> parents: 37127 diff changeset	337 fin, fout = uin, uout
38799 e5724be689b3 procutil: compare fd number to see if stdio protection is needed (issue5992) Yuya Nishihara <yuya@tcha.org> parents: 38528 diff changeset	338 if _testfileno(uin, stdin):
37221 ac71cbad5da3 procutil: unroll uin/uout loop in protectstdio() Yuya Nishihara <yuya@tcha.org> parents: 37127 diff changeset	339 newfd = os.dup(uin.fileno())
37222 7f78de1c93aa procutil: redirect ui.fout to stderr while stdio is protected Yuya Nishihara <yuya@tcha.org> parents: 37221 diff changeset	340 nullfd = os.open(os.devnull, os.O_RDONLY)
37221 ac71cbad5da3 procutil: unroll uin/uout loop in protectstdio() Yuya Nishihara <yuya@tcha.org> parents: 37127 diff changeset	341 os.dup2(nullfd, uin.fileno())
37222 7f78de1c93aa procutil: redirect ui.fout to stderr while stdio is protected Yuya Nishihara <yuya@tcha.org> parents: 37221 diff changeset	342 os.close(nullfd)
37221 ac71cbad5da3 procutil: unroll uin/uout loop in protectstdio() Yuya Nishihara <yuya@tcha.org> parents: 37127 diff changeset	343 fin = os.fdopen(newfd, r'rb')
38799 e5724be689b3 procutil: compare fd number to see if stdio protection is needed (issue5992) Yuya Nishihara <yuya@tcha.org> parents: 38528 diff changeset	344 if _testfileno(uout, stdout):
37221 ac71cbad5da3 procutil: unroll uin/uout loop in protectstdio() Yuya Nishihara <yuya@tcha.org> parents: 37127 diff changeset	345 newfd = os.dup(uout.fileno())
37222 7f78de1c93aa procutil: redirect ui.fout to stderr while stdio is protected Yuya Nishihara <yuya@tcha.org> parents: 37221 diff changeset	346 os.dup2(stderr.fileno(), uout.fileno())
37221 ac71cbad5da3 procutil: unroll uin/uout loop in protectstdio() Yuya Nishihara <yuya@tcha.org> parents: 37127 diff changeset	347 fout = os.fdopen(newfd, r'wb')
ac71cbad5da3 procutil: unroll uin/uout loop in protectstdio() Yuya Nishihara <yuya@tcha.org> parents: 37127 diff changeset	348 return fin, fout
37126 0216232f21ab procutil: move protectio/restoreio from commandserver Yuya Nishihara <yuya@tcha.org> parents: 37121 diff changeset	349
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	350
37126 0216232f21ab procutil: move protectio/restoreio from commandserver Yuya Nishihara <yuya@tcha.org> parents: 37121 diff changeset	351 def restorestdio(uin, uout, fin, fout):
0216232f21ab procutil: move protectio/restoreio from commandserver Yuya Nishihara <yuya@tcha.org> parents: 37121 diff changeset	352 """Restore (uin, uout) streams from possibly duplicated (fin, fout)"""
0216232f21ab procutil: move protectio/restoreio from commandserver Yuya Nishihara <yuya@tcha.org> parents: 37121 diff changeset	353 uout.flush()
0216232f21ab procutil: move protectio/restoreio from commandserver Yuya Nishihara <yuya@tcha.org> parents: 37121 diff changeset	354 for f, uif in [(fin, uin), (fout, uout)]:
0216232f21ab procutil: move protectio/restoreio from commandserver Yuya Nishihara <yuya@tcha.org> parents: 37121 diff changeset	355 if f is not uif:
0216232f21ab procutil: move protectio/restoreio from commandserver Yuya Nishihara <yuya@tcha.org> parents: 37121 diff changeset	356 os.dup2(f.fileno(), uif.fileno())
0216232f21ab procutil: move protectio/restoreio from commandserver Yuya Nishihara <yuya@tcha.org> parents: 37121 diff changeset	357 f.close()
0216232f21ab procutil: move protectio/restoreio from commandserver Yuya Nishihara <yuya@tcha.org> parents: 37121 diff changeset	358
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	359
30736 d9e5b0aeeb90 util: extract the logic calculating environment variables Jun Wu <quark@fb.com> parents: 30672 diff changeset	360 def shellenviron(environ=None):
d9e5b0aeeb90 util: extract the logic calculating environment variables Jun Wu <quark@fb.com> parents: 30672 diff changeset	361 """return environ with optional override, useful for shelling out"""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	362
30736 d9e5b0aeeb90 util: extract the logic calculating environment variables Jun Wu <quark@fb.com> parents: 30672 diff changeset	363 def py2shell(val):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	364 b'convert python object into string that is useful to shell'
30736 d9e5b0aeeb90 util: extract the logic calculating environment variables Jun Wu <quark@fb.com> parents: 30672 diff changeset	365 if val is None or val is False:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	366 return b'0'
30736 d9e5b0aeeb90 util: extract the logic calculating environment variables Jun Wu <quark@fb.com> parents: 30672 diff changeset	367 if val is True:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	368 return b'1'
36448 d26b0bedfaa4 util: use pycompat.bytestr() instead of str() Augie Fackler <augie@google.com> parents: 36445 diff changeset	369 return pycompat.bytestr(val)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	370
30736 d9e5b0aeeb90 util: extract the logic calculating environment variables Jun Wu <quark@fb.com> parents: 30672 diff changeset	371 env = dict(encoding.environ)
d9e5b0aeeb90 util: extract the logic calculating environment variables Jun Wu <quark@fb.com> parents: 30672 diff changeset	372 if environ:
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43096 diff changeset	373 env.update((k, py2shell(v)) for k, v in pycompat.iteritems(environ))
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	374 env[b'HG'] = hgexecutable()
30736 d9e5b0aeeb90 util: extract the logic calculating environment variables Jun Wu <quark@fb.com> parents: 30672 diff changeset	375 return env
d9e5b0aeeb90 util: extract the logic calculating environment variables Jun Wu <quark@fb.com> parents: 30672 diff changeset	376
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	377
38495 72286f9e324f procutil: add a shim for translating shell commands to native commands Matt Harbison <matt_harbison@yahoo.com> parents: 38459 diff changeset	378 if pycompat.iswindows:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	379
38495 72286f9e324f procutil: add a shim for translating shell commands to native commands Matt Harbison <matt_harbison@yahoo.com> parents: 38459 diff changeset	380 def shelltonative(cmd, env):
72286f9e324f procutil: add a shim for translating shell commands to native commands Matt Harbison <matt_harbison@yahoo.com> parents: 38459 diff changeset	381 return platform.shelltocmdexe(cmd, shellenviron(env))
39678 50f46b771921 py3: partially fix pager spawning on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 38528 diff changeset	382
50f46b771921 py3: partially fix pager spawning on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 38528 diff changeset	383 tonativestr = encoding.strfromlocal
38495 72286f9e324f procutil: add a shim for translating shell commands to native commands Matt Harbison <matt_harbison@yahoo.com> parents: 38459 diff changeset	384 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	385
38495 72286f9e324f procutil: add a shim for translating shell commands to native commands Matt Harbison <matt_harbison@yahoo.com> parents: 38459 diff changeset	386 def shelltonative(cmd, env):
72286f9e324f procutil: add a shim for translating shell commands to native commands Matt Harbison <matt_harbison@yahoo.com> parents: 38459 diff changeset	387 return cmd
72286f9e324f procutil: add a shim for translating shell commands to native commands Matt Harbison <matt_harbison@yahoo.com> parents: 38459 diff changeset	388
39678 50f46b771921 py3: partially fix pager spawning on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 38528 diff changeset	389 tonativestr = pycompat.identity
50f46b771921 py3: partially fix pager spawning on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 38528 diff changeset	390
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	391
39678 50f46b771921 py3: partially fix pager spawning on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 38528 diff changeset	392 def tonativeenv(env):
50f46b771921 py3: partially fix pager spawning on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 38528 diff changeset	393 '''convert the environment from bytes to strings suitable for Popen(), etc.
50f46b771921 py3: partially fix pager spawning on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 38528 diff changeset	394 '''
50f46b771921 py3: partially fix pager spawning on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 38528 diff changeset	395 return pycompat.rapply(tonativestr, env)
50f46b771921 py3: partially fix pager spawning on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 38528 diff changeset	396
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	397
31125 3f8f53190d6a chg: deduplicate error handling of ui.system() Yuya Nishihara <yuya@tcha.org> parents: 31091 diff changeset	398 def system(cmd, environ=None, cwd=None, out=None):
1882 c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	399 '''enhanced shell command execution.
c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	400 run with environment maybe modified, maybe in different dir.
508 42a660abaf75 [PATCH] Harden os.system mpm@selenic.com parents: 464 diff changeset	401
11469 c37f35d7f2f5 http: deliver hook output to client Maxim Khitrov <mkhitrov@gmail.com> parents: 11297 diff changeset	402 if out is specified, it is assumed to be a file-like object that has a
c37f35d7f2f5 http: deliver hook output to client Maxim Khitrov <mkhitrov@gmail.com> parents: 11297 diff changeset	403 write() method. stdout and stderr will be redirected to out.'''
13439 d724a69309e0 util: flush stdout before calling external processes Mads Kiilerich <mads@kiilerich.com> parents: 13400 diff changeset	404 try:
30482 39d13b8c101d py3: bulk replace sys.stdin/out/err by util's Yuya Nishihara <yuya@tcha.org> parents: 30481 diff changeset	405 stdout.flush()
13439 d724a69309e0 util: flush stdout before calling external processes Mads Kiilerich <mads@kiilerich.com> parents: 13400 diff changeset	406 except Exception:
d724a69309e0 util: flush stdout before calling external processes Mads Kiilerich <mads@kiilerich.com> parents: 13400 diff changeset	407 pass
13188 6c9345f9edca util: concentrate quoting knowledge to windows.py quotecommand() Steve Borho <steve@borho.org> parents: 13128 diff changeset	408 cmd = quotecommand(cmd)
32904 19b0fd4b5570 plan9: drop py26 hacks Matt Harbison <matt_harbison@yahoo.com> parents: 32835 diff changeset	409 env = shellenviron(environ)
36801 eca1051e6c22 util: add public isstdin/isstdout() functions Yuya Nishihara <yuya@tcha.org> parents: 36799 diff changeset	410 if out is None or isstdout(out):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	411 rc = subprocess.call(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	412 tonativestr(cmd),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	413 shell=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	414 close_fds=closefds,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	415 env=tonativeenv(env),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	416 cwd=pycompat.rapply(tonativestr, cwd),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	417 )
11469 c37f35d7f2f5 http: deliver hook output to client Maxim Khitrov <mkhitrov@gmail.com> parents: 11297 diff changeset	418 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	419 proc = subprocess.Popen(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	420 tonativestr(cmd),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	421 shell=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	422 close_fds=closefds,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	423 env=tonativeenv(env),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	424 cwd=pycompat.rapply(tonativestr, cwd),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	425 stdout=subprocess.PIPE,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	426 stderr=subprocess.STDOUT,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	427 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	428 for line in iter(proc.stdout.readline, b''):
32904 19b0fd4b5570 plan9: drop py26 hacks Matt Harbison <matt_harbison@yahoo.com> parents: 32835 diff changeset	429 out.write(line)
19b0fd4b5570 plan9: drop py26 hacks Matt Harbison <matt_harbison@yahoo.com> parents: 32835 diff changeset	430 proc.wait()
19b0fd4b5570 plan9: drop py26 hacks Matt Harbison <matt_harbison@yahoo.com> parents: 32835 diff changeset	431 rc = proc.returncode
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	432 if pycompat.sysplatform == b'OpenVMS' and rc & 1:
32904 19b0fd4b5570 plan9: drop py26 hacks Matt Harbison <matt_harbison@yahoo.com> parents: 32835 diff changeset	433 rc = 0
9517 4368f582c806 util.system: Use subprocess instead of os.system Mads Kiilerich <mads@kiilerich.com> parents: 9508 diff changeset	434 return rc
1880 05c7d75be925 fix broken environment save/restore when a hook runs. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1877 diff changeset	435
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	436
6007 090b1a665901 filemerge: add config item for GUI tools Matt Mackall <mpm@selenic.com> parents: 6006 diff changeset	437 def gui():
090b1a665901 filemerge: add config item for GUI tools Matt Mackall <mpm@selenic.com> parents: 6006 diff changeset	438 '''Are we running in a GUI?'''
34647 dacfcdd8b94e codemod: use pycompat.isdarwin Jun Wu <quark@fb.com> parents: 34646 diff changeset	439 if pycompat.isdarwin:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	440 if b'SSH_CONNECTION' in encoding.environ:
13734 16118b4859a1 util: add Mac-specific check whether we're in a GUI session (issue2553) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 13439 diff changeset	441 # handle SSH access to a box where the user is logged in
16118b4859a1 util: add Mac-specific check whether we're in a GUI session (issue2553) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 13439 diff changeset	442 return False
16118b4859a1 util: add Mac-specific check whether we're in a GUI session (issue2553) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 13439 diff changeset	443 elif getattr(osutil, 'isgui', None):
16118b4859a1 util: add Mac-specific check whether we're in a GUI session (issue2553) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 13439 diff changeset	444 # check if a CoreGraphics session is available
16118b4859a1 util: add Mac-specific check whether we're in a GUI session (issue2553) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 13439 diff changeset	445 return osutil.isgui()
16118b4859a1 util: add Mac-specific check whether we're in a GUI session (issue2553) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 13439 diff changeset	446 else:
16118b4859a1 util: add Mac-specific check whether we're in a GUI session (issue2553) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 13439 diff changeset	447 # pure build; use a safe default
16118b4859a1 util: add Mac-specific check whether we're in a GUI session (issue2553) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 13439 diff changeset	448 return True
16118b4859a1 util: add Mac-specific check whether we're in a GUI session (issue2553) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 13439 diff changeset	449 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	450 return pycompat.iswindows or encoding.environ.get(b"DISPLAY")
6007 090b1a665901 filemerge: add config item for GUI tools Matt Mackall <mpm@selenic.com> parents: 6006 diff changeset	451
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	452
10239 8e4be44a676f Find right hg command for detached process Patrick Mezard <pmezard@gmail.com> parents: 10199 diff changeset	453 def hgcmd():
8e4be44a676f Find right hg command for detached process Patrick Mezard <pmezard@gmail.com> parents: 10199 diff changeset	454 """Return the command used to execute current hg
8e4be44a676f Find right hg command for detached process Patrick Mezard <pmezard@gmail.com> parents: 10199 diff changeset	455
8e4be44a676f Find right hg command for detached process Patrick Mezard <pmezard@gmail.com> parents: 10199 diff changeset	456 This is different from hgexecutable() because on Windows we want
8e4be44a676f Find right hg command for detached process Patrick Mezard <pmezard@gmail.com> parents: 10199 diff changeset	457 to avoid things opening new shell windows like batch files, so we
8e4be44a676f Find right hg command for detached process Patrick Mezard <pmezard@gmail.com> parents: 10199 diff changeset	458 get either the python call or current executable.
8e4be44a676f Find right hg command for detached process Patrick Mezard <pmezard@gmail.com> parents: 10199 diff changeset	459 """
14228 116de1da2154 rename util.main_is_frozen to mainfrozen Adrian Buehlmann <adrian@cadifra.com> parents: 14167 diff changeset	460 if mainfrozen():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	461 if getattr(sys, 'frozen', None) == b'macosx_app':
27766 198f78a52a2f util: adjust hgcmd() to handle frozen Mercurial on OS X Matt Harbison <matt_harbison@yahoo.com> parents: 27765 diff changeset	462 # Env variable set by py2app
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	463 return [encoding.environ[b'EXECUTABLEPATH']]
27766 198f78a52a2f util: adjust hgcmd() to handle frozen Mercurial on OS X Matt Harbison <matt_harbison@yahoo.com> parents: 27765 diff changeset	464 else:
30672 10b17ed9b591 py3: replace sys.executable with pycompat.sysexecutable Pulkit Goyal <7895pulkit@gmail.com> parents: 30647 diff changeset	465 return [pycompat.sysexecutable]
37118 49d6ba67c93f util: mark platform-specific gethgcmd() as private Yuya Nishihara <yuya@tcha.org> parents: 37102 diff changeset	466 return _gethgcmd()
10344 9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	467
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	468
10344 9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	469 def rundetached(args, condfn):
9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	470 """Execute the argument list in a detached process.
10422 600142e7a028 util: fix trailing whitespace found by check-code Augie Fackler <durin42@gmail.com> parents: 10344 diff changeset	471
10344 9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	472 condfn is a callable which is called repeatedly and should return
9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	473 True once the child process is known to have started successfully.
9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	474 At this point, the child process PID is returned. If the child
9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	475 process fails to start or finishes before condfn() evaluates to
9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	476 True, return -1.
9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	477 """
9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	478 # Windows case is easier because the child process is either
9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	479 # successfully starting and validating the condition or exiting
9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	480 # on failure. We just poll on its PID. On Unix, if the child
9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	481 # process fails to start, it will be left in a zombie state until
9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	482 # the parent wait on it, which we cannot do since we expect a long
9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	483 # running process on success. Instead we listen for SIGCHLD telling
9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	484 # us our child process terminated.
9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	485 terminated = set()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	486
10344 9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	487 def handler(signum, frame):
9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	488 terminated.add(os.wait())
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	489
10344 9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	490 prevhandler = None
14968 b7dbe957585c util: use safehasattr or getattr instead of hasattr Augie Fackler <durin42@gmail.com> parents: 14942 diff changeset	491 SIGCHLD = getattr(signal, 'SIGCHLD', None)
b7dbe957585c util: use safehasattr or getattr instead of hasattr Augie Fackler <durin42@gmail.com> parents: 14942 diff changeset	492 if SIGCHLD is not None:
b7dbe957585c util: use safehasattr or getattr instead of hasattr Augie Fackler <durin42@gmail.com> parents: 14942 diff changeset	493 prevhandler = signal.signal(SIGCHLD, handler)
10344 9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	494 try:
9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	495 pid = spawndetached(args)
9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	496 while not condfn():
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	497 if (pid in terminated or not testpid(pid)) and not condfn():
10344 9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	498 return -1
9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	499 time.sleep(0.1)
9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	500 return pid
9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	501 finally:
9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	502 if prevhandler is not None:
9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	503 signal.signal(signal.SIGCHLD, prevhandler)
38528 313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38527 diff changeset	504
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	505
38528 313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38527 diff changeset	506 @contextlib.contextmanager
41079 8ecb17b7f432 procutil: correct spelling of uninterruptable -> uninterruptible Kyle Lippincott <spectral@google.com> parents: 40751 diff changeset	507 def uninterruptible(warn):
38528 313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38527 diff changeset	508 """Inhibit SIGINT handling on a region of code.
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38527 diff changeset	509
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38527 diff changeset	510 Note that if this is called in a non-main thread, it turns into a no-op.
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38527 diff changeset	511
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38527 diff changeset	512 Args:
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38527 diff changeset	513 warn: A callable which takes no arguments, and returns True if the
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38527 diff changeset	514 previous signal handling should be restored.
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38527 diff changeset	515 """
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38527 diff changeset	516
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38527 diff changeset	517 oldsiginthandler = [signal.getsignal(signal.SIGINT)]
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38527 diff changeset	518 shouldbail = []
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38527 diff changeset	519
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38527 diff changeset	520 def disabledsiginthandler(*args):
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38527 diff changeset	521 if warn():
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38527 diff changeset	522 signal.signal(signal.SIGINT, oldsiginthandler[0])
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38527 diff changeset	523 del oldsiginthandler[0]
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38527 diff changeset	524 shouldbail.append(True)
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38527 diff changeset	525
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38527 diff changeset	526 try:
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38527 diff changeset	527 try:
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38527 diff changeset	528 signal.signal(signal.SIGINT, disabledsiginthandler)
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38527 diff changeset	529 except ValueError:
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38527 diff changeset	530 # wrong thread, oh well, we tried
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38527 diff changeset	531 del oldsiginthandler[0]
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38527 diff changeset	532 yield
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38527 diff changeset	533 finally:
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38527 diff changeset	534 if oldsiginthandler:
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38527 diff changeset	535 signal.signal(signal.SIGINT, oldsiginthandler[0])
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38527 diff changeset	536 if shouldbail:
313a940d49a3 ui: add an uninterruptable context manager that can block SIGINT Augie Fackler <augie@google.com> parents: 38527 diff changeset	537 raise KeyboardInterrupt
40547 3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	538
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	539
40547 3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	540 if pycompat.iswindows:
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	541 # no fork on Windows, but we can create a detached process
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	542 # https://msdn.microsoft.com/en-us/library/windows/desktop/ms684863.aspx
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	543 # No stdlib constant exists for this value
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	544 DETACHED_PROCESS = 0x00000008
40586 1d3bed7d2923 procutil: import concerns about creationflags on Windows from D1701 Boris Feld <boris.feld@octobus.net> parents: 40548 diff changeset	545 # Following creation flags might create a console GUI window.
1d3bed7d2923 procutil: import concerns about creationflags on Windows from D1701 Boris Feld <boris.feld@octobus.net> parents: 40548 diff changeset	546 # Using subprocess.CREATE_NEW_CONSOLE might helps.
1d3bed7d2923 procutil: import concerns about creationflags on Windows from D1701 Boris Feld <boris.feld@octobus.net> parents: 40548 diff changeset	547 # See https://phab.mercurial-scm.org/D1701 for discussion
40547 3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	548 _creationflags = DETACHED_PROCESS \| subprocess.CREATE_NEW_PROCESS_GROUP
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	549
42511 ca1014ad3de4 procutil: allow callers of runbgcommand to assume the process starts Augie Fackler <augie@google.com> parents: 41837 diff changeset	550 def runbgcommand(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	551 script, env, shell=False, stdout=None, stderr=None, ensurestart=True
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	552 ):
40547 3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	553 '''Spawn a command without waiting for it to finish.'''
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	554 # we can't use close_fds and redirect stdin. I'm not sure that we
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	555 # need to because the detached process has no console connection.
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	556 subprocess.Popen(
40548 8fab95aa5280 procutil: port over windows encoding fixes from logtoprocess Augie Fackler <augie@google.com> parents: 40547 diff changeset	557 tonativestr(script),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	558 shell=shell,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	559 env=tonativeenv(env),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	560 close_fds=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	561 creationflags=_creationflags,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	562 stdout=stdout,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	563 stderr=stderr,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	564 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	565
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	566
40547 3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	567 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	568
42511 ca1014ad3de4 procutil: allow callers of runbgcommand to assume the process starts Augie Fackler <augie@google.com> parents: 41837 diff changeset	569 def runbgcommand(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	570 cmd, env, shell=False, stdout=None, stderr=None, ensurestart=True
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	571 ):
40547 3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	572 '''Spawn a command without waiting for it to finish.'''
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	573 # double-fork to completely detach from the parent process
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	574 # based on http://code.activestate.com/recipes/278731
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	575 pid = os.fork()
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	576 if pid:
42511 ca1014ad3de4 procutil: allow callers of runbgcommand to assume the process starts Augie Fackler <augie@google.com> parents: 41837 diff changeset	577 if not ensurestart:
ca1014ad3de4 procutil: allow callers of runbgcommand to assume the process starts Augie Fackler <augie@google.com> parents: 41837 diff changeset	578 return
40547 3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	579 # Parent process
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	580 (_pid, status) = os.waitpid(pid, 0)
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	581 if os.WIFEXITED(status):
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	582 returncode = os.WEXITSTATUS(status)
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	583 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	584 returncode = -(os.WTERMSIG(status))
40547 3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	585 if returncode != 0:
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	586 # The child process's return code is 0 on success, an errno
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	587 # value on failure, or 255 if we don't have a valid errno
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	588 # value.
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	589 #
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	590 # (It would be slightly nicer to return the full exception info
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	591 # over a pipe as the subprocess module does. For now it
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	592 # doesn't seem worth adding that complexity here, though.)
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	593 if returncode == 255:
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	594 returncode = errno.EINVAL
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	595 raise OSError(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	596 returncode,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	597 b'error running %r: %s' % (cmd, os.strerror(returncode)),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	598 )
40547 3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	599 return
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	600
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	601 returncode = 255
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	602 try:
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	603 # Start a new session
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	604 os.setsid()
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	605
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	606 stdin = open(os.devnull, b'r')
40547 3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	607 if stdout is None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	608 stdout = open(os.devnull, b'w')
40547 3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	609 if stderr is None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	610 stderr = open(os.devnull, b'w')
40547 3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	611
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	612 # connect stdin to devnull to make sure the subprocess can't
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	613 # muck up that stream for mercurial.
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	614 subprocess.Popen(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	615 cmd,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	616 shell=shell,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	617 env=env,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	618 close_fds=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	619 stdin=stdin,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	620 stdout=stdout,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	621 stderr=stderr,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	622 )
40547 3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	623 returncode = 0
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	624 except EnvironmentError as ex:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43021 diff changeset	625 returncode = ex.errno & 0xFF
40547 3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	626 if returncode == 0:
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	627 # This shouldn't happen, but just in case make sure the
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	628 # return code is never 0 here.
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	629 returncode = 255
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	630 except Exception:
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	631 returncode = 255
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	632 finally:
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	633 # mission accomplished, this child needs to exit and not
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	634 # continue the hg process here.
3fbfbc8c9f82 remotefilelog: transplant runbgcommand to procutil Augie Fackler <augie@google.com> parents: 39845 diff changeset	635 os._exit(returncode)

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/utils/procutil.py @ 43165:227ba1afcb65