Commitd3a7282

Cory Johns

committed

[#5330] Ensure wait() is called on git processes

1 parent5869c5c commitd3a7282Copy full SHA for d3a7282

File tree

+25

-15

lines changed

+25

-15

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,7 @@ def __del__(self):`
`80`	`80`	`# try to kill it`
`81`	`81`	`try:`
`82`	`82`	`os.kill(self.proc.pid,2)# interrupt signal`
	`83`	`+self.proc.wait()# ensure process goes away`
`83`	`84`	`exceptAttributeError:`
`84`	`85`	`# try windows`
`85`	`86`	`# for some reason, providing None for stdout/stderr still prints something. This is why`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`Actor,`
`9`	`9`	`Iterable,`
`10`	`10`	`Stats,`
	`11`	`+finalize_process`
`11`	`12`	`)`
`12`	`13`	`fromgit.diffimportDiffable`
`13`	`14`	`fromtreeimportTree`
`@@ -251,6 +252,8 @@ def _iter_from_process_or_stream(cls, repo, proc_or_stream):`
`251`	`252`	`assertlen(hexsha)==40,"Invalid line: %s"%hexsha`
`252`	`253`	`yieldCommit(repo,hex_to_bin(hexsha))`
`253`	`254`	`# END for each line in stream`
	`255`	`+ifhas_attr(proc_or_stream,'wait'):`
	`256`	`+finalize_process(proc_or_stream)`
`254`	`257`
`255`	`258`
`256`	`259`	`@classmethod`

Lines changed: 4 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,10 @@`
`24`	`24`	`TagReference`
`25`	`25`	`)`
`26`	`26`
`27`		`-fromgit.utilimportjoin_path`
	`27`	`+fromgit.utilimport (`
	`28`	`+join_path,`
	`29`	`+finalize_process`
	`30`	`+)`
`28`	`31`	`fromgitdb.utilimportjoin`
`29`	`32`
`30`	`33`	`importre`
`@@ -58,18 +61,6 @@ def digest_process_messages(fh, progress):`
`58`	`61`	`# END while file is not done reading`
`59`	`62`	`returndropped_lines`
`60`	`63`
`61`		`-deffinalize_process(proc):`
`62`		`-"""Wait for the process (clone, fetch, pull or push) and handle its errors accordingly"""`
`63`		`-try:`
`64`		`-proc.wait()`
`65`		`-exceptGitCommandError,e:`
`66`		`-# if a push has rejected items, the command has non-zero return status`
`67`		`-# a return status of 128 indicates a connection error - reraise the previous one`
`68`		`-ifproc.poll()==128:`
`69`		`-raise`
`70`		`-pass`
`71`		`-# END exception handling`
`72`		`-`
`73`	`64`	`defadd_progress(kwargs,git,progress):`
`74`	`65`	`"""Add the --progress flag to the given kwargs dict if supported by the`
`75`	`66`	`git command. If the actual progress in the given progress instance is not`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,15 +6,17 @@`
`6`	`6`
`7`	`7`	`fromgit.excimportInvalidGitRepositoryError,NoSuchPathError`
`8`	`8`	`fromgit.cmdimportGit`
`9`		`-fromgit.utilimportActor`
	`9`	`+fromgit.utilimport (`
	`10`	`+Actor,`
	`11`	`+finalize_process`
	`12`	`+)`
`10`	`13`	`fromgit.refsimport*`
`11`	`14`	`fromgit.indeximportIndexFile`
`12`	`15`	`fromgit.objectsimport*`
`13`	`16`	`fromgit.configimportGitConfigParser`
`14`	`17`	`fromgit.remoteimport (`
`15`	`18`	`Remote,`
`16`	`19`	`digest_process_messages,`
`17`		`-finalize_process,`
`18`	`20`	`add_progress`
`19`	`21`	`)`
`20`	`22`
`@@ -541,6 +543,7 @@ def untracked_files(self):`
`541`	`543`	`untracked_files.append(untracked_info.replace("#\t","").rstrip())`
`542`	`544`	`# END for each utracked info line`
`543`	`545`	`# END for each line`
	`546`	`+finalize_process(proc)`
`544`	`547`	`returnuntracked_files`
`545`	`548`
`546`	`549`	`@property`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,18 @@ def get_user_id():`
`121`	`121`	`# END get username from login`
`122`	`122`	`return"%s@%s"% (username,platform.node())`
`123`	`123`
	`124`	`+deffinalize_process(proc):`
	`125`	`+"""Wait for the process (clone, fetch, pull or push) and handle its errors accordingly"""`
	`126`	`+try:`
	`127`	`+proc.wait()`
	`128`	`+exceptGitCommandError,e:`
	`129`	`+# if a push has rejected items, the command has non-zero return status`
	`130`	`+# a return status of 128 indicates a connection error - reraise the previous one`
	`131`	`+ifproc.poll()==128:`
	`132`	`+raise`
	`133`	`+pass`
	`134`	`+# END exception handling`
	`135`	`+`
`124`	`136`	`#} END utilities`
`125`	`137`
`126`	`138`	`#{ Classes`

Comments

(0)