|
1 | 1 | use crate::{Change, Index}; |
2 | 2 | use git_repository as git; |
3 | | -use git_repository::prelude::{FindExt, ObjectIdExt, TreeIterExt}; |
| 3 | +use git_repository::prelude::{FindExt, ObjectIdExt}; |
4 | 4 | use git_repository::refs::transaction::PreviousValue; |
5 | 5 | use std::convert::TryFrom; |
6 | 6 |
|
@@ -98,12 +98,14 @@ impl Index { |
98 | 98 | let from = into_tree(from.into())?; |
99 | 99 | let to = into_tree(to.into())?; |
100 | 100 | let mut delegate = Delegate::from_repo(&self.repo); |
101 | | - let file_changes = git::objs::TreeRefIter::from_bytes(&from.data).changes_needed( |
102 | | - git::objs::TreeRefIter::from_bytes(&to.data), |
103 | | - git::diff::tree::State::default(), |
104 | | - |id, buf| self.repo.objects.find_tree_iter(id, buf).ok(), |
105 | | - &mut delegate, |
106 | | - ); |
| 101 | + let file_changes = |
| 102 | + git::diff::tree::Changes::from(git::objs::TreeRefIter::from_bytes(&from.data)) |
| 103 | + .needed_to_obtain( |
| 104 | + git::objs::TreeRefIter::from_bytes(&to.data), |
| 105 | + git::diff::tree::State::default(), |
| 106 | + |id, buf| self.repo.objects.find_tree_iter(id, buf), |
| 107 | + &mut delegate, |
| 108 | + ); |
107 | 109 | match file_changes.err() { |
108 | 110 | None | Some(git::diff::tree::changes::Error::Cancelled) => { /*error in delegate*/ } |
109 | 111 | Some(err) => return Err(err.into()), |
|
0 commit comments