cleanup

Author: wbbradley

src/git.rs

@@ -1,10 +1,11 @@
-use std::process::{Command, ExitStatus};
-use std::time::Instant;
+use std::{
+    process::{Command, ExitStatus},
+    time::Instant,
+};
 
 use anyhow::{Context, Result, anyhow, bail};
 
-use crate::git2_ops::GitRepo;
-use crate::stats::record_git_command;
+use crate::{git2_ops::GitRepo, stats::record_git_command};
 
 pub const DEFAULT_REMOTE: &str = "origin";
 
@@ -150,10 +151,10 @@ pub(crate) fn git_branch_status(
     let exists = git_branch_exists(repo, branch);
     let parent_branch = match parent_branch {
         Some(parent_branch) => parent_branch.to_string(),
-        None => git_remote_main(repo, DEFAULT_REMOTE)?,
+        None => repo.remote_main(DEFAULT_REMOTE)?,
     };
     let is_descendent = exists && is_ancestor(repo, &parent_branch, branch)?;
-    let upstream_symbolic_name = git_get_upstream(repo, branch);
+    let upstream_symbolic_name = repo.get_upstream(branch);
     let upstream_synced = upstream_symbolic_name
         .as_ref()
         .is_some_and(|upstream| shas_match(repo, upstream, branch));
@@ -214,8 +215,8 @@ pub(crate) struct GitTrunk {
     pub(crate) main_branch: String,
 }
 
-pub(crate) fn git_trunk(repo: &GitRepo) -> Result<GitTrunk> {
-    let remote_main = git_remote_main(repo, DEFAULT_REMOTE)?;
+pub(crate) fn git_trunk(git_repo: &GitRepo) -> Result<GitTrunk> {
+    let remote_main = git_repo.remote_main(DEFAULT_REMOTE)?;
     let main_branch = after_text(&remote_main, format!("{DEFAULT_REMOTE}/"))
         .ok_or(anyhow!("no branch?"))?
         .to_string();
@@ -224,12 +225,3 @@ pub(crate) fn git_trunk(repo: &GitRepo) -> Result<GitTrunk> {
         main_branch,
     })
 }
-
-/// Returns a string of the form "origin/main".
-pub(crate) fn git_remote_main(repo: &GitRepo, remote: &str) -> Result<String> {
-    repo.remote_main(remote)
-}
-
-pub(crate) fn git_get_upstream(repo: &GitRepo, branch: &str) -> Option<String> {
-    repo.get_upstream(branch)
-}

src/main.rs

@@ -12,8 +12,6 @@ use git::{
     git_checkout_main,
     git_diff_stats,
     git_fetch,
-    git_get_upstream,
-    git_remote_main,
     git_sha,
     is_ancestor,
     run_git_status,
@@ -182,7 +180,7 @@ fn inner_main() -> Result<()> {
 
     let run_version = format!("{}", chrono::Utc::now().timestamp());
     let current_branch = git.current_branch()?;
-    let current_upstream = git_get_upstream(&git, "");
+    let current_upstream = git.get_upstream("");
     tracing::debug!(run_version, current_branch, current_upstream);
 
     match args.command {
@@ -310,12 +308,14 @@ fn recur_tree(
     parent_branch: Option<&str>,
     verbose: bool,
 ) -> Result<()> {
-    let Ok(branch_status) = git_branch_status(git, parent_branch, &branch.name).with_context(|| {
-        format!(
-            "attempting to fetch the branch status of {}",
-            branch.name.red()
-        )
-    }) else {
+    let Ok(branch_status) =
+        git_branch_status(git, parent_branch, &branch.name).with_context(|| {
+            format!(
+                "attempting to fetch the branch status of {}",
+                branch.name.red()
+            )
+        })
+    else {
         tracing::warn!("Branch {} does not exist", branch.name);
         return Ok(());
     };
@@ -499,6 +499,7 @@ fn status(
     Ok(())
 }
 
+#[allow(clippy::too_many_arguments)]
 fn restack(
     git: &GitRepo,
     mut state: State,
@@ -534,7 +535,13 @@ fn restack(
                 branch.name,
                 parent
             );
-            if push && !shas_match(git, &format!("{DEFAULT_REMOTE}/{}", branch.name), &branch.name) {
+            if push
+                && !shas_match(
+                    git,
+                    &format!("{DEFAULT_REMOTE}/{}", branch.name),
+                    &branch.name,
+                )
+            {
                 run_git(&[
                     "push",
                     match branch.stack_method {

src/state.rs

@@ -18,7 +18,6 @@ use crate::{
         GitTrunk,
         after_text,
         git_branch_exists,
-        git_remote_main,
         git_sha,
         git_trunk,
         is_ancestor,
@@ -258,7 +257,11 @@ impl State {
 
     /// Auto-cleanup missing branches silently during status display.
     /// Returns true if any branches were cleaned up.
-    pub(crate) fn auto_cleanup_missing_branches(&mut self, git: &GitRepo, repo: &str) -> Result<bool> {
+    pub(crate) fn auto_cleanup_missing_branches(
+        &mut self,
+        git: &GitRepo,
+        repo: &str,
+    ) -> Result<bool> {
         let Some(tree) = self.trees.get_mut(repo) else {
             return Ok(false);
         };
@@ -397,7 +400,12 @@ impl State {
             let mut removed_branches = Vec::new();
             let mut remounted_branches = Vec::new();
 
-            cleanup_tree_recursive(&repo_git, tree, &mut removed_branches, &mut remounted_branches);
+            cleanup_tree_recursive(
+                &repo_git,
+                tree,
+                &mut removed_branches,
+                &mut remounted_branches,
+            );
 
             std::env::set_current_dir(original_dir)?;
 
@@ -642,7 +650,12 @@ impl State {
     /// Try to auto-mount the current branch if it's not in the tree.
     /// Returns Ok(true) if the branch was auto-mounted, Ok(false) if it was already in the tree,
     /// or Err if auto-mount failed.
-    pub(crate) fn try_auto_mount(&mut self, git: &GitRepo, repo: &str, branch_name: &str) -> Result<bool> {
+    pub(crate) fn try_auto_mount(
+        &mut self,
+        git: &GitRepo,
+        repo: &str,
+        branch_name: &str,
+    ) -> Result<bool> {
         // Ensure the tree exists for this repo
         self.ensure_trunk(git, repo)?;