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

describe: warn user of limitations when describing multiple commits

Browse source 
I think it might be nice to have this in the upcoming release, but I'd
like to warn people that their changes will be lost if they aren't
careful, and to not rely on the syntax being fixed just yet.
This commit is contained in:
Ilya Grigoriev 2024-08-04 14:55:31 -07:00
parent 6d1cc7f803
commit 132dfd30e2
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cli/src/description_util.rs
View file

@ -64,8 +64,11 @@ pub fn edit_multiple_descriptions(
let mut bulk_message = String::new();
bulk_message.push_str(indoc! {r#"
JJ: Enter or edit commit descriptions after the `JJ: describe` lines.
JJ: Enter or edit commit descriptions after the `JJ: describe` lines.
JJ: Warning:
JJ: - The text you enter will be lost on a syntax error.
JJ: - The syntax of the separator lines may change in the future.
"#});
for (commit_id, temp_commit) in commits.iter() {
let commit_hash = short_commit_hash(commit_id);

7
cli/tests/test_describe_command.rs
View file

@ -224,6 +224,9 @@ fn test_describe_multiple_commits() {
insta::assert_snapshot!(
std::fs::read_to_string(test_env.env_root().join("editor0")).unwrap(), @r###"
JJ: Enter or edit commit descriptions after the `JJ: describe` lines.
JJ: Warning:
JJ: - The text you enter will be lost on a syntax error.
JJ: - The syntax of the separator lines may change in the future.
JJ: describe 8d650510daad -------
@ -238,6 +241,10 @@ fn test_describe_multiple_commits() {
&edit_script,
indoc! {"
write
JJ: Enter or edit commit descriptions after the `JJ: describe` lines.
JJ: More header tests. Library tests verify parsing in other situations.
JJ: describe 8d650510daad -------
description from editor of @-