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

merge_tools: use left_file_mode in make_diff_files

Browse source 
The `scm-record` library comments say that the `file_mode` is:
> The Unix file mode of the file (before any changes), if available.

This reverts commit ffd6884 and fixes #2591 and #2548.
This commit is contained in:
Łukasz Kurowski 2023-11-18 04:41:28 +01:00 committed by Łukasz Kurowski
parent 0357915778
commit e21ffb0139
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cli/src/merge_tools/builtin.rs
View file

@ -350,7 +350,7 @@ pub fn make_diff_files(
files.push(scm_record::File { files.push(scm_record::File {
old_path: None, old_path: None,
path: Cow::Owned(changed_path.to_fs_path(Path::new(""))), path: Cow::Owned(changed_path.to_fs_path(Path::new(""))),
file_mode: Some(right_file_mode), file_mode: Some(left_file_mode),
sections, sections,
}); });
} }
@ -654,7 +654,7 @@ mod tests {
path: "added", path: "added",
file_mode: Some( file_mode: Some(
FileMode( FileMode(
33188, 0,
), ),
), ),
sections: [ sections: [