jj/cli/src/description_util.rs
Martin von Zweigbergk f3e35f1da4 description_utils: teach combine_messages() to handle more than two sources
I plan to teach `jj squash --from` to accept a revset as input.
2024-03-13 05:21:05 -07:00

162 lines
5.1 KiB
Rust

use itertools::Itertools;
use jj_lib::commit::Commit;
use jj_lib::matchers::EverythingMatcher;
use jj_lib::merged_tree::MergedTree;
use jj_lib::repo::ReadonlyRepo;
use jj_lib::settings::UserSettings;
use crate::cli_util::{edit_temp_file, WorkspaceCommandHelper};
use crate::command_error::CommandError;
use crate::diff_util::{self, DiffFormat};
use crate::formatter::PlainTextFormatter;
use crate::text_util;
use crate::ui::Ui;
pub fn edit_description(
repo: &ReadonlyRepo,
description: &str,
settings: &UserSettings,
) -> Result<String, CommandError> {
let description = format!(
r#"{}
JJ: Lines starting with "JJ: " (like this one) will be removed.
"#,
description
);
let description = edit_temp_file(
"description",
".jjdescription",
repo.repo_path(),
&description,
settings,
)?;
// Normalize line ending, remove leading and trailing blank lines.
let description = description
.lines()
.filter(|line| !line.starts_with("JJ: "))
.join("\n");
Ok(text_util::complete_newline(description.trim_matches('\n')))
}
/// Combines the descriptions from the input commits. If only one is non-empty,
/// then that one is used. Otherwise we concatenate the messages and ask the
/// user to edit the result in their editor.
pub fn combine_messages(
repo: &ReadonlyRepo,
sources: &[&Commit],
destination: &Commit,
settings: &UserSettings,
) -> Result<String, CommandError> {
let non_empty = sources
.iter()
.chain(std::iter::once(&destination))
.filter(|c| !c.description().is_empty())
.take(2)
.collect_vec();
match *non_empty.as_slice() {
[] => {
return Ok(String::new());
}
[commit] => {
return Ok(commit.description().to_owned());
}
_ => {}
}
// Produce a combined description with instructions for the user to edit.
// Include empty descriptins too, so the user doesn't have to wonder why they
// only see 2 descriptions when they combined 3 commits.
let mut combined = "JJ: Enter a description for the combined commit.".to_string();
combined.push_str("\nJJ: Description from the destination commit:\n");
combined.push_str(destination.description());
for commit in sources {
combined.push_str("\nJJ: Description from source commit:\n");
combined.push_str(commit.description());
}
edit_description(repo, &combined, settings)
}
/// Create a description from a list of paragraphs.
///
/// Based on the Git CLI behavior. See `opt_parse_m()` and `cleanup_mode` in
/// `git/builtin/commit.c`.
pub fn join_message_paragraphs(paragraphs: &[String]) -> String {
// Ensure each paragraph ends with a newline, then add another newline between
// paragraphs.
paragraphs
.iter()
.map(|p| text_util::complete_newline(p.as_str()))
.join("\n")
}
pub fn description_template_for_describe(
ui: &Ui,
settings: &UserSettings,
workspace_command: &WorkspaceCommandHelper,
commit: &Commit,
) -> Result<String, CommandError> {
let mut diff_summary_bytes = Vec::new();
diff_util::show_patch(
ui,
&mut PlainTextFormatter::new(&mut diff_summary_bytes),
workspace_command,
commit,
&EverythingMatcher,
&[DiffFormat::Summary],
)?;
let description = if commit.description().is_empty() {
settings.default_description()
} else {
commit.description().to_owned()
};
if diff_summary_bytes.is_empty() {
Ok(description)
} else {
Ok(description + "\n" + &diff_summary_to_description(&diff_summary_bytes))
}
}
pub fn description_template_for_commit(
ui: &Ui,
settings: &UserSettings,
workspace_command: &WorkspaceCommandHelper,
intro: &str,
overall_commit_description: &str,
from_tree: &MergedTree,
to_tree: &MergedTree,
) -> Result<String, CommandError> {
let mut diff_summary_bytes = Vec::new();
diff_util::show_diff(
ui,
&mut PlainTextFormatter::new(&mut diff_summary_bytes),
workspace_command,
from_tree,
to_tree,
&EverythingMatcher,
&[DiffFormat::Summary],
)?;
let mut template_chunks = Vec::new();
if !intro.is_empty() {
template_chunks.push(format!("JJ: {intro}\n"));
}
template_chunks.push(if overall_commit_description.is_empty() {
settings.default_description()
} else {
overall_commit_description.to_owned()
});
if !diff_summary_bytes.is_empty() {
template_chunks.push("\n".to_owned());
template_chunks.push(diff_summary_to_description(&diff_summary_bytes));
}
Ok(template_chunks.concat())
}
pub fn diff_summary_to_description(bytes: &[u8]) -> String {
let text = std::str::from_utf8(bytes).expect(
"Summary diffs and repo paths must always be valid UTF8.",
// Double-check this assumption for diffs that include file content.
);
"JJ: This commit contains the following changes:\n".to_owned()
+ &textwrap::indent(text, "JJ: ")
}