Skip to content

Pr cmd raise with stderr on error #452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jun 13, 2016
Merged

Pr cmd raise with stderr on error #452

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5077fc7
Return all the stderr messge after an error is detected for pull()
barry-scott May 29, 2016
78f3f38
Return stderr lines from a pull() call that fails
barry-scott May 29, 2016
46201b3
Fix flake8 complaints
barry-scott May 30, 2016
08a0fad
Make sure that stderr is converted to bytes
barry-scott May 30, 2016
3565888
Merge remote-tracking branch 'upstream/master' into pr-cmd-raise-with…
barry-scott Jun 6, 2016
4a5ceba
log all the output from stdout and stderr for debugging process failures
barry-scott Jun 6, 2016
6891caf
Can get a str object from stream.read rather then bytes.
barry-scott Jun 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Return stderr lines from a pull() call that fails
  • Loading branch information
@barry-scott
barry-scott committed May 29, 2016
commit 78f3f38d18fc88fd639af8a6c1ef757d2ffe51d6
4 changes: 4 additions & 0 deletions git/remote.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,10 @@ def stdout_handler(line):

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
Expand Down
10 changes: 9 additions & 1 deletion git/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I recommend providing the highest-value data available, which in this case in an array of lines. There should be no assumption about how the user will evaluate that data.
As in GitPython in the very majority of cases there is no get_ prefix, this accessor would be called something like error_lines().


def _parse_progress_line(self, line):
"""Parse progress information from the given line as retrieved by git-push
Expand All @@ -190,6 +194,10 @@ def _parse_progress_line(self, line):
# 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:') ):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe this would be a breakage in the API, as now lines that would previously be passed to update, will be caught in the base-class. Existing sub-types could depend on errors being handed to update().
Do you think that makes sense, or is there another reason this has to be done in the base-class ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Once you see error or fatal the progress either never started or will not continue.

The parsing will never pass an error to update. It only passes data from lines that pattern match against
a "progress" line.

self._error_lines.append( self._cur_line )
return []

sub_lines = line.split('\r')
failed_lines = list()
for sline in sub_lines:
Expand Down