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

conflicts: extract function that materializes file conflict

Browse source 
This will be used in "jj resolve".
This commit is contained in:
Yuya Nishihara 2025-04-11 00:05:18 +09:00
parent f047addfe0
commit a856494ab4
1 changed files with 28 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

47
lib/src/conflicts.rs
View file

@ -225,28 +225,37 @@ async fn materialize_tree_value_no_access_denied(
Ok(Some(TreeValue::Conflict(_))) => {
panic!("cannot materialize legacy conflict object at path {path:?}");
}
Err(conflict) => {
let Some(file_merge) = conflict.to_file_merge() else {
return Ok(MaterializedTreeValue::OtherConflict { id: conflict });
};
let file_merge = file_merge.simplify();
let contents = extract_as_single_hunk(&file_merge, store, path).await?;
let executable = if let Some(merge) = conflict.to_executable_merge() {
merge.resolve_trivial().copied().unwrap_or_default()
} else {
false
};
Ok(MaterializedTreeValue::FileConflict(
MaterializedFileConflictValue {
ids: file_merge,
contents,
executable,
},
))
}
Err(conflict) => match try_materialize_file_conflict_value(store, path, &conflict).await? {
Some(file) => Ok(MaterializedTreeValue::FileConflict(file)),
None => Ok(MaterializedTreeValue::OtherConflict { id: conflict }),
},
}
}
/// Suppose `conflict` contains only files or absent entries, reads the file
/// contents.
async fn try_materialize_file_conflict_value(
store: &Store,
path: &RepoPath,
conflict: &MergedTreeValue,
) -> BackendResult<Option<MaterializedFileConflictValue>> {
let Some(unsimplified_ids) = conflict.to_file_merge() else {
return Ok(None);
};
let ids = unsimplified_ids.simplify();
let contents = extract_as_single_hunk(&ids, store, path).await?;
let executable = if let Some(merge) = conflict.to_executable_merge() {
merge.resolve_trivial().copied().unwrap_or_default()
} else {
false
};
Ok(Some(MaterializedFileConflictValue {
ids,
contents,
executable,
}))
}
/// Describes what style should be used when materializing conflicts.
#[derive(Clone, Copy, PartialEq, Eq, Debug, Default, serde::Deserialize)]
#[serde(rename_all = "kebab-case")]