From 6a7e64d04a8b0ad932169df43e2d93efe8ceedf8 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Tue, 18 Aug 2026 07:18:07 +0900 Subject: fix: propagate ported exceptions instead of flattening them `ProcessExecutor::execute_args` existed only to turn `execute`'s `anyhow::Result` into an exit code of 1, so every one of its ~87 call sites silently took the "command failed" branch on an error PHP would have thrown. It is gone; callers use `execute` and propagate with `?`. Where the enclosing function had no `Result` to propagate into, its signature grew one, up to and including `Git::get_version`, `Svn::binary_version`, `GitHub`/`GitLab`/`Bitbucket::authorize_oauth`, `InitCommand::get_git_config` and `DiagnoseCommand::check_git`. The VCS drivers had the same problem in the other direction: their `get_contents` returned `Result>`, a type too narrow for the PHP method, which lets any Throwable out of the `catch (TransportException $e)` block. Every non-transport error was therefore rewritten into a `TransportException` with code 0, which the callers switch on. They now return `anyhow::Result>>`: the outer `Result` carries what PHP does not catch, the inner one the exception the drivers handle. That signature also restores `GitLabDriver::getContents`: the 400/401 `TransportException`s it raises to force authentication are thrown inside its own `try` block and handled by its own `catch`, but the port returned them straight to the caller, so the authentication flow behind them never ran. `impl_php_exception!` gains `From> for anyhow::Error` so a caught exception can be re-propagated with `?`. Co-Authored-By: Claude Opus 5 (1M context) --- crates/shirabe/src/repository/vcs/hg_driver.rs | 38 +++++++++++++------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'crates/shirabe/src/repository/vcs/hg_driver.rs') diff --git a/crates/shirabe/src/repository/vcs/hg_driver.rs b/crates/shirabe/src/repository/vcs/hg_driver.rs index 54341070..c952eb0f 100644 --- a/crates/shirabe/src/repository/vcs/hg_driver.rs +++ b/crates/shirabe/src/repository/vcs/hg_driver.rs @@ -89,17 +89,17 @@ impl HgDriver { ); if is_dir(&self.repo_dir) - && self.inner.process.borrow_mut().execute_args( + && self.inner.process.borrow_mut().execute( ["hg", "summary"].map(|s| s.to_string()).as_ref(), &mut String::new(), Some(&self.repo_dir), - ) == 0 + )? == 0 { - if self.inner.process.borrow_mut().execute_args( + if self.inner.process.borrow_mut().execute( ["hg", "pull"].map(|s| s.to_string()).as_ref(), &mut String::new(), Some(&self.repo_dir), - ) != 0 + )? != 0 { self.inner.io.write_error3(&format!("Failed to update {}, package information from this repository may be outdated ({})", self.inner.url, self.inner.process.borrow().get_error_output()), true, crate::io::NORMAL); } @@ -132,13 +132,13 @@ impl HgDriver { pub fn get_root_identifier(&mut self) -> anyhow::Result { if self.root_identifier.is_none() { let mut output = String::new(); - self.inner.process.borrow_mut().execute_args( + self.inner.process.borrow_mut().execute( ["hg", "tip", "--template", "{node}"] .map(|s| s.to_string()) .as_ref(), &mut output, Some(&self.repo_dir), - ); + )?; let lines = self.inner.process.borrow().split_lines(&output); self.root_identifier = lines.into_iter().next(); } @@ -183,7 +183,7 @@ impl HgDriver { self.inner .process .borrow_mut() - .execute_args(&resource, &mut content, Some(&self.repo_dir)); + .execute(&resource, &mut content, Some(&self.repo_dir))?; if content.trim().is_empty() { return Ok(None); @@ -205,7 +205,7 @@ impl HgDriver { } let mut output = String::new(); - self.inner.process.borrow_mut().execute_args( + self.inner.process.borrow_mut().execute( [ "hg", "log", @@ -218,7 +218,7 @@ impl HgDriver { .as_ref(), &mut output, Some(&self.repo_dir), - ); + )?; let date: DateTime = shirabe_php_shim::date_create(output.trim())?; Ok(Some(date.fixed_offset())) @@ -228,11 +228,11 @@ impl HgDriver { if self.tags.is_none() { let mut tags: IndexMap = IndexMap::new(); let mut output = String::new(); - self.inner.process.borrow_mut().execute_args( + self.inner.process.borrow_mut().execute( ["hg", "tags"].map(|s| s.to_string()).as_ref(), &mut output, Some(&self.repo_dir), - ); + )?; for tag in self.inner.process.borrow().split_lines(&output) { if !tag.is_empty() && let Some(m) = preg_match(php_regex!(r"(^([^\s]+)\s+\d+:(.*)$)"), &tag) @@ -257,11 +257,11 @@ impl HgDriver { let mut bookmarks: IndexMap = IndexMap::new(); let mut output = String::new(); - self.inner.process.borrow_mut().execute_args( + self.inner.process.borrow_mut().execute( ["hg", "branches"].map(|s| s.to_string()).as_ref(), &mut output, Some(&self.repo_dir), - ); + )?; for branch in self.inner.process.borrow().split_lines(&output) { if !branch.is_empty() && let Some(m) = @@ -275,11 +275,11 @@ impl HgDriver { } output.clear(); - self.inner.process.borrow_mut().execute_args( + self.inner.process.borrow_mut().execute( ["hg", "bookmarks"].map(|s| s.to_string()).as_ref(), &mut output, Some(&self.repo_dir), - ); + )?; for branch in self.inner.process.borrow().split_lines(&output) { if !branch.is_empty() && let Some(m) = @@ -323,11 +323,11 @@ impl HgDriver { let mut process = crate::util::ProcessExecutor::new(Some(io.clone())); let mut output = String::new(); - if process.execute_args( + if process.execute( ["hg", "summary"].map(|s| s.to_string()).as_ref(), &mut output, Some(&url), - ) == 0 + )? == 0 { return Ok(true); } @@ -339,13 +339,13 @@ impl HgDriver { let mut process = crate::util::ProcessExecutor::new(Some(io)); let mut ignored = String::new(); - let exit = process.execute_args( + let exit = process.execute( ["hg", "identify", "--", url] .map(|s| s.to_string()) .as_ref(), &mut ignored, None, - ); + )?; Ok(exit == 0) } -- cgit v1.3.1-4-g156e