use new mailmap keys and make a few improvements.

Byron · Byron · commit 7f65ffdb5748 · 2023-12-10T08:25:30.000+01:00
diff --git a/gix/Cargo.toml b/gix/Cargo.toml
@@ -84,7 +84,7 @@ excludes = ["dep:gix-ignore", "dep:gix-worktree", "index"]
 attributes = ["excludes", "dep:gix-filter", "dep:gix-pathspec", "dep:gix-attributes", "dep:gix-submodule", "gix-worktree?/attributes", "dep:gix-command"]
 
 ## Add support for mailmaps, as way of determining the final name of commmiters and authors.
-mailmap = ["dep:gix-mailmap"]
+mailmap = ["dep:gix-mailmap", "revision"]
 
 ## Make revspec parsing possible, as well describing revision.
 revision = ["gix-revision/describe", "index"]
diff --git a/gix/src/config/snapshot/access.rs b/gix/src/config/snapshot/access.rs
@@ -51,7 +51,7 @@ impl<'repo> Snapshot<'repo> {
     ///
     /// Note that this method takes the most recent value at `key` even if it is from a file with reduced trust.
     #[momo]
-    pub fn string<'a>(&self, key: impl Into<&'a BStr>) -> Option<Cow<'_, BStr>> {
+    pub fn string<'a>(&self, key: impl Into<&'a BStr>) -> Option<Cow<'repo, BStr>> {
         self.repo.config.resolved.string_by_key(key)
     }
 
@@ -62,7 +62,7 @@ impl<'repo> Snapshot<'repo> {
     pub fn trusted_path<'a>(
         &self,
         key: impl Into<&'a BStr>,
-    ) -> Option<Result<Cow<'_, std::path::Path>, gix_config::path::interpolate::Error>> {
+    ) -> Option<Result<Cow<'repo, std::path::Path>, gix_config::path::interpolate::Error>> {
         let key = gix_config::parse::key(key.into())?;
         self.repo
             .config
diff --git a/gix/src/mailmap.rs b/gix/src/mailmap.rs
@@ -9,7 +9,7 @@ pub mod load {
         #[error("The mailmap file declared in `mailmap.file` could not be read")]
         Io(#[from] std::io::Error),
         #[error("The configured mailmap.blob could not be parsed")]
-        BlobSpec(#[from] gix_hash::decode::Error),
+        BlobSpec(#[from] crate::revision::spec::parse::single::Error),
         #[error(transparent)]
         PathInterpolate(#[from] gix_config::path::interpolate::Error),
         #[error("Could not find object configured in `mailmap.blob`")]
diff --git a/gix/src/repository/mailmap.rs b/gix/src/repository/mailmap.rs
@@ -1,3 +1,6 @@
+use crate::config::tree::{Key, Mailmap};
+use crate::Id;
+
 impl crate::Repository {
     // TODO: tests
     /// Similar to [`open_mailmap_into()`][crate::Repository::open_mailmap_into()], but ignores all errors and returns at worst
@@ -27,12 +30,11 @@ impl crate::Repository {
         let mut blob_id = self
             .config
             .resolved
-            .raw_value("mailmap", None, "blob")
-            .ok()
+            .string("mailmap", None, Mailmap::BLOB.name)
             .and_then(|spec| {
-                // TODO: actually resolve this as spec (once we can do that)
-                gix_hash::ObjectId::from_hex(spec.as_ref())
+                self.rev_parse_single(spec.as_ref())
                     .map_err(|e| err.get_or_insert(e.into()))
+                    .map(Id::detach)
                     .ok()
             });
         match self.work_dir() {
@@ -69,29 +71,9 @@ impl crate::Repository {
         }
 
         let configured_path = self
-            .config
-            .resolved
-            .value::<gix_config::Path<'_>>("mailmap", None, "file")
-            .ok()
-            .and_then(|path| {
-                let install_dir = self.install_dir().ok()?;
-                let home = self.config.home_dir();
-                match path.interpolate(gix_config::path::interpolate::Context {
-                    git_install_dir: Some(install_dir.as_path()),
-                    home_dir: home.as_deref(),
-                    home_for_user: if self.options.git_dir_trust.expect("trust is set") == gix_sec::Trust::Full {
-                        Some(gix_config::path::interpolate::home_for_user)
-                    } else {
-                        None
-                    },
-                }) {
-                    Ok(path) => Some(path),
-                    Err(e) => {
-                        err.get_or_insert(e.into());
-                        None
-                    }
-                }
-            });
+            .config_snapshot()
+            .trusted_path(Mailmap::FILE.logical_name().as_str())
+            .and_then(|res| res.map_err(|e| err.get_or_insert(e.into())).ok());
 
         if let Some(mut file) =
             configured_path.and_then(|path| std::fs::File::open(path).map_err(|e| err.get_or_insert(e.into())).ok())
