Skip to content

Commit 68ff142

Browse files
committed
adapt to changes in git-repository (#16)
1 parent 371b512 commit 68ff142

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

src/index/diff/mod.rs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::{Change, Index};
22
use git_repository as git;
3-
use git_repository::prelude::{FindExt, ObjectIdExt, TreeIterExt};
3+
use git_repository::prelude::{FindExt, ObjectIdExt};
44
use git_repository::refs::transaction::PreviousValue;
55
use std::convert::TryFrom;
66

@@ -98,12 +98,14 @@ impl Index {
9898
let from = into_tree(from.into())?;
9999
let to = into_tree(to.into())?;
100100
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+
);
107109
match file_changes.err() {
108110
None | Some(git::diff::tree::changes::Error::Cancelled) => { /*error in delegate*/ }
109111
Some(err) => return Err(err.into()),

0 commit comments

Comments
 (0)