mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-12 07:24:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

diff: extract function that maps diff entry to status label and char

Browse source 
I'm going to add diff_entry.status() template method.
This commit is contained in:
Yuya Nishihara 2025-01-24 12:06:23 +09:00
parent e58713c135
commit e21f8e62cb
1 changed files with 27 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
cli/src/diff_util.rs
View file

@ -40,6 +40,7 @@ use jj_lib::conflicts::ConflictMarkerStyle;
use jj_lib::conflicts::MaterializedTreeDiffEntry;
use jj_lib::conflicts::MaterializedTreeValue;
use jj_lib::copies::CopiesTreeDiffEntry;
use jj_lib::copies::CopiesTreeDiffEntryPath;
use jj_lib::copies::CopyOperation;
use jj_lib::copies::CopyRecords;
use jj_lib::diff::find_line_ranges;
@ -1606,30 +1607,39 @@ pub fn show_diff_summary(
async {
while let Some(CopiesTreeDiffEntry { path, values }) = tree_diff.next().await {
let (before, after) = values?;
let before_path = path.source();
let after_path = path.target();
if let Some(op) = path.copy_operation() {
let (label, sigil) = match op {
CopyOperation::Copy => ("copied", "C"),
CopyOperation::Rename => ("renamed", "R"),
};
let path = path_converter.format_copied_path(before_path, after_path);
writeln!(formatter.labeled(label), "{sigil} {path}")?;
let (label, sigil) = diff_status_label_and_char(&path, &before, &after);
let path = if path.copy_operation().is_some() {
path_converter.format_copied_path(path.source(), path.target())
} else {
let path = path_converter.format_file_path(after_path);
match (before.is_present(), after.is_present()) {
(true, true) => writeln!(formatter.labeled("modified"), "M {path}")?,
(false, true) => writeln!(formatter.labeled("added"), "A {path}")?,
(true, false) => writeln!(formatter.labeled("removed"), "D {path}")?,
(false, false) => unreachable!(),
}
}
path_converter.format_file_path(path.target())
};
writeln!(formatter.labeled(label), "{sigil} {path}")?;
}
Ok(())
}
.block_on()
}
fn diff_status_label_and_char(
path: &CopiesTreeDiffEntryPath,
before: &MergedTreeValue,
after: &MergedTreeValue,
) -> (&'static str, char) {
if let Some(op) = path.copy_operation() {
match op {
CopyOperation::Copy => ("copied", 'C'),
CopyOperation::Rename => ("renamed", 'R'),
}
} else {
match (before.is_present(), after.is_present()) {
(true, true) => ("modified", 'M'),
(false, true) => ("added", 'A'),
(true, false) => ("removed", 'D'),
(false, false) => panic!("values pair must differ"),
}
}
}
#[derive(Clone, Debug, Default, Eq, PartialEq)]
pub struct DiffStatOptions {
/// How lines are tokenized and compared.