refactor: remove nesting

Author: nik-rev

src/commands/branch_fetch.rs

@@ -5,46 +5,39 @@ use colored::Colorize as _;
 use crate::cli::Remote;
 use crate::commit::Commit;
 use crate::git::{fetch_branch, git};
+use anyhow::anyhow;
 
 /// Fetch the given branch
 pub async fn branch_fetch(
     remote: Remote,
     commit: Option<Commit>,
     checkout: bool,
 ) -> anyhow::Result<()> {
-    match fetch_branch(&remote, commit.as_ref()).await {
-        Ok((_, info)) => {
-            log::info!(
-                "Fetched branch {}/{}/{} available at branch {}{}",
-                remote.owner,
-                remote.repo,
-                info.branch.upstream_branch_name,
-                info.branch.local_branch_name.bright_cyan(),
-                commit
-                    .map(|commit_hash| {
-                        format!(", at commit {}", commit_hash.as_ref().bright_yellow())
-                    })
-                    .unwrap_or_default()
-            );
-
-            // Attempt to cleanup after ourselves
-            let _ = git(["remote", "remove", &info.remote.local_remote_alias]);
-
-            if checkout {
-                if let Err(cant_checkout) = git(["checkout", &info.branch.local_branch_name]) {
-                    log::error!(
-                        "Could not check out branch
-                {}:\n{cant_checkout}",
-                        info.branch.local_branch_name
-                    );
-                } else {
-                    log::info!("checked out: {}", info.branch.local_branch_name);
-                }
-            }
-        }
-        Err(err) => {
-            log::error!("{err}");
-        }
+    let (_, info) = fetch_branch(&remote, commit.as_ref()).await?;
+
+    log::info!(
+        "Fetched branch {}/{}/{} available at branch {}{}",
+        remote.owner,
+        remote.repo,
+        info.branch.upstream_branch_name,
+        info.branch.local_branch_name.bright_cyan(),
+        commit
+            .map(|commit_hash| { format!(", at commit {}", commit_hash.as_ref().bright_yellow()) })
+            .unwrap_or_default()
+    );
+
+    // Attempt to cleanup after ourselves
+    let _ = git(["remote", "remove", &info.remote.local_remote_alias]);
+
+    if checkout {
+        git(["checkout", &info.branch.local_branch_name]).map_err(|err| {
+            anyhow!(
+                "failed to check out branch {}:\n{err}",
+                info.branch.local_branch_name
+            )
+        })?;
+
+        log::info!("checked out: {}", info.branch.local_branch_name);
     }
 
     Ok(())

src/commands/gen_patch.rs

@@ -5,21 +5,19 @@ use std::path::PathBuf;
 
 use anyhow::bail;
 
-use crate::CONFIG_ROOT;
+use crate::CONFIG_PATH;
 use crate::commit::Commit;
-use crate::git::{GIT_ROOT, git};
+use crate::git::git;
 use crate::utils::normalize_commit_msg;
 
 /// Generate patch `filename` at the given `Commit`
 pub fn gen_patch(commit: Commit, filename: Option<PathBuf>) -> anyhow::Result<()> {
-    let config_path = GIT_ROOT.join(CONFIG_ROOT.as_str());
-
-    if !config_path.exists() {
+    if !CONFIG_PATH.exists() {
         log::info!(
             "Config directory {} does not exist, creating it...",
-            config_path.to_string_lossy()
+            CONFIG_PATH.to_string_lossy()
         );
-        fs::create_dir_all(&config_path)?;
+        fs::create_dir_all(&*CONFIG_PATH)?;
     }
 
     // 1. if the user provides a custom filename for the patch file, use that
@@ -32,17 +30,15 @@ pub fn gen_patch(commit: Commit, filename: Option<PathBuf>) -> anyhow::Result<()
                 |commit_msg| normalize_commit_msg(&commit_msg),
             )
         },
-        |filename| filename.to_str().unwrap_or_default().to_string(),
+        |filename| filename.to_str().unwrap_or("").to_string(),
     );
 
-    let patch_filename = format!("{patch_filename}.patch");
-
-    let patch_file_path = config_path.join(&patch_filename);
+    let patch_file_path = CONFIG_PATH.join(format!("{patch_filename}.patch"));
 
     // Paths are UTF-8 encoded. If we cannot convert to UTF-8 that means it is not a
     // valid path
     let Some(patch_file_path_str) = patch_file_path.as_os_str().to_str() else {
-        bail!("Not a valid path: {patch_file_path:?}");
+        bail!("invalid path: {patch_file_path:?}");
     };
 
     if let Err(err) = git([

src/commands/init.rs

@@ -6,33 +6,26 @@ use std::io::Write as _;
 use anyhow::bail;
 use colored::Colorize as _;
 
-use crate::git::GIT_ROOT;
-use crate::{CONFIG_FILE, CONFIG_ROOT, confirm_prompt};
+use crate::{CONFIG_FILE_PATH, CONFIG_PATH, confirm_prompt};
 
 /// Initialize the Patchy config file
 pub fn init() -> anyhow::Result<()> {
-    let example_config = include_bytes!("../../example-config.toml");
-
-    let config_path = GIT_ROOT.join(CONFIG_ROOT.as_str());
-
-    let config_file_path = config_path.join(CONFIG_FILE);
-
-    if config_file_path.exists()
+    if CONFIG_FILE_PATH.exists()
         && !confirm_prompt!(
             "File {} already exists. Overwrite it?",
-            config_file_path.to_string_lossy().bright_blue(),
+            CONFIG_FILE_PATH.to_string_lossy().bright_blue(),
         )
     {
-        bail!("Did not overwrite {}", config_file_path.display());
+        bail!("Did not overwrite {}", CONFIG_FILE_PATH.display());
     }
 
-    fs::create_dir_all(config_path)?;
+    fs::create_dir_all(&*CONFIG_PATH)?;
 
-    let mut file = File::create(&config_file_path)?;
+    let mut file = File::create(&*CONFIG_FILE_PATH)?;
 
-    file.write_all(example_config)?;
+    file.write_all(include_bytes!("../../example-config.toml"))?;
 
-    log::info!("Created config file {}", config_file_path.display());
+    log::info!("Created config file {}", CONFIG_FILE_PATH.display());
 
     Ok(())
 }

src/commands/pr_fetch.rs

@@ -24,7 +24,8 @@ pub async fn pr_fetch(
     let remote = remote.map_or_else(
         || -> anyhow::Result<Remote> {
             let remote = git(["remote", "get-url", "origin"])?;
-            let err = || anyhow!("git command returned invalid remote. Output {remote}");
+            let err = || anyhow!("git command returned invalid remote: {remote}");
+
             if remote.starts_with(GITHUB_REMOTE_PREFIX) && remote.ends_with(GITHUB_REMOTE_SUFFIX) {
                 let start = GITHUB_REMOTE_PREFIX.len();
                 let end = remote.len() - GITHUB_REMOTE_SUFFIX.len();