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/util/github.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'crates/shirabe/src/util/github.rs') diff --git a/crates/shirabe/src/util/github.rs b/crates/shirabe/src/util/github.rs index ccfedcf8..d4fd3283 100644 --- a/crates/shirabe/src/util/github.rs +++ b/crates/shirabe/src/util/github.rs @@ -52,14 +52,14 @@ impl GitHub { }) } - pub fn authorize_oauth(&mut self, origin_url: &str) -> bool { + pub fn authorize_oauth(&mut self, origin_url: &str) -> anyhow::Result { let github_domains = self.config.borrow_mut().get("github-domains"); if !in_array_loose(origin_url.to_string(), github_domains.values()) { - return false; + return Ok(false); } let mut output = String::new(); - if self.process.borrow_mut().execute_args( + if self.process.borrow_mut().execute( &[ "git".to_string(), "config".to_string(), @@ -67,17 +67,17 @@ impl GitHub { ], &mut output, None, - ) == 0 + )? == 0 { self.io.borrow_mut().set_authentication( origin_url.to_string(), output.trim().to_string(), Some("x-oauth-basic".to_string()), ); - return true; + return Ok(true); } - false + Ok(false) } pub fn authorize_oauth_interactively( @@ -101,7 +101,7 @@ impl GitHub { if self .process .borrow_mut() - .execute_args(&["hostname".to_string()], &mut output, None) + .execute(&["hostname".to_string()], &mut output, None)? == 0 { note += &format!(" on {}", output.trim()); -- cgit v1.3.1-4-g156e