mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-01 00:50:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

files: use Merge constructor to interleave conflicting diff parts

Browse source 
Since we build a temporary Vec<_> anyway, we can just rely on the Merge API.
This commit is contained in:
Yuya Nishihara 2025-01-09 10:30:19 +09:00
parent 3d4b5e45e7
commit 3fbf1249f9
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/src/files.rs
View file

@ -26,7 +26,6 @@ use itertools::Itertools;
use crate::diff::Diff;
use crate::diff::DiffHunk;
use crate::diff::DiffHunkKind;
use crate::merge::trivial_merge;
use crate::merge::Merge;
/// A diff line which may contain small hunks originating from both sides.
@ -213,20 +212,18 @@ fn merge_hunks(diff: &Diff, num_diffs: usize) -> MergeResult {
resolved_hunk.extend_from_slice(diff_hunk.contents[0]);
}
DiffHunkKind::Different => {
let parts = &diff_hunk.contents;
let interleaved =
itertools::interleave(&parts[num_diffs..], &parts[..num_diffs]).collect_vec();
if let Some(resolved) = trivial_merge(&interleaved) {
let merge = Merge::from_removes_adds(
diff_hunk.contents[..num_diffs].iter().copied(),
diff_hunk.contents[num_diffs..].iter().copied(),
);
if let Some(resolved) = merge.resolve_trivial() {
resolved_hunk.extend_from_slice(resolved);
} else {
if !resolved_hunk.is_empty() {
merge_hunks.push(Merge::resolved(resolved_hunk));
resolved_hunk = BString::new(vec![]);
}
merge_hunks.push(Merge::from_removes_adds(
parts[..num_diffs].iter().copied().map(BString::from),
parts[num_diffs..].iter().copied().map(BString::from),
));
merge_hunks.push(merge.map(|&s| s.to_owned()));
}
}
}