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/downloader/svn_downloader.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'crates/shirabe/src/downloader/svn_downloader.rs') diff --git a/crates/shirabe/src/downloader/svn_downloader.rs b/crates/shirabe/src/downloader/svn_downloader.rs index 93b860f0..8c062320 100644 --- a/crates/shirabe/src/downloader/svn_downloader.rs +++ b/crates/shirabe/src/downloader/svn_downloader.rs @@ -69,11 +69,11 @@ impl SvnDownloader { async fn discard_changes(&self, path: &str) -> anyhow::Result> { let mut output = String::new(); - if self.inner.process.borrow_mut().execute_args( + if self.inner.process.borrow_mut().execute( ["svn", "revert", "-R", "."].map(|s| s.to_string()).as_ref(), &mut output, Some(path), - ) != 0 + )? != 0 { return Err(RuntimeException::new(format!( "Could not reset changes\n\n:{}", @@ -139,7 +139,7 @@ impl VcsDownloader for SvnDownloader { self.inner.config.clone(), Some(self.inner.process.clone()), ); - if util.binary_version().is_none() { + if util.binary_version()?.is_none() { return Err(RuntimeException::new( "svn was not found in your PATH, skipping source download".to_string(), ) @@ -217,7 +217,7 @@ impl VcsDownloader for SvnDownloader { ); let mut flags: Vec = vec![]; if version_compare( - &util.binary_version().unwrap_or_default(), + &util.binary_version()?.unwrap_or_default(), "1.7.0", CmpOp::Ge, ) { @@ -370,7 +370,7 @@ impl VcsDownloader for SvnDownloader { .inner .process .borrow_mut() - .execute_args(&command, &mut output, Some(path)) + .execute(&command, &mut output, Some(path))? != 0 { return Err(RuntimeException::new(format!( @@ -444,13 +444,13 @@ impl ChangeReportInterface for SvnDownloader { } let mut output = String::new(); - self.inner.process.borrow_mut().execute_args( + self.inner.process.borrow_mut().execute( ["svn", "status", "--ignore-externals"] .map(|s| s.to_string()) .as_ref(), &mut output, Some(path), - ); + )?; Ok(if preg_is_match(php_regex!("{^ *[^X ] +}m"), &output) { Some(output) -- cgit v1.3.1-4-g156e