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

merge_tools: postpone writing conflict object a little longer

Browse source 
This gets us a tiny bit closer to being able to write tree-level
conflicts in this code.
This commit is contained in:
Martin von Zweigbergk 2023-08-11 15:14:35 -07:00 committed by Martin von Zweigbergk
parent 4c46398b1c
commit 3b164c69a2
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
cli/src/merge_tools.rs
View file

@ -26,6 +26,7 @@ use jj_lib::conflicts;
use jj_lib::conflicts::{extract_as_single_hunk, materialize_merge_result};
use jj_lib::gitignore::GitIgnoreFile;
use jj_lib::matchers::{EverythingMatcher, Matcher};
use jj_lib::merge::Merge;
use jj_lib::repo_path::RepoPath;
use jj_lib::settings::{ConfigResultExt as _, UserSettings};
use jj_lib::store::Store;
@ -323,29 +324,30 @@ pub fn run_mergetool(
return Err(ConflictResolveError::EmptyOrUnchanged);
}
let mut new_tree_value: Option<TreeValue> = None;
if editor.merge_tool_edits_conflict_markers {
let new_file_ids = conflicts::update_from_content(
let new_file_ids = if editor.merge_tool_edits_conflict_markers {
conflicts::update_from_content(
&file_merge,
tree.store(),
repo_path,
output_file_contents.as_slice(),
)?;
if !new_file_ids.is_resolved() {
let new_conflict = conflict.with_new_file_ids(&new_file_ids);
let new_conflict_id = tree.store().write_conflict(repo_path, &new_conflict)?;
new_tree_value = Some(TreeValue::Conflict(new_conflict_id));
}
}
let new_tree_value = new_tree_value.unwrap_or({
)?
} else {
let new_file_id = tree
.store()
.write_file(repo_path, &mut output_file_contents.as_slice())?;
TreeValue::File {
id: new_file_id,
Merge::normal(new_file_id)
};
let new_tree_value = match new_file_ids.into_resolved() {
Ok(new_file_id) => TreeValue::File {
id: new_file_id.unwrap(),
executable: false,
},
Err(new_file_ids) => {
let new_conflict = conflict.with_new_file_ids(&new_file_ids);
let new_conflict_id = tree.store().write_conflict(repo_path, &new_conflict)?;
TreeValue::Conflict(new_conflict_id)
}
});
};
let mut tree_builder = tree.store().tree_builder(tree.id().clone());
tree_builder.set(repo_path.clone(), new_tree_value);
Ok(tree_builder.write_tree())