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

cli: remove "at" from "Modified file at README" etc.

Browse source 
This patch changes the preposition depending on the case and removes
it in most cases.
This commit is contained in:
Martin von Zweigbergk 2021-10-22 12:41:44 -07:00
parent 709b2e85c2
commit 5098270640
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/commands.rs
View file

@ -1617,7 +1617,7 @@ fn show_color_words_diff(
let right_content = diff_content(repo, &path, &right_value)?; let right_content = diff_content(repo, &path, &right_value)?;
let description = basic_diff_file_type(&right_value); let description = basic_diff_file_type(&right_value);
formatter.add_label(String::from("header"))?; formatter.add_label(String::from("header"))?;
formatter.write_str(&format!("Added {} at {}:\n", description, ui_path))?; formatter.write_str(&format!("Added {} {}:\n", description, ui_path))?;
formatter.remove_label()?; formatter.remove_label()?;
show_color_words_diff_hunks(&[], &right_content, formatter.as_mut())?; show_color_words_diff_hunks(&[], &right_content, formatter.as_mut())?;
} }
@ -1638,27 +1638,27 @@ fn show_color_words_diff(
if left_executable && right_executable { if left_executable && right_executable {
"Modified executable file".to_string() "Modified executable file".to_string()
} else if left_executable { } else if left_executable {
"Executable file became non-executable".to_string() "Executable file became non-executable at".to_string()
} else if right_executable { } else if right_executable {
"Non-executable file became executable".to_string() "Non-executable file became executable at".to_string()
} else { } else {
"Modified regular file".to_string() "Modified regular file".to_string()
} }
} }
(TreeValue::Conflict(_), TreeValue::Conflict(_)) => { (TreeValue::Conflict(_), TreeValue::Conflict(_)) => {
"Modified conflict".to_string() "Modified conflict in".to_string()
} }
(TreeValue::Conflict(_), _) => "Resolved conflict".to_string(), (TreeValue::Conflict(_), _) => "Resolved conflict in".to_string(),
(_, TreeValue::Conflict(_)) => "Created conflict".to_string(), (_, TreeValue::Conflict(_)) => "Created conflict in".to_string(),
(TreeValue::Symlink(_), TreeValue::Symlink(_)) => { (TreeValue::Symlink(_), TreeValue::Symlink(_)) => {
"Symlink target changed".to_string() "Symlink target changed at".to_string()
} }
(left_value, right_value) => { (left_value, right_value) => {
let left_type = basic_diff_file_type(&left_value); let left_type = basic_diff_file_type(&left_value);
let right_type = basic_diff_file_type(&right_value); let right_type = basic_diff_file_type(&right_value);
let (first, rest) = left_type.split_at(1); let (first, rest) = left_type.split_at(1);
format!( format!(
"{}{} became {}", "{}{} became {} at",
first.to_ascii_uppercase(), first.to_ascii_uppercase(),
rest, rest,
right_type right_type
@ -1666,7 +1666,7 @@ fn show_color_words_diff(
} }
}; };
formatter.add_label(String::from("header"))?; formatter.add_label(String::from("header"))?;
formatter.write_str(&format!("{} at {}:\n", description, ui_path))?; formatter.write_str(&format!("{} {}:\n", description, ui_path))?;
formatter.remove_label()?; formatter.remove_label()?;
show_color_words_diff_hunks(&left_content, &right_content, formatter.as_mut())?; show_color_words_diff_hunks(&left_content, &right_content, formatter.as_mut())?;
} }
@ -1674,7 +1674,7 @@ fn show_color_words_diff(
let left_content = diff_content(repo, &path, &left_value)?; let left_content = diff_content(repo, &path, &left_value)?;
let description = basic_diff_file_type(&left_value); let description = basic_diff_file_type(&left_value);
formatter.add_label(String::from("header"))?; formatter.add_label(String::from("header"))?;
formatter.write_str(&format!("Removed {} at {}:\n", description, ui_path))?; formatter.write_str(&format!("Removed {} {}:\n", description, ui_path))?;
formatter.remove_label()?; formatter.remove_label()?;
show_color_words_diff_hunks(&left_content, &[], formatter.as_mut())?; show_color_words_diff_hunks(&left_content, &[], formatter.as_mut())?;
} }