Commitc7887c6

committed

Improve error handling of fetch/pull line parsing

1 parent36cdfd3 commitc7887c6Copy full SHA for c7887c6

File tree

-3

lines changed

-3

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,12 @@ def dispatch_line(fno):`
`83`	`83`	`# we are good ...`
`84`	`84`	`line=readline(stream).decode(defenc)`
`85`	`85`	`iflineandhandler:`
`86`		`-handler(line)`
	`86`	`+try:`
	`87`	`+handler(line)`
	`88`	`+exceptException:`
	`89`	`+# Keep reading, have to pump the lines empty nontheless`
	`90`	`+log.error("Line handler exception on line: %s",line,exc_info=True)`
	`91`	`+# end`
`87`	`92`	`returnline`
`88`	`93`	`# end dispatch helper`
`89`	`94`	`# end`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -518,7 +518,7 @@ def my_progress_handler(line):`
`518`	`518`	`raiseGitCommandError(("Error when fetching: %s"%line,),2)`
`519`	`519`	`# END handle special messages`
`520`	`520`	`forcmdincmds:`
`521`		`-ifline[1]==cmd:`
	`521`	`+iflen(line)>1andline[0]==' 'andline[1]==cmd:`
`522`	`522`	`fetch_info_lines.append(line)`
`523`	`523`	`continue`
`524`	`524`	`# end find command code`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ def __init__(self, path=None, odbt=DefaultDBType):`
`113`	`113`	`:raise NoSuchPathError:`
`114`	`114`	`:return: git.Repo """`
`115`	`115`	`epath=os.path.abspath(os.path.expandvars(os.path.expanduser(pathoros.getcwd())))`
`116`		`-`
	`116`	`+self.git=None# should be set for __del__ not to fail in case we raise`
`117`	`117`	`ifnotos.path.exists(epath):`
`118`	`118`	`raiseNoSuchPathError(epath)`
`119`	`119`

Comments

(0)