proper pre-push hook implementation

Author: extrawurst

asyncgit/src/sync/hooks.rs

@@ -15,13 +15,17 @@ pub enum HookResult {
 impl From<git2_hooks::HookResult> for HookResult {
 	fn from(v: git2_hooks::HookResult) -> Self {
 		match v {
-			git2_hooks::HookResult::Ok { .. }
-			| git2_hooks::HookResult::NoHookFound => Self::Ok,
-			git2_hooks::HookResult::RunNotSuccessful {
-				stdout,
-				stderr,
-				..
-			} => Self::NotOk(format!("{stdout}{stderr}")),
+			git2_hooks::HookResult::NoHookFound => Self::Ok,
+			git2_hooks::HookResult::Run(response) => {
+				if response.is_successful() {
+					Self::Ok
+				} else {
+					Self::NotOk(format!(
+						"{}{}",
+						response.stdout, response.stderr
+					))
+				}
+			}
 		}
 	}
 }
@@ -73,12 +77,26 @@ pub fn hooks_prepare_commit_msg(
 }
 
 /// see `git2_hooks::hooks_pre_push`
-pub fn hooks_pre_push(repo_path: &RepoPath) -> Result<HookResult> {
+pub fn hooks_pre_push(
+	repo_path: &RepoPath,
+	remote: Option<&str>,
+	url: &str,
+	branch_name: Option<&str>,
+	remote_branch_name: Option<&str>,
+) -> Result<HookResult> {
 	scope_time!("hooks_pre_push");
 
 	let repo = repo(repo_path)?;
 
-	Ok(git2_hooks::hooks_pre_push(&repo, None)?.into())
+	Ok(git2_hooks::hooks_pre_push(
+		&repo,
+		None,
+		remote,
+		url,
+		branch_name,
+		remote_branch_name,
+	)?
+	.into())
 }
 
 #[cfg(test)]

git2-hooks/src/hookspath.rs

@@ -141,6 +141,20 @@ impl HookPaths {
 	/// this function calls hook scripts based on conventions documented here
 	/// see <https://git-scm.com/docs/githooks>
 	pub fn run_hook_os_str<I, S>(&self, args: I) -> Result<HookResult>
+	where
+		I: IntoIterator<Item = S> + Copy,
+		S: AsRef<OsStr>,
+	{
+		self.run_hook_os_str_with_stdin(args, None)
+	}
+
+	/// this function calls hook scripts with stdin input based on conventions documented here
+	/// see <https://git-scm.com/docs/githooks>
+	pub fn run_hook_os_str_with_stdin<I, S>(
+		&self,
+		args: I,
+		stdin: Option<&[u8]>,
+	) -> Result<HookResult>
 	where
 		I: IntoIterator<Item = S> + Copy,
 		S: AsRef<OsStr>,
@@ -153,11 +167,23 @@ impl HookPaths {
 		);
 
 		let run_command = |command: &mut Command| {
-			command
+			let mut child = command
 				.args(args)
 				.current_dir(&self.pwd)
 				.with_no_window()
-				.output()
+				.stdin(std::process::Stdio::piped())
+				.stdout(std::process::Stdio::piped())
+				.stderr(std::process::Stdio::piped())
+				.spawn()?;
+
+			if let Some(input) = stdin {
+				use std::io::Write;
+				if let Some(mut stdin_handle) = child.stdin.take() {
+					stdin_handle.write_all(input)?;
+				}
+			}
+
+			child.wait_with_output()
 		};
 
 		let output = if cfg!(windows) {
@@ -210,21 +236,21 @@ impl HookPaths {
 			}
 		}?;
 
-		if output.status.success() {
-			Ok(HookResult::Ok { hook })
-		} else {
-			let stderr =
-				String::from_utf8_lossy(&output.stderr).to_string();
-			let stdout =
-				String::from_utf8_lossy(&output.stdout).to_string();
-
-			Ok(HookResult::RunNotSuccessful {
-				code: output.status.code(),
-				stdout,
-				stderr,
-				hook,
-			})
-		}
+		let stderr =
+			String::from_utf8_lossy(&output.stderr).to_string();
+		let stdout =
+			String::from_utf8_lossy(&output.stdout).to_string();
+
+		Ok(HookResult::Run(crate::HookRunResponse {
+			hook,
+			stdout,
+			stderr,
+			code: if output.status.success() {
+				None
+			} else {
+				output.status.code()
+			},
+		}))
 	}
 }