cybercyst/jj
1
0
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2025-05-16 20:54:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

annotate: omit building intermediate same_line_map

Browse Source 
Perhaps, get_same_line_map() could return an iterator, but implementing an
iterator to be "pull"-ed is much harder than writing a function to "push",
especially when lifetime is involved.
This commit is contained in:
Yuya Nishihara 2024-10-26 22:22:19 +09:00
parent 0eedc0cbae
commit 1fd628a0cf
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lib/src/annotate.rs
View File

@ -194,16 +194,20 @@ fn process_commit(
// commit B. Then, we update local line_map to say that "Commit B line 6 // commit B. Then, we update local line_map to say that "Commit B line 6
// goes to line 7 of the original file". We repeat this for all lines in // goes to line 7 of the original file". We repeat this for all lines in
// common in the two commits. // common in the two commits.
let same_line_map = get_same_line_map(&current_source.text, &parent_source.text); copy_same_lines_with(
for (current_line_number, parent_line_number) in same_line_map { &current_source.text,
let Some(original_line_number) = current_source.line_map.remove(&current_line_number) &parent_source.text,
else { |current_line_number, parent_line_number| {
continue; let Some(original_line_number) =
}; current_source.line_map.remove(&current_line_number)
parent_source else {
.line_map return;
.insert(parent_line_number, original_line_number); };
} parent_source
.line_map
.insert(parent_line_number, original_line_number);
},
);
if parent_source.line_map.is_empty() { if parent_source.line_map.is_empty() {
commit_source_map.remove(parent_commit_id); commit_source_map.remove(parent_commit_id);
} }
@ -219,9 +223,13 @@ fn process_commit(
Ok(()) Ok(())
} }
/// For two files, get a map of all lines in common (e.g. line 8 maps to line 9) /// For two files, calls `copy(current, parent)` for each line in common
fn get_same_line_map(current_contents: &[u8], parent_contents: &[u8]) -> HashMap<usize, usize> { /// (e.g. line 8 maps to line 9)
let mut result_map = HashMap::new(); fn copy_same_lines_with(
current_contents: &[u8],
parent_contents: &[u8],
mut copy: impl FnMut(usize, usize),
) {
let diff = Diff::by_line([current_contents, parent_contents]); let diff = Diff::by_line([current_contents, parent_contents]);
let mut current_line_counter: usize = 0; let mut current_line_counter: usize = 0;
let mut parent_line_counter: usize = 0; let mut parent_line_counter: usize = 0;
@ -229,7 +237,7 @@ fn get_same_line_map(current_contents: &[u8], parent_contents: &[u8]) -> HashMap
match hunk.kind { match hunk.kind {
DiffHunkKind::Matching => { DiffHunkKind::Matching => {
for _ in hunk.contents[0].split_inclusive(|b| *b == b'\n') { for _ in hunk.contents[0].split_inclusive(|b| *b == b'\n') {
result_map.insert(current_line_counter, parent_line_counter); copy(current_line_counter, parent_line_counter);
current_line_counter += 1; current_line_counter += 1;
parent_line_counter += 1; parent_line_counter += 1;
} }
@ -242,8 +250,6 @@ fn get_same_line_map(current_contents: &[u8], parent_contents: &[u8]) -> HashMap
} }
} }
} }
result_map
} }
fn get_file_contents( fn get_file_contents(