adapt to changes in gix-index

Author: Byron

gix-fs/tests/stack/mod.rs

@@ -1,3 +1,4 @@
+#![allow(clippy::join_absolute_paths)]
 use std::path::{Path, PathBuf};
 
 use gix_fs::Stack;

gix/src/clone/checkout.rs

@@ -18,8 +18,10 @@ pub mod main_worktree {
         #[error("Could not create index from tree at {id}")]
         IndexFromTree {
             id: gix_hash::ObjectId,
-            source: gix_traverse::tree::breadthfirst::Error,
+            source: gix_index::init::from_tree::Error,
         },
+        #[error("Couldn't obtain configuration for core.protect*")]
+        BooleanConfig(#[from] crate::config::boolean::Error),
         #[error(transparent)]
         WriteIndex(#[from] gix_index::file::write::Error),
         #[error(transparent)]
@@ -95,10 +97,11 @@ pub mod main_worktree {
                     ))
                 }
             };
-            let index = gix_index::State::from_tree(&root_tree, &repo.objects).map_err(|err| Error::IndexFromTree {
-                id: root_tree,
-                source: err,
-            })?;
+            let index = gix_index::State::from_tree(&root_tree, &repo.objects, repo.config.protect_options()?)
+                .map_err(|err| Error::IndexFromTree {
+                    id: root_tree,
+                    source: err,
+                })?;
             let mut index = gix_index::File::from_state(index, repo.index_path());
 
             let mut opts = repo

gix/src/config/cache/access.rs

@@ -271,8 +271,8 @@ impl Cache {
         })
     }
 
-    #[cfg(feature = "worktree-mutation")]
-    fn protect_options(&self) -> Result<gix_validate::path::component::Options, config::boolean::Error> {
+    #[cfg(feature = "index")]
+    pub(crate) fn protect_options(&self) -> Result<gix_validate::path::component::Options, config::boolean::Error> {
         const IS_WINDOWS: bool = cfg!(windows);
         const IS_MACOS: bool = cfg!(target_os = "macos");
         const ALWAYS_ON_FOR_SAFETY: bool = true;

gix/src/repository/filter.rs

@@ -12,7 +12,7 @@ pub mod pipeline {
         #[error(transparent)]
         DecodeCommit(#[from] gix_object::decode::Error),
         #[error("Could not create index from tree at HEAD^{{tree}}")]
-        TreeTraverse(#[from] gix_traverse::tree::breadthfirst::Error),
+        TreeTraverse(#[from] crate::repository::index_from_tree::Error),
         #[error(transparent)]
         BareAttributes(#[from] crate::config::attribute_stack::Error),
         #[error(transparent)]

gix/src/repository/index.rs

@@ -111,12 +111,14 @@ impl crate::Repository {
     /// Create new index-file, which would live at the correct location, in memory from the given `tree`.
     ///
     /// Note that this is an expensive operation as it requires recursively traversing the entire tree to unpack it into the index.
-    pub fn index_from_tree(
-        &self,
-        tree: &gix_hash::oid,
-    ) -> Result<gix_index::File, gix_traverse::tree::breadthfirst::Error> {
+    pub fn index_from_tree(&self, tree: &gix_hash::oid) -> Result<gix_index::File, super::index_from_tree::Error> {
         Ok(gix_index::File::from_state(
-            gix_index::State::from_tree(tree, &self.objects)?,
+            gix_index::State::from_tree(tree, &self.objects, self.config.protect_options()?).map_err(|err| {
+                super::index_from_tree::Error::IndexFromTree {
+                    id: tree.into(),
+                    source: err,
+                }
+            })?,
             self.git_dir().join("index"),
         ))
     }

gix/src/repository/mod.rs

@@ -41,12 +41,15 @@ pub mod attributes;
 mod cache;
 mod config;
 ///
+#[allow(clippy::empty_docs)]
 #[cfg(feature = "blob-diff")]
 pub mod diff;
 ///
+#[allow(clippy::empty_docs)]
 #[cfg(feature = "dirwalk")]
 mod dirwalk;
 ///
+#[allow(clippy::empty_docs)]
 #[cfg(feature = "attributes")]
 pub mod filter;
 mod graph;
@@ -73,6 +76,24 @@ mod submodule;
 mod thread_safe;
 mod worktree;
 
+///
+#[allow(clippy::empty_docs)]
+#[cfg(feature = "index")]
+pub mod index_from_tree {
+    /// The error returned by [Repository::index_from_tree()](crate::Repository::index_from_tree).
+    #[derive(Debug, thiserror::Error)]
+    #[allow(missing_docs)]
+    pub enum Error {
+        #[error("Could not create index from tree at {id}")]
+        IndexFromTree {
+            id: gix_hash::ObjectId,
+            source: gix_index::init::from_tree::Error,
+        },
+        #[error("Couldn't obtain configuration for core.protect*")]
+        BooleanConfig(#[from] crate::config::boolean::Error),
+    }
+}
+
 ///
 #[allow(clippy::empty_docs)]
 pub mod branch_remote_ref_name {
@@ -133,7 +154,7 @@ pub mod index_or_load_from_head {
         #[error(transparent)]
         TreeId(#[from] gix_object::decode::Error),
         #[error(transparent)]
-        TraverseTree(#[from] gix_traverse::tree::breadthfirst::Error),
+        TraverseTree(#[from] crate::repository::index_from_tree::Error),
         #[error(transparent)]
         OpenIndex(#[from] crate::worktree::open_index::Error),
     }
@@ -149,7 +170,7 @@ pub mod worktree_stream {
         #[error(transparent)]
         FindTree(#[from] crate::object::find::existing::Error),
         #[error(transparent)]
-        OpenTree(#[from] gix_traverse::tree::breadthfirst::Error),
+        OpenTree(#[from] crate::repository::index_from_tree::Error),
         #[error(transparent)]
         AttributesCache(#[from] crate::config::attribute_stack::Error),
         #[error(transparent)]