Win, hook, gitpython-developers#519: Consume Hook Popen-proc out of GIL

+ HookException thrown on Popen, and were missed on Windows.
+ No SHELL on Popen??
+ Minor fixes:
  + Try harder to delete trees - no remorses.
  + Simplify exception reprs.
  + Unittest-ize test_index assertions.

Author: ankostis

git/compat.py

@@ -62,7 +62,8 @@ def safe_decode(s):
         return s
     elif isinstance(s, bytes):
         return s.decode(defenc, 'replace')
-    raise TypeError('Expected bytes or text, but got %r' % (s,))
+    elif s is not None:
+        raise TypeError('Expected bytes or text, but got %r' % (s,))
 
 
 def with_metaclass(meta, *bases):

git/exc.py

@@ -37,13 +37,9 @@ def __init__(self, command, status, stderr=None, stdout=None):
         self.command = command
 
     def __unicode__(self):
-        ret = u"'%s' returned with exit code %s" % \
-              (u' '.join(safe_decode(i) for i in self.command), self.status)
-        if self.stderr:
-            ret += u"\nstderr: '%s'" % safe_decode(self.stderr)
-        if self.stdout:
-            ret += u"\nstdout: '%s'" % safe_decode(self.stdout)
-        return ret
+        cmdline = u' '.join(safe_decode(i) for i in self.command)
+        return (u"'%s' returned with exit code %s\n  stdout: '%s'\n  stderr: '%s'"
+                % (cmdline, self.status, safe_decode(self.stdout), safe_decode(self.stderr)))
 
 
 class CheckoutError(Exception):
@@ -80,19 +76,20 @@ class UnmergedEntriesError(CacheError):
     entries in the cache"""
 
 
-class HookExecutionError(Exception):
+class HookExecutionError(UnicodeMixin, Exception):
     """Thrown if a hook exits with a non-zero exit code. It provides access to the exit code and the string returned
     via standard output"""
 
-    def __init__(self, command, status, stdout, stderr):
+    def __init__(self, command, status, stdout=None, stderr=None):
         self.command = command
         self.status = status
         self.stdout = stdout
         self.stderr = stderr
 
-    def __str__(self):
-        return ("'%s' hook returned with exit code %i\nstdout: '%s'\nstderr: '%s'"
-                % (self.command, self.status, self.stdout, self.stderr))
+    def __unicode__(self):
+        cmdline = u' '.join(safe_decode(i) for i in self.command)
+        return (u"'%s' hook failed with %r\n  stdout: '%s'\n  stderr: '%s'"
+                % (cmdline, self.status, safe_decode(self.stdout), safe_decode(self.stderr)))
 
 
 class RepositoryDirtyError(Exception):

git/index/fun.py

@@ -14,8 +14,8 @@
 import os
 import subprocess
 
-from git.util import IndexFileSHA1Writer
-from git.cmd import PROC_CREATIONFLAGS
+from git.util import IndexFileSHA1Writer, finalize_process
+from git.cmd import PROC_CREATIONFLAGS, handle_process_output
 from git.exc import (
     UnmergedEntriesError,
     HookExecutionError
@@ -71,21 +71,26 @@ def run_commit_hook(name, index):
     env = os.environ.copy()
     env['GIT_INDEX_FILE'] = index.path
     env['GIT_EDITOR'] = ':'
-    cmd = subprocess.Popen(hp,
-                           env=env,
-                           stdout=subprocess.PIPE,
-                           stderr=subprocess.PIPE,
-                           cwd=index.repo.working_dir,
-                           close_fds=is_posix,
-                           creationflags=PROC_CREATIONFLAGS,)
-    stdout, stderr = cmd.communicate()
-    cmd.stdout.close()
-    cmd.stderr.close()
-
-    if cmd.returncode != 0:
-        stdout = force_text(stdout, defenc)
-        stderr = force_text(stderr, defenc)
-        raise HookExecutionError(hp, cmd.returncode, stdout, stderr)
+    try:
+        cmd = subprocess.Popen(hp,
+                               env=env,
+                               stdout=subprocess.PIPE,
+                               stderr=subprocess.PIPE,
+                               cwd=index.repo.working_dir,
+                               close_fds=is_posix,
+                               creationflags=PROC_CREATIONFLAGS,)
+    except Exception as ex:
+        raise HookExecutionError(hp, ex)
+    else:
+        stdout = []
+        stderr = []
+        handle_process_output(cmd, stdout.append, stderr.append, finalize_process)
+        stdout = ''.join(stdout)
+        stderr = ''.join(stderr)
+        if cmd.returncode != 0:
+            stdout = force_text(stdout, defenc)
+            stderr = force_text(stderr, defenc)
+            raise HookExecutionError(hp, cmd.returncode, stdout, stderr)
     # end handle return code