chore(deps): upgrade to jj-lib 0.41.0
This commit is contained in:
Generated
+241
-276
File diff suppressed because it is too large
Load Diff
+1
-1
@@ -27,7 +27,7 @@ etcetera = "0.11.0"
|
|||||||
clap = { version = "4.5.57", features = ["derive"] }
|
clap = { version = "4.5.57", features = ["derive"] }
|
||||||
git-conventional = "0.12.9"
|
git-conventional = "0.12.9"
|
||||||
inquire = { version = "0.9.2", features = ["editor"] }
|
inquire = { version = "0.9.2", features = ["editor"] }
|
||||||
jj-lib = "0.40.0"
|
jj-lib = "0.41.0"
|
||||||
lazy-regex = { version = "3.5.1", features = ["lite"] }
|
lazy-regex = { version = "3.5.1", features = ["lite"] }
|
||||||
thiserror = "2.0.18"
|
thiserror = "2.0.18"
|
||||||
tokio = { version = "1.49.0", features = ["macros", "rt-multi-thread"] }
|
tokio = { version = "1.49.0", features = ["macros", "rt-multi-thread"] }
|
||||||
|
|||||||
@@ -179,20 +179,20 @@ impl JjLib {
|
|||||||
.map_err(|e| Error::from_revset_resolution_error(revset, e))?
|
.map_err(|e| Error::from_revset_resolution_error(revset, e))?
|
||||||
.evaluate(&*repo)
|
.evaluate(&*repo)
|
||||||
.map_err(|e| Error::from_revset_evaluation_error(revset, e))?;
|
.map_err(|e| Error::from_revset_evaluation_error(revset, e))?;
|
||||||
let mut iter = revision.iter();
|
let mut all_ids = revision.commit_change_ids();
|
||||||
let commit_id = iter
|
let commit_id = all_ids
|
||||||
.next()
|
.next()
|
||||||
.ok_or(Error::RevsetResolutionError {
|
.ok_or(Error::RevsetResolutionError {
|
||||||
revset: revset.to_string(),
|
revset: revset.into(),
|
||||||
context: "No matching revision".to_string(),
|
context: "No matching revision".to_string(),
|
||||||
})?
|
})?
|
||||||
.map_err(|e| Error::from_revset_evaluation_error(revset, e))?;
|
.map_err(|e| Error::from_revset_evaluation_error(revset, e))?;
|
||||||
if iter.next().is_some() {
|
match all_ids.next() {
|
||||||
return Err(Error::MultipleRevisions {
|
None => Ok(commit_id.0),
|
||||||
|
Some(_) => Err(Error::MultipleRevisions {
|
||||||
revset: revset.to_string(),
|
revset: revset.to_string(),
|
||||||
});
|
}),
|
||||||
}
|
}
|
||||||
Ok(commit_id)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -56,12 +56,6 @@ impl MockJjExecutor {
|
|||||||
self
|
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
|
/// Check if is_repository() was called
|
||||||
pub fn was_is_repo_called(&self) -> bool {
|
pub fn was_is_repo_called(&self) -> bool {
|
||||||
self.is_repo_called
|
self.is_repo_called
|
||||||
@@ -72,11 +66,6 @@ impl MockJjExecutor {
|
|||||||
pub fn describe_messages(&self) -> Vec<String> {
|
pub fn describe_messages(&self) -> Vec<String> {
|
||||||
self.describe_calls.lock().unwrap().clone()
|
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)]
|
#[async_trait(?Send)]
|
||||||
|
|||||||
Reference in New Issue
Block a user