adapt to changes in gix

Author: Byron

gitoxide-core/src/hours/core.rs

@@ -6,7 +6,7 @@ use std::{
     },
 };
 
-use gix::{bstr::BStr, odb::FindExt};
+use gix::bstr::BStr;
 use itertools::Itertools;
 use smallvec::SmallVec;
 
@@ -182,11 +182,7 @@ pub fn spawn_tree_delta_threads<'scope>(
                                                 (true, true) => {
                                                     files.modified += 1;
                                                     if let Some((attrs, matches)) = attributes.as_mut() {
-                                                        let entry = attrs.at_entry(
-                                                            change.location,
-                                                            Some(false),
-                                                            |id, buf| repo.objects.find_blob(id, buf),
-                                                        )?;
+                                                        let entry = attrs.at_entry(change.location, Some(false))?;
                                                         let is_text_file = if entry.matching_attributes(matches) {
                                                             let attrs: SmallVec<[_; 2]> =
                                                                 matches.iter_selected().collect();

gitoxide-core/src/repository/attributes/query.rs

@@ -11,7 +11,7 @@ pub(crate) mod function {
     use std::{io, path::Path};
 
     use anyhow::{anyhow, bail};
-    use gix::{bstr::BStr, prelude::FindExt};
+    use gix::bstr::BStr;
 
     use crate::{
         repository::{
@@ -40,7 +40,7 @@ pub(crate) mod function {
                 for path in paths {
                     let is_dir = gix::path::from_bstr(path.as_ref()).metadata().ok().map(|m| m.is_dir());
 
-                    let entry = cache.at_entry(path.as_slice(), is_dir, |oid, buf| repo.objects.find_blob(oid, buf))?;
+                    let entry = cache.at_entry(path.as_slice(), is_dir)?;
                     if !entry.matching_attributes(&mut matches) {
                         continue;
                     }
@@ -59,7 +59,7 @@ pub(crate) mod function {
                     .index_entries_with_paths(&index)
                     .ok_or_else(|| anyhow!("Pathspec didn't match a single path in the index"))?
                 {
-                    let entry = cache.at_entry(path, Some(false), |oid, buf| repo.objects.find_blob(oid, buf))?;
+                    let entry = cache.at_entry(path, Some(false))?;
                     if !entry.matching_attributes(&mut matches) {
                         continue;
                     }
@@ -97,7 +97,7 @@ pub(crate) mod function {
 
 pub(crate) fn attributes_cache(
     repo: &gix::Repository,
-) -> anyhow::Result<(gix::worktree::Stack, IndexPersistedOrInMemory)> {
+) -> anyhow::Result<(gix::AttributeStack<'_>, IndexPersistedOrInMemory)> {
     let index = repo.index_or_load_from_head()?;
     let cache = repo.attributes(
         &index,

gitoxide-core/src/repository/attributes/validate_baseline.rs

@@ -18,7 +18,7 @@ pub(crate) mod function {
     };
 
     use anyhow::{anyhow, bail};
-    use gix::{attrs::Assignment, bstr::BString, odb::FindExt, Progress};
+    use gix::{attrs::Assignment, bstr::BString, Progress};
 
     use crate::{
         repository::attributes::{query::attributes_cache, validate_baseline::Options},
@@ -192,9 +192,7 @@ pub(crate) mod function {
         );
 
         for (rela_path, baseline) in rx_base {
-            let entry = cache.at_entry(rela_path.as_str(), Some(false), |oid, buf| {
-                repo.objects.find_blob(oid, buf)
-            })?;
+            let entry = cache.at_entry(rela_path.as_str(), Some(false))?;
             match baseline {
                 Baseline::Attribute { assignments: expected } => {
                     entry.matching_attributes(&mut matches);

gitoxide-core/src/repository/index/entries.rs

@@ -25,7 +25,6 @@ pub(crate) mod function {
 
     use gix::{
         bstr::{BStr, BString},
-        odb::FindExt,
         repository::IndexPersistedOrInMemory,
         Repository,
     };
@@ -133,27 +132,25 @@ pub(crate) mod function {
                     .and_then(|(attrs, cache)| {
                         // If the user wants to see assigned attributes, we always have to match.
                         attributes.is_some().then(|| {
-                            cache
-                                .at_entry(entry.path(&index), None, |id, buf| repo.objects.find_blob(id, buf))
-                                .map(|entry| {
-                                    let is_excluded = entry.is_excluded();
-                                    stats.excluded += usize::from(is_excluded);
-                                    let attributes: Vec<_> = {
-                                        last_match = Some(entry.matching_attributes(attrs));
-                                        attrs.iter().map(|m| m.assignment.to_owned()).collect()
-                                    };
-                                    stats.with_attributes += usize::from(!attributes.is_empty());
-                                    stats.max_attributes_per_path = stats.max_attributes_per_path.max(attributes.len());
-                                    if let Some(attrs) = repo_attrs.as_mut() {
-                                        attributes.iter().for_each(|attr| {
-                                            attrs.insert(attr.clone());
-                                        });
-                                    }
-                                    Attrs {
-                                        is_excluded,
-                                        attributes,
-                                    }
-                                })
+                            cache.at_entry(entry.path(&index), None).map(|entry| {
+                                let is_excluded = entry.is_excluded();
+                                stats.excluded += usize::from(is_excluded);
+                                let attributes: Vec<_> = {
+                                    last_match = Some(entry.matching_attributes(attrs));
+                                    attrs.iter().map(|m| m.assignment.to_owned()).collect()
+                                };
+                                stats.with_attributes += usize::from(!attributes.is_empty());
+                                stats.max_attributes_per_path = stats.max_attributes_per_path.max(attributes.len());
+                                if let Some(attrs) = repo_attrs.as_mut() {
+                                    attributes.iter().for_each(|attr| {
+                                        attrs.insert(attr.clone());
+                                    });
+                                }
+                                Attrs {
+                                    is_excluded,
+                                    attributes,
+                                }
+                            })
                         })
                     })
                     .transpose()?;
@@ -173,7 +170,7 @@ pub(crate) mod function {
                                     }
                                     // The user doesn't want attributes, so we set the cache position on demand only
                                     None => cache
-                                        .at_entry(rela_path, Some(is_dir), |id, buf| repo.objects.find_blob(id, buf))
+                                        .at_entry(rela_path, Some(is_dir))
                                         .ok()
                                         .map(|platform| platform.matching_attributes(out))
                                         .unwrap_or_default(),
@@ -251,7 +248,7 @@ pub(crate) mod function {
     ) -> anyhow::Result<(
         gix::pathspec::Search,
         IndexPersistedOrInMemory,
-        Option<(gix::attrs::search::Outcome, gix::worktree::Stack)>,
+        Option<(gix::attrs::search::Outcome, gix::AttributeStack<'_>)>,
     )> {
         let index = repo.index_or_load_from_head()?;
         let pathspec = repo.pathspec(