diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-08-18 07:18:07 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-08-18 07:18:07 +0900 |
| commit | 6a7e64d04a8b0ad932169df43e2d93efe8ceedf8 (patch) | |
| tree | f74bca82b226fde11c820ba3988e094a49073940 /crates/shirabe/src/util/hg.rs | |
| parent | bed0cd33ca32b95aed9d65891f97649a6f9d0069 (diff) | |
| download | php-shirabe-6a7e64d04a8b0ad932169df43e2d93efe8ceedf8.tar.gz php-shirabe-6a7e64d04a8b0ad932169df43e2d93efe8ceedf8.tar.zst php-shirabe-6a7e64d04a8b0ad932169df43e2d93efe8ceedf8.zip | |
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<Response, Box<TransportException>>`, 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<Result<Response, Box<TransportException>>>`: 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<Box<$ty>> for anyhow::Error` so a
caught exception can be re-propagated with `?`.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/util/hg.rs')
| -rw-r--r-- | crates/shirabe/src/util/hg.rs | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/crates/shirabe/src/util/hg.rs b/crates/shirabe/src/util/hg.rs index 3180f4f9..575c2c1f 100644 --- a/crates/shirabe/src/util/hg.rs +++ b/crates/shirabe/src/util/hg.rs @@ -6,9 +6,9 @@ use crate::io::IOInterfaceImmutable; use crate::util::ProcessExecutor; use crate::util::Url; use shirabe_php_shim::{php_regex, preg_match, rawurlencode}; -use std::sync::OnceLock; +use std::sync::Mutex; -static VERSION: OnceLock<Option<String>> = OnceLock::new(); +static VERSION: Mutex<Option<Option<String>>> = Mutex::new(None); #[derive(Debug)] pub struct Hg { @@ -48,7 +48,7 @@ impl Hg { if self .process .borrow_mut() - .execute_args(&command, &mut ignored_output, cwd.as_deref()) + .execute(&command, &mut ignored_output, cwd.as_deref())? == 0 { return Ok(()); @@ -107,7 +107,7 @@ impl Hg { if self .process .borrow_mut() - .execute_args(&command, &mut ignored_output, cwd.as_deref()) + .execute(&command, &mut ignored_output, cwd.as_deref())? == 0 { return Ok(()); @@ -125,7 +125,7 @@ impl Hg { } fn throw_exception(&self, message: &str, url: &str) -> anyhow::Result<()> { - if Self::get_version(&self.process).is_none() { + if Self::get_version(&self.process)?.is_none() { anyhow::bail!( "{}", Url::sanitize(format!( @@ -141,24 +141,25 @@ impl Hg { pub fn get_version( process: &std::rc::Rc<std::cell::RefCell<ProcessExecutor>>, - ) -> Option<&'static str> { - VERSION - .get_or_init(|| { - let mut output = String::new(); - if process.borrow_mut().execute_args( - &["hg".to_string(), "--version".to_string()], - &mut output, - None, - ) == 0 - && let Some(matches) = preg_match( - php_regex!(r"/^.+? (\d+(?:\.\d+)+)(?:\+.*?)?\)?\r?\n/"), - &output, - ) - { - return matches.get(1).map(str::to_string); - } - None - }) - .as_deref() + ) -> anyhow::Result<Option<String>> { + let mut version = VERSION.lock().unwrap(); + if version.is_none() { + *version = Some(None); + let mut output = String::new(); + if process.borrow_mut().execute( + &["hg".to_string(), "--version".to_string()], + &mut output, + None, + )? == 0 + && let Some(matches) = preg_match( + php_regex!(r"/^.+? (\d+(?:\.\d+)+)(?:\+.*?)?\)?\r?\n/"), + &output, + ) + { + *version = Some(matches.get(1).map(str::to_string)); + } + } + + Ok(version.clone().unwrap_or(None)) } } |
