D5121: procutil: port over windows encoding fixes from logtoprocess

durin42 (Augie Fackler) phabricator at mercurial-scm.org
Tue Oct 16 19:18:08 UTC 2018


durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D5121

AFFECTED FILES
  mercurial/utils/procutil.py

CHANGE DETAILS

diff --git a/mercurial/utils/procutil.py b/mercurial/utils/procutil.py
--- a/mercurial/utils/procutil.py
+++ b/mercurial/utils/procutil.py
@@ -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.'''



To: durin42, #hg-reviewers
Cc: mercurial-devel


More information about the Mercurial-devel mailing list