Merge branch 'victorgp-master'

Byron · Byron · commit 152a60f0bd7c · 2015-06-10T14:50:28.000+02:00
diff --git a/git/remote.py b/git/remote.py
@@ -538,7 +538,6 @@ def update(self, **kwargs):
 
     def _get_fetch_info_from_stderr(self, proc, progress):
         # skip first line as it is some remote info we are not interested in
-        # TODO: Use poll() to process stdout and stderr at same time
         output = IterableList('name')
 
         # lines which are no progress are fetch info lines
@@ -551,11 +550,9 @@ def _get_fetch_info_from_stderr(self, proc, progress):
 
         progress_handler = progress.new_message_handler()
 
-        for line in proc.stderr:
-            line = line.decode(defenc)
-            line = line.rstrip()
+        def my_progress_handler(line):
             for pline in progress_handler(line):
-                if line.startswith('fatal:'):
+                if line.startswith('fatal:') or line.startswith('error:'):
                     raise GitCommandError(("Error when fetching: %s" % line,), 2)
                 # END handle special messages
                 for cmd in cmds:
@@ -568,12 +565,7 @@ def _get_fetch_info_from_stderr(self, proc, progress):
         # end
 
         # We are only interested in stderr here ...
-        try:
-            finalize_process(proc)
-        except Exception:
-            if len(fetch_info_lines) == 0:
-                raise
-        # end exception handler
+        handle_process_output(proc, None, my_progress_handler, finalize_process)
 
         # read head information
         fp = open(join(self.repo.git_dir, 'FETCH_HEAD'), 'rb')
@@ -593,7 +585,6 @@ def _get_push_info(self, proc, progress):
         # we hope stdout can hold all the data, it should ...
         # read the lines manually as it will use carriage returns between the messages
         # to override the previous one. This is why we read the bytes manually
-        # TODO: poll() on file descriptors to know what to read next, process streams concurrently
         progress_handler = progress.new_message_handler()
         output = IterableList('name')
 
@@ -647,7 +638,6 @@ def fetch(self, refspec=None, progress=None, **kwargs):
             args = [refspec]
 
         proc = self.repo.git.fetch(self, *args, with_extended_output=True, as_process=True, v=True, **kwargs)
-        proc.stdout.close()
         res = self._get_fetch_info_from_stderr(proc, progress or RemoteProgress())
         if hasattr(self.repo.odb, 'update_cache'):
             self.repo.odb.update_cache()
@@ -663,7 +653,6 @@ def pull(self, refspec=None, progress=None, **kwargs):
         :return: Please see 'fetch' method """
         kwargs = add_progress(kwargs, self.repo.git, progress)
         proc = self.repo.git.pull(self, refspec, with_extended_output=True, as_process=True, v=True, **kwargs)
-        proc.stdout.close()
         res = self._get_fetch_info_from_stderr(proc, progress or RemoteProgress())
         if hasattr(self.repo.odb, 'update_cache'):
             self.repo.odb.update_cache()
