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

cli: allow any number of trailing dashes in "JJ: describe" line

Browse source 
Because a line without " -------" is allowed, it makes sense to strip other
variants like " --".
This commit is contained in:
Yuya Nishihara 2024-08-05 20:29:04 +09:00
parent fb3e120092
commit 0b1a6cd9e0
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cli/src/description_util.rs
View file

@ -121,7 +121,8 @@ where
let mut messages: Vec<(&str, Vec<&str>)> = vec![]; let mut messages: Vec<(&str, Vec<&str>)> = vec![];
for line in message.lines() { for line in message.lines() {
if let Some(commit_id_prefix) = line.strip_prefix("JJ: describe ") { if let Some(commit_id_prefix) = line.strip_prefix("JJ: describe ") {
let commit_id_prefix = commit_id_prefix.trim_end_matches(" -------"); let commit_id_prefix =
commit_id_prefix.trim_end_matches(|c: char| c.is_ascii_whitespace() || c == '-');
messages.push((commit_id_prefix, vec![])); messages.push((commit_id_prefix, vec![]));
} else if let Some((_, lines)) = messages.last_mut() { } else if let Some((_, lines)) = messages.last_mut() {
lines.push(line); lines.push(line);
@ -257,12 +258,16 @@ mod tests {
JJ: describe 1 ------- JJ: describe 1 -------
Description 1 Description 1
JJ: describe 2 ------- JJ: describe 2
Description 2 Description 2
JJ: describe 3 --
Description 3
"}, "},
&indexmap! { &indexmap! {
"1".to_string() => &1, "1".to_string() => &1,
"2".to_string() => &2, "2".to_string() => &2,
"3".to_string() => &3,
}, },
) )
.unwrap(); .unwrap();
@ -271,6 +276,7 @@ mod tests {
hashmap! { hashmap! {
1 => "Description 1\n".to_string(), 1 => "Description 1\n".to_string(),
2 => "Description 2\n".to_string(), 2 => "Description 2\n".to_string(),
3 => "Description 3\n".to_string(),
} }
); );
assert!(result.missing.is_empty()); assert!(result.missing.is_empty());