feat: ein tool estimate-hours now supports mailmaps (#366)

Author: Byron

git-repository/src/repository/snapshots.rs

@@ -18,6 +18,19 @@ impl crate::Repository {
         }
     }
 
+    // TODO: tests
+    /// Similar to [`load_mailmap_into()`][crate::Repository::load_mailmap_into()], but ignores all errors and returns at worst
+    /// an empty mailmap, e.g. if there is no mailmap or if there were errors loading them.
+    ///
+    /// This represents typical usage within git, which also works with what's there without considering a populated mailmap
+    /// a reason to abort an operation, considering it optional.
+    #[cfg(feature = "git-mailmap")]
+    pub fn load_mailmap(&self) -> git_mailmap::Snapshot {
+        let mut out = git_mailmap::Snapshot::default();
+        self.load_mailmap_into(&mut out).ok();
+        out
+    }
+
     // TODO: tests
     /// Try to merge mailmaps from the following locations into `target`:
     ///

gitoxide-core/src/hours.rs

@@ -9,6 +9,7 @@ use std::{
 };
 
 use anyhow::{anyhow, bail};
+use git_repository as git;
 use git_repository::{actor, bstr::BString, interrupt, objs, prelude::*, progress, refs::file::ReferenceExt, Progress};
 use itertools::Itertools;
 use rayon::prelude::*;
@@ -44,7 +45,7 @@ where
     W: io::Write,
     P: Progress,
 {
-    let repo = git_repository::discover(working_dir)?;
+    let repo = git::discover(working_dir)?;
     let handle = repo.clone().apply_environment();
     let commit_id = repo
         .refs
@@ -79,6 +80,7 @@ where
         commits
     };
 
+    let mailmap = repo.load_mailmap();
     let start = Instant::now();
     #[allow(clippy::redundant_closure)]
     let mut all_commits: Vec<actor::Signature> = all_commits
@@ -87,7 +89,7 @@ where
             objs::CommitRefIter::from_bytes(&commit_data)
                 .signatures()
                 .next()
-                .map(|author| actor::Signature::from(author))
+                .map(|author| mailmap.resolve(&author))
         })
         .try_fold(
             || Vec::new(),

gitoxide-core/src/repository/mailmap.rs

@@ -1,6 +1,6 @@
 use crate::OutputFormat;
 use git_repository as git;
-use git_repository::bstr::ByteSlice;
+#[cfg(feature = "serde1")]
 use git_repository::mailmap::Entry;
 use std::io;
 use std::path::PathBuf;
@@ -17,6 +17,7 @@ struct JsonEntry {
 #[cfg(feature = "serde1")]
 impl<'a> From<Entry<'a>> for JsonEntry {
     fn from(v: Entry<'a>) -> Self {
+        use git_repository::bstr::ByteSlice;
         JsonEntry {
             new_name: v.new_name().map(|s| s.to_str_lossy().into_owned()),
             new_email: v.new_email().map(|s| s.to_str_lossy().into_owned()),
@@ -29,7 +30,7 @@ impl<'a> From<Entry<'a>> for JsonEntry {
 pub fn entries(
     repository: PathBuf,
     format: OutputFormat,
-    out: impl io::Write,
+    #[cfg_attr(not(feature = "serde1"), allow(unused_variables))] out: impl io::Write,
     mut err: impl io::Write,
 ) -> anyhow::Result<()> {
     if format == OutputFormat::Human {