ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

tree: leverage Merge::try_map() when reading file contents to merge

Browse source
This commit is contained in:
Martin von Zweigbergk 2023-09-21 11:39:41 -07:00 committed by Martin von Zweigbergk
parent 4974065edb
commit 9946e52fdf
1 changed files with 6 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lib/src/tree.rs
View file

@ -433,9 +433,7 @@ pub fn try_resolve_file_conflict(
executable,
}));
}
let mut removed_contents = vec![];
let mut added_contents = vec![];
for &file_id in file_id_conflict.removes() {
let contents = file_id_conflict.try_map(|&file_id| -> Result<Vec<u8>, TreeMergeError> {
let mut content = vec![];
store
.read_file(filename, file_id)?
@ -444,23 +442,11 @@ pub fn try_resolve_file_conflict(
source: err,
file_id: file_id.clone(),
})?;
removed_contents.push(content);
}
for &file_id in file_id_conflict.adds() {
let mut content = vec![];
store
.read_file(filename, file_id)?
.read_to_end(&mut content)
.map_err(|err| TreeMergeError::ReadError {
source: err,
file_id: file_id.clone(),
})?;
added_contents.push(content);
}
let merge_result = files::merge(
&removed_contents.iter().map(Vec::as_slice).collect_vec(),
&added_contents.iter().map(Vec::as_slice).collect_vec(),
);
Ok(content)
})?;
let removed_contents = contents.removes().iter().map(Vec::as_slice).collect_vec();
let added_contents = contents.adds().iter().map(Vec::as_slice).collect_vec();
let merge_result = files::merge(&removed_contents, &added_contents);
match merge_result {
MergeResult::Resolved(merged_content) => {
let id = store.write_file(filename, &mut merged_content.0.as_slice())?;