Return all the stderr messge after an error is detected for pull()

barry-scott · barry-scott · commit 5077fc7e4031 · 2016-05-29T13:34:35.000+01:00
diff --git a/git/cmd.py b/git/cmd.py
@@ -307,7 +307,7 @@ def __del__(self):
 def __getattr__(self, attr):
 return getattr(self.proc, attr)
 
- def wait(self, stderr=None):
+ def wait(self, stderr=''):
 """Wait for the process and return its status code.
 
 :param stderr: Previously read value of stderr, in case stderr is already closed.
@@ -317,7 +317,7 @@ def wait(self, stderr=None):
 
 def read_all_from_possibly_closed_stream(stream):
 try:
- return stream.read()
+ return stderr + stream.read()
 except ValueError:
 return stderr or ''
 
@@ -678,7 +678,7 @@ def _kill_process(pid):
 # strip trailing "\n"
 if stderr_value.endswith(b"\n"):
 stderr_value = stderr_value[:-1]
- status = proc.wait()
+ status = proc.wait(stderr=stderr_value)
 # END stdout handling
 finally:
 proc.stdout.close()
diff --git a/git/remote.py b/git/remote.py
@@ -570,21 +570,36 @@ def _get_fetch_info_from_stderr(self, proc, progress):
 
 progress_handler = progress.new_message_handler()
 
+ error_message = None
+ stderr_text = None
+
 for line in proc.stderr:
 line = force_text(line)
 for pline in progress_handler(line):
 if line.startswith('fatal:') or line.startswith('error:'):
- raise GitCommandError(("Error when fetching: %s" % line,), 2)
+ error_message = "Error when fetching: %s" % (line,)
+ break
+
 # END handle special messages
 for cmd in cmds:
 if len(line) > 1 and line[0] == ' ' and line[1] == cmd:
 fetch_info_lines.append(line)
 continue
 # end find command code
 # end for each comand code we know
+
+ if error_message is not None:
+ break
 # end for each line progress didn't handle
+
+ if error_message is not None:
+ stderr_text = proc.stderr.read()
+
 # end
- finalize_process(proc)
+ finalize_process(proc, stderr=stderr_text)
+
+ if error_message is not None:
+ raise GitCommandError( error_message, 2, stderr=stderr_text )
 
 # read head information
 fp = open(join(self.repo.git_dir, 'FETCH_HEAD'), 'rb')

-Original file line number
+Diff line change
 def__getattr__(self, attr):
 returngetattr(self.proc, attr)
 -defwait(self, stderr=None):
 +defwait(self, stderr=''):
 """Wait for the process and return its status code.
  :param stderr: Previously read value of stderr, in case stderr is already closed.
 defread_all_from_possibly_closed_stream(stream):
 try:
 -returnstream.read()
 +returnstderr+stream.read()
 exceptValueError:
 returnstderror''
 # strip trailing "\n"
 ifstderr_value.endswith(b"\n"):
 stderr_value=stderr_value[:-1]
 -status=proc.wait()
 +status=proc.wait(stderr=stderr_value)
 # END stdout handling
 finally:
 proc.stdout.close()
-Original file line number
+Diff line change
 progress_handler=progress.new_message_handler()
 +error_message=None
 +stderr_text=None
++
 forlineinproc.stderr:
 line=force_text(line)
 forplineinprogress_handler(line):
 ifline.startswith('fatal:') orline.startswith('error:'):
 -raiseGitCommandError(("Error when fetching: %s"%line,), 2)
 +error_message="Error when fetching: %s"% (line,)
 +break
++
 # END handle special messages
 forcmdincmds:
 iflen(line) >1andline[0] ==' 'andline[1] ==cmd:
 fetch_info_lines.append(line)
 continue
 # end find command code
 # end for each comand code we know
++
 +iferror_messageisnotNone:
 +break
 # end for each line progress didn't handle
++
 +iferror_messageisnotNone:
 +stderr_text=proc.stderr.read()
++
 # end
 -finalize_process(proc)
 +finalize_process(proc, stderr=stderr_text)
++
 +iferror_messageisnotNone:
 +raiseGitCommandError( error_message, 2, stderr=stderr_text )
 # read head information
 fp=open(join(self.repo.git_dir, 'FETCH_HEAD'), 'rb')