Commit678821a

committed

Merge pull requestgitpython-developers#198 from folti/0.3

GitRunCommand exception can store stdout output too.

2 parents6404168 +48f5476 commit678821aCopy full SHA for 678821a

File tree

+11

-4

lines changed

+11

-4

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -380,7 +380,10 @@ def execute(self, command,`
`380`	`380`	`# END handle debug printing`
`381`	`381`
`382`	`382`	`ifwith_exceptionsandstatus!=0:`
`383`		`-raiseGitCommandError(command,status,stderr_value)`
	`383`	`+ifwith_extended_output:`
	`384`	`+raiseGitCommandError(command,status,stderr_value,stdout_value)`
	`385`	`+else:`
	`386`	`+raiseGitCommandError(command,status,stderr_value)`
`384`	`387`
`385`	`388`	`# Allow access to the command's status code`
`386`	`389`	`ifwith_extended_output:`

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,14 +17,18 @@ class NoSuchPathError(OSError):`
`17`	`17`
`18`	`18`	`classGitCommandError(Exception):`
`19`	`19`	`""" Thrown if execution of the git command fails with non-zero status code. """`
`20`		`-def__init__(self,command,status,stderr=None):`
	`20`	`+def__init__(self,command,status,stderr=None,stdout=None):`
`21`	`21`	`self.stderr=stderr`
	`22`	`+self.stdout=stdout`
`22`	`23`	`self.status=status`
`23`	`24`	`self.command=command`
`24`	`25`
`25`	`26`	`def__str__(self):`
`26`		`-return ("'%s' returned exit status %i: %s"%`
`27`		`- (' '.join(str(i)foriinself.command),self.status,self.stderr))`
	`27`	`+ret="'%s' returned exit status %i: %s"% \`
	`28`	`+ (' '.join(str(i)foriinself.command),self.status,self.stderr)`
	`29`	`+ifself.stdoutisnotNone:`
	`30`	`+ret+="\nstdout: %s"%self.stdout`
	`31`	`+returnret`
`28`	`32`
`29`	`33`
`30`	`34`	`classCheckoutError(Exception ):`

Comments

(0)