prepare attribute-group setup as far as possible. (#450)

It's not used yet, after all.

Sebastian Thiel committed 4 years ago

Commit f5e2eeb1 parent 5c11b843 files · +15 −5Browse files

Unified · Split

3 files

git-repository/src/clone/checkout.rs +1 −1
git-repository/src/config/cache/access.rs +10 −4
src/plumbing/progress.rs +4 −0

git-repository/src/clone/checkout.rs+1−1

@@ -59,7 +59,7 @@ pub mod main_worktree { · 58 unmodified lines
59	let mut index = git_index::File::from_state(index, repo.index_path());	59	let mut index = git_index::File::from_state(index, repo.index_path());
60	index.write(Default::default())?;	60	index.write(Default::default())?;
61		61
62	let mut opts = repo.config.checkout_options()?;	62	let mut opts = repo.config.checkout_options(repo.git_dir())?;
63	opts.destination_is_initially_empty = true;	63	opts.destination_is_initially_empty = true;
64	// git_worktree::index::checkout(	64	// git_worktree::index::checkout(
65	// &mut index,	65	// &mut index,

git-repository/src/config/cache/access.rs+10−4

     /// Collect everything needed to checkout files into a worktree.
     /// Note that some of the options being returned will be defaulted so safe settings, the caller might have to override them
     /// depending on the use-case.
-    pub(crate) fn checkout_options(&self) -> Result<git_worktree::index::checkout::Options, checkout_options::Error> {
+    pub(crate) fn checkout_options(
+        &self,
+        git_dir: &std::path::Path,
+    ) -> Result<git_worktree::index::checkout::Options, checkout_options::Error> {
         fn checkout_thread_limit_from_config(
             config: &git_config::File<'static>,
         ) -> Option<Result<usize, checkout_options::Error>> {
                 .unwrap_or(default))
         }
-        fn assemble_attribute_globals(me: &Cache) -> Result<git_attributes::MatchGroup, checkout_options::Error> {
+        fn assemble_attribute_globals(
+            me: &Cache,
+            _git_dir: &std::path::Path,
+        ) -> Result<git_attributes::MatchGroup, checkout_options::Error> {
             let _attributes_file = match me.trusted_file_path("core", None, "attributesFile").transpose()? {
                 Some(attributes) => Some(attributes.into_owned()),
                 None => me.xdg_config_path("attributes").ok().flatten(),
             };
-            // let group = git_attributes::MatchGroup::<git_attributes::Attributes>::from_git_dir()
+            // TODO: implement git_attributes::MatchGroup::<git_attributes::Attributes>::from_git_dir(), similar to what's done for `Ignore`.
             Ok(Default::default())
         }
                 .resolved
                 .string("core", None, "checkStat")
                 .map_or(true, |v| v.as_ref() != "minimal"),
-            attribute_globals: assemble_attribute_globals(self)?,
+            attribute_globals: assemble_attribute_globals(self, git_dir)?,
         })
     }
     pub(crate) fn xdg_config_path(

src/plumbing/progress.rs+4−0

             deviation: None,
         },
     },
+    Record {
+        config: "core.attributesFile",
+        usage: Planned {note: Some("for checkout - it's already queried but needs building of attributes group, and of course support during checkout")},
+    },
     Record {
         config: "core.abbrev",
         usage: InModule {