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

merged_tree: leverage Merge<Tree> entries iterator in all_tree_entries()

Browse source
This commit is contained in:
Yuya Nishihara 2024-08-11 13:18:56 +09:00
parent 88018e84fc
commit fd52efa0ba
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/src/merged_tree.rs
View file

@ -378,8 +378,13 @@ fn all_tree_entries(
.map(|entry| (entry.name(), MergedTreeVal::Resolved(Some(entry.value()))));
Either::Left(iter)
} else {
// TODO: reimplement as entries iterator?
let iter = all_tree_basenames(trees).map(|name| (name, trees_value(trees, name)));
let iter = all_merged_tree_entries(trees).map(|(name, values)| {
let value = match values.resolve_trivial() {
Some(resolved) => MergedTreeVal::Resolved(*resolved),
None => MergedTreeVal::Conflict(values.map(|value| value.cloned())),
};
(name, value)
});
Either::Right(iter)
}
}