chore(deps): upgrade to jj-lib 0.41.0

This commit is contained in:
2026-05-19 11:27:20 +02:00
parent bd6892d91e
commit 412a056e70
4 changed files with 249 additions and 295 deletions
+7 -7
View File
@@ -179,20 +179,20 @@ impl JjLib {
.map_err(|e| Error::from_revset_resolution_error(revset, e))?
.evaluate(&*repo)
.map_err(|e| Error::from_revset_evaluation_error(revset, e))?;
let mut iter = revision.iter();
let commit_id = iter
let mut all_ids = revision.commit_change_ids();
let commit_id = all_ids
.next()
.ok_or(Error::RevsetResolutionError {
revset: revset.to_string(),
revset: revset.into(),
context: "No matching revision".to_string(),
})?
.map_err(|e| Error::from_revset_evaluation_error(revset, e))?;
if iter.next().is_some() {
return Err(Error::MultipleRevisions {
match all_ids.next() {
None => Ok(commit_id.0),
Some(_) => Err(Error::MultipleRevisions {
revset: revset.to_string(),
});
}),
}
Ok(commit_id)
}
}
-11
View File
@@ -56,12 +56,6 @@ impl MockJjExecutor {
self
}
/// Configure get_description() to return a specific value
pub fn with_get_description_response(mut self, response: Result<String, Error>) -> Self {
self.get_description_response = response;
self
}
/// Check if is_repository() was called
pub fn was_is_repo_called(&self) -> bool {
self.is_repo_called
@@ -72,11 +66,6 @@ impl MockJjExecutor {
pub fn describe_messages(&self) -> Vec<String> {
self.describe_calls.lock().unwrap().clone()
}
/// Get all revsets visited
pub fn described_revsets(&self) -> Vec<String> {
self.described_revsets.lock().unwrap().clone()
}
}
#[async_trait(?Send)]