mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-07 21:27:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

revset: add two new error variants to support extensions

Browse source
This commit is contained in:
dploch 2024-04-16 19:25:54 -04:00 committed by Daniel Ploch
parent d13be927a8
commit cf78532bd8
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cli/src/command_error.rs
View file

@ -496,7 +496,8 @@ impl From<RevsetResolutionError> for CommandError {
| RevsetResolutionError::WorkspaceMissingWorkingCopy { .. } | RevsetResolutionError::WorkspaceMissingWorkingCopy { .. }
| RevsetResolutionError::AmbiguousCommitIdPrefix(_) | RevsetResolutionError::AmbiguousCommitIdPrefix(_)
| RevsetResolutionError::AmbiguousChangeIdPrefix(_) | RevsetResolutionError::AmbiguousChangeIdPrefix(_)
| RevsetResolutionError::StoreError(_) => None, | RevsetResolutionError::StoreError(_)
| RevsetResolutionError::Other(_) => None,
}; };
let mut cmd_err = user_error(err); let mut cmd_err = user_error(err);
cmd_err.extend_hints(hint); cmd_err.extend_hints(hint);

5
lib/src/revset.rs
View file

@ -62,6 +62,8 @@ pub enum RevsetResolutionError {
AmbiguousChangeIdPrefix(String), AmbiguousChangeIdPrefix(String),
#[error("Unexpected error from store")] #[error("Unexpected error from store")]
StoreError(#[source] BackendError), StoreError(#[source] BackendError),
#[error(transparent)]
Other(#[from] Box<dyn std::error::Error + Send + Sync>),
} }
/// Error occurred during revset evaluation. /// Error occurred during revset evaluation.
@ -2283,7 +2285,8 @@ fn resolve_symbols(
| RevsetResolutionError::EmptyString | RevsetResolutionError::EmptyString
| RevsetResolutionError::AmbiguousCommitIdPrefix(_) | RevsetResolutionError::AmbiguousCommitIdPrefix(_)
| RevsetResolutionError::AmbiguousChangeIdPrefix(_) | RevsetResolutionError::AmbiguousChangeIdPrefix(_)
| RevsetResolutionError::StoreError(_) => Err(err), | RevsetResolutionError::StoreError(_)
| RevsetResolutionError::Other(_) => Err(err),
}) })
.map(Some) // Always rewrite subtree .map(Some) // Always rewrite subtree
} }