| hg-reviewers |
For automatic clonebundles generation I need to pass arbitrary large amount of
data to the process (eg: common nodes, target nodes).
I am updating the runbgcommand to allow for this. Previously not stdin input
was possible, now, one can provide raw bytes and they will be feed to the
command through an unnamed temporary files.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/utils/procutil.py (50 lines) |
| def runbgcommand( | def runbgcommand( | ||||
| script, | script, | ||||
| env, | env, | ||||
| shell=False, | shell=False, | ||||
| stdout=None, | stdout=None, | ||||
| stderr=None, | stderr=None, | ||||
| ensurestart=True, | ensurestart=True, | ||||
| record_wait=None, | record_wait=None, | ||||
| stdin_bytes=None, | |||||
| ): | ): | ||||
| '''Spawn a command without waiting for it to finish.''' | '''Spawn a command without waiting for it to finish.''' | ||||
| # we can't use close_fds *and* redirect stdin. I'm not sure that we | # we can't use close_fds *and* redirect stdin. I'm not sure that we | ||||
| # need to because the detached process has no console connection. | # need to because the detached process has no console connection. | ||||
| try: | |||||
| stdin = None | |||||
| if stdin_bytes is not None: | |||||
| stdin = pycompat.unnamedtempfile() | |||||
| stdin.write(stdin_bytes) | |||||
| stdin.flush() | |||||
| stdin.seek(0) | |||||
| p = subprocess.Popen( | p = subprocess.Popen( | ||||
| tonativestr(script), | tonativestr(script), | ||||
| shell=shell, | shell=shell, | ||||
| env=tonativeenv(env), | env=tonativeenv(env), | ||||
| close_fds=True, | close_fds=True, | ||||
| creationflags=_creationflags, | creationflags=_creationflags, | ||||
| stdin=stdin, | |||||
| stdout=stdout, | stdout=stdout, | ||||
| stderr=stderr, | stderr=stderr, | ||||
| ) | ) | ||||
| if record_wait is not None: | if record_wait is not None: | ||||
| record_wait(p.wait) | record_wait(p.wait) | ||||
| finally: | |||||
| if stdin is not None: | |||||
| stdin.close() | |||||
| else: | else: | ||||
| def runbgcommand( | def runbgcommand( | ||||
| cmd, | cmd, | ||||
| env, | env, | ||||
| shell=False, | shell=False, | ||||
| stdout=None, | stdout=None, | ||||
| stderr=None, | stderr=None, | ||||
| ensurestart=True, | ensurestart=True, | ||||
| record_wait=None, | record_wait=None, | ||||
| stdin_bytes=None, | |||||
| ): | ): | ||||
| '''Spawn a command without waiting for it to finish. | '''Spawn a command without waiting for it to finish. | ||||
| When `record_wait` is not None, the spawned process will not be fully | When `record_wait` is not None, the spawned process will not be fully | ||||
| detached and the `record_wait` argument will be called with a the | detached and the `record_wait` argument will be called with a the | ||||
| `Subprocess.wait` function for the spawned process. This is mostly | `Subprocess.wait` function for the spawned process. This is mostly | ||||
| useful for developers that need to make sure the spawned process | useful for developers that need to make sure the spawned process | ||||
| ) | ) | ||||
| return | return | ||||
| returncode = 255 | returncode = 255 | ||||
| try: | try: | ||||
| if record_wait is None: | if record_wait is None: | ||||
| # Start a new session | # Start a new session | ||||
| os.setsid() | os.setsid() | ||||
| # connect stdin to devnull to make sure the subprocess can't | |||||
| # muck up that stream for mercurial. | |||||
| if stdin_bytes is None: | |||||
| stdin = open(os.devnull, b'r') | stdin = open(os.devnull, b'r') | ||||
| else: | |||||
| stdin = pycompat.unnamedtempfile() | |||||
| stdin.write(stdin_bytes) | |||||
| stdin.flush() | |||||
| stdin.seek(0) | |||||
| if stdout is None: | if stdout is None: | ||||
| stdout = open(os.devnull, b'w') | stdout = open(os.devnull, b'w') | ||||
| if stderr is None: | if stderr is None: | ||||
| stderr = open(os.devnull, b'w') | stderr = open(os.devnull, b'w') | ||||
| # connect stdin to devnull to make sure the subprocess can't | |||||
| # muck up that stream for mercurial. | |||||
| p = subprocess.Popen( | p = subprocess.Popen( | ||||
| cmd, | cmd, | ||||
| shell=shell, | shell=shell, | ||||
| env=env, | env=env, | ||||
| close_fds=True, | close_fds=True, | ||||
| stdin=stdin, | stdin=stdin, | ||||
| stdout=stdout, | stdout=stdout, | ||||
| stderr=stderr, | stderr=stderr, | ||||
| ) | ) | ||||
| if record_wait is not None: | if record_wait is not None: | ||||
| record_wait(p.wait) | record_wait(p.wait) | ||||
| returncode = 0 | returncode = 0 | ||||
| except EnvironmentError as ex: | except EnvironmentError as ex: | ||||
| returncode = ex.errno & 0xFF | returncode = ex.errno & 0xFF | ||||
| if returncode == 0: | if returncode == 0: | ||||
| # This shouldn't happen, but just in case make sure the | # This shouldn't happen, but just in case make sure the | ||||
| # return code is never 0 here. | # return code is never 0 here. | ||||
| returncode = 255 | returncode = 255 | ||||
| except Exception: | except Exception: | ||||
| returncode = 255 | returncode = 255 | ||||
| finally: | finally: | ||||
| # mission accomplished, this child needs to exit and not | # mission accomplished, this child needs to exit and not | ||||
| # continue the hg process here. | # continue the hg process here. | ||||
| stdin.close() | |||||
| if record_wait is None: | if record_wait is None: | ||||
| os._exit(returncode) | os._exit(returncode) | ||||