Merge pull request #30 from epage/source

fix(ops): Expose separate committer/author signatures

Author: epage

src/ops.rs

@@ -117,7 +117,7 @@ pub fn cherry_pick(
             ));
         }
 
-        let mut sig = signature(repo)?;
+        let mut sig = commit_signature(repo)?;
         if let (Some(name), Some(email)) = (sig.name(), sig.email()) {
             // For simple rebases, preserve the original commit time
             sig = git2::Signature::new(name, email, &cherry_commit.time())?.to_owned();
@@ -309,7 +309,7 @@ impl UserSign {
 
                 let signing_key = config.get_string("user.signingkey").or_else(
                     |_| -> Result<_, git2::Error> {
-                        let sig = signature(repo)?;
+                        let sig = commit_signature(repo)?;
                         Ok(sig.to_string())
                     },
                 )?;
@@ -326,7 +326,7 @@ impl UserSign {
 
                 let signing_key = config.get_string("user.signingkey").or_else(
                     |_| -> Result<_, git2::Error> {
-                        let sig = signature(repo)?;
+                        let sig = commit_signature(repo)?;
                         Ok(sig.to_string())
                     },
                 )?;
@@ -347,7 +347,7 @@ impl UserSign {
                     .unwrap_or_else(|_| -> Result<_, git2::Error> {
                         get_default_ssh_signing_key(config)?.map(Ok).unwrap_or_else(
                             || -> Result<_, git2::Error> {
-                                let sig = signature(repo)?;
+                                let sig = commit_signature(repo)?;
                                 Ok(sig.to_string())
                             },
                         )
@@ -669,61 +669,54 @@ fn get_default_ssh_signing_key(config: &git2::Config) -> Result<Option<String>,
     Ok(Some(default_key.to_owned()))
 }
 
-/// Replacement for [`git2::Repository::signature`] that respects env variables
+#[doc(hidden)]
+#[deprecated(
+    since = "0.4.3",
+    note = "Replaced with `commit_signature`, `author_signature`"
+)]
 pub fn signature(repo: &git2::Repository) -> Result<git2::Signature<'_>, git2::Error> {
-    let config_sig = repo.signature()?;
+    commit_signature(repo)
+}
 
-    let name = std::env::var_os("GIT_COMMITTER_NAME")
-        .map(|os| {
-            os.into_string().map_err(|os| {
-                git2::Error::new(
-                    git2::ErrorCode::Unmerged,
-                    git2::ErrorClass::Invalid,
-                    format!(
-                        "`GIT_COMMITTER_NAME` is not valid UTF-8: {}",
-                        os.to_string_lossy()
-                    ),
-                )
-            })
-        })
-        .unwrap_or_else(|| {
-            config_sig.name().map(ToOwned::to_owned).ok_or_else(|| {
-                git2::Error::new(
-                    git2::ErrorCode::Unmerged,
-                    git2::ErrorClass::Invalid,
-                    format!(
-                        "name is not valid UTF-8: {}",
-                        String::from_utf8_lossy(config_sig.name_bytes())
-                    ),
-                )
-            })
-        })?;
+/// Lookup the configured committer's signature
+pub fn commit_signature(repo: &git2::Repository) -> Result<git2::Signature<'_>, git2::Error> {
+    let config = repo.config()?;
+    let name = read_signature_field(&config, "GIT_COMMITTER_NAME", "committer.name", "user.name")?;
+    let email = read_signature_field(
+        &config,
+        "GIT_COMMITTER_EMAIL",
+        "committer.email",
+        "user.email",
+    )?;
+
+    git2::Signature::now(&name, &email)
+}
+
+/// Lookup the configured author's signature
+pub fn author_signature(repo: &git2::Repository) -> Result<git2::Signature<'_>, git2::Error> {
+    let config = repo.config()?;
+    let name = read_signature_field(&config, "GIT_AUTHOR_NAME", "author.name", "user.name")?;
+    let email = read_signature_field(&config, "GIT_AUTHOR_EMAIL", "author.email", "user.email")?;
 
-    let email = std::env::var_os("GIT_COMMITTER_EMAIL")
+    git2::Signature::now(&name, &email)
+}
+
+fn read_signature_field(
+    config: &git2::Config,
+    env_var: &str,
+    specialized_key: &str,
+    general_key: &str,
+) -> Result<String, git2::Error> {
+    std::env::var_os(env_var)
         .map(|os| {
             os.into_string().map_err(|os| {
                 git2::Error::new(
                     git2::ErrorCode::Unmerged,
                     git2::ErrorClass::Invalid,
-                    format!(
-                        "`GIT_COMMITTER_EMAIL` is not valid UTF-8: {}",
-                        os.to_string_lossy()
-                    ),
+                    format!("`{}` is not valid UTF-8: {}", env_var, os.to_string_lossy()),
                 )
             })
         })
-        .unwrap_or_else(|| {
-            config_sig.email().map(ToOwned::to_owned).ok_or_else(|| {
-                git2::Error::new(
-                    git2::ErrorCode::Unmerged,
-                    git2::ErrorClass::Invalid,
-                    format!(
-                        "email is not valid UTF-8: {}",
-                        String::from_utf8_lossy(config_sig.email_bytes())
-                    ),
-                )
-            })
-        })?;
-
-    git2::Signature::new(&name, &email, &config_sig.when())
+        .or_else(|| config.get_string(specialized_key).ok().map(Ok))
+        .unwrap_or_else(|| config.get_string(general_key))
 }