From e4b0e629c9eed9e9318c6edfa127bfed52746c0d Mon Sep 17 00:00:00 2001 From: Yuya Nishihara Date: Mon, 6 Nov 2023 16:28:44 +0900 Subject: [PATCH] merge_tools: borrow file contents without consuming Merge object --- cli/src/merge_tools/external.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cli/src/merge_tools/external.rs b/cli/src/merge_tools/external.rs index a1d53374a..beb868882 100644 --- a/cli/src/merge_tools/external.rs +++ b/cli/src/merge_tools/external.rs @@ -307,12 +307,12 @@ pub fn run_mergetool_external( } else { vec![] }; - let (mut removes, mut adds) = content.take(); - let files: HashMap<&str, _> = maplit::hashmap! { - "base" => removes.pop().unwrap().0, - "right" => adds.pop().unwrap().0, - "left" => adds.pop().unwrap().0, - "output" => initial_output_content.clone(), + assert_eq!(content.num_sides(), 2); + let files: HashMap<&str, &[u8]> = maplit::hashmap! { + "base" => content.get_remove(0).unwrap().0.as_slice(), + "left" => content.get_add(0).unwrap().0.as_slice(), + "right" => content.get_add(1).unwrap().0.as_slice(), + "output" => initial_output_content.as_slice(), }; let temp_dir = new_utf8_temp_dir("jj-resolve-").map_err(ExternalToolError::SetUpDir)?;