Adjust to breaking changes in git-traverse (#364)

Author: Byron

experiments/diffing/src/main.rs

@@ -41,7 +41,7 @@ fn main() -> anyhow::Result<()> {
             let db = db
                 .to_cache()
                 .with_pack_cache(|| Box::new(odb::pack::cache::lru::StaticLinkedList::<64>::default()));
-            move |oid, buf| db.find_commit_iter(oid, buf).ok()
+            move |oid, buf| db.find_commit_iter(oid, buf)
         })
         .collect::<Result<Vec<_>, _>>()?;
     let num_diffs = all_commits.len();

experiments/traversal/src/main.rs

@@ -37,7 +37,7 @@ fn main() -> anyhow::Result<()> {
 
     let start = Instant::now();
     let all_commits = commit_id
-        .ancestors(|oid, buf| db.find_commit_iter(oid, buf).ok())
+        .ancestors(|oid, buf| db.find_commit_iter(oid, buf))
         .collect::<Result<Vec<_>, _>>()?;
     let elapsed = start.elapsed();
     println!(
@@ -146,7 +146,7 @@ fn do_gitoxide_commit_graph_traversal<C>(
 where
     C: odb::pack::cache::DecodeEntry,
 {
-    let ancestors = tip.ancestors(|oid, buf| db.find_commit_iter(oid, buf).ok());
+    let ancestors = tip.ancestors(|oid, buf| db.find_commit_iter(oid, buf));
     let mut commits = 0;
     for commit_id in ancestors {
         let _ = commit_id?;

git-diff/tests/visit/mod.rs

@@ -135,10 +135,8 @@ mod changes {
 
             let head = head_of(db);
             commit::Ancestors::new(Some(head), commit::ancestors::State::default(), |oid, buf| {
-                db.try_find(oid, buf)
-                    .ok()
-                    .flatten()
-                    .and_then(|t| t.0.try_into_commit_iter())
+                use git_odb::FindExt;
+                db.find_commit_iter(oid, buf)
             })
             .collect::<Vec<_>>()
             .into_iter()

git-repository/src/ext/object_id.rs

@@ -6,9 +6,10 @@ pub trait Sealed {}
 /// An extension trait to add functionality to [`ObjectId`]s.
 pub trait ObjectIdExt: Sealed {
     /// Create an iterator over the ancestry of the commits reachable from this id, which must be a commit.
-    fn ancestors<Find>(self, find: Find) -> Ancestors<Find, fn(&git_hash::oid) -> bool, ancestors::State>
+    fn ancestors<Find, E>(self, find: Find) -> Ancestors<Find, fn(&git_hash::oid) -> bool, ancestors::State>
     where
-        Find: for<'a> FnMut(&git_hash::oid, &'a mut Vec<u8>) -> Option<git_object::CommitRefIter<'a>>;
+        Find: for<'a> FnMut(&git_hash::oid, &'a mut Vec<u8>) -> Result<git_object::CommitRefIter<'a>, E>,
+        E: std::error::Error + Send + Sync + 'static;
 
     /// Infuse this object id `repo` access.
     fn attach(self, repo: &crate::Repository) -> crate::Id<'_>;
@@ -17,9 +18,10 @@ pub trait ObjectIdExt: Sealed {
 impl Sealed for ObjectId {}
 
 impl ObjectIdExt for ObjectId {
-    fn ancestors<Find>(self, find: Find) -> Ancestors<Find, fn(&git_hash::oid) -> bool, ancestors::State>
+    fn ancestors<Find, E>(self, find: Find) -> Ancestors<Find, fn(&git_hash::oid) -> bool, ancestors::State>
     where
-        Find: for<'a> FnMut(&git_hash::oid, &'a mut Vec<u8>) -> Option<git_object::CommitRefIter<'a>>,
+        Find: for<'a> FnMut(&git_hash::oid, &'a mut Vec<u8>) -> Result<git_object::CommitRefIter<'a>, E>,
+        E: std::error::Error + Send + Sync + 'static,
     {
         Ancestors::new(Some(self), ancestors::State::default(), find)
     }

git-repository/src/id.rs

@@ -97,7 +97,7 @@ pub struct Ancestors<'repo> {
 
 ///
 pub mod ancestors {
-    use git_odb::Find;
+    use git_odb::FindExt;
 
     use crate::id::Ancestors;
     use crate::{ext::ObjectIdExt, Id};
@@ -138,14 +138,7 @@ pub mod ancestors {
                     git_traverse::commit::Ancestors::new(
                         tips,
                         git_traverse::commit::ancestors::State::default(),
-                        move |oid, buf| {
-                            self.repo
-                                .objects
-                                .try_find(oid, buf)
-                                .ok()
-                                .flatten()
-                                .and_then(|obj| obj.try_into_commit_iter())
-                        },
+                        move |oid, buf| self.repo.objects.find_commit_iter(oid, buf),
                     )
                     .sorting(sorting)
                     .parents(parents),

gitoxide-core/src/hours.rs

@@ -66,7 +66,7 @@ where
         let commit_iter = interrupt::Iter::new(
             commit_id.ancestors(|oid, buf| {
                 progress.inc();
-                handle.objects.find(oid, buf).ok().map(|o| {
+                handle.objects.find(oid, buf).map(|o| {
                     commits.push(o.data.to_owned());
                     objs::CommitRefIter::from_bytes(o.data)
                 })

gitoxide-core/src/pack/create.rs

@@ -143,7 +143,7 @@ where
             let iter = Box::new(
                 traverse::commit::Ancestors::new(tips, traverse::commit::ancestors::State::default(), {
                     let handle = handle.clone();
-                    move |oid, buf| handle.find_commit_iter(oid, buf).ok().map(|t| t.0)
+                    move |oid, buf| handle.find_commit_iter(oid, buf).map(|t| t.0)
                 })
                 .map(|res| res.map_err(Into::into))
                 .inspect(move |_| progress.inc()),