adapt to changes in gix_object and gix_odb.

Byron · Byron · commit 24e319e996b4 · 2023-11-04T20:58:21.000+01:00
diff --git a/gitoxide-core/src/index/checkout.rs b/gitoxide-core/src/index/checkout.rs
@@ -4,7 +4,7 @@ use std::{
 };
 
 use anyhow::bail;
-use gix::{odb::FindExt, worktree::state::checkout, NestedProgress, Progress};
+use gix::{prelude::FindExt, worktree::state::checkout, NestedProgress, Progress};
 
 use crate::{
     index,
diff --git a/gitoxide-core/src/query/engine/update.rs b/gitoxide-core/src/query/engine/update.rs
@@ -9,8 +9,8 @@ use gix::{
     bstr::{BStr, BString, ByteSlice},
     features::progress,
     object::tree::diff::rewrites::CopySource,
-    odb::FindExt,
     parallel::{InOrderIter, SequenceId},
+    prelude::FindExt,
     prelude::ObjectIdExt,
     Count, Progress,
 };
diff --git a/gitoxide-core/src/repository/verify.rs b/gitoxide-core/src/repository/verify.rs
@@ -44,7 +44,7 @@ pub fn integrity(
         index.verify_integrity()?;
         index.verify_entries()?;
         index.verify_extensions(true, {
-            use gix::odb::FindExt;
+            use gix::prelude::FindExt;
             let objects = repo.objects;
             move |oid, buf: &mut Vec<u8>| objects.find_tree_iter(oid, buf).ok()
         })?;
diff --git a/gix-archive/tests/archive.rs b/gix-archive/tests/archive.rs
@@ -9,7 +9,7 @@ mod from_tree {
     use gix_archive::Format;
     use gix_attributes::glob::pattern::Case;
     use gix_object::tree::EntryMode;
-    use gix_odb::FindExt;
+    use gix_object::FindExt;
     use gix_testtools::bstr::ByteSlice;
     use gix_worktree::stack::state::attributes::Source;
 
diff --git a/gix-diff/tests/tree/mod.rs b/gix-diff/tests/tree/mod.rs
@@ -142,14 +142,14 @@ mod changes {
 
             let head = head_of(db);
             commit::Ancestors::new(Some(head), commit::ancestors::State::default(), |oid, buf| {
-                use gix_odb::FindExt;
+                use gix_object::FindExt;
                 db.find_commit_iter(oid, buf)
             })
             .collect::<Result<Vec<_>, _>>()
             .expect("valid iteration")
             .into_iter()
             .map(|c| {
-                use gix_odb::FindExt;
+                use gix_object::FindExt;
                 (
                     db.find_commit(&c.id, &mut buf)
                         .unwrap()
diff --git a/gix-negotiate/tests/baseline/mod.rs b/gix-negotiate/tests/baseline/mod.rs
@@ -2,7 +2,7 @@ use std::cell::RefCell;
 
 use gix_negotiate::Algorithm;
 use gix_object::{bstr, bstr::ByteSlice};
-use gix_odb::{Find, FindExt};
+use gix_object::{Find, FindExt};
 use gix_ref::{file::ReferenceExt, store::WriteReflog};
 
 #[test]
diff --git a/gix-ref/tests/file/transaction/prepare_and_commit/create_or_update/mod.rs b/gix-ref/tests/file/transaction/prepare_and_commit/create_or_update/mod.rs
@@ -3,7 +3,7 @@ use std::convert::TryInto;
 use gix_hash::ObjectId;
 use gix_lock::acquire::Fail;
 use gix_object::bstr::{BString, ByteSlice};
-use gix_odb::Find;
+use gix_object::Find;
 use gix_ref::{
     file::{
         transaction::{self, PackedRefs},
diff --git a/gix-ref/tests/file/worktree.rs b/gix-ref/tests/file/worktree.rs
@@ -1,6 +1,6 @@
 use std::{cmp::Ordering, path::PathBuf};
 
-use gix_odb::Find;
+use gix_object::Find;
 use gix_ref::{file::ReferenceExt, Reference};
 use gix_testtools::Creation;
 
diff --git a/gix-revision/tests/describe/mod.rs b/gix-revision/tests/describe/mod.rs
@@ -1,7 +1,7 @@
 use std::{borrow::Cow, path::PathBuf};
 
 use gix_object::bstr::ByteSlice;
-use gix_odb::Find;
+use gix_object::Find;
 use gix_revision::{
     describe,
     describe::{Error, Outcome},
diff --git a/gix-traverse/tests/commit/mod.rs b/gix-traverse/tests/commit/mod.rs
@@ -346,7 +346,7 @@ mod ancestor {
 
     /// Some dates adjusted to be a year apart, but still 'c1' and 'c2' with the same date.
     mod adjusted_dates {
-        use gix_odb::FindExt;
+        use gix_object::FindExt;
         use gix_traverse::commit::{ancestors, Ancestors, Parents, Sorting};
 
         use crate::{commit::ancestor::TraversalAssertion, hex_to_id};
diff --git a/gix-worktree-state/tests/state/checkout.rs b/gix-worktree-state/tests/state/checkout.rs
@@ -9,7 +9,7 @@ use std::{
 
 use gix_features::progress;
 use gix_object::bstr::ByteSlice;
-use gix_odb::FindExt;
+use gix_object::FindExt;
 use gix_testtools::tempfile::TempDir;
 use gix_worktree_state::checkout::Collision;
 use once_cell::sync::Lazy;
@@ -504,7 +504,7 @@ fn checkout_index_in_tmp_dir_opts(
             if allow_return_object(oid) {
                 odb.find_blob(oid, buf)
             } else {
-                Err(gix_odb::find::existing_object::Error::NotFound { oid: oid.to_owned() })
+                Err(gix_object::find::existing_object::Error::NotFound { oid: oid.to_owned() })
             }
         },
         &progress::Discard,
diff --git a/gix-worktree-stream/tests/stream.rs b/gix-worktree-stream/tests/stream.rs
@@ -12,8 +12,8 @@ mod from_tree {
     };
 
     use gix_attributes::glob::pattern::Case;
+    use gix_object::FindExt;
     use gix_object::{bstr::ByteSlice, tree::EntryMode};
-    use gix_odb::FindExt;
     use gix_testtools::once_cell::sync::Lazy;
     use gix_worktree::stack::state::attributes::Source;
 
diff --git a/gix-worktree/tests/worktree/stack/ignore.rs b/gix-worktree/tests/worktree/stack/ignore.rs
@@ -1,5 +1,5 @@
 use bstr::{BStr, ByteSlice};
-use gix_odb::FindExt;
+use gix_object::FindExt;
 use gix_worktree::{stack::state::ignore::Source, Stack};
 
 use crate::hex_to_id;
diff --git a/gix/src/attribute_stack.rs b/gix/src/attribute_stack.rs
@@ -1,7 +1,7 @@
 use crate::bstr::BStr;
 use crate::types::AttributeStack;
 use crate::Repository;
-use gix_odb::FindExt;
+use gix_object::FindExt;
 use std::ops::{Deref, DerefMut};
 
 /// Lifecycle
diff --git a/gix/src/clone/checkout.rs b/gix/src/clone/checkout.rs
@@ -4,7 +4,7 @@ use crate::{clone::PrepareCheckout, Repository};
 pub mod main_worktree {
     use std::{path::PathBuf, sync::atomic::AtomicBool};
 
-    use gix_odb::FindExt;
+    use gix_object::FindExt;
 
     use crate::{clone::PrepareCheckout, Progress, Repository};
 
@@ -26,7 +26,7 @@ pub mod main_worktree {
         #[error(transparent)]
         CheckoutOptions(#[from] crate::config::checkout_options::Error),
         #[error(transparent)]
-        IndexCheckout(#[from] gix_worktree_state::checkout::Error<gix_odb::find::existing_object::Error>),
+        IndexCheckout(#[from] gix_worktree_state::checkout::Error<gix_object::find::existing_object::Error>),
         #[error("Failed to reopen object database as Arc (only if thread-safety wasn't compiled in)")]
         OpenArcOdb(#[from] std::io::Error),
         #[error("The HEAD reference could not be located")]
diff --git a/gix/src/clone/fetch/util.rs b/gix/src/clone/fetch/util.rs
@@ -1,6 +1,6 @@
 use std::{borrow::Cow, convert::TryInto, io::Write};
 
-use gix_odb::Find;
+use gix_object::Find;
 use gix_ref::{
     transaction::{LogChange, RefLog},
     FullNameRef,
diff --git a/gix/src/commit.rs b/gix/src/commit.rs
@@ -28,7 +28,7 @@ pub mod describe {
 
     use gix_hash::ObjectId;
     use gix_hashtable::HashMap;
-    use gix_odb::Find;
+    use gix_object::Find;
 
     use crate::{bstr::BStr, ext::ObjectIdExt, Repository};
 
diff --git a/gix/src/filter.rs b/gix/src/filter.rs
@@ -2,7 +2,7 @@
 use std::borrow::Cow;
 
 pub use gix_filter as plumbing;
-use gix_odb::{Find, FindExt};
+use gix_object::{Find, FindExt};
 
 use crate::{
     bstr::BStr,
@@ -150,7 +150,7 @@ impl<'repo> Pipeline<'repo> {
             &mut |_, attrs| {
                 entry.matching_attributes(attrs);
             },
-            &mut |buf| -> Result<_, gix_odb::find::Error> {
+            &mut |buf| -> Result<_, gix_object::find::Error> {
                 let entry = match index.entry_by_path(gix_path::into_bstr(rela_path).as_ref()) {
                     None => return Ok(None),
                     Some(entry) => entry,
diff --git a/gix/src/object/errors.rs b/gix/src/object/errors.rs
@@ -20,12 +20,12 @@ pub mod find {
     /// Indicate that an error occurred when trying to find an object.
     #[derive(Debug, thiserror::Error)]
     #[error(transparent)]
-    pub struct Error(#[from] pub gix_odb::find::Error);
+    pub struct Error(#[from] pub gix_object::find::Error);
 
     ///
     pub mod existing {
         /// An object could not be found in the database, or an error occurred when trying to obtain it.
-        pub type Error = gix_odb::find::existing::Error;
+        pub type Error = gix_object::find::existing::Error;
     }
 }
 
@@ -34,5 +34,5 @@ pub mod write {
     /// An error to indicate writing to the loose object store failed.
     #[derive(Debug, thiserror::Error)]
     #[error(transparent)]
-    pub struct Error(#[from] pub gix_odb::find::Error);
+    pub struct Error(#[from] pub gix_object::find::Error);
 }
diff --git a/gix/src/object/tree/diff/for_each.rs b/gix/src/object/tree/diff/for_each.rs
@@ -1,5 +1,5 @@
+use gix_object::FindExt;
 use gix_object::TreeRefIter;
-use gix_odb::FindExt;
 
 use super::{change, Action, Change, Platform};
 use crate::{
diff --git a/gix/src/object/tree/mod.rs b/gix/src/object/tree/mod.rs
@@ -1,8 +1,8 @@
 use gix_hash::ObjectId;
 use gix_macros::momo;
 pub use gix_object::tree::EntryMode;
+use gix_object::FindExt;
 use gix_object::{bstr::BStr, TreeRefIter};
-use gix_odb::FindExt;
 
 use crate::{object::find, Id, ObjectDetached, Tree};
 
diff --git a/gix/src/object/tree/traverse.rs b/gix/src/object/tree/traverse.rs
@@ -1,4 +1,4 @@
-use gix_odb::FindExt;
+use gix_object::FindExt;
 
 use crate::Tree;
 
diff --git a/gix/src/pathspec.rs b/gix/src/pathspec.rs
@@ -1,6 +1,6 @@
 //! Pathspec plumbing and abstractions
 use gix_macros::momo;
-use gix_odb::FindExt;
+use gix_object::FindExt;
 pub use gix_pathspec::*;
 
 use crate::{bstr::BStr, AttributeStack, Pathspec, PathspecDetached, Repository};
diff --git a/gix/src/prelude.rs b/gix/src/prelude.rs
@@ -1,4 +1,5 @@
 pub use gix_features::parallel::reduce::Finalize;
-pub use gix_odb::{Find, FindExt, Header, HeaderExt, Write};
+pub use gix_object::{Find, FindExt};
+pub use gix_odb::{Header, HeaderExt, Write};
 
 pub use crate::ext::*;
diff --git a/gix/src/remote/connection/fetch/receive_pack.rs b/gix/src/remote/connection/fetch/receive_pack.rs
@@ -3,7 +3,8 @@ use std::{
     sync::atomic::{AtomicBool, Ordering},
 };
 
-use gix_odb::{store::RefreshMode, FindExt};
+use gix_object::FindExt;
+use gix_odb::store::RefreshMode;
 use gix_protocol::{
     fetch::Arguments,
     transport::{client::Transport, packetline::read::ProgressAction},
diff --git a/gix/src/remote/connection/fetch/update_refs/mod.rs b/gix/src/remote/connection/fetch/update_refs/mod.rs
@@ -1,7 +1,7 @@
 #![allow(clippy::result_large_err)]
 use std::{collections::BTreeMap, convert::TryInto, path::PathBuf};
 
-use gix_odb::{Find, FindExt};
+use gix_object::{Exists, Find, FindExt};
 use gix_ref::{
     transaction::{Change, LogChange, PreviousValue, RefEdit, RefLog},
     Target, TargetRef,
@@ -96,8 +96,8 @@ pub(crate) fn update(
     ) {
         // `None` only if unborn.
         let remote_id = remote.as_id();
-        if matches!(dry_run, fetch::DryRun::No) && !remote_id.map_or(true, |id| repo.objects.contains(id)) {
-            if let Some(remote_id) = remote_id.filter(|id| !repo.objects.contains(id)) {
+        if matches!(dry_run, fetch::DryRun::No) && !remote_id.map_or(true, |id| repo.objects.exists(id)) {
+            if let Some(remote_id) = remote_id.filter(|id| !repo.objects.exists(id)) {
                 let update = if is_implicit_tag {
                     Mode::ImplicitTagNotSentByRemote.into()
                 } else {
diff --git a/gix/src/repository/graph.rs b/gix/src/repository/graph.rs
@@ -1,4 +1,4 @@
-use gix_odb::Find;
+use gix_object::Find;
 
 impl crate::Repository {
     /// Create a graph data-structure capable of accelerating graph traversals and storing state of type `T` with each commit
diff --git a/gix/src/repository/index.rs b/gix/src/repository/index.rs
@@ -1,4 +1,4 @@
-use gix_odb::FindExt;
+use gix_object::FindExt;
 
 use crate::{config::cache::util::ApplyLeniencyDefault, repository::IndexPersistedOrInMemory, worktree};
 
diff --git a/gix/src/repository/object.rs b/gix/src/repository/object.rs
@@ -3,7 +3,8 @@ use std::{convert::TryInto, ops::DerefMut};
 
 use gix_hash::ObjectId;
 use gix_macros::momo;
-use gix_odb::{Find, FindExt, Header, HeaderExt, Write};
+use gix_object::{Exists, Find, FindExt};
+use gix_odb::{Header, HeaderExt, Write};
 use gix_ref::{
     transaction::{LogChange, PreviousValue, RefLog},
     FullName,
@@ -70,7 +71,7 @@ impl crate::Repository {
         if id == ObjectId::empty_tree(self.object_hash()) {
             true
         } else {
-            self.objects.contains(id)
+            self.objects.exists(id)
         }
     }
 
@@ -140,7 +141,7 @@ impl crate::Repository {
 
     fn write_object_inner(&self, buf: &[u8], kind: gix_object::Kind) -> Result<Id<'_>, object::write::Error> {
         let oid = gix_object::compute_hash(self.object_hash(), kind, buf);
-        if self.objects.contains(&oid) {
+        if self.objects.exists(&oid) {
             return Ok(oid.attach(self));
         }
 
@@ -158,7 +159,7 @@ impl crate::Repository {
     pub fn write_blob(&self, bytes: impl AsRef<[u8]>) -> Result<Id<'_>, object::write::Error> {
         let bytes = bytes.as_ref();
         let oid = gix_object::compute_hash(self.object_hash(), gix_object::Kind::Blob, bytes);
-        if self.objects.contains(&oid) {
+        if self.objects.exists(&oid) {
             return Ok(oid.attach(self));
         }
         self.objects
@@ -185,7 +186,7 @@ impl crate::Repository {
 
     fn write_blob_stream_inner(&self, buf: &[u8]) -> Result<Id<'_>, object::write::Error> {
         let oid = gix_object::compute_hash(self.object_hash(), gix_object::Kind::Blob, buf);
-        if self.objects.contains(&oid) {
+        if self.objects.exists(&oid) {
             return Ok(oid.attach(self));
         }
 
diff --git a/gix/src/repository/worktree.rs b/gix/src/repository/worktree.rs
@@ -62,7 +62,8 @@ impl crate::Repository {
         &self,
         id: impl Into<gix_hash::ObjectId>,
     ) -> Result<(gix_worktree_stream::Stream, gix_index::File), crate::repository::worktree_stream::Error> {
-        use gix_odb::{FindExt, HeaderExt};
+        use gix_object::FindExt;
+        use gix_odb::HeaderExt;
         let id = id.into();
         let header = self.objects.header(id)?;
         if !header.kind().is_tree() {
diff --git a/gix/src/revision/walk.rs b/gix/src/revision/walk.rs
@@ -1,5 +1,5 @@
 use gix_hash::ObjectId;
-use gix_odb::FindExt;
+use gix_object::FindExt;
 
 use crate::{ext::ObjectIdExt, revision, Repository};
 
diff --git a/gix/src/submodule/mod.rs b/gix/src/submodule/mod.rs
@@ -7,7 +7,7 @@ use std::{
     path::PathBuf,
 };
 
-use gix_odb::FindExt;
+use gix_object::FindExt;
 pub use gix_submodule::*;
 
 use crate::{bstr::BStr, repository::IndexPersistedOrInMemory, Repository, Submodule};
diff --git a/gix/tests/clone/mod.rs b/gix/tests/clone/mod.rs
@@ -326,7 +326,7 @@ mod blocking_io {
         match out.status {
             gix::remote::fetch::Status::Change { update_refs, .. } => {
                 for edit in &update_refs.edits {
-                    use gix_odb::Find;
+                    use gix_object::Exists;
                     match edit.change.new_value().expect("always set/no deletion") {
                         TargetRef::Symbolic(referent) => {
                             assert!(
@@ -335,7 +335,7 @@ mod blocking_io {
                             )
                         }
                         TargetRef::Peeled(id) => {
-                            assert!(repo.objects.contains(id), "part of the fetched pack");
+                            assert!(repo.objects.exists(id), "part of the fetched pack");
                         }
                     }
                     let r = repo
