git_command: switch process capturing over to subprocess
Now that these code paths are all synchronous, there's no need to run
our own poll loop to read & pass thru/save output. Delete all of that
and just let the subprocess module take care of it all.
Change-Id: Ic27fe71b6f964905cf280ce2b183bb7ee46f4a0d
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/297422
Reviewed-by: Michael Mortensen <mmortensen@google.com>
Reviewed-by: Jonathan Nieder <jrn@google.com>
Tested-by: Mike Frysinger <vapier@google.com>
diff --git a/git_command.py b/git_command.py
index 6cb6e0c..8bd4e67 100644
--- a/git_command.py
+++ b/git_command.py
@@ -259,9 +259,6 @@
gitdir=None):
env = self._GetBasicEnv()
- # If we are not capturing std* then need to print it.
- self.tee = {'stdout': not capture_stdout, 'stderr': not capture_stderr}
-
if disable_editor:
env['GIT_EDITOR'] = ':'
if ssh_proxy:
@@ -299,8 +296,9 @@
command.extend(cmdv[1:])
stdin = subprocess.PIPE if input else None
- stdout = subprocess.PIPE
- stderr = subprocess.STDOUT if merge_output else subprocess.PIPE
+ stdout = subprocess.PIPE if capture_stdout else None
+ stderr = (subprocess.STDOUT if merge_output else
+ (subprocess.PIPE if capture_stderr else None))
if IsTrace():
global LAST_CWD
@@ -336,6 +334,8 @@
p = subprocess.Popen(command,
cwd=cwd,
env=env,
+ encoding='utf-8',
+ errors='backslashreplace',
stdin=stdin,
stdout=stdout,
stderr=stderr)
@@ -353,9 +353,10 @@
p.stdin.close()
try:
- self.rc = self._CaptureOutput()
+ self.stdout, self.stderr = p.communicate()
finally:
_remove_ssh_client(p)
+ self.rc = p.wait()
@staticmethod
def _GetBasicEnv():
@@ -376,30 +377,3 @@
def Wait(self):
return self.rc
-
- def _CaptureOutput(self):
- p = self.process
- s_in = platform_utils.FileDescriptorStreams.create()
- s_in.add(p.stdout, sys.stdout, 'stdout')
- if p.stderr is not None:
- s_in.add(p.stderr, sys.stderr, 'stderr')
- self.stdout = ''
- self.stderr = ''
-
- while not s_in.is_done:
- in_ready = s_in.select()
- for s in in_ready:
- buf = s.read()
- if not buf:
- s_in.remove(s)
- continue
- if not hasattr(buf, 'encode'):
- buf = buf.decode('utf-8', 'backslashreplace')
- if s.std_name == 'stdout':
- self.stdout += buf
- else:
- self.stderr += buf
- if self.tee[s.std_name]:
- s.dest.write(buf)
- s.dest.flush()
- return p.wait()
