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

merged_tree: rename all_tree_conflict_names() since it's not about conflicts

Browse source
This commit is contained in:
Martin von Zweigbergk 2023-10-29 07:03:15 -07:00 committed by Martin von Zweigbergk
parent 043f786fbf
commit b72f04ba61
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/src/merged_tree.rs
View file

@ -170,7 +170,7 @@ impl MergedTree {
pub fn names<'a>(&'a self) -> Box<dyn Iterator<Item = &'a RepoPathComponent> + 'a> {
match self {
MergedTree::Legacy(tree) => Box::new(tree.data().names()),
MergedTree::Merge(conflict) => Box::new(all_tree_conflict_names(conflict)),
MergedTree::Merge(conflict) => Box::new(all_tree_basenames(conflict)),
}
}
@ -434,7 +434,7 @@ pub type TreeDiffStream<'matcher> = Pin<
>,
>;
fn all_tree_conflict_names(trees: &Merge<Tree>) -> impl Iterator<Item = &RepoPathComponent> {
fn all_tree_basenames(trees: &Merge<Tree>) -> impl Iterator<Item = &RepoPathComponent> {
trees
.iter()
.map(|tree| tree.data().names())
@ -455,7 +455,7 @@ fn merge_trees(merge: &Merge<Tree>) -> Result<Merge<Tree>, TreeMergeError> {
// any conflicts.
let mut new_tree = backend::Tree::default();
let mut conflicts = vec![];
for basename in all_tree_conflict_names(merge) {
for basename in all_tree_basenames(merge) {
let path_merge = merge.map(|tree| tree.value(basename).cloned());
let path = dir.join(basename);
let path_merge = merge_tree_values(store, &path, path_merge)?;
@ -638,7 +638,7 @@ impl<'a> ConflictEntriesNonRecursiveIterator<'a> {
if trees.is_resolved() {
Box::new(iter::empty())
} else {
Box::new(all_tree_conflict_names(trees))
Box::new(all_tree_basenames(trees))
}
}
};
@ -774,15 +774,14 @@ impl<'a> TreeEntryDiffIterator<'a> {
merge_iters(before.data().names(), after.data().names())
}
(MergedTree::Merge(before), MergedTree::Legacy(after)) => {
merge_iters(all_tree_conflict_names(before), after.data().names())
merge_iters(all_tree_basenames(before), after.data().names())
}
(MergedTree::Legacy(before), MergedTree::Merge(after)) => {
merge_iters(before.data().names(), all_tree_conflict_names(after))
merge_iters(before.data().names(), all_tree_basenames(after))
}
(MergedTree::Merge(before), MergedTree::Merge(after)) => {
merge_iters(all_tree_basenames(before), all_tree_basenames(after))
}
(MergedTree::Merge(before), MergedTree::Merge(after)) => merge_iters(
all_tree_conflict_names(before),
all_tree_conflict_names(after),
),
};
TreeEntryDiffIterator {
before,