Repository: Use anyhow errors as return types

This makes it easier to provide additional context on some of these errors

Author: Turbo87

src/git.rs

@@ -1,7 +1,7 @@
+use anyhow::anyhow;
 use std::collections::HashMap;
 use std::path::{Path, PathBuf};
 
-use swirl::PerformError;
 use tempfile::TempDir;
 use url::Url;
 
@@ -143,7 +143,7 @@ pub struct Repository {
 }
 
 impl Repository {
-    pub fn open(repository_config: &RepositoryConfig) -> Result<Self, PerformError> {
+    pub fn open(repository_config: &RepositoryConfig) -> anyhow::Result<Self> {
         let checkout_path = tempfile::Builder::new().prefix("git").tempdir()?;
 
         let repository = git2::build::RepoBuilder::new()
@@ -190,11 +190,11 @@ impl Repository {
         }
     }
 
-    pub fn head_oid(&self) -> Result<git2::Oid, PerformError> {
+    pub fn head_oid(&self) -> anyhow::Result<git2::Oid> {
         Ok(self.repository.head()?.target().unwrap())
     }
 
-    fn perform_commit_and_push(&self, msg: &str, modified_file: &Path) -> Result<(), PerformError> {
+    fn perform_commit_and_push(&self, msg: &str, modified_file: &Path) -> anyhow::Result<()> {
         // git add $file
         let mut index = self.repository.index()?;
         index.add_path(modified_file)?;
@@ -213,7 +213,7 @@ impl Repository {
     }
 
     /// Push the current branch to the provided refname
-    fn push(&self, refspec: &str) -> Result<(), PerformError> {
+    fn push(&self, refspec: &str) -> anyhow::Result<()> {
         let mut ref_status = Ok(());
         let mut callback_called = false;
         {
@@ -224,7 +224,7 @@ impl Repository {
             });
             callbacks.push_update_reference(|_, status| {
                 if let Some(s) = status {
-                    ref_status = Err(format!("failed to push a ref: {}", s).into())
+                    ref_status = Err(anyhow!("failed to push a ref: {}", s))
                 }
                 callback_called = true;
                 Ok(())
@@ -235,13 +235,13 @@ impl Repository {
         }
 
         if !callback_called {
-            ref_status = Err("update_reference callback was not called".into());
+            ref_status = Err(anyhow!("update_reference callback was not called"));
         }
 
         ref_status
     }
 
-    pub fn commit_and_push(&self, message: &str, modified_file: &Path) -> Result<(), PerformError> {
+    pub fn commit_and_push(&self, message: &str, modified_file: &Path) -> anyhow::Result<()> {
         println!("Committing and pushing \"{}\"", message);
 
         let relative_path = modified_file.strip_prefix(self.checkout_path.path())?;
@@ -253,7 +253,7 @@ impl Repository {
             })
     }
 
-    pub fn reset_head(&self) -> Result<(), PerformError> {
+    pub fn reset_head(&self) -> anyhow::Result<()> {
         let mut origin = self.repository.find_remote("origin")?;
         let original_head = self.head_oid()?;
         origin.fetch(
@@ -287,7 +287,7 @@ impl Repository {
     }
 
     /// Reset `HEAD` to a single commit with all the index contents, but no parent
-    pub fn squash_to_single_commit(&self, msg: &str) -> Result<(), PerformError> {
+    pub fn squash_to_single_commit(&self, msg: &str) -> anyhow::Result<()> {
         let tree = self.repository.find_commit(self.head_oid()?)?.tree()?;
         let sig = self.repository.signature()?;
 

src/worker/git.rs

@@ -23,7 +23,9 @@ pub fn add_crate(env: &Environment, krate: Crate) -> Result<(), PerformError> {
 
     let message: String = format!("Updating crate `{}#{}`", krate.name, krate.vers);
 
-    repo.commit_and_push(&message, &dst)
+    repo.commit_and_push(&message, &dst)?;
+
+    Ok(())
 }
 
 /// Yanks or unyanks a crate version. This requires finding the index