Commit1ef3365

committed

Factor communicate and watchdog logic to helper

The goal is to improve readability by not repeating the platformand kill_after_timeout check three times.

1 parent4191f7d commit1ef3365Copy full SHA for 1ef3365

File tree

1 file changed

+18

-14

lines changed

git
- cmd.py

1 file changed

+18

-14

lines changed

`‎git/cmd.py`

Lines changed: 18 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -1135,12 +1135,12 @@ def execute(`
`1135`	`1135`	`env.update(inline_env)`
`1136`	`1136`
`1137`	`1137`	`ifsys.platform=="win32":`
`1138`		`-cmd_not_found_exception=OSError`
`1139`	`1138`	`ifkill_after_timeoutisnotNone:`
`1140`	`1139`	`raiseGitCommandError(`
`1141`	`1140`	`redacted_command,`
`1142`	`1141`	`'"kill_after_timeout" feature is not supported on Windows.',`
`1143`	`1142`	`)`
	`1143`	`+cmd_not_found_exception=OSError`
`1144`	`1144`	`else:`
`1145`	`1145`	`cmd_not_found_exception=FileNotFoundError`
`1146`	`1146`	`# END handle`
`@@ -1209,10 +1209,25 @@ def kill_process(pid: int) -> None:`
`1209`	`1209`	`pass`
`1210`	`1210`	`return`
`1211`	`1211`
`1212`		`-# END kill_process`
	`1212`	`+defcommunicate()->Tuple[AnyStr,AnyStr]:`
	`1213`	`+watchdog.start()`
	`1214`	`+out,err=proc.communicate()`
	`1215`	`+watchdog.cancel()`
	`1216`	`+ifkill_check.is_set():`
	`1217`	`+err='Timeout: the command "%s" did not complete in %d '"secs."% (`
	`1218`	`+" ".join(redacted_command),`
	`1219`	`+kill_after_timeout,`
	`1220`	`+ )`
	`1221`	`+ifnotuniversal_newlines:`
	`1222`	`+err=err.encode(defenc)`
	`1223`	`+returnout,err`
	`1224`	`+`
	`1225`	`+# END helpers`
`1213`	`1226`
`1214`	`1227`	`kill_check=threading.Event()`
`1215`	`1228`	`watchdog=threading.Timer(kill_after_timeout,kill_process,args=(proc.pid,))`
	`1229`	`+else:`
	`1230`	`+communicate=proc.communicate`
`1216`	`1231`
`1217`	`1232`	`# Wait for the process to return.`
`1218`	`1233`	`status=0`
`@@ -1221,18 +1236,7 @@ def kill_process(pid: int) -> None:`
`1221`	`1236`	`newline="\n"ifuniversal_newlineselseb"\n"`
`1222`	`1237`	`try:`
`1223`	`1238`	`ifoutput_streamisNone:`
`1224`		`-ifsys.platform!="win32"andkill_after_timeoutisnotNone:`
`1225`		`-watchdog.start()`
`1226`		`-stdout_value,stderr_value=proc.communicate()`
`1227`		`-ifsys.platform!="win32"andkill_after_timeoutisnotNone:`
`1228`		`-watchdog.cancel()`
`1229`		`-ifkill_check.is_set():`
`1230`		`-stderr_value='Timeout: the command "%s" did not complete in %d '"secs."% (`
`1231`		`-" ".join(redacted_command),`
`1232`		`-kill_after_timeout,`
`1233`		`- )`
`1234`		`-ifnotuniversal_newlines:`
`1235`		`-stderr_value=stderr_value.encode(defenc)`
	`1239`	`+stdout_value,stderr_value=communicate()`
`1236`	`1240`	`# Strip trailing "\n".`
`1237`	`1241`	`ifstdout_value.endswith(newline)andstrip_newline_in_stdout:# type: ignore`
`1238`	`1242`	`stdout_value=stdout_value[:-1]`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit1ef3365

File tree

1 file changed

1 file changed

`‎git/cmd.py`

0 commit comments