aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/repository/vcs/fossil_driver.rs
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-08-18 07:18:07 +0900
committernsfisis <nsfisis@gmail.com>2026-08-18 07:18:07 +0900
commit6a7e64d04a8b0ad932169df43e2d93efe8ceedf8 (patch)
treef74bca82b226fde11c820ba3988e094a49073940 /crates/shirabe/src/repository/vcs/fossil_driver.rs
parentbed0cd33ca32b95aed9d65891f97649a6f9d0069 (diff)
downloadphp-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/repository/vcs/fossil_driver.rs')
-rw-r--r--crates/shirabe/src/repository/vcs/fossil_driver.rs40
1 files changed, 20 insertions, 20 deletions
diff --git a/crates/shirabe/src/repository/vcs/fossil_driver.rs b/crates/shirabe/src/repository/vcs/fossil_driver.rs
index 9a678284..1824ad5f 100644
--- a/crates/shirabe/src/repository/vcs/fossil_driver.rs
+++ b/crates/shirabe/src/repository/vcs/fossil_driver.rs
@@ -97,11 +97,11 @@ impl FossilDriver {
fn check_fossil(&self) -> anyhow::Result<()> {
let mut ignored_output = String::new();
- if self.inner.process.borrow_mut().execute_args(
+ if self.inner.process.borrow_mut().execute(
["fossil", "version"].map(|s| s.to_string()).as_ref(),
&mut ignored_output,
None,
- ) != 0
+ )? != 0
{
return Err(RuntimeException::new(format!(
"fossil was not found, check that it is installed and in your PATH env.\n\n{}",
@@ -131,17 +131,17 @@ impl FossilDriver {
// update the repo if it is a valid fossil repository
if is_file(&repo_file)
&& is_dir(&self.checkout_dir)
- && self.inner.process.borrow_mut().execute_args(
+ && self.inner.process.borrow_mut().execute(
["fossil", "info"].map(|s| s.to_string()).as_ref(),
&mut String::new(),
Some(&self.checkout_dir),
- ) == 0
+ )? == 0
{
- if self.inner.process.borrow_mut().execute_args(
+ if self.inner.process.borrow_mut().execute(
["fossil", "pull"].map(|s| s.to_string()).as_ref(),
&mut String::new(),
Some(&self.checkout_dir),
- ) != 0
+ )? != 0
{
self.inner.io.write_error3(&format!(
"<error>Failed to update {}, package information from this repository may be outdated ({})</error>",
@@ -156,13 +156,13 @@ impl FossilDriver {
fs.ensure_directory_exists(&self.checkout_dir)?;
let mut output = String::new();
- if self.inner.process.borrow_mut().execute_args(
+ if self.inner.process.borrow_mut().execute(
["fossil", "clone", "--", &self.inner.url, &repo_file]
.map(|s| s.to_string())
.as_ref(),
&mut output,
None,
- ) != 0
+ )? != 0
{
let output = self.inner.process.borrow().get_error_output().to_string();
return Err(RuntimeException::new(format!(
@@ -172,13 +172,13 @@ impl FossilDriver {
.into());
}
- if self.inner.process.borrow_mut().execute_args(
+ if self.inner.process.borrow_mut().execute(
["fossil", "open", "--nested", "--", &repo_file]
.map(|s| s.to_string())
.as_ref(),
&mut output,
Some(&self.checkout_dir),
- ) != 0
+ )? != 0
{
let output = self.inner.process.borrow().get_error_output().to_string();
return Err(RuntimeException::new(format!(
@@ -225,13 +225,13 @@ impl FossilDriver {
}
let mut content = String::new();
- self.inner.process.borrow_mut().execute_args(
+ self.inner.process.borrow_mut().execute(
["fossil", "cat", "-r", identifier, "--", file]
.map(|s| s.to_string())
.as_ref(),
&mut content,
Some(&self.checkout_dir),
- );
+ )?;
if content.trim().is_empty() {
return Ok(None);
@@ -245,13 +245,13 @@ impl FossilDriver {
_identifier: &str,
) -> anyhow::Result<Option<DateTime<FixedOffset>>> {
let mut output = String::new();
- self.inner.process.borrow_mut().execute_args(
+ self.inner.process.borrow_mut().execute(
["fossil", "finfo", "-b", "-n", "1", "composer.json"]
.map(|s| s.to_string())
.as_ref(),
&mut output,
Some(&self.checkout_dir),
- );
+ )?;
let parts: Vec<&str> = output.trim().splitn(3, ' ').collect();
let date = parts.get(1).copied().unwrap_or("");
@@ -263,11 +263,11 @@ impl FossilDriver {
if self.tags.is_none() {
let mut tags: IndexMap<String, String> = IndexMap::new();
let mut output = String::new();
- self.inner.process.borrow_mut().execute_args(
+ self.inner.process.borrow_mut().execute(
["fossil", "tag", "list"].map(|s| s.to_string()).as_ref(),
&mut output,
Some(&self.checkout_dir),
- );
+ )?;
for tag in self.inner.process.borrow().split_lines(&output) {
tags.insert(tag.clone(), tag);
}
@@ -280,11 +280,11 @@ impl FossilDriver {
if self.branches.is_none() {
let mut branches: IndexMap<String, String> = IndexMap::new();
let mut output = String::new();
- self.inner.process.borrow_mut().execute_args(
+ self.inner.process.borrow_mut().execute(
["fossil", "branch", "list"].map(|s| s.to_string()).as_ref(),
&mut output,
Some(&self.checkout_dir),
- );
+ )?;
for branch in self.inner.process.borrow().split_lines(&output) {
let branch = preg_replace(php_regex!(r"/^\*/"), "", branch.trim());
let branch = branch.trim().to_string();
@@ -321,11 +321,11 @@ impl FossilDriver {
let mut process = ProcessExecutor::new(Some(io));
let mut output = String::new();
- if process.execute_args(
+ if process.execute(
["fossil", "info"].map(|s| s.to_string()).as_ref(),
&mut output,
Some(&url),
- ) == 0
+ )? == 0
{
return Ok(true);
}