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

diff-editor: pass reference to store into apply_diff_builtin()

Browse source 
It's cheap to copy an `Arc` and it's simpler to pass just a reference.
This commit is contained in:
Martin von Zweigbergk 2024-06-09 18:23:18 -07:00 committed by Martin von Zweigbergk
parent b8d0cf31b8
commit 6a57fa969d
1 changed files with 16 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
cli/src/merge_tools/builtin.rs
View file

@ -419,7 +419,7 @@ pub fn make_diff_files(
} }
pub fn apply_diff_builtin( pub fn apply_diff_builtin(
store: Arc<Store>, store: &Arc<Store>,
left_tree: &MergedTree, left_tree: &MergedTree,
right_tree: &MergedTree, right_tree: &MergedTree,
changed_files: Vec<RepoPathBuf>, changed_files: Vec<RepoPathBuf>,
@ -513,7 +513,7 @@ pub fn edit_diff_builtin(
&mut input, &mut input,
); );
let result = recorder.run().map_err(BuiltinToolError::Record)?; let result = recorder.run().map_err(BuiltinToolError::Record)?;
let tree_id = apply_diff_builtin(store, left_tree, right_tree, changed_files, &result.files) let tree_id = apply_diff_builtin(&store, left_tree, right_tree, changed_files, &result.files)
.map_err(BuiltinToolError::BackendError)?; .map_err(BuiltinToolError::BackendError)?;
Ok(tree_id) Ok(tree_id)
} }
@ -624,14 +624,8 @@ pub fn edit_merge_builtin(
let state = recorder.run()?; let state = recorder.run()?;
let file = state.files.into_iter().exactly_one().unwrap(); let file = state.files.into_iter().exactly_one().unwrap();
apply_diff_builtin( apply_diff_builtin(tree.store(), tree, tree, vec![path.to_owned()], &[file])
tree.store().clone(), .map_err(BuiltinToolError::BackendError)
tree,
tree,
vec![path.to_owned()],
&[file],
)
.map_err(BuiltinToolError::BackendError)
} }
#[cfg(test)] #[cfg(test)]
@ -767,7 +761,7 @@ mod tests {
"###); "###);
let no_changes_tree_id = apply_diff_builtin( let no_changes_tree_id = apply_diff_builtin(
store.clone(), store,
&left_tree, &left_tree,
&right_tree, &right_tree,
changed_files.clone(), changed_files.clone(),
@ -785,14 +779,8 @@ mod tests {
for file in files.iter_mut() { for file in files.iter_mut() {
file.toggle_all(); file.toggle_all();
} }
let all_changes_tree_id = apply_diff_builtin( let all_changes_tree_id =
store.clone(), apply_diff_builtin(store, &left_tree, &right_tree, changed_files, &files).unwrap();
&left_tree,
&right_tree,
changed_files,
&files,
)
.unwrap();
let all_changes_tree = store.get_root_tree(&all_changes_tree_id).unwrap(); let all_changes_tree = store.get_root_tree(&all_changes_tree_id).unwrap();
assert_eq!( assert_eq!(
all_changes_tree.id(), all_changes_tree.id(),
@ -837,7 +825,7 @@ mod tests {
] ]
"###); "###);
let no_changes_tree_id = apply_diff_builtin( let no_changes_tree_id = apply_diff_builtin(
store.clone(), store,
&left_tree, &left_tree,
&right_tree, &right_tree,
changed_files.clone(), changed_files.clone(),
@ -855,14 +843,8 @@ mod tests {
for file in files.iter_mut() { for file in files.iter_mut() {
file.toggle_all(); file.toggle_all();
} }
let all_changes_tree_id = apply_diff_builtin( let all_changes_tree_id =
store.clone(), apply_diff_builtin(store, &left_tree, &right_tree, changed_files, &files).unwrap();
&left_tree,
&right_tree,
changed_files,
&files,
)
.unwrap();
let all_changes_tree = store.get_root_tree(&all_changes_tree_id).unwrap(); let all_changes_tree = store.get_root_tree(&all_changes_tree_id).unwrap();
assert_eq!( assert_eq!(
all_changes_tree.id(), all_changes_tree.id(),
@ -907,7 +889,7 @@ mod tests {
] ]
"###); "###);
let no_changes_tree_id = apply_diff_builtin( let no_changes_tree_id = apply_diff_builtin(
store.clone(), store,
&left_tree, &left_tree,
&right_tree, &right_tree,
changed_files.clone(), changed_files.clone(),
@ -925,14 +907,8 @@ mod tests {
for file in files.iter_mut() { for file in files.iter_mut() {
file.toggle_all(); file.toggle_all();
} }
let all_changes_tree_id = apply_diff_builtin( let all_changes_tree_id =
store.clone(), apply_diff_builtin(store, &left_tree, &right_tree, changed_files, &files).unwrap();
&left_tree,
&right_tree,
changed_files,
&files,
)
.unwrap();
let all_changes_tree = store.get_root_tree(&all_changes_tree_id).unwrap(); let all_changes_tree = store.get_root_tree(&all_changes_tree_id).unwrap();
assert_eq!( assert_eq!(
all_changes_tree.id(), all_changes_tree.id(),
@ -978,7 +954,7 @@ mod tests {
] ]
"###); "###);
let no_changes_tree_id = apply_diff_builtin( let no_changes_tree_id = apply_diff_builtin(
store.clone(), store,
&left_tree, &left_tree,
&right_tree, &right_tree,
changed_files.clone(), changed_files.clone(),
@ -996,14 +972,8 @@ mod tests {
for file in files.iter_mut() { for file in files.iter_mut() {
file.toggle_all(); file.toggle_all();
} }
let all_changes_tree_id = apply_diff_builtin( let all_changes_tree_id =
store.clone(), apply_diff_builtin(store, &left_tree, &right_tree, changed_files, &files).unwrap();
&left_tree,
&right_tree,
changed_files,
&files,
)
.unwrap();
let all_changes_tree = store.get_root_tree(&all_changes_tree_id).unwrap(); let all_changes_tree = store.get_root_tree(&all_changes_tree_id).unwrap();
assert_eq!( assert_eq!(
all_changes_tree.id(), all_changes_tree.id(),