From f1905dcaf4cba63c6becea0b93abec6c0d57384f Mon Sep 17 00:00:00 2001
From: Ossama Hjaji <ossama-hjaji@live.fr>
Date: Tue, 28 Nov 2023 19:08:14 +0100
Subject: [PATCH] Refactoring git metrics module (#1217)

* refacot

* add break line
---
 src/info/authors.rs          |  98 ++++++++++++++++++-
 src/info/churn.rs            |  95 +++++++++++++++++--
 src/info/contributors.rs     |  20 +---
 src/info/git/metrics.rs      | 177 +----------------------------------
 src/info/git/mod.rs          |  28 +++---
 src/info/langs/language.rs   |  18 ++--
 src/info/license.rs          |   3 +-
 src/info/loc.rs              |   6 +-
 src/info/mod.rs              |  75 ++++++++++++---
 src/info/utils/info_field.rs |   3 +-
 src/info/utils/mod.rs        |   9 +-
 11 files changed, 284 insertions(+), 248 deletions(-)

diff --git a/src/info/authors.rs b/src/info/authors.rs
index 35f3cf0b9..8d0579a77 100644
--- a/src/info/authors.rs
+++ b/src/info/authors.rs
@@ -1,10 +1,10 @@
-use super::git::metrics::GitMetrics;
+use super::git::sig::Sig;
 use crate::{
     cli::NumberSeparator,
     info::utils::{format_number, info_field::InfoField},
 };
 use serde::Serialize;
-use std::fmt::Write;
+use std::{collections::HashMap, fmt::Write};
 
 #[derive(Serialize, Clone, Debug, PartialEq)]
 #[serde(rename_all = "camelCase")]
@@ -66,8 +66,20 @@ pub struct AuthorsInfo {
 }
 
 impl AuthorsInfo {
-    pub fn new(git_metrics: &GitMetrics) -> Self {
-        let authors = git_metrics.authors_to_display.clone();
+    pub fn new(
+        number_of_commits_by_signature: &HashMap<Sig, usize>,
+        total_number_of_commits: usize,
+        number_of_authors_to_display: usize,
+        show_email: bool,
+        number_separator: NumberSeparator,
+    ) -> Self {
+        let authors = compute_authors(
+            number_of_commits_by_signature,
+            total_number_of_commits,
+            number_of_authors_to_display,
+            show_email,
+            number_separator,
+        );
         Self { authors }
     }
 
@@ -79,6 +91,40 @@ impl AuthorsInfo {
     }
 }
 
+fn compute_authors(
+    number_of_commits_by_signature: &HashMap<Sig, usize>,
+    total_number_of_commits: usize,
+    number_of_authors_to_display: usize,
+    show_email: bool,
+    number_separator: NumberSeparator,
+) -> Vec<Author> {
+    let mut signature_with_number_of_commits_sorted: Vec<(&Sig, &usize)> =
+        Vec::from_iter(number_of_commits_by_signature);
+
+    signature_with_number_of_commits_sorted.sort_by(|(sa, a_count), (sb, b_count)| {
+        b_count.cmp(a_count).then_with(|| sa.name.cmp(&sb.name))
+    });
+
+    let authors: Vec<Author> = signature_with_number_of_commits_sorted
+        .into_iter()
+        .map(|(author, author_nbr_of_commits)| {
+            Author::new(
+                author.name.to_string(),
+                if show_email {
+                    Some(author.email.to_string())
+                } else {
+                    None
+                },
+                *author_nbr_of_commits,
+                total_number_of_commits,
+                number_separator,
+            )
+        })
+        .take(number_of_authors_to_display)
+        .collect();
+    authors
+}
+
 fn digit_difference(num1: usize, num2: usize) -> usize {
     let count_digits = |num: usize| (num.checked_ilog10().unwrap_or(0) + 1) as usize;
     count_digits(num1).abs_diff(count_digits(num2))
@@ -285,4 +331,48 @@ mod test {
         let result = digit_difference(num1, num2);
         assert_eq!(result, expected);
     }
+
+    #[test]
+    fn test_compute_authors() {
+        let mut number_of_commits_by_signature: HashMap<Sig, usize> = HashMap::new();
+        number_of_commits_by_signature.insert(
+            Sig {
+                name: "John Doe".into(),
+                email: "johndoe@example.com".into(),
+            },
+            30,
+        );
+        number_of_commits_by_signature.insert(
+            Sig {
+                name: "Jane Doe".into(),
+                email: "janedoe@example.com".into(),
+            },
+            20,
+        );
+        number_of_commits_by_signature.insert(
+            Sig {
+                name: "Ellen Smith".into(),
+                email: "ellensmith@example.com".into(),
+            },
+            50,
+        );
+        let total_number_of_commits = 100;
+        let number_of_authors_to_display = 2;
+        let show_email = false;
+        let number_separator = NumberSeparator::Comma;
+
+        let actual = compute_authors(
+            &number_of_commits_by_signature,
+            total_number_of_commits,
+            number_of_authors_to_display,
+            show_email,
+            number_separator,
+        );
+
+        let expected = vec![
+            Author::new(String::from("Ellen Smith"), None, 50, 100, number_separator),
+            Author::new(String::from("John Doe"), None, 30, 100, number_separator),
+        ];
+        assert_eq!(actual, expected);
+    }
 }
diff --git a/src/info/churn.rs b/src/info/churn.rs
index 0f9547889..48012c654 100644
--- a/src/info/churn.rs
+++ b/src/info/churn.rs
@@ -1,7 +1,10 @@
-use super::{git::metrics::GitMetrics, utils::info_field::InfoField};
+use super::utils::info_field::InfoField;
 use crate::{cli::NumberSeparator, info::utils::format_number};
+use anyhow::Result;
+use gix::bstr::BString;
+use globset::{Glob, GlobSetBuilder};
 use serde::Serialize;
-use std::fmt::Write;
+use std::{collections::HashMap, fmt::Write};
 
 #[derive(Serialize, Clone, Debug, PartialEq)]
 #[serde(rename_all = "camelCase")]
@@ -42,15 +45,62 @@ pub struct ChurnInfo {
     pub file_churns: Vec<FileChurn>,
     pub churn_pool_size: usize,
 }
+
 impl ChurnInfo {
-    pub fn new(git_metrics: &GitMetrics) -> Self {
-        let file_churns = git_metrics.file_churns_to_display.clone();
-        Self {
+    pub fn new(
+        number_of_commits_by_file_path: &HashMap<BString, usize>,
+        churn_pool_size: usize,
+        number_of_file_churns_to_display: usize,
+        globs_to_exclude: &[String],
+        number_separator: NumberSeparator,
+    ) -> Result<Self> {
+        let file_churns = compute_file_churns(
+            number_of_commits_by_file_path,
+            number_of_file_churns_to_display,
+            globs_to_exclude,
+            number_separator,
+        )?;
+
+        Ok(Self {
             file_churns,
-            churn_pool_size: git_metrics.churn_pool_size,
-        }
+            churn_pool_size,
+        })
+    }
+}
+
+fn compute_file_churns(
+    number_of_commits_by_file_path: &HashMap<BString, usize>,
+    number_of_file_churns_to_display: usize,
+    globs_to_exclude: &[String],
+    number_separator: NumberSeparator,
+) -> Result<Vec<FileChurn>> {
+    let mut builder = GlobSetBuilder::new();
+    for glob in globs_to_exclude {
+        builder.add(Glob::new(glob)?);
     }
+    let glob_set = builder.build()?;
+    let mut number_of_commits_by_file_path_sorted = Vec::from_iter(number_of_commits_by_file_path);
+
+    number_of_commits_by_file_path_sorted
+        .sort_by(|(_, a_count), (_, b_count)| b_count.cmp(a_count));
+
+    Ok(number_of_commits_by_file_path_sorted
+        .into_iter()
+        .filter_map(|(file_path, nbr_of_commits)| {
+            if !glob_set.is_match(file_path.to_string()) {
+                Some(FileChurn::new(
+                    file_path.to_string(),
+                    *nbr_of_commits,
+                    number_separator,
+                ))
+            } else {
+                None
+            }
+        })
+        .take(number_of_file_churns_to_display)
+        .collect())
 }
+
 impl std::fmt::Display for ChurnInfo {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         let mut churn_info = String::new();
@@ -139,4 +189,35 @@ mod tests {
         );
         assert_eq!(shorten_file_path("file.txt", 0), "file.txt");
     }
+
+    #[test]
+    fn test_compute_file_churns() -> Result<()> {
+        let mut number_of_commits_by_file_path = HashMap::new();
+        number_of_commits_by_file_path.insert("path/to/file1.txt".into(), 2);
+        number_of_commits_by_file_path.insert("path/to/file2.txt".into(), 5);
+        number_of_commits_by_file_path.insert("path/to/file3.txt".into(), 3);
+        number_of_commits_by_file_path.insert("path/to/file4.txt".into(), 7);
+        number_of_commits_by_file_path.insert("foo/x/y/file.txt".into(), 70);
+        number_of_commits_by_file_path.insert("foo/x/file.txt".into(), 10);
+
+        let number_of_file_churns_to_display = 3;
+        let number_separator = NumberSeparator::Comma;
+        let globs_to_exclude = vec![
+            "foo/**/file.txt".to_string(),
+            "path/to/file2.txt".to_string(),
+        ];
+        let actual = compute_file_churns(
+            &number_of_commits_by_file_path,
+            number_of_file_churns_to_display,
+            &globs_to_exclude,
+            number_separator,
+        )?;
+        let expected = vec![
+            FileChurn::new(String::from("path/to/file4.txt"), 7, number_separator),
+            FileChurn::new(String::from("path/to/file3.txt"), 3, number_separator),
+            FileChurn::new(String::from("path/to/file1.txt"), 2, number_separator),
+        ];
+        assert_eq!(actual, expected);
+        Ok(())
+    }
 }
diff --git a/src/info/contributors.rs b/src/info/contributors.rs
index 252a127fc..0ae8d3895 100644
--- a/src/info/contributors.rs
+++ b/src/info/contributors.rs
@@ -1,4 +1,4 @@
-use super::{git::metrics::GitMetrics, utils::format_number};
+use super::utils::format_number;
 use crate::{cli::NumberSeparator, info::utils::info_field::InfoField};
 use serde::Serialize;
 
@@ -14,12 +14,12 @@ pub struct ContributorsInfo {
 
 impl ContributorsInfo {
     pub fn new(
-        git_metrics: &GitMetrics,
+        total_number_of_authors: usize,
         number_of_authors_to_display: usize,
         number_separator: NumberSeparator,
     ) -> Self {
         Self {
-            total_number_of_authors: git_metrics.total_number_of_authors,
+            total_number_of_authors,
             number_of_authors_to_display,
             number_separator,
         }
@@ -44,22 +44,10 @@ impl InfoField for ContributorsInfo {
 #[cfg(test)]
 mod test {
     use super::*;
-    use gix::date::Time;
 
     #[test]
     fn test_display_contributors_info() {
-        let timestamp = Time::now_utc();
-        let git_metrics = GitMetrics {
-            authors_to_display: vec![],
-            file_churns_to_display: vec![],
-            total_number_of_authors: 12,
-            total_number_of_commits: 2,
-            churn_pool_size: 0,
-            time_of_most_recent_commit: timestamp,
-            time_of_first_commit: timestamp,
-        };
-
-        let contributors_info = ContributorsInfo::new(&git_metrics, 2, NumberSeparator::Plain);
+        let contributors_info = ContributorsInfo::new(12, 2, NumberSeparator::Plain);
         assert_eq!(contributors_info.value(), "12".to_string());
         assert_eq!(contributors_info.title(), "Contributors".to_string());
     }
diff --git a/src/info/git/metrics.rs b/src/info/git/metrics.rs
index 4158170ea..a9da66abf 100644
--- a/src/info/git/metrics.rs
+++ b/src/info/git/metrics.rs
@@ -1,16 +1,12 @@
 use super::sig::Sig;
-use crate::cli::{CliOptions, NumberSeparator};
-use crate::info::authors::Author;
-use crate::info::churn::FileChurn;
 use anyhow::Result;
 use gix::bstr::BString;
 use gix::date::Time;
-use globset::{Glob, GlobSetBuilder};
 use std::collections::HashMap;
 
 pub struct GitMetrics {
-    pub authors_to_display: Vec<Author>,
-    pub file_churns_to_display: Vec<FileChurn>,
+    pub number_of_commits_by_signature: HashMap<Sig, usize>,
+    pub number_of_commits_by_file_path: HashMap<BString, usize>,
     pub total_number_of_authors: usize,
     pub total_number_of_commits: usize,
     pub churn_pool_size: usize,
@@ -25,23 +21,9 @@ impl GitMetrics {
         churn_pool_size: usize,
         time_of_first_commit: Option<Time>,
         time_of_most_recent_commit: Option<Time>,
-        options: &CliOptions,
     ) -> Result<Self> {
         let total_number_of_commits = number_of_commits_by_signature.values().sum();
-        let (authors_to_display, total_number_of_authors) = compute_authors(
-            number_of_commits_by_signature,
-            total_number_of_commits,
-            options.info.number_of_authors,
-            options.info.email,
-            options.text_formatting.number_separator,
-        );
-
-        let file_churns_to_display = compute_file_churns(
-            number_of_commits_by_file_path,
-            options.info.number_of_file_churns,
-            options.text_formatting.number_separator,
-            &options.info.exclude,
-        )?;
+        let total_number_of_authors = number_of_commits_by_signature.len();
 
         // This could happen if a branch pointed to non-commit object, so no traversal actually happens.
         let (time_of_first_commit, time_of_most_recent_commit) = time_of_first_commit
@@ -49,8 +31,8 @@ impl GitMetrics {
             .unwrap_or_default();
 
         Ok(Self {
-            authors_to_display,
-            file_churns_to_display,
+            number_of_commits_by_signature,
+            number_of_commits_by_file_path,
             total_number_of_authors,
             total_number_of_commits,
             churn_pool_size,
@@ -59,152 +41,3 @@ impl GitMetrics {
         })
     }
 }
-
-fn compute_file_churns(
-    number_of_commits_by_file_path: HashMap<BString, usize>,
-    number_of_file_churns_to_display: usize,
-    number_separator: NumberSeparator,
-    globs_to_exclude: &[String],
-) -> Result<Vec<FileChurn>> {
-    let mut builder = GlobSetBuilder::new();
-    for glob in globs_to_exclude {
-        builder.add(Glob::new(glob)?);
-    }
-    let glob_set = builder.build()?;
-    let mut number_of_commits_by_file_path_sorted = Vec::from_iter(number_of_commits_by_file_path);
-
-    number_of_commits_by_file_path_sorted
-        .sort_by(|(_, a_count), (_, b_count)| b_count.cmp(a_count));
-
-    Ok(number_of_commits_by_file_path_sorted
-        .into_iter()
-        .filter_map(|(file_path, nbr_of_commits)| {
-            if !glob_set.is_match(file_path.to_string()) {
-                Some(FileChurn::new(
-                    file_path.to_string(),
-                    nbr_of_commits,
-                    number_separator,
-                ))
-            } else {
-                None
-            }
-        })
-        .take(number_of_file_churns_to_display)
-        .collect())
-}
-
-fn compute_authors(
-    number_of_commits_by_signature: HashMap<Sig, usize>,
-    total_number_of_commits: usize,
-    number_of_authors_to_display: usize,
-    show_email: bool,
-    number_separator: NumberSeparator,
-) -> (Vec<Author>, usize) {
-    let total_number_of_authors = number_of_commits_by_signature.len();
-    let mut signature_with_number_of_commits_sorted: Vec<(Sig, usize)> =
-        number_of_commits_by_signature.into_iter().collect();
-
-    signature_with_number_of_commits_sorted.sort_by(|(sa, a_count), (sb, b_count)| {
-        b_count.cmp(a_count).then_with(|| sa.name.cmp(&sb.name))
-    });
-
-    let authors: Vec<Author> = signature_with_number_of_commits_sorted
-        .into_iter()
-        .map(|(author, author_nbr_of_commits)| {
-            Author::new(
-                author.name.to_string(),
-                if show_email {
-                    Some(author.email.to_string())
-                } else {
-                    None
-                },
-                author_nbr_of_commits,
-                total_number_of_commits,
-                number_separator,
-            )
-        })
-        .take(number_of_authors_to_display)
-        .collect();
-    (authors, total_number_of_authors)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_compute_authors() {
-        let mut number_of_commits_by_signature: HashMap<Sig, usize> = HashMap::new();
-        number_of_commits_by_signature.insert(
-            Sig {
-                name: "John Doe".into(),
-                email: "johndoe@example.com".into(),
-            },
-            30,
-        );
-        number_of_commits_by_signature.insert(
-            Sig {
-                name: "Jane Doe".into(),
-                email: "janedoe@example.com".into(),
-            },
-            20,
-        );
-        number_of_commits_by_signature.insert(
-            Sig {
-                name: "Ellen Smith".into(),
-                email: "ellensmith@example.com".into(),
-            },
-            50,
-        );
-        let total_number_of_commits = 100;
-        let number_of_authors_to_display = 2;
-        let show_email = false;
-        let number_separator = NumberSeparator::Comma;
-
-        let (actual, total_number_of_authors) = compute_authors(
-            number_of_commits_by_signature,
-            total_number_of_commits,
-            number_of_authors_to_display,
-            show_email,
-            number_separator,
-        );
-
-        assert_eq!(total_number_of_authors, 3);
-        let expected = vec![
-            Author::new(String::from("Ellen Smith"), None, 50, 100, number_separator),
-            Author::new(String::from("John Doe"), None, 30, 100, number_separator),
-        ];
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn test_compute_file_churns() -> Result<()> {
-        let mut number_of_commits_by_file_path = HashMap::new();
-        number_of_commits_by_file_path.insert("path/to/file1.txt".into(), 2);
-        number_of_commits_by_file_path.insert("path/to/file2.txt".into(), 5);
-        number_of_commits_by_file_path.insert("path/to/file3.txt".into(), 3);
-        number_of_commits_by_file_path.insert("path/to/file4.txt".into(), 7);
-        number_of_commits_by_file_path.insert("foo/x/y/file.txt".into(), 70);
-        number_of_commits_by_file_path.insert("foo/x/file.txt".into(), 10);
-
-        let number_of_file_churns_to_display = 3;
-        let number_separator = NumberSeparator::Comma;
-        let globs_to_exclude = vec![
-            "foo/**/file.txt".to_string(),
-            "path/to/file2.txt".to_string(),
-        ];
-        let actual = compute_file_churns(
-            number_of_commits_by_file_path,
-            number_of_file_churns_to_display,
-            number_separator,
-            &globs_to_exclude,
-        )?;
-        let expected = vec![
-            FileChurn::new(String::from("path/to/file4.txt"), 7, number_separator),
-            FileChurn::new(String::from("path/to/file3.txt"), 3, number_separator),
-            FileChurn::new(String::from("path/to/file1.txt"), 2, number_separator),
-        ];
-        assert_eq!(actual, expected);
-        Ok(())
-    }
-}
diff --git a/src/info/git/mod.rs b/src/info/git/mod.rs
index 9b0fb9c68..dc9a1cbb5 100644
--- a/src/info/git/mod.rs
+++ b/src/info/git/mod.rs
@@ -1,6 +1,6 @@
 use self::metrics::GitMetrics;
 use self::sig::Sig;
-use crate::cli::{CliOptions, MyRegex};
+use crate::cli::MyRegex;
 use anyhow::Result;
 use gix::bstr::ByteSlice;
 use gix::bstr::{BString, Utf8Error};
@@ -19,14 +19,19 @@ use std::sync::Arc;
 use std::thread::JoinHandle;
 
 pub mod metrics;
-mod sig;
+pub mod sig;
 
-pub fn traverse_commit_graph(repo: &gix::Repository, options: &CliOptions) -> Result<GitMetrics> {
+pub fn traverse_commit_graph(
+    repo: &gix::Repository,
+    no_bots: &Option<Option<MyRegex>>,
+    max_churn_pool_size: Option<usize>,
+    no_merges: bool,
+) -> Result<GitMetrics> {
     let mut time_of_most_recent_commit = None;
     let mut time_of_first_commit = None;
     let mut number_of_commits_by_signature: HashMap<Sig, usize> = HashMap::new();
     let mailmap = repo.open_mailmap();
-    let bot_regex_pattern = get_no_bots_regex(&options.info.no_bots)?;
+    let bot_regex_pattern = get_no_bots_regex(no_bots)?;
     let has_commit_graph_traversal_ended = Arc::new(AtomicBool::default());
     let total_number_of_commits = Arc::new(AtomicUsize::default());
 
@@ -49,7 +54,7 @@ pub fn traverse_commit_graph(repo: &gix::Repository, options: &CliOptions) -> Re
         repo,
         &has_commit_graph_traversal_ended,
         &total_number_of_commits,
-        options.info.churn_pool_size,
+        max_churn_pool_size,
     )?;
 
     let author_threads = can_use_author_threads
@@ -59,7 +64,7 @@ pub fn traverse_commit_graph(repo: &gix::Repository, options: &CliOptions) -> Re
     for commit in commit_iter {
         let commit = commit?;
         {
-            if options.info.no_merges && commit.parent_ids.len() > 1 {
+            if no_merges && commit.parent_ids.len() > 1 {
                 continue;
             }
 
@@ -111,7 +116,6 @@ pub fn traverse_commit_graph(repo: &gix::Repository, options: &CliOptions) -> Re
         churn_pool_size,
         time_of_first_commit,
         time_of_most_recent_commit,
-        options,
     )?;
 
     Ok(git_metrics)
@@ -169,7 +173,7 @@ fn get_churn_channel(
     repo: &gix::Repository,
     has_commit_graph_traversal_ended: &Arc<AtomicBool>,
     total_number_of_commits: &Arc<AtomicUsize>,
-    churn_pool_size_opt: Option<usize>,
+    max_churn_pool_size: Option<usize>,
 ) -> Result<(JoinHandle<Result<ChurnPair>>, Sender<ObjectId>)> {
     let (tx, rx) = channel::<gix::hash::ObjectId>();
     let thread = std::thread::spawn({
@@ -186,7 +190,7 @@ fn get_churn_channel(
                 if should_break(
                     has_commit_graph_traversal_ended.load(Ordering::Relaxed),
                     total_number_of_commits.load(Ordering::Relaxed),
-                    churn_pool_size_opt,
+                    max_churn_pool_size,
                     number_of_diffs_computed,
                 ) {
                     break;
@@ -203,15 +207,15 @@ fn get_churn_channel(
 fn should_break(
     has_commit_graph_traversal_ended: bool,
     total_number_of_commits: usize,
-    churn_pool_size_opt: Option<usize>,
+    max_churn_pool_size_opt: Option<usize>,
     number_of_diffs_computed: usize,
 ) -> bool {
     if !has_commit_graph_traversal_ended {
         return false;
     }
 
-    churn_pool_size_opt.map_or(true, |churn_pool_size| {
-        number_of_diffs_computed >= churn_pool_size.min(total_number_of_commits)
+    max_churn_pool_size_opt.map_or(true, |max_churn_pool_size| {
+        number_of_diffs_computed >= max_churn_pool_size.min(total_number_of_commits)
     })
 }
 
diff --git a/src/info/langs/language.rs b/src/info/langs/language.rs
index 48d25502d..044e16c0b 100644
--- a/src/info/langs/language.rs
+++ b/src/info/langs/language.rs
@@ -20,7 +20,7 @@ pub struct LanguagesInfo {
     #[serde(skip_serializing)]
     true_color: bool,
     #[serde(skip_serializing)]
-    number_of_languages: usize,
+    number_of_languages_to_display: usize,
     #[serde(skip_serializing)]
     info_color: DynColors,
 }
@@ -29,7 +29,7 @@ impl LanguagesInfo {
     pub fn new(
         loc_by_language: &[(Language, usize)],
         true_color: bool,
-        number_of_languages: usize,
+        number_of_languages_to_display: usize,
         info_color: DynColors,
     ) -> Self {
         let total: usize = loc_by_language.iter().map(|(_, v)| v).sum();
@@ -54,7 +54,7 @@ impl LanguagesInfo {
         Self {
             languages_with_percentage,
             true_color,
-            number_of_languages,
+            number_of_languages_to_display,
             info_color,
         }
     }
@@ -125,10 +125,12 @@ fn prepare_languages(
                 (language.to_string(), percentage, circle_color)
             },
         );
-    if languages_info.languages_with_percentage.len() > languages_info.number_of_languages {
+    if languages_info.languages_with_percentage.len()
+        > languages_info.number_of_languages_to_display
+    {
         let mut languages = iter
             .by_ref()
-            .take(languages_info.number_of_languages)
+            .take(languages_info.number_of_languages_to_display)
             .collect::<Vec<_>>();
         let other_perc = iter.fold(0.0, |acc, x| acc + x.1);
         languages.push((
@@ -208,7 +210,7 @@ mod test {
                 percentage: 100_f64,
             }],
             true_color: false,
-            number_of_languages: 6,
+            number_of_languages_to_display: 6,
             info_color: DynColors::Ansi(AnsiColors::White),
         };
         let expected_languages_info = format!(
@@ -246,7 +248,7 @@ mod test {
                 },
             ],
             true_color: false,
-            number_of_languages: 2,
+            number_of_languages_to_display: 2,
             info_color: DynColors::Ansi(AnsiColors::White),
         };
 
@@ -316,7 +318,7 @@ mod test {
                 },
             ],
             true_color: false,
-            number_of_languages: 2,
+            number_of_languages_to_display: 2,
             info_color: DynColors::Ansi(AnsiColors::White),
         };
 
diff --git a/src/info/license.rs b/src/info/license.rs
index cf2da4dc7..20b74d663 100644
--- a/src/info/license.rs
+++ b/src/info/license.rs
@@ -99,9 +99,8 @@ impl InfoField for LicenseInfo {
 
 #[cfg(test)]
 mod test {
-    use onefetch_manifest::ManifestType;
-
     use super::*;
+    use onefetch_manifest::ManifestType;
 
     #[test]
     fn test_get_license() -> Result<()> {
diff --git a/src/info/loc.rs b/src/info/loc.rs
index 2ded0e3b5..fc4a71be5 100644
--- a/src/info/loc.rs
+++ b/src/info/loc.rs
@@ -1,10 +1,8 @@
+use super::utils::format_number;
 use crate::info::langs::get_total_loc;
 use crate::info::langs::language::Language;
-use serde::Serialize;
-
 use crate::{cli::NumberSeparator, info::utils::info_field::InfoField};
-
-use super::utils::format_number;
+use serde::Serialize;
 
 #[derive(Serialize)]
 #[serde(rename_all = "camelCase")]
diff --git a/src/info/mod.rs b/src/info/mod.rs
index 60794b7fc..49e5f9160 100644
--- a/src/info/mod.rs
+++ b/src/info/mod.rs
@@ -145,7 +145,12 @@ pub fn build_info(cli_options: &CliOptions) -> Result<Info> {
     let manifest = get_manifest(&repo_path)?;
     let repo_url = get_repo_url(&repo);
 
-    let git_metrics = traverse_commit_graph(&repo, cli_options)?;
+    let git_metrics = traverse_commit_graph(
+        &repo,
+        &cli_options.info.no_bots,
+        cli_options.info.churn_pool_size,
+        cli_options.info.no_merges,
+    )?;
     let true_color = match cli_options.ascii.true_color {
         When::Always => true,
         When::Never => false,
@@ -163,8 +168,11 @@ pub fn build_info(cli_options: &CliOptions) -> Result<Info> {
     let no_bold = cli_options.text_formatting.no_bold;
     let number_separator = cli_options.text_formatting.number_separator;
     let iso_time = cli_options.text_formatting.iso_time;
-    let number_of_languages = cli_options.info.number_of_languages;
-    let number_of_authors = cli_options.info.number_of_authors;
+    let number_of_languages_to_display = cli_options.info.number_of_languages;
+    let number_of_authors_to_display = cli_options.info.number_of_authors;
+    let number_of_file_churns_to_display = cli_options.info.number_of_file_churns;
+    let globs_to_exclude = &cli_options.info.exclude;
+    let show_email = cli_options.info.email;
 
     Ok(InfoBuilder::new(cli_options)
         .title(&repo, no_bold, &text_colors)
@@ -177,16 +185,26 @@ pub fn build_info(cli_options: &CliOptions) -> Result<Info> {
         .languages(
             &loc_by_language,
             true_color,
-            number_of_languages,
+            number_of_languages_to_display,
             &text_colors,
         )
         .dependencies(&manifest, number_separator)
-        .authors(&git_metrics)
+        .authors(
+            &git_metrics,
+            number_of_authors_to_display,
+            show_email,
+            number_separator,
+        )
         .last_change(&git_metrics, iso_time)
-        .contributors(&git_metrics, number_of_authors, number_separator)
+        .contributors(&git_metrics, number_of_authors_to_display, number_separator)
         .url(&repo_url)
         .commits(&git_metrics, repo.is_shallow(), number_separator)
-        .churn(&git_metrics)
+        .churn(
+            &git_metrics,
+            number_of_file_churns_to_display,
+            globs_to_exclude,
+            number_separator,
+        )?
         .loc(&loc_by_language, number_separator)
         .size(&repo, number_separator)
         .license(&repo_path, &manifest)?
@@ -326,9 +344,21 @@ impl InfoBuilder {
         self
     }
 
-    fn authors(mut self, git_metrics: &GitMetrics) -> Self {
+    fn authors(
+        mut self,
+        git_metrics: &GitMetrics,
+        number_of_authors_to_display: usize,
+        show_email: bool,
+        number_separator: NumberSeparator,
+    ) -> Self {
         if !self.disabled_fields.contains(&InfoType::Authors) {
-            let authors = AuthorsInfo::new(git_metrics);
+            let authors = AuthorsInfo::new(
+                &git_metrics.number_of_commits_by_signature,
+                git_metrics.total_number_of_commits,
+                number_of_authors_to_display,
+                show_email,
+                number_separator,
+            );
             self.info_fields.push(Box::new(authors));
         }
         self
@@ -345,12 +375,15 @@ impl InfoBuilder {
     fn contributors(
         mut self,
         git_metrics: &GitMetrics,
-        number_of_authors: usize,
+        number_of_authors_to_display: usize,
         number_separator: NumberSeparator,
     ) -> Self {
         if !self.disabled_fields.contains(&InfoType::Contributors) {
-            let contributors =
-                ContributorsInfo::new(git_metrics, number_of_authors, number_separator);
+            let contributors = ContributorsInfo::new(
+                git_metrics.total_number_of_authors,
+                number_of_authors_to_display,
+                number_separator,
+            );
             self.info_fields.push(Box::new(contributors));
         }
         self
@@ -369,12 +402,24 @@ impl InfoBuilder {
         self
     }
 
-    fn churn(mut self, git_metrics: &GitMetrics) -> Self {
+    fn churn(
+        mut self,
+        git_metrics: &GitMetrics,
+        number_of_file_churns_to_display: usize,
+        globs_to_exclude: &[String],
+        number_separator: NumberSeparator,
+    ) -> Result<Self> {
         if !self.disabled_fields.contains(&InfoType::Churn) {
-            let churn = ChurnInfo::new(git_metrics);
+            let churn = ChurnInfo::new(
+                &git_metrics.number_of_commits_by_file_path,
+                git_metrics.churn_pool_size,
+                number_of_file_churns_to_display,
+                globs_to_exclude,
+                number_separator,
+            )?;
             self.info_fields.push(Box::new(churn));
         }
-        self
+        Ok(self)
     }
 
     fn loc(
diff --git a/src/info/utils/info_field.rs b/src/info/utils/info_field.rs
index 166c90d57..52d69011c 100644
--- a/src/info/utils/info_field.rs
+++ b/src/info/utils/info_field.rs
@@ -78,11 +78,10 @@ pub enum InfoType {
 
 #[cfg(test)]
 mod test {
+    use super::*;
     use owo_colors::DynColors;
     use serde::Serialize;
 
-    use super::*;
-
     #[derive(Serialize)]
     struct InfoFieldImpl(&'static str);
 
diff --git a/src/info/utils/mod.rs b/src/info/utils/mod.rs
index bc83cb76c..0595580df 100644
--- a/src/info/utils/mod.rs
+++ b/src/info/utils/mod.rs
@@ -1,13 +1,11 @@
-use std::time::{Duration, SystemTime};
-
+use crate::cli::NumberSeparator;
 use gix::date::Time;
 use num_format::ToFormattedString;
 use owo_colors::{DynColors, Style};
+use std::time::{Duration, SystemTime};
 use time::{format_description::well_known::Rfc3339, OffsetDateTime};
 use time_humanize::HumanTime;
 
-use crate::cli::NumberSeparator;
-
 pub mod info_field;
 
 pub fn format_time(time: Time, iso_time: bool) -> String {
@@ -59,10 +57,9 @@ pub fn get_style(is_bold: bool, color: DynColors) -> Style {
 
 #[cfg(test)]
 mod tests {
+    use super::*;
     use owo_colors::AnsiColors;
     use rstest::rstest;
-
-    use super::*;
     use std::time::{Duration, SystemTime};
 
     #[test]