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

refs: directly assign ancestor (index, id) pair in find_pair_to_remove()

Browse source
This commit is contained in:
Yuya Nishihara 2023-07-08 00:30:48 +09:00
parent 9140e5b686
commit fe3be99f0d
1 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lib/src/refs.rs
View file

@ -77,26 +77,19 @@ fn find_pair_to_remove(
// "adds" is an ancestor of the other, then pick the descendant.
for (add_index1, add1) in adds.iter().enumerate() {
for (add_index2, add2) in adds.iter().enumerate().skip(add_index1 + 1) {
let first_add_is_ancestor;
if add1 == add2 || index.is_ancestor(add1, add2) {
first_add_is_ancestor = true;
let (add_index, add) = if add1 == add2 || index.is_ancestor(add1, add2) {
(add_index1, add1)
} else if index.is_ancestor(add2, add1) {
first_add_is_ancestor = false;
(add_index2, add2)
} else {
continue;
}
};
if removes.is_empty() {
if first_add_is_ancestor {
return Some((None, add_index1));
} else {
return Some((None, add_index2));
}
return Some((None, add_index));
}
for (remove_index, remove) in removes.iter().enumerate() {
if first_add_is_ancestor && index.is_ancestor(remove, add1) {
return Some((Some(remove_index), add_index1));
} else if !first_add_is_ancestor && index.is_ancestor(remove, add2) {
return Some((Some(remove_index), add_index2));
if index.is_ancestor(remove, add) {
return Some((Some(remove_index), add_index));
}
}
}