martinvonz/jj
1
1
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2024-09-11 13:56:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

diff: add headers to file-by-file mode

Browse Source
This commit is contained in:
Matt Kulukundis 2024-06-30 15:02:33 -04:00
parent 6ffe05290d
commit 32f2e22c1c
2 changed files with 55 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
cli/src/diff_util.rs
View File

@ -30,7 +30,7 @@ use jj_lib::merge::MergedTreeValue;
use jj_lib::merged_tree::{MergedTree, TreeDiffStream};
use jj_lib::object_id::ObjectId;
use jj_lib::repo::Repo;
use jj_lib::repo_path::{RepoPath, RepoPathUiConverter};
use jj_lib::repo_path::{RepoPath, RepoPathBuf, RepoPathUiConverter};
use jj_lib::settings::{ConfigResultExt as _, UserSettings};
use jj_lib::store::Store;
use jj_lib::{diff, files};
@ -684,11 +684,15 @@ pub fn show_file_by_file_diff(
let left_wc_dir = temp_dir.path().join("left");
let right_wc_dir = temp_dir.path().join("right");
let mut diff_stream = materialized_diff_stream(store, tree_diff);
let mut items: Vec<(
String,
RepoPathBuf,
(MaterializedTreeValue, MaterializedTreeValue),
)> = Vec::new();
async {
while let Some((path, diff)) = diff_stream.next().await {
let ui_path = path_converter.format_file_path(&path);
let (left_value, right_value) = diff?;
match (&left_value, &right_value) {
(_, MaterializedTreeValue::AccessDenied(source))
| (MaterializedTreeValue::AccessDenied(source), _) => {
@ -699,25 +703,39 @@ pub fn show_file_by_file_diff(
writeln!(formatter, " {source}")?;
continue;
}
_ => {}
_ => {
items.push((ui_path, path, (left_value, right_value)));
}
}
let left_path = create_file(&path, &left_wc_dir, left_value)?;
let right_path = create_file(&path, &right_wc_dir, right_value)?;
invoke_external_diff(
ui,
formatter.raw(),
tool,
&maplit::hashmap! {
"left" => left_path.to_str().expect("temp_dir should be valid utf-8"),
"right" => right_path.to_str().expect("temp_dir should be valid utf-8"),
},
)
.map_err(DiffRenderError::DiffGenerate)?;
}
Ok::<(), DiffRenderError>(())
}
.block_on()
.block_on()?;
let num_items = items.len();
for (idx, (ui_path, path, (left_value, right_value))) in items.into_iter().enumerate() {
if idx > 0 {
writeln!(formatter.labeled("header"))?;
}
writeln!(
formatter.labeled("header"),
"JJ (#{} of {}): comparing {ui_path}",
idx + 1,
num_items,
)?;
let left_path = create_file(&path, &left_wc_dir, left_value)?;
let right_path = create_file(&path, &right_wc_dir, right_value)?;
invoke_external_diff(
ui,
formatter.raw(),
tool,
&maplit::hashmap! {
"left" => left_path.to_str().expect("temp_dir should be valid utf-8"),
"right" => right_path.to_str().expect("temp_dir should be valid utf-8"),
},
)
.map_err(DiffRenderError::DiffGenerate)?;
}
Ok(())
}
struct GitDiffPart {

20
cli/tests/test_diff_command.rs
View File

@ -1282,14 +1282,20 @@ fn test_diff_external_file_by_file_tool() {
// diff without file patterns
insta::assert_snapshot!(
test_env.jj_cmd_success(&repo_path, &["diff", config]), @r###"
JJ (#1 of 3): comparing file1
==
file1
--
file1
JJ (#2 of 3): comparing file2
==
file2
--
file2
JJ (#3 of 3): comparing file3
==
file3
--
@ -1299,6 +1305,7 @@ fn test_diff_external_file_by_file_tool() {
// diff with file patterns
insta::assert_snapshot!(
test_env.jj_cmd_success(&repo_path, &["diff", config, "file1"]), @r###"
JJ (#1 of 1): comparing file1
==
file1
--
@ -1309,24 +1316,32 @@ fn test_diff_external_file_by_file_tool() {
test_env.jj_cmd_success(&repo_path, &["log", "-p", config]), @r###"
@ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 39d9055d
│ (no description set)
│ JJ (#1 of 3): comparing file1
│ ==
│ file1
│ --
│ file1
│
│ JJ (#2 of 3): comparing file2
│ ==
│ file2
│ --
│ file2
│
│ JJ (#3 of 3): comparing file3
│ ==
│ file3
│ --
│ file3
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 0ad4ef22
│ (no description set)
│ JJ (#1 of 2): comparing file1
│ ==
│ file1
│ --
│ file1
│
│ JJ (#2 of 2): comparing file2
│ ==
│ file2
│ --
@ -1343,14 +1358,19 @@ fn test_diff_external_file_by_file_tool() {
(no description set)
JJ (#1 of 3): comparing file1
==
file1
--
file1
JJ (#2 of 3): comparing file2
==
file2
--
file2
JJ (#3 of 3): comparing file3
==
file3
--