[pack #67] refactor

Author: Byron

git-odb/src/store/compound/init.rs

@@ -38,6 +38,8 @@ impl compound::Store {
                         p.extension().unwrap_or_default() == "idx"
                             && p.file_name().unwrap_or_default().to_string_lossy().starts_with("pack-")
                     })
+                    // TODO: make this configurable, git for instance sorts by modification date
+                    //       https://github.com/libgit2/libgit2/blob/main/src/odb_pack.c#L41-L158
                     .map(|(p, md)| pack::Bundle::at(p).map(|b| (b, md.len())))
                     .collect::<Result<Vec<_>, _>>()?;
                 packs_and_sizes.sort_by_key(|e| e.1);

git-pack/src/data/output/count/mod.rs

@@ -26,5 +26,5 @@ impl Count {
 }
 
 ///
-pub mod iter_from_objects;
-pub use iter_from_objects::{objects, objects_unthreaded};
+pub mod objects;
+pub use objects::{objects, objects_unthreaded};

git-pack/src/data/output/count/iter_from_objects.rs renamed to git-pack/src/data/output/count/objects.rs

@@ -318,7 +318,7 @@ where
 
 mod tree {
     pub mod changes {
-        use crate::data::output::count::iter_from_objects::util::InsertImmutable;
+        use crate::data::output::count::objects::util::InsertImmutable;
         use git_diff::tree::{
             visit::{Action, Change},
             Visit,
@@ -374,7 +374,7 @@ mod tree {
     }
 
     pub mod traverse {
-        use crate::data::output::count::iter_from_objects::util::InsertImmutable;
+        use crate::data::output::count::objects::util::InsertImmutable;
         use git_hash::ObjectId;
         use git_object::{bstr::BStr, immutable::tree::Entry};
         use git_traverse::tree::visit::{Action, Visit};

git-pack/tests/pack/data/output/count_and_entries.rs

@@ -90,7 +90,7 @@ fn traversals() -> crate::Result {
         allow_thin_pack,
     ) in [
         (
-            count::iter_from_objects::ObjectExpansion::AsIs,
+            count::objects::ObjectExpansion::AsIs,
             Count {
                 trees: 0,
                 commits: 15,
@@ -105,7 +105,7 @@ fn traversals() -> crate::Result {
                 blobs: 0,
                 tags: 1,
             },
-            output::count::iter_from_objects::Outcome {
+            output::count::objects::Outcome {
                 input_objects: 16,
                 expanded_objects: 0,
                 decoded_objects: 16,
@@ -122,7 +122,7 @@ fn traversals() -> crate::Result {
             false,
         ),
         (
-            count::iter_from_objects::ObjectExpansion::TreeAdditionsComparedToAncestor,
+            count::objects::ObjectExpansion::TreeAdditionsComparedToAncestor,
             Count {
                 trees: 3,
                 commits: 2, // todo: why more?
@@ -137,7 +137,7 @@ fn traversals() -> crate::Result {
                 blobs: 96,
                 tags: 0,
             },
-            output::count::iter_from_objects::Outcome {
+            output::count::objects::Outcome {
                 input_objects: 1,
                 expanded_objects: 102,
                 decoded_objects: 18,
@@ -154,7 +154,7 @@ fn traversals() -> crate::Result {
             true,
         ),
         (
-            count::iter_from_objects::ObjectExpansion::TreeAdditionsComparedToAncestor,
+            count::objects::ObjectExpansion::TreeAdditionsComparedToAncestor,
             Count {
                 trees: 5,
                 commits: 2, // todo: why more?
@@ -169,7 +169,7 @@ fn traversals() -> crate::Result {
                 blobs: 96,
                 tags: 0,
             },
-            output::count::iter_from_objects::Outcome {
+            output::count::objects::Outcome {
                 input_objects: 1,
                 expanded_objects: 102,
                 decoded_objects: 18,
@@ -186,10 +186,10 @@ fn traversals() -> crate::Result {
             false,
         ),
         (
-            count::iter_from_objects::ObjectExpansion::TreeContents,
+            count::objects::ObjectExpansion::TreeContents,
             whole_pack,
             whole_pack_obj_count,
-            output::count::iter_from_objects::Outcome {
+            output::count::objects::Outcome {
                 input_objects: 16,
                 expanded_objects: 852,
                 decoded_objects: 57,
@@ -206,10 +206,10 @@ fn traversals() -> crate::Result {
             false,
         ),
         (
-            count::iter_from_objects::ObjectExpansion::TreeAdditionsComparedToAncestor,
+            count::objects::ObjectExpansion::TreeAdditionsComparedToAncestor,
             whole_pack,
             whole_pack_obj_count,
-            output::count::iter_from_objects::Outcome {
+            output::count::objects::Outcome {
                 input_objects: 16,
                 expanded_objects: 866,
                 decoded_objects: 208,
@@ -255,7 +255,7 @@ fn traversals() -> crate::Result {
                 .map(Ok::<_, Infallible>),
             progress::Discard,
             &AtomicBool::new(false),
-            count::iter_from_objects::Options {
+            count::objects::Options {
                 input_object_expansion: expansion_mode,
                 thread_limit: deterministic_count_needs_single_thread,
                 ..Default::default()

gitoxide-core/src/pack/create.rs

@@ -49,9 +49,9 @@ impl FromStr for ObjectExpansion {
     }
 }
 
-impl From<ObjectExpansion> for pack::data::output::count::iter_from_objects::ObjectExpansion {
+impl From<ObjectExpansion> for pack::data::output::count::objects::ObjectExpansion {
     fn from(v: ObjectExpansion) -> Self {
-        use pack::data::output::count::iter_from_objects::ObjectExpansion::*;
+        use pack::data::output::count::objects::ObjectExpansion::*;
         match v {
             ObjectExpansion::None => AsIs,
             ObjectExpansion::TreeTraversal => TreeContents,
@@ -190,7 +190,7 @@ where
                 input,
                 progress,
                 &interrupt::IS_INTERRUPTED,
-                pack::data::output::count::iter_from_objects::Options {
+                pack::data::output::count::objects::Options {
                     thread_limit,
                     chunk_size,
                     input_object_expansion,
@@ -300,7 +300,7 @@ fn print(stats: Statistics, format: OutputFormat, out: impl std::io::Write) -> a
 fn human_output(
     Statistics {
         counts:
-            pack::data::output::count::iter_from_objects::Outcome {
+            pack::data::output::count::objects::Outcome {
                 input_objects,
                 expanded_objects,
                 decoded_objects,
@@ -343,7 +343,7 @@ fn human_output(
 #[derive(Default)]
 #[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]
 struct Statistics {
-    counts: pack::data::output::count::iter_from_objects::Outcome,
+    counts: pack::data::output::count::objects::Outcome,
     entries: pack::data::output::entry::iter_from_counts::Outcome,
 }