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

merge_tools: borrow file contents without consuming Merge object

Browse source
This commit is contained in:
Yuya Nishihara 2023-11-06 16:28:44 +09:00
parent 895bbce8c0
commit e4b0e629c9
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cli/src/merge_tools/external.rs
View file

@ -307,12 +307,12 @@ pub fn run_mergetool_external(
} else { } else {
vec![] vec![]
}; };
let (mut removes, mut adds) = content.take(); assert_eq!(content.num_sides(), 2);
let files: HashMap<&str, _> = maplit::hashmap! { let files: HashMap<&str, &[u8]> = maplit::hashmap! {
"base" => removes.pop().unwrap().0, "base" => content.get_remove(0).unwrap().0.as_slice(),
"right" => adds.pop().unwrap().0, "left" => content.get_add(0).unwrap().0.as_slice(),
"left" => adds.pop().unwrap().0, "right" => content.get_add(1).unwrap().0.as_slice(),
"output" => initial_output_content.clone(), "output" => initial_output_content.as_slice(),
}; };
let temp_dir = new_utf8_temp_dir("jj-resolve-").map_err(ExternalToolError::SetUpDir)?; let temp_dir = new_utf8_temp_dir("jj-resolve-").map_err(ExternalToolError::SetUpDir)?;