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

working_copy: move writing of conflicts to receiver side of channel

Browse source 
When writing tree-level conflicts, we're going to be writing multiple
tree (maybe using some new `MergedTreeBuilder`), so we'll need the
full `Merge<Option<TreeValue>>` object. This gets us closer to that by
sending such objects over the channel and having the receiver write
the conflict object.

Note that we still sometimes send `TreeValue::Conflict` variants over
the channel. That only happens if they're unchanged.
This commit is contained in:
Martin von Zweigbergk 2023-08-14 15:53:52 -07:00 committed by Martin von Zweigbergk
parent 03f00bbf30
commit eacdad3ebd
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/src/working_copy.rs
View file

@ -673,18 +673,20 @@ impl TreeState {
.map(|(path, _state)| path.clone())
.collect()
});
trace_span!("process tree entries").in_scope(|| {
trace_span!("process tree entries").in_scope(|| -> Result<(), SnapshotError> {
while let Ok((path, tree_values)) = tree_entries_rx.recv() {
match tree_values.into_resolved() {
Ok(tree_value) => {
tree_builder.set(path, tree_value.unwrap());
}
Err(_) => {
todo!()
Err(conflict) => {
let conflict_id = self.store.write_conflict(&path, &conflict)?;
tree_builder.set(path, TreeValue::Conflict(conflict_id));
}
}
}
});
Ok(())
})?;
trace_span!("process file states").in_scope(|| {
while let Ok((path, file_state)) = file_states_rx.recv() {
self.file_states.insert(path, file_state);
@ -1003,10 +1005,7 @@ impl TreeState {
}
Err(new_file_ids) => {
if new_file_ids != old_file_ids {
let new_conflict = conflict.with_new_file_ids(&new_file_ids);
let new_conflict_id =
self.store.write_conflict(repo_path, &new_conflict)?;
Ok(Merge::normal(TreeValue::Conflict(new_conflict_id)))
Ok(conflict.with_new_file_ids(&new_file_ids))
} else {
Ok(Merge::normal(TreeValue::Conflict(conflict_id.clone())))
}