mirrors/jj
1
0
Fork 0
mirror of https://github.com/jj-vcs/jj.git synced 2025-12-23 06:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

revset: rename StoreError variants to Backend

Browse source 
I haven't checked, but I think "store" is a holdover from a long time
ago.
This commit is contained in:
Martin von Zweigbergk 2025-04-19 18:16:39 -07:00
parent 7073811fe0
commit ed99e21bc4
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cli/src/command_error.rs
View file

@ -897,7 +897,7 @@ fn revset_resolution_error_hint(err: &RevsetResolutionError) -> Option<String> {
| RevsetResolutionError::WorkspaceMissingWorkingCopy { .. }
| RevsetResolutionError::AmbiguousCommitIdPrefix(_)
| RevsetResolutionError::AmbiguousChangeIdPrefix(_)
| RevsetResolutionError::StoreError(_)
| RevsetResolutionError::Backend(_)
| RevsetResolutionError::Other(_) => None,
}
}

16
lib/src/revset.rs
View file

@ -87,8 +87,8 @@ pub enum RevsetResolutionError {
AmbiguousCommitIdPrefix(String),
#[error("Change ID prefix `{0}` is ambiguous")]
AmbiguousChangeIdPrefix(String),
#[error("Unexpected error from store")]
StoreError(#[source] BackendError),
#[error("Unexpected error from commit backend")]
Backend(#[source] BackendError),
#[error(transparent)]
Other(#[from] Box<dyn std::error::Error + Send + Sync>),
}
@ -96,8 +96,8 @@ pub enum RevsetResolutionError {
/// Error occurred during revset evaluation.
#[derive(Debug, Error)]
pub enum RevsetEvaluationError {
#[error("Unexpected error from store")]
StoreError(#[from] BackendError),
#[error("Unexpected error from commit backend")]
Backend(#[from] BackendError),
#[error(transparent)]
Other(Box<dyn std::error::Error + Send + Sync>),
}
@ -107,7 +107,7 @@ impl RevsetEvaluationError {
// BackendError
pub fn into_backend_error(self) -> BackendError {
match self {
Self::StoreError(err) => err,
Self::Backend(err) => err,
Self::Other(err) => BackendError::Other(err),
}
}
@ -1812,7 +1812,7 @@ fn reload_repo_at_operation(
let operation = op_walk::resolve_op_with_repo(base_repo, op_str)
.map_err(|err| RevsetResolutionError::Other(err.into()))?;
base_repo.reload_at(&operation).map_err(|err| match err {
RepoLoaderError::Backend(err) => RevsetResolutionError::StoreError(err),
RepoLoaderError::Backend(err) => RevsetResolutionError::Backend(err),
RepoLoaderError::IndexRead(_)
| RepoLoaderError::OpHeadResolution(_)
| RepoLoaderError::OpHeadsStoreError(_)
@ -2207,7 +2207,7 @@ impl ExpressionStateFolder<UserExpressionState, ResolvedExpressionState>
RevsetResolutionError::EmptyString
| RevsetResolutionError::AmbiguousCommitIdPrefix(_)
| RevsetResolutionError::AmbiguousChangeIdPrefix(_)
| RevsetResolutionError::StoreError(_)
| RevsetResolutionError::Backend(_)
| RevsetResolutionError::Other(_) => Err(err),
})
}
@ -2531,7 +2531,7 @@ impl<I: Iterator<Item = Result<CommitId, RevsetEvaluationError>>> Iterator
let commit_id = commit_id?;
self.store
.get_commit(&commit_id)
.map_err(RevsetEvaluationError::StoreError)
.map_err(RevsetEvaluationError::Backend)
})
}
}