Commit5077fc7

committed

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

1 parente836e5c commit5077fc7Copy full SHA for 5077fc7

File tree

+20

-5

lines changed

+20

-5

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ def __del__(self):`
`307`	`307`	`def__getattr__(self,attr):`
`308`	`308`	`returngetattr(self.proc,attr)`
`309`	`309`
`310`		`-defwait(self,stderr=None):`
	`310`	`+defwait(self,stderr=''):`
`311`	`311`	`"""Wait for the process and return its status code.`
`312`	`312`
`313`	`313`	`:param stderr: Previously read value of stderr, in case stderr is already closed.`
`@@ -317,7 +317,7 @@ def wait(self, stderr=None):`
`317`	`317`
`318`	`318`	`defread_all_from_possibly_closed_stream(stream):`
`319`	`319`	`try:`
`320`		`-returnstream.read()`
	`320`	`+returnstderr+stream.read()`
`321`	`321`	`exceptValueError:`
`322`	`322`	`returnstderror''`
`323`	`323`
`@@ -678,7 +678,7 @@ def _kill_process(pid):`
`678`	`678`	`# strip trailing "\n"`
`679`	`679`	`ifstderr_value.endswith(b"\n"):`
`680`	`680`	`stderr_value=stderr_value[:-1]`
`681`		`-status=proc.wait()`
	`681`	`+status=proc.wait(stderr=stderr_value)`
`682`	`682`	`# END stdout handling`
`683`	`683`	`finally:`
`684`	`684`	`proc.stdout.close()`

Lines changed: 17 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -570,21 +570,36 @@ def _get_fetch_info_from_stderr(self, proc, progress):`
`570`	`570`
`571`	`571`	`progress_handler=progress.new_message_handler()`
`572`	`572`
	`573`	`+error_message=None`
	`574`	`+stderr_text=None`
	`575`	`+`
`573`	`576`	`forlineinproc.stderr:`
`574`	`577`	`line=force_text(line)`
`575`	`578`	`forplineinprogress_handler(line):`
`576`	`579`	`ifline.startswith('fatal:')orline.startswith('error:'):`
`577`		`-raiseGitCommandError(("Error when fetching: %s"%line,),2)`
	`580`	`+error_message="Error when fetching: %s"% (line,)`
	`581`	`+break`
	`582`	`+`
`578`	`583`	`# END handle special messages`
`579`	`584`	`forcmdincmds:`
`580`	`585`	`iflen(line)>1andline[0]==' 'andline[1]==cmd:`
`581`	`586`	`fetch_info_lines.append(line)`
`582`	`587`	`continue`
`583`	`588`	`# end find command code`
`584`	`589`	`# end for each comand code we know`
	`590`	`+`
	`591`	`+iferror_messageisnotNone:`
	`592`	`+break`
`585`	`593`	`# end for each line progress didn't handle`
	`594`	`+`
	`595`	`+iferror_messageisnotNone:`
	`596`	`+stderr_text=proc.stderr.read()`
	`597`	`+`
`586`	`598`	`# end`
`587`		`-finalize_process(proc)`
	`599`	`+finalize_process(proc,stderr=stderr_text)`
	`600`	`+`
	`601`	`+iferror_messageisnotNone:`
	`602`	`+raiseGitCommandError(error_message,2,stderr=stderr_text )`
`588`	`603`
`589`	`604`	`# read head information`
`590`	`605`	`fp=open(join(self.repo.git_dir,'FETCH_HEAD'),'rb')`

Comments

(0)