consolidate git operations into a Repo type

crates/signed_state/src/checkouts.rs

@@ -7,6 +7,7 @@ use gpui::{App, AppContext, Context, Entity, Global, Subscription};
 use nostr::prelude::*;
 use settings::{CheckoutRecord, SettingsStore};
 use signed_core::{Announcement, RepoAddr};
+use signed_git::Repo;
 use utils::same_repo_url;
 
 use crate::backend::{Backend, BackendEvent};
@@ -338,8 +339,14 @@ impl CheckoutsStore {
                 {
                     continue;
                 }
-                let origin = signed_git::origin_url(path).ok().flatten();
-                let root = signed_git::root_commit(path).ok().flatten();
+                let origin = Repo::open(path)
+                    .and_then(|repo| repo.origin_url())
+                    .ok()
+                    .flatten();
+                let root = Repo::open(path)
+                    .and_then(|repo| repo.root_commit())
+                    .ok()
+                    .flatten();
                 facts.push((path.clone(), origin, root));
             }
 
@@ -555,14 +562,15 @@ fn resolve_associations<'a>(
 }
 
 fn checkout_status(path: &Path, announced_head: Option<&str>) -> Option<CheckoutStatus> {
-    let branches = signed_git::worktree_branches(path).ok()?;
+    let repo = Repo::try_open(path)?;
+    let branches = repo.branches().ok()?;
 
-    if branches.is_empty() || signed_git::worktree_dirty(path) {
+    if branches.is_empty() || repo.is_dirty() {
         return None;
     }
 
-    let branch = signed_git::worktree_current_branch(path)?;
-    let head = signed_git::head_commit_id(path).ok().flatten()?;
+    let branch = repo.current_branch()?;
+    let head = repo.head()?;
     let base = announced_head
         .filter(|name| branches.iter().any(|b| b == name))
         .map(str::to_owned)
@@ -573,7 +581,7 @@ fn checkout_status(path: &Path, announced_head: Option<&str>) -> Option<Checkout
         return None;
     }
 
-    let ahead = signed_git::worktree_commits_ahead(path, &base, &branch);
+    let ahead = repo.commits_ahead(&base, &branch);
     (ahead > 0).then_some(CheckoutStatus {
         path: path.to_path_buf(),
         branch,
@@ -585,31 +593,33 @@ fn checkout_status(path: &Path, announced_head: Option<&str>) -> Option<Checkout
 
 /// The `ready to push` status of one checkout of the user's own repository.
 fn checkout_push_status(path: &Path, fetch: bool) -> Option<CheckoutStatus> {
-    if signed_git::worktree_dirty(path) {
+    let repo = Repo::try_open(path)?;
+    if repo.is_dirty() {
         return None;
     }
 
-    let branch = signed_git::worktree_current_branch(path)?;
-    let head = signed_git::head_commit_id(path).ok().flatten()?;
-    let origin = signed_git::origin_url(path).ok().flatten()?;
+    let branch = repo.current_branch()?;
+    let head = repo.head()?;
+    let origin = repo.origin_url().ok().flatten()?;
 
     if fetch {
-        signed_git::fetch_repo_refs(path, &[origin], "+refs/heads/*:refs/remotes/origin/*").ok();
+        repo.fetch_refs(&[origin], "+refs/heads/*:refs/remotes/origin/*")
+            .ok();
     }
 
     let remote = format!("refs/remotes/origin/{branch}");
 
     // A branch never fetched or pushed yet compares against the remote HEAD.
     // The remote HEAD is the fork point in practice.
-    let base = if signed_git::worktree_ref_exists(path, &remote) {
+    let base = if repo.ref_exists(&remote) {
         remote
-    } else if signed_git::worktree_ref_exists(path, "refs/remotes/origin/HEAD") {
+    } else if repo.ref_exists("refs/remotes/origin/HEAD") {
         "refs/remotes/origin/HEAD".to_owned()
     } else {
         return None;
     };
 
-    let ahead = signed_git::worktree_commits_ahead(path, &base, &branch);
+    let ahead = repo.commits_ahead(&base, &branch);
 
     (ahead > 0).then_some(CheckoutStatus {
         path: path.to_path_buf(),
@@ -730,7 +740,7 @@ mod tests {
     fn checkout_status_reports_ahead_branches_only() {
         let dir = tempfile::tempdir().expect("tempdir");
         let path = dir.path().join("repo");
-        let _initial = signed_git::init_repository(&path, "My Repo", "").expect("init");
+        let _initial = Repo::init(&path, "My Repo", "").expect("init");
         let run = |args: &[&str]| {
             let status = Command::new("git")
                 .current_dir(&path)
@@ -777,7 +787,7 @@ mod tests {
         // Act like a grasp server and allow them.
         let dir = tempfile::tempdir().expect("tempdir");
         let remote = dir.path().join("remote");
-        signed_git::init_repository(&remote, "My Repo", "").expect("init");
+        Repo::init(&remote, "My Repo", "").expect("init");
         let config = Command::new("git")
             .args(["config", "receive.denyCurrentBranch", "ignore"])
             .current_dir(&remote)