1)pump git-daemon stderr 2)nojoin pumps, 3)no submodules

ankostis · ankostis · commit 0dd56ad8bb84 · 2016-10-22T12:43:49.000+02:00
diff --git a/git/__init__.py b/git/__init__.py
@@ -15,24 +15,6 @@
 __version__ = 'git'
 
 
-#{ Initialization
-def _init_externals():
-    """Initialize external projects by putting them into the path"""
-    if __version__ == 'git':
-        sys.path.insert(0, osp.join(osp.dirname(__file__), 'ext', 'gitdb'))
-
-    try:
-        import gitdb
-    except ImportError:
-        raise ImportError("'gitdb' could not be found in your PYTHONPATH")
-    # END verify import
-
-#} END initialization
-
-#################
-_init_externals()
-#################
-
 #{ Imports
 
 from git.config import GitConfigParser  # @NoMove @IgnorePep8
diff --git a/git/cmd.py b/git/cmd.py
@@ -61,7 +61,7 @@
 ## @{
 
 def handle_process_output(process, stdout_handler, stderr_handler,
-                          finalizer=None, decode_streams=True):
+                          finalizer=None, decode_streams=True, nojoin=False):
     """Registers for notifications to lean that process output is ready to read, and dispatches lines to
     the respective line handlers.
     This function returns once the finalizer returns
@@ -112,8 +112,9 @@ def pump_stream(cmdline, name, stream, is_decode, handler):
 
     ## FIXME: Why Join??  Will block if `stdin` needs feeding...
     #
-    for t in threads:
-        t.join()
+    if not nojoin:
+        for t in threads:
+            t.join()
 
     if finalizer:
         return finalizer(process)
@@ -580,8 +581,9 @@ def execute(self, command,
         stdout_sink = (PIPE
                        if with_stdout
                        else getattr(subprocess, 'DEVNULL', open(os.devnull, 'wb')))
-        log.debug("Popen(%s, cwd=%s, universal_newlines=%s, shell=%s)",
-                  command, cwd, universal_newlines, shell)
+        import subprocess as sb
+        log.debug("Popen(%s, cwd=%s, universal_newlines=%s, shell=%s,\n_active=%s)",
+                  command, cwd, universal_newlines, shell, sb._active)
         try:
             proc = Popen(command,
                          env=env,
diff --git a/git/remote.py b/git/remote.py
@@ -686,14 +686,18 @@ def stdout_handler(line):
                 # If an error happens, additional info is given which we parse below.
                 pass
 
-        handle_process_output(proc, stdout_handler, progress_handler, finalizer=None, decode_streams=False)
+        stdout, stderr = proc.communicate()
+        for l in stderr.split('\n'):
+            if l:
+                progress_handler(l)
         stderr_text = progress.error_lines and '\n'.join(progress.error_lines) or ''
-        try:
-            proc.wait(stderr=stderr_text)
-        except Exception:
-            if not output:
-                raise
-            elif stderr_text:
+        for l in stdout.split('\n'):
+            stdout_handler(l)
+        status = proc.proc.wait()
+        if status and not output:
+            raise GitCommandError(getattr(proc, 'args', ''), status, stderr, stdout)
+        else:
+            if stderr_text:
                 log.warning("Error lines received while fetching: %s", stderr_text)
 
         return output
diff --git a/git/test/lib/helper.py b/git/test/lib/helper.py
@@ -169,6 +169,7 @@ def git_daemon_launched(base_path, ip, port):
                           '--enable=receive-pack',
                           '--listen=%s' % ip,
                           '--port=%s' % port,
+                          '--timeout=10',
                           '--base-path=%s' % base_path,
                           base_path]
             gd = Git().execute(daemon_cmd, as_process=True)
@@ -179,6 +180,9 @@ def git_daemon_launched(base_path, ip, port):
                               port=port,
                               base_path=base_path,
                               as_process=True)
+        from git.cmd import handle_process_output
+        import functools as fnt
+        handle_process_output(gd, fnt.partial(print, 'GDout>>>'), fnt.partial(print, 'GDerr>>>'), nojoin=True)
         # yes, I know ... fortunately, this is always going to work if sleep time is just large enough
         time.sleep(0.5 * (1 + is_win))
     except Exception as ex:
@@ -286,13 +290,15 @@ def remote_repo_creator(self):
                     rw_repo.git.ls_remote(d_remote)
 
                     with cwd(rw_repo.working_dir):
+                        ok = False
                         try:
                             return func(self, rw_repo, rw_daemon_repo)
-                        except:
-                            log.info("Keeping repos after failure: \n  rw_repo_dir: %s \n  rw_daemon_repo_dir: %s",
-                                     rw_repo_dir, rw_daemon_repo_dir)
-                            rw_repo_dir = rw_daemon_repo_dir = None
-                            raise
+                            ok = True
+                        finally:
+                            if not ok:
+                                log.info("Keeping repos after failure: \n  rw_repo_dir: %s \n  rw_daemon_repo_dir: %s",
+                                         rw_repo_dir, rw_daemon_repo_dir)
+                                rw_repo_dir = rw_daemon_repo_dir = None
 
             finally:
                 rw_repo.git.clear_cache()
