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

diff: also show diff of executable files if executableness unchanged

Browse source
This commit is contained in:
Martin von Zweigbergk 2021-03-31 22:09:25 -07:00
parent 69659ec490
commit ec68842a59
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/commands.rs
View file

@ -797,15 +797,22 @@ fn cmd_diff(
TreeValueDiff::Modified(
TreeValue::Normal {
id: id_left,
executable: false,
executable: left_executable,
},
TreeValue::Normal {
id: id_right,
executable: false,
executable: right_executable,
},
) => {
) if left_executable == right_executable => {
styler.add_label(String::from("header"));
styler.write_str(&format!("modified file {}:\n", path.to_internal_string()));
if *left_executable {
styler.write_str(&format!(
"modified executable file {}:\n",
path.to_internal_string()
));
} else {
styler.write_str(&format!("modified file {}:\n", path.to_internal_string()));
}
styler.remove_label();
let mut file_reader_left = repo.store().read_file(path, id_left).unwrap();