changeset 40498:8fab95aa5280

procutil: port over windows encoding fixes from logtoprocess Differential Revision: https://phab.mercurial-scm.org/D5121
author Augie Fackler <augie@google.com>
date Tue, 16 Oct 2018 14:42:57 -0400
parents 3fbfbc8c9f82
children 2e09d1cae90c
files mercurial/utils/procutil.py
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/utils/procutil.py	Wed Oct 03 14:01:04 2018 -0400
+++ b/mercurial/utils/procutil.py	Tue Oct 16 14:42:57 2018 -0400
@@ -481,8 +481,10 @@
         # 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.
         subprocess.Popen(
-            script, shell=shell, env=env, close_fds=True,
-            creationflags=_creationflags, stdout=stdout, stderr=stderr)
+            tonativestr(script),
+            shell=shell, env=tonativeenv(env), close_fds=True,
+            creationflags=_creationflags, stdout=stdout,
+            stderr=stderr)
 else:
     def runbgcommand(cmd, env, shell=False, stdout=None, stderr=None):
         '''Spawn a command without waiting for it to finish.'''