aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/repository/vcs/git_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/git_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/git_driver.rs')
-rw-r--r--crates/shirabe/src/repository/vcs/git_driver.rs26
1 files changed, 13 insertions, 13 deletions
diff --git a/crates/shirabe/src/repository/vcs/git_driver.rs b/crates/shirabe/src/repository/vcs/git_driver.rs
index f45dbcaa..776a18e5 100644
--- a/crates/shirabe/src/repository/vcs/git_driver.rs
+++ b/crates/shirabe/src/repository/vcs/git_driver.rs
@@ -185,7 +185,7 @@ impl GitDriver {
}
let mut output = String::new();
- self.inner.process.borrow_mut().execute_args(
+ self.inner.process.borrow_mut().execute(
&[
"git".to_string(),
"branch".to_string(),
@@ -193,7 +193,7 @@ impl GitDriver {
],
&mut output,
Some(&self.repo_dir),
- );
+ )?;
let branches = self.inner.process.borrow().split_lines(&output);
if !branches.contains(&"* master".to_string()) {
for branch in &branches {
@@ -241,7 +241,7 @@ impl GitDriver {
}
let mut content = String::new();
- self.inner.process.borrow_mut().execute_args(
+ self.inner.process.borrow_mut().execute(
&[
"git".to_string(),
"show".to_string(),
@@ -249,7 +249,7 @@ impl GitDriver {
],
&mut content,
Some(&self.repo_dir),
- );
+ )?;
if content.trim().is_empty() {
return Ok(None);
@@ -277,14 +277,14 @@ impl GitDriver {
"--format=%at".to_string(),
identifier.to_string(),
],
- );
+ )?;
let mut output = String::new();
self.inner
.process
.borrow_mut()
- .execute_args(&command, &mut output, Some(&self.repo_dir));
+ .execute(&command, &mut output, Some(&self.repo_dir))?;
- let timestamp_str = GitUtil::parse_rev_list_output(&output, &self.inner.process);
+ let timestamp_str = GitUtil::parse_rev_list_output(&output, &self.inner.process)?;
let timestamp: i64 = timestamp_str.trim().parse().unwrap_or(0);
Ok(Some(
Utc.timestamp_opt(timestamp, 0).unwrap().fixed_offset(),
@@ -296,7 +296,7 @@ impl GitDriver {
self.tags = Some(IndexMap::new());
let mut output = String::new();
- self.inner.process.borrow_mut().execute_args(
+ self.inner.process.borrow_mut().execute(
&[
"git".to_string(),
"show-ref".to_string(),
@@ -305,7 +305,7 @@ impl GitDriver {
],
&mut output,
Some(&self.repo_dir),
- );
+ )?;
for tag in self.inner.process.borrow().split_lines(&output) {
if !tag.is_empty()
&& let Some(caps) = preg_match(
@@ -330,7 +330,7 @@ impl GitDriver {
let mut branches = IndexMap::new();
let mut output = String::new();
- self.inner.process.borrow_mut().execute_args(
+ self.inner.process.borrow_mut().execute(
&[
"git".to_string(),
"branch".to_string(),
@@ -340,7 +340,7 @@ impl GitDriver {
],
&mut output,
Some(&self.repo_dir),
- );
+ )?;
for branch in self.inner.process.borrow().split_lines(&output) {
if !branch.is_empty()
&& !preg_is_match(php_regex!(r"{^ *[^/]+/HEAD }"), &branch)
@@ -384,11 +384,11 @@ impl GitDriver {
io.clone(),
))));
let mut output = String::new();
- if process.borrow_mut().execute_args(
+ if process.borrow_mut().execute(
&["git".to_string(), "tag".to_string()],
&mut output,
Some(&url),
- ) == 0
+ )? == 0
{
return Ok(true);
}