Commit78f3f38

committed

Return stderr lines from a pull() call that fails

1 parent5077fc7 commit78f3f38Copy full SHA for 78f3f38

File tree

+13

-1

lines changed

+13

-1

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -646,6 +646,10 @@ def stdout_handler(line):`
`646`	`646`
`647`	`647`	`try:`
`648`	`648`	`handle_process_output(proc,stdout_handler,progress_handler,finalize_process)`
	`649`	`+exceptGitCommandErroraserr:`
	`650`	`+# convert any error from wait() into the same error with stdout lines`
	`651`	`+raiseGitCommandError(err.command,err.status,progress.get_stderr() )`
	`652`	`+`
`649`	`653`	`exceptException:`
`650`	`654`	`iflen(output)==0:`
`651`	`655`	`raise`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -173,13 +173,17 @@ class RemoteProgress(object):`
`173`	`173`	`DONE_TOKEN='done.'`
`174`	`174`	`TOKEN_SEPARATOR=', '`
`175`	`175`
`176`		`-__slots__= ("_cur_line","_seen_ops")`
	`176`	`+__slots__= ("_cur_line","_seen_ops","_error_lines")`
`177`	`177`	`re_op_absolute=re.compile(r"(remote: )?([\w\s]+):\s+()(\d+)()(.*)")`
`178`	`178`	`re_op_relative=re.compile(r"(remote: )?([\w\s]+):\s+(\d+)% \((\d+)/(\d+)\)(.*)")`
`179`	`179`
`180`	`180`	`def__init__(self):`
`181`	`181`	`self._seen_ops=list()`
`182`	`182`	`self._cur_line=None`
	`183`	`+self._error_lines= []`
	`184`	`+`
	`185`	`+defget_stderr(self):`
	`186`	`+return'\n'.join(self._error_lines)`
`183`	`187`
`184`	`188`	`def_parse_progress_line(self,line):`
`185`	`189`	`"""Parse progress information from the given line as retrieved by git-push`
`@@ -190,6 +194,10 @@ def _parse_progress_line(self, line):`
`190`	`194`	`# Counting objects: 4, done.`
`191`	`195`	`# Compressing objects: 50% (1/2) \rCompressing objects: 100% (2/2) \rCompressing objects: 100% (2/2), done.`
`192`	`196`	`self._cur_line=line`
	`197`	`+iflen(self._error_lines)>0orself._cur_line.startswith( ('error:','fatal:') ):`
	`198`	`+self._error_lines.append(self._cur_line )`
	`199`	`+return []`
	`200`	`+`
`193`	`201`	`sub_lines=line.split('\r')`
`194`	`202`	`failed_lines=list()`
`195`	`203`	`forslineinsub_lines:`

Comments

(0)