From 5077fc7e4031e53f730676df4d8df5165b1d36cc Mon Sep 17 00:00:00 2001 From: Barry Scott Date: Sun, 29 May 2016 13:34:35 +0100 Subject: Return all the stderr messge after an error is detected for pull() --- git/cmd.py | 6 +++--- git/remote.py | 19 +++++++++++++++++-- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/git/cmd.py b/git/cmd.py index c29e3485..821bf299 100644 --- a/git/cmd.py +++ b/git/cmd.py @@ -307,7 +307,7 @@ class Git(LazyMixin): 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 @@ class Git(LazyMixin): 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 @@ class Git(LazyMixin): # 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 index 30e32ae3..f23f50a2 100644 --- a/git/remote.py +++ b/git/remote.py @@ -570,11 +570,16 @@ class Remote(LazyMixin, Iterable): 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: @@ -582,9 +587,19 @@ class Remote(LazyMixin, Iterable): 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') -- cgit v1.2.3 From 78f3f38d18fc88fd639af8a6c1ef757d2ffe51d6 Mon Sep 17 00:00:00 2001 From: Barry Scott Date: Sun, 29 May 2016 13:59:53 +0100 Subject: Return stderr lines from a pull() call that fails --- git/remote.py | 4 ++++ git/util.py | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/git/remote.py b/git/remote.py index f23f50a2..1ef62409 100644 --- a/git/remote.py +++ b/git/remote.py @@ -646,6 +646,10 @@ class Remote(LazyMixin, Iterable): try: handle_process_output(proc, stdout_handler, progress_handler, finalize_process) + except GitCommandError as err: + # convert any error from wait() into the same error with stdout lines + raise GitCommandError( err.command, err.status, progress.get_stderr() ) + except Exception: if len(output) == 0: raise diff --git a/git/util.py b/git/util.py index 5ed014fc..f185156c 100644 --- a/git/util.py +++ b/git/util.py @@ -173,13 +173,17 @@ class RemoteProgress(object): DONE_TOKEN = 'done.' TOKEN_SEPARATOR = ', ' - __slots__ = ("_cur_line", "_seen_ops") + __slots__ = ("_cur_line", "_seen_ops", "_error_lines") re_op_absolute = re.compile(r"(remote: )?([\w\s]+):\s+()(\d+)()(.*)") re_op_relative = re.compile(r"(remote: )?([\w\s]+):\s+(\d+)% \((\d+)/(\d+)\)(.*)") def __init__(self): self._seen_ops = list() self._cur_line = None + self._error_lines = [] + + def get_stderr(self): + return '\n'.join(self._error_lines) def _parse_progress_line(self, line): """Parse progress information from the given line as retrieved by git-push @@ -190,6 +194,10 @@ class RemoteProgress(object): # Counting objects: 4, done. # Compressing objects: 50% (1/2) \rCompressing objects: 100% (2/2) \rCompressing objects: 100% (2/2), done. self._cur_line = line + if len(self._error_lines) > 0 or self._cur_line.startswith( ('error:', 'fatal:') ): + self._error_lines.append( self._cur_line ) + return [] + sub_lines = line.split('\r') failed_lines = list() for sline in sub_lines: -- cgit v1.2.3 From 46201b346fec29f9cb740728a3c20266094d58b2 Mon Sep 17 00:00:00 2001 From: Barry Scott Date: Mon, 30 May 2016 15:05:32 +0100 Subject: Fix flake8 complaints --- git/remote.py | 4 ++-- git/util.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/git/remote.py b/git/remote.py index 1ef62409..ba51fe92 100644 --- a/git/remote.py +++ b/git/remote.py @@ -599,7 +599,7 @@ class Remote(LazyMixin, Iterable): finalize_process(proc, stderr=stderr_text) if error_message is not None: - raise GitCommandError( error_message, 2, stderr=stderr_text ) + raise GitCommandError(error_message, 2, stderr=stderr_text) # read head information fp = open(join(self.repo.git_dir, 'FETCH_HEAD'), 'rb') @@ -648,7 +648,7 @@ class Remote(LazyMixin, Iterable): handle_process_output(proc, stdout_handler, progress_handler, finalize_process) except GitCommandError as err: # convert any error from wait() into the same error with stdout lines - raise GitCommandError( err.command, err.status, progress.get_stderr() ) + raise GitCommandError(err.command, err.status, progress.get_stderr()) except Exception: if len(output) == 0: diff --git a/git/util.py b/git/util.py index f185156c..2f894576 100644 --- a/git/util.py +++ b/git/util.py @@ -194,8 +194,8 @@ class RemoteProgress(object): # Counting objects: 4, done. # Compressing objects: 50% (1/2) \rCompressing objects: 100% (2/2) \rCompressing objects: 100% (2/2), done. self._cur_line = line - if len(self._error_lines) > 0 or self._cur_line.startswith( ('error:', 'fatal:') ): - self._error_lines.append( self._cur_line ) + if len(self._error_lines) > 0 or self._cur_line.startswith(('error:', 'fatal:')): + self._error_lines.append(self._cur_line) return [] sub_lines = line.split('\r') -- cgit v1.2.3 From 08a0fad2c9dcdfe0bbc980b8cd260b4be5582381 Mon Sep 17 00:00:00 2001 From: Barry Scott Date: Mon, 30 May 2016 15:49:40 +0100 Subject: Make sure that stderr is converted to bytes remove stderr for a wait() that is not the GitPython wrapper. --- git/cmd.py | 15 ++++++++++++--- git/util.py | 4 ++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/git/cmd.py b/git/cmd.py index 821bf299..e3b39bda 100644 --- a/git/cmd.py +++ b/git/cmd.py @@ -307,19 +307,28 @@ class Git(LazyMixin): def __getattr__(self, attr): return getattr(self.proc, attr) - def wait(self, stderr=''): + def wait(self, stderr=b''): """Wait for the process and return its status code. :param stderr: Previously read value of stderr, in case stderr is already closed. :warn: may deadlock if output or error pipes are used and not handled separately. :raise GitCommandError: if the return status is not 0""" + + # stderr must be a bytes object as it will + # combined with more data from the process and + # decoded by the caller + if stderr is None: + stderr = b'' + elif type(stderr) == unicode: + stderr = stderr.encode(defenc) + status = self.proc.wait() def read_all_from_possibly_closed_stream(stream): try: return stderr + stream.read() except ValueError: - return stderr or '' + return stderr or b'' if status != 0: errstr = read_all_from_possibly_closed_stream(self.proc.stderr) @@ -678,7 +687,7 @@ class Git(LazyMixin): # strip trailing "\n" if stderr_value.endswith(b"\n"): stderr_value = stderr_value[:-1] - status = proc.wait(stderr=stderr_value) + status = proc.wait() # END stdout handling finally: proc.stdout.close() diff --git a/git/util.py b/git/util.py index 2f894576..706518b8 100644 --- a/git/util.py +++ b/git/util.py @@ -772,10 +772,10 @@ class WaitGroup(object): self.cv.notify_all() self.cv.release() - def wait(self): + def wait(self, stderr=b''): self.cv.acquire() while self.count > 0: - self.cv.wait() + self.cv.wait(strerr=stderr) self.cv.release() -- cgit v1.2.3 From 4a5cebaeda2c5062fb6c727f457ee3288f6046ef Mon Sep 17 00:00:00 2001 From: Barry Scott Date: Mon, 6 Jun 2016 10:28:29 +0100 Subject: log all the output from stdout and stderr for debugging process failures --- git/cmd.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/git/cmd.py b/git/cmd.py index fb00869c..f992a399 100644 --- a/git/cmd.py +++ b/git/cmd.py @@ -69,6 +69,10 @@ else: # Documentation ## @{ +def _drop_output_handler(line): + pass + + def handle_process_output(process, stdout_handler, stderr_handler, finalizer): """Registers for notifications to lean that process output is ready to read, and dispatches lines to the respective line handlers. We are able to handle carriage returns in case progress is sent by that @@ -79,6 +83,13 @@ def handle_process_output(process, stdout_handler, stderr_handler, finalizer): :param stdout_handler: f(stdout_line_string), or None :param stderr_hanlder: f(stderr_line_string), or None :param finalizer: f(proc) - wait for proc to finish""" + + log.debug('handle_process_output( process=%r, stdout_handler=%r, stderr_handler=%r, finalizer=%r' + % (process, stdout_handler, stderr_handler, finalizer)) + + if stdout_handler is None: + stdout_handler = _drop_output_handler + fdmap = {process.stdout.fileno(): (stdout_handler, [b'']), process.stderr.fileno(): (stderr_handler, [b''])} @@ -119,6 +130,7 @@ def handle_process_output(process, stdout_handler, stderr_handler, finalizer): # end single line helper def _dispatch_lines(fno, handler, buf_list): + log.debug('fno=%d, handler=%r, buf_list=%r' % (fno, handler, buf_list)) lc = 0 for line in _read_lines_from_fno(fno, buf_list): _dispatch_single_line(line, handler) @@ -332,6 +344,7 @@ class Git(LazyMixin): if status != 0: errstr = read_all_from_possibly_closed_stream(self.proc.stderr) + log.debug('AutoInterrupt wait stderr: %r' % (errstr,)) raise GitCommandError(self.args, status, errstr) # END status handling return status @@ -618,7 +631,7 @@ class Git(LazyMixin): bufsize=-1, stdin=istream, stderr=PIPE, - stdout=PIPE if with_stdout else open(os.devnull, 'wb'), + stdout=PIPE, shell=self.USE_SHELL, close_fds=(os.name == 'posix'), # unsupported on windows universal_newlines=universal_newlines, -- cgit v1.2.3 From 6891caf73735ea465c909de8dc13129cc98c47f7 Mon Sep 17 00:00:00 2001 From: Barry Scott Date: Mon, 6 Jun 2016 10:45:16 +0100 Subject: Can get a str object from stream.read rather then bytes. Convert to the expected bytes. --- git/cmd.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git/cmd.py b/git/cmd.py index f992a399..633aedcb 100644 --- a/git/cmd.py +++ b/git/cmd.py @@ -338,7 +338,10 @@ class Git(LazyMixin): def read_all_from_possibly_closed_stream(stream): try: - return stderr + stream.read() + last_stderr = stream.read() + if type(last_stderr) == unicode: + last_stderr = last_stderr.encode(defenc) + return stderr + last_stderr except ValueError: return stderr or b'' -- cgit v1.2.3