aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/downloader/svn_downloader.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/downloader/svn_downloader.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/downloader/svn_downloader.rs')
-rw-r--r--crates/shirabe/src/downloader/svn_downloader.rs14
1 files changed, 7 insertions, 7 deletions
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<Option<PhpMixed>> {
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<String> = 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)