mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-11 06:42:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 19

diff_utils: pass tree value into diff_content() by value

Browse source 
Avoids a few calls to `.clone()`.
This commit is contained in:
Martin von Zweigbergk 2023-11-08 13:24:12 -08:00 committed by Martin von Zweigbergk
parent 9b24d24612
commit b11f7eee1b
1 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
cli/src/diff_util.rs
View file

@ -26,7 +26,7 @@ use jj_lib::conflicts::{materialize_tree_value, MaterializedTreeValue};
use jj_lib::diff::{Diff, DiffHunk}; use jj_lib::diff::{Diff, DiffHunk};
use jj_lib::files::DiffLine; use jj_lib::files::DiffLine;
use jj_lib::matchers::Matcher; use jj_lib::matchers::Matcher;
use jj_lib::merge::{Merge, MergedTreeValue}; use jj_lib::merge::MergedTreeValue;
use jj_lib::merged_tree::{MergedTree, TreeDiffStream}; use jj_lib::merged_tree::{MergedTree, TreeDiffStream};
use jj_lib::repo::{ReadonlyRepo, Repo}; use jj_lib::repo::{ReadonlyRepo, Repo};
use jj_lib::repo_path::RepoPath; use jj_lib::repo_path::RepoPath;
@ -347,9 +347,9 @@ fn show_color_words_diff_line(
fn diff_content( fn diff_content(
repo: &Arc<ReadonlyRepo>, repo: &Arc<ReadonlyRepo>,
path: &RepoPath, path: &RepoPath,
value: &MergedTreeValue, value: MergedTreeValue,
) -> Result<Vec<u8>, CommandError> { ) -> Result<Vec<u8>, CommandError> {
let materialized = materialize_tree_value(repo.store(), path, value.clone()).block_on()?; let materialized = materialize_tree_value(repo.store(), path, value).block_on()?;
match materialized { match materialized {
MaterializedTreeValue::Absent => Ok(vec![]), MaterializedTreeValue::Absent => Ok(vec![]),
MaterializedTreeValue::File { mut reader, .. } => { MaterializedTreeValue::File { mut reader, .. } => {
@ -402,50 +402,48 @@ pub fn show_color_words_diff(
let ui_path = workspace_command.format_file_path(&path); let ui_path = workspace_command.format_file_path(&path);
let (left_value, right_value) = diff?; let (left_value, right_value) = diff?;
if left_value.is_absent() { if left_value.is_absent() {
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);
writeln!( writeln!(
formatter.labeled("header"), formatter.labeled("header"),
"Added {description} {ui_path}:" "Added {description} {ui_path}:"
)?; )?;
let right_content = diff_content(repo, &path, right_value)?;
if right_content.is_empty() { if right_content.is_empty() {
writeln!(formatter.labeled("empty"), " (empty)")?; writeln!(formatter.labeled("empty"), " (empty)")?;
} else { } else {
show_color_words_diff_hunks(&[], &right_content, formatter)?; show_color_words_diff_hunks(&[], &right_content, formatter)?;
} }
} else if right_value.is_present() { } else if right_value.is_present() {
let left_content = diff_content(repo, &path, &left_value)?; let description = match (left_value.as_resolved(), right_value.as_resolved()) {
let right_content = diff_content(repo, &path, &right_value)?;
let description = match (left_value.into_resolved(), right_value.into_resolved()) {
( (
Ok(Some(TreeValue::File { Some(Some(TreeValue::File {
executable: left_executable, executable: left_executable,
.. ..
})), })),
Ok(Some(TreeValue::File { Some(Some(TreeValue::File {
executable: right_executable, executable: right_executable,
.. ..
})), })),
) => { ) => {
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 at".to_string() "Executable file became non-executable at".to_string()
} else if right_executable { } else if *right_executable {
"Non-executable file became executable at".to_string() "Non-executable file became executable at".to_string()
} else { } else {
"Modified regular file".to_string() "Modified regular file".to_string()
} }
} }
(Err(_), Err(_)) => "Modified conflict in".to_string(), (None, None) => "Modified conflict in".to_string(),
(Err(_), _) => "Resolved conflict in".to_string(), (None, _) => "Resolved conflict in".to_string(),
(_, Err(_)) => "Created conflict in".to_string(), (_, None) => "Created conflict in".to_string(),
(Ok(Some(TreeValue::Symlink(_))), Ok(Some(TreeValue::Symlink(_)))) => { (Some(Some(TreeValue::Symlink(_))), Some(Some(TreeValue::Symlink(_)))) => {
"Symlink target changed at".to_string() "Symlink target changed at".to_string()
} }
(Ok(left_value), Ok(right_value)) => { (Some(_), Some(_)) => {
let left_type = basic_diff_file_type(&Merge::resolved(left_value)); let left_type = basic_diff_file_type(&left_value);
let right_type = basic_diff_file_type(&Merge::resolved(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 {} at", "{}{} became {} at",
@ -455,15 +453,17 @@ pub fn show_color_words_diff(
) )
} }
}; };
let left_content = diff_content(repo, &path, left_value)?;
let right_content = diff_content(repo, &path, right_value)?;
writeln!(formatter.labeled("header"), "{description} {ui_path}:")?; writeln!(formatter.labeled("header"), "{description} {ui_path}:")?;
show_color_words_diff_hunks(&left_content, &right_content, formatter)?; show_color_words_diff_hunks(&left_content, &right_content, formatter)?;
} else { } else {
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);
writeln!( writeln!(
formatter.labeled("header"), formatter.labeled("header"),
"Removed {description} {ui_path}:" "Removed {description} {ui_path}:"
)?; )?;
let left_content = diff_content(repo, &path, left_value)?;
if left_content.is_empty() { if left_content.is_empty() {
writeln!(formatter.labeled("empty"), " (empty)")?; writeln!(formatter.labeled("empty"), " (empty)")?;
} else { } else {
@ -819,8 +819,8 @@ pub fn show_diff_stat(
while let Some((repo_path, diff)) = tree_diff.next().await { while let Some((repo_path, diff)) = tree_diff.next().await {
let (left, right) = diff?; let (left, right) = diff?;
let path = workspace_command.format_file_path(&repo_path); let path = workspace_command.format_file_path(&repo_path);
let left_content = diff_content(workspace_command.repo(), &repo_path, &left)?; let left_content = diff_content(workspace_command.repo(), &repo_path, left)?;
let right_content = diff_content(workspace_command.repo(), &repo_path, &right)?; let right_content = diff_content(workspace_command.repo(), &repo_path, right)?;
max_path_width = max(max_path_width, path.width()); max_path_width = max(max_path_width, path.width());
let stat = get_diff_stat(path, &left_content, &right_content); let stat = get_diff_stat(path, &left_content, &right_content);
max_diffs = max(max_diffs, stat.added + stat.removed); max_diffs = max(max_diffs, stat.added + stat.removed);