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

cli: inline resolve_revset_default_single()

Browse source
This commit is contained in:
Yuya Nishihara 2024-03-31 13:38:03 +09:00
parent 4f0c52d828
commit c3fa13e761
1 changed files with 13 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
cli/src/cli_util.rs
View file

@ -771,7 +771,19 @@ impl WorkspaceCommandHelper {
) -> Result<IndexSet<Commit>, CommandError> {
let mut all_commits = IndexSet::new();
for revision_str in revision_args {
let commits = self.resolve_revset_default_single(revision_str)?;
let (expression, all) = self.parse_revset_with_all_prefix(revision_str)?;
let commits = if all {
expression.evaluate_to_commits()?.try_collect()?
} else {
let should_hint_about_all_prefix = true;
let commit = revset_util::evaluate_revset_to_single_commit(
revision_str,
&expression,
|| self.commit_summary_template(),
should_hint_about_all_prefix,
)?;
vec![commit]
};
for commit in commits {
let commit_hash = short_commit_hash(commit.id());
if !all_commits.insert(commit) {
@ -796,28 +808,6 @@ impl WorkspaceCommandHelper {
.try_collect()?)
}
/// Resolve a revset any number of revisions (including 0), but require the
/// user to indicate if they allow multiple revisions by prefixing the
/// expression with `all:`.
fn resolve_revset_default_single(
&self,
revision_str: &str,
) -> Result<Vec<Commit>, CommandError> {
let (expression, all) = self.parse_revset_with_all_prefix(revision_str)?;
if all {
Ok(expression.evaluate_to_commits()?.try_collect()?)
} else {
let should_hint_about_all_prefix = true;
let commit = revset_util::evaluate_revset_to_single_commit(
revision_str,
&expression,
|| self.commit_summary_template(),
should_hint_about_all_prefix,
)?;
Ok(vec![commit])
}
}
pub fn parse_revset(
&self,
revision_str: &str,