ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

cli: extract commits_summary variable

Browse source
This commit is contained in:
Willian Mori 2023-09-21 21:24:01 -03:00 committed by Willian Mori
parent 6873438b85
commit a3ed43efc3
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cli/src/cli_util.rs
View file

@ -1016,14 +1016,14 @@ impl WorkspaceCommandHelper {
let mut iter = [commit0, commit1].into_iter().chain(iter);
let commits: Vec<_> = iter.by_ref().take(5).try_collect()?;
let elided = iter.next().is_some();
let commits_summary = commits
.iter()
.map(|c| self.format_commit_summary(c))
.join("\n")
+ elided.then_some("\n...").unwrap_or_default();
let hint = format!(
r#"The revset "{revision_str}" resolved to these revisions:{eol}{commits}{ellipsis}"#,
eol = "\n",
commits = commits
.iter()
.map(|c| self.format_commit_summary(c))
.join("\n"),
ellipsis = elided.then_some("\n...").unwrap_or_default()
r#"The revset "{revision_str}" resolved to these revisions:
{commits_summary}"#,
);
Err(user_error_with_hint(
format!(r#"Revset "{revision_str}" resolved to more than one revision"#),