mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-11-28 17:41:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

backend: add a function for setting or removing a tree entry

Browse source
This commit is contained in:
Martin von Zweigbergk 2023-06-28 03:09:54 -07:00 committed by Martin von Zweigbergk
parent c0ffce781e
commit 6bd13382f4
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/src/backend.rs
View file

@ -317,6 +317,17 @@ impl Tree {
self.entries.remove(name);
}
pub fn set_or_remove(&mut self, name: &RepoPathComponent, value: Option<TreeValue>) {
match value {
None => {
self.entries.remove(name);
}
Some(value) => {
self.entries.insert(name.clone(), value);
}
}
}
pub fn entry(&self, name: &RepoPathComponent) -> Option<TreeEntry> {
self.entries
.get_key_value(name)

10
lib/src/tree.rs
View file

@ -558,10 +558,7 @@ pub fn merge_trees(
let maybe_side1 = side1_tree.value(basename);
if maybe_side1 == maybe_base {
// side 1 is unchanged: use the value from side 2
match maybe_side2 {
None => new_tree.remove(basename),
Some(side2) => new_tree.set(basename.clone(), side2.clone()),
};
new_tree.set_or_remove(basename, maybe_side2.cloned());
} else if maybe_side1 == maybe_side2 {
// Both sides changed in the same way: new_tree already has the
// value
@ -569,10 +566,7 @@ pub fn merge_trees(
// The two sides changed in different ways
let new_value =
merge_tree_value(store, dir, basename, maybe_base, maybe_side1, maybe_side2)?;
match new_value {
None => new_tree.remove(basename),
Some(value) => new_tree.set(basename.clone(), value),
}
new_tree.set_or_remove(basename, new_value);
}
}
Ok(store.write_tree(dir, new_tree)?)