[repository #190] test for oid.ancestors().all()

Author: Byron

git-repository/src/easy/head.rs

@@ -78,8 +78,6 @@ pub mod log {
 }
 
 pub mod peel {
-    use git_hash::ObjectId;
-
     use crate::{
         easy,
         easy::{head::Kind, Access, Head},
@@ -136,23 +134,19 @@ pub mod peel {
             })
         }
 
-        pub fn into_fully_peeled_id(self) -> Option<Result<ObjectId, Error>> {
+        pub fn into_fully_peeled_id(self) -> Option<Result<easy::Oid<'repo, A>, Error>> {
             Some(match self.kind {
                 Kind::Unborn(_name) => return None,
                 Kind::Detached {
                     peeled: Some(peeled), ..
-                } => Ok(peeled),
+                } => Ok(peeled.attach(self.access)),
                 Kind::Detached { peeled: None, target } => target
                     .attach(self.access)
                     .object()
                     .map_err(Into::into)
                     .and_then(|obj| obj.peel_to_end().map_err(Into::into))
-                    .map(|peeled| peeled.id),
-                Kind::Symbolic(r) => r
-                    .attach(self.access)
-                    .peel_to_id_in_place()
-                    .map_err(Into::into)
-                    .map(|id| id.detach()),
+                    .map(|obj| obj.id.attach(self.access)),
+                Kind::Symbolic(r) => r.attach(self.access).peel_to_id_in_place().map_err(Into::into),
             })
         }
     }

git-repository/src/easy/oid.rs

@@ -1,13 +1,12 @@
 #![allow(missing_docs)]
-use std::ops::Deref;
+use std::{cell::RefMut, ops::Deref};
 
 use git_hash::{oid, ObjectId};
 
 use crate::{
     easy,
     easy::{ext::ObjectAccessExt, object::find, ObjectRef, Oid},
 };
-use std::cell::RefMut;
 
 impl<'repo, A> Oid<'repo, A>
 where
@@ -62,12 +61,15 @@ where
 }
 
 pub mod ancestors {
-    use crate::easy;
-    use crate::easy::oid::Ancestors;
-    use crate::easy::Oid;
-    use git_odb::Find;
     use std::ops::{Deref, DerefMut};
 
+    use git_odb::Find;
+
+    use crate::{
+        easy,
+        easy::{oid::Ancestors, Oid},
+    };
+
     impl<'repo, A> Oid<'repo, A>
     where
         A: easy::Access + Sized,
@@ -96,7 +98,6 @@ pub mod ancestors {
     where
         A: easy::Access + Sized,
     {
-        // TODO: tests
         pub fn all(&mut self) -> Iter<'_, 'repo, A> {
             Iter {
                 access: self.access,
@@ -139,8 +140,9 @@ pub mod ancestors {
             BorrowBufMut(#[from] easy::borrow::state::Error),
         }
     }
-    use crate::ext::ObjectIdExt;
     use error::Error;
+
+    use crate::ext::ObjectIdExt;
 }
 
 mod impls {

git-repository/tests/easy/ext/object.rs

@@ -87,7 +87,7 @@ mod commit {
             "we get the actual HEAD log, not the log of some reference"
         );
         let current_commit = repo.head()?.into_fully_peeled_id().expect("born")?;
-        assert_eq!(current_commit, &*first_commit_id, "the commit was set");
+        assert_eq!(current_commit, first_commit_id, "the commit was set");
 
         let second_commit_id = repo.commit(
             "refs/heads/new-branch",

git-repository/tests/easy/mod.rs

@@ -1,4 +1,5 @@
 mod access;
 mod ext;
 mod object;
+mod oid;
 mod reference;

git-repository/tests/easy/oid.rs

@@ -0,0 +1,19 @@
+mod ancestors {
+    use git_repository::prelude::ReferenceAccessExt;
+
+    #[test]
+    fn all() -> crate::Result {
+        let repo = crate::basic_repo()?;
+        assert_eq!(
+            repo.head()?
+                .into_fully_peeled_id()
+                .expect("born")?
+                .ancestors()?
+                .all()
+                .count(),
+            2,
+            "need a specific amount of commits"
+        );
+        Ok(())
+    }
+}