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

tree: make TreeEntryDiffIterator use RepoPathComponent

Browse source
This commit is contained in:
Martin von Zweigbergk 2021-06-05 22:55:10 -07:00
parent ac38c8b641
commit 5ece748dff
1 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
lib/src/tree.rs
View file

@ -294,7 +294,11 @@ impl<'a> TreeEntryDiffIterator<'a> {
} }
impl<'a> Iterator for TreeEntryDiffIterator<'a> { impl<'a> Iterator for TreeEntryDiffIterator<'a> {
type Item = (String, Option<&'a TreeValue>, Option<&'a TreeValue>); type Item = (
RepoPathComponent,
Option<&'a TreeValue>,
Option<&'a TreeValue>,
);
fn next(&mut self) -> Option<Self::Item> { fn next(&mut self) -> Option<Self::Item> {
loop { loop {
@ -306,12 +310,20 @@ impl<'a> Iterator for TreeEntryDiffIterator<'a> {
Ordering::Less => { Ordering::Less => {
// entry removed // entry removed
let before = self.it1.next().unwrap(); let before = self.it1.next().unwrap();
return Some((before.name().to_owned(), Some(before.value()), None)); return Some((
RepoPathComponent::from(before.name()),
Some(before.value()),
None,
));
} }
Ordering::Greater => { Ordering::Greater => {
// entry added // entry added
let after = self.it2.next().unwrap(); let after = self.it2.next().unwrap();
return Some((after.name().to_owned(), None, Some(after.value()))); return Some((
RepoPathComponent::from(after.name()),
None,
Some(after.value()),
));
} }
Ordering::Equal => { Ordering::Equal => {
// entry modified or clean // entry modified or clean
@ -319,7 +331,7 @@ impl<'a> Iterator for TreeEntryDiffIterator<'a> {
let after = self.it2.next().unwrap(); let after = self.it2.next().unwrap();
if before.value() != after.value() { if before.value() != after.value() {
return Some(( return Some((
before.name().to_owned(), RepoPathComponent::from(before.name()),
Some(before.value()), Some(before.value()),
Some(after.value()), Some(after.value()),
)); ));
@ -330,12 +342,20 @@ impl<'a> Iterator for TreeEntryDiffIterator<'a> {
(Some(_), None) => { (Some(_), None) => {
// second iterator exhausted // second iterator exhausted
let before = self.it1.next().unwrap(); let before = self.it1.next().unwrap();
return Some((before.name().to_owned(), Some(before.value()), None)); return Some((
RepoPathComponent::from(before.name()),
Some(before.value()),
None,
));
} }
(None, Some(_)) => { (None, Some(_)) => {
// first iterator exhausted // first iterator exhausted
let after = self.it2.next().unwrap(); let after = self.it2.next().unwrap();
return Some((after.name().to_owned(), None, Some(after.value()))); return Some((
RepoPathComponent::from(after.name()),
None,
Some(after.value()),
));
} }
(None, None) => { (None, None) => {
// both iterators exhausted // both iterators exhausted
@ -488,7 +508,7 @@ pub fn merge_trees(
// side 1 is unchanged: use the value from side 2 // side 1 is unchanged: use the value from side 2
match maybe_side2 { match maybe_side2 {
None => new_tree.remove(basename.as_str()), None => new_tree.remove(basename.as_str()),
Some(side2) => new_tree.set(basename.to_owned(), side2.clone()), Some(side2) => new_tree.set(basename.as_str().to_owned(), side2.clone()),
}; };
} else if maybe_side1 == maybe_side2 { } else if maybe_side1 == maybe_side2 {
// Both sides changed in the same way: new_tree already has the // Both sides changed in the same way: new_tree already has the
@ -505,7 +525,7 @@ pub fn merge_trees(
)?; )?;
match new_value { match new_value {
None => new_tree.remove(basename.as_str()), None => new_tree.remove(basename.as_str()),
Some(value) => new_tree.set(basename.to_owned(), value), Some(value) => new_tree.set(basename.as_str().to_owned(), value),
} }
} }
} }