cybercyst/jj
1
0
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2025-05-05 15:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

description_template: Write intro verbatim when present

Browse Source 
This way we can make it so split looks more like describe and has an
empty line for the first line. Most other caller sets intro as the empty
string, so does not need updating.

I'm adding the empty first line to `split` since its use is very similar
to `describe`, namely the user is looking at a "blank" screen and
expected to write a commit message.

Squash on the other hand is presenting information that the user is
going to want to read first so it makes sense to avoid the empty line as
the first line.
This commit is contained in:
Manuel Mendez 2025-03-26 21:25:59 -04:00
parent 5dd64ae978
commit 75f2911b97
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cli/src/commands/split.rs
View File

@ -146,18 +146,17 @@ pub(crate) fn cmd_split(
// Create the first commit, which includes the changes selected by the user.
let first_commit = {
let mut intro = "".to_string();
let mut commit_builder = tx.repo_mut().rewrite_commit(&target.commit).detach();
commit_builder.set_tree_id(target.selected_tree.id());
if commit_builder.description().is_empty() {
commit_builder.set_description(tx.settings().get_string("ui.default-description")?);
intro += "\n";
}
intro += "JJ: Enter a description for the first commit.";
let temp_commit = commit_builder.write_hidden()?;
let template = description_template(
ui,
&tx,
"Enter a description for the first commit.",
&temp_commit,
)?;
let template = description_template(ui, &tx, &intro, &temp_commit)?;
let description = edit_description(&text_editor, &template)?;
commit_builder.set_description(description);
commit_builder.write(tx.repo_mut())?
@ -193,12 +192,8 @@ pub(crate) fn cmd_split(
"".to_string()
} else {
let temp_commit = commit_builder.write_hidden()?;
let template = description_template(
ui,
&tx,
"Enter a description for the second commit.",
&temp_commit,
)?;
let intro = "JJ: Enter a description for the second commit.";
let template = description_template(ui, &tx, intro, &temp_commit)?;
edit_description(&text_editor, &template)?
};
commit_builder.set_description(description);

2
cli/src/commands/squash.rs
View File

@ -183,7 +183,7 @@ pub(crate) fn cmd_squash(
if let Some(description) = try_combine_messages(abandoned_commits, &destination) {
description
} else {
let intro = "Enter a description for the combined commit.";
let intro = "JJ: Enter a description for the combined commit.";
let combined = combine_messages_for_editing(abandoned_commits, &destination);
// It's weird that commit.description() contains "JJ: " lines, but works.
commit_builder.set_description(combined);

2
cli/src/description_util.rs
View File

@ -357,7 +357,7 @@ pub fn description_template(
let mut output = Vec::new();
if !intro.is_empty() {
writeln!(output, "JJ: {intro}").unwrap();
writeln!(output, "{intro}").unwrap();
}
template
.format(commit, &mut PlainTextFormatter::new(&mut output))