aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/package/version
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/package/version
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/package/version')
-rw-r--r--crates/shirabe/src/package/version/version_guesser.rs40
1 files changed, 20 insertions, 20 deletions
diff --git a/crates/shirabe/src/package/version/version_guesser.rs b/crates/shirabe/src/package/version/version_guesser.rs
index 38c4f0a3..ebd7ade8 100644
--- a/crates/shirabe/src/package/version/version_guesser.rs
+++ b/crates/shirabe/src/package/version/version_guesser.rs
@@ -206,7 +206,7 @@ impl VersionGuesser {
// try to fetch current version from git branch
let mut output = String::new();
- if 0 == self.process.borrow_mut().execute_args(
+ if 0 == self.process.borrow_mut().execute(
&[
"git".to_string(),
"branch".to_string(),
@@ -217,7 +217,7 @@ impl VersionGuesser {
],
&mut output,
Some(path),
- ) {
+ )? {
let mut branches: Vec<String> = vec![];
let mut is_feature_branch = false;
@@ -309,7 +309,7 @@ impl VersionGuesser {
PhpMixed::String("HEAD".to_string()),
]),
PhpMixed::List(
- GitUtil::get_no_show_signature_flags(&self.process)
+ GitUtil::get_no_show_signature_flags(&self.process)?
.into_iter()
.map(PhpMixed::String)
.collect(),
@@ -322,15 +322,15 @@ impl VersionGuesser {
.collect()
})
.unwrap_or_default(),
- );
+ )?;
let mut command_output = String::new();
- if 0 == self.process.borrow_mut().execute_args(
- &command,
- &mut command_output,
- Some(path),
- ) {
+ if 0 == self
+ .process
+ .borrow_mut()
+ .execute(&command, &mut command_output, Some(path))?
+ {
let parsed = trim(
- &GitUtil::parse_rev_list_output(&command_output, &self.process),
+ &GitUtil::parse_rev_list_output(&command_output, &self.process)?,
None,
);
commit = if parsed.is_empty() {
@@ -353,7 +353,7 @@ impl VersionGuesser {
fn version_from_git_tags(&mut self, path: &str) -> anyhow::Result<Option<(String, String)>> {
// try to fetch current version from git tags
let mut output = String::new();
- if 0 == self.process.borrow_mut().execute_args(
+ if 0 == self.process.borrow_mut().execute(
&[
"git".to_string(),
"describe".to_string(),
@@ -362,7 +362,7 @@ impl VersionGuesser {
],
&mut output,
Some(path),
- ) {
+ )? {
match self.version_parser.normalize(&trim(&output, None), None) {
Ok(version) => return Ok(Some((version, trim(&output, None)))),
Err(_e) => {}
@@ -379,11 +379,11 @@ impl VersionGuesser {
) -> anyhow::Result<Option<VersionData>> {
// try to fetch current version from hg branch
let mut output = String::new();
- if 0 == self.process.borrow_mut().execute_args(
+ if 0 == self.process.borrow_mut().execute(
&["hg".to_string(), "branch".to_string()],
&mut output,
Some(path),
- ) {
+ )? {
let branch = trim(&output, None);
let version = self.version_parser.normalize_branch(&branch)?;
let is_feature_branch = strpos(&version, "dev-") == Some(0);
@@ -617,7 +617,7 @@ impl VersionGuesser {
// try to fetch current version from fossil
let mut output = String::new();
- if 0 == self.process.borrow_mut().execute_args(
+ if 0 == self.process.borrow_mut().execute(
&[
"fossil".to_string(),
"branch".to_string(),
@@ -625,7 +625,7 @@ impl VersionGuesser {
],
&mut output,
Some(path),
- ) {
+ )? {
let branch = trim(&output, None);
version = Some(self.version_parser.normalize_branch(&branch)?);
pretty_version = Some(format!("dev-{}", branch));
@@ -633,11 +633,11 @@ impl VersionGuesser {
// try to fetch current version from fossil tags
let mut output = String::new();
- if 0 == self.process.borrow_mut().execute_args(
+ if 0 == self.process.borrow_mut().execute(
&["fossil".to_string(), "tag".to_string(), "list".to_string()],
&mut output,
Some(path),
- ) {
+ )? {
match self.version_parser.normalize(&trim(&output, None), None) {
Ok(v) => {
version = Some(v);
@@ -665,11 +665,11 @@ impl VersionGuesser {
// try to fetch current version from svn
let mut output = String::new();
- if 0 == self.process.borrow_mut().execute_args(
+ if 0 == self.process.borrow_mut().execute(
&["svn".to_string(), "info".to_string(), "--xml".to_string()],
&mut output,
Some(path),
- ) {
+ )? {
let trunk_path = package_config
.get("trunk-path")
.and_then(|v| v.as_string())