Refactoring update_base_branch

Author: Caleb-T-Owens

crates/gitbutler-core/src/git/repository_ext.rs

@@ -6,6 +6,7 @@ use tracing::instrument;
 use crate::{
     config::git::{GbConfig, GitConfig},
     error::Code,
+    project_repository::LogUntil,
 };
 
 use super::{CommitBuffer, Refname};
@@ -19,6 +20,9 @@ use std::os::windows::process::CommandExt;
 ///
 /// For now, it collects useful methods from `gitbutler-core::git::Repository`
 pub trait RepositoryExt {
+    fn distance(&self, from: git2::Oid, to: git2::Oid) -> Result<u32>;
+    fn list_commits(&self, from: git2::Oid, to: LogUntil) -> Result<Vec<git2::Commit>>;
+    fn list_commit_oids(&self, from: git2::Oid, to: LogUntil) -> Result<Vec<git2::Oid>>;
     /// Open a new in-memory repository and executes the provided closure using it.
     /// This is useful when temporary objects are created for the purpose of comparing or getting a diff.
     /// Note that it's the odb that is in-memory, not the working directory.
@@ -346,6 +350,77 @@ impl RepositoryExt for Repository {
         }
         Err(anyhow::anyhow!("No signing key found"))
     }
+
+    // returns a list of commit oids from the first oid to the second oid
+    fn list_commit_oids(&self, from: git2::Oid, to: LogUntil) -> Result<Vec<git2::Oid>> {
+        match to {
+            LogUntil::Commit(oid) => {
+                let mut revwalk = self.revwalk().context("failed to create revwalk")?;
+                revwalk
+                    .push(from)
+                    .context(format!("failed to push {}", from))?;
+                revwalk
+                    .hide(oid)
+                    .context(format!("failed to hide {}", oid))?;
+                revwalk
+                    .map(|oid| oid.map(Into::into))
+                    .collect::<Result<Vec<_>, _>>()
+            }
+            LogUntil::Take(n) => {
+                let mut revwalk = self.revwalk().context("failed to create revwalk")?;
+                revwalk
+                    .push(from)
+                    .context(format!("failed to push {}", from))?;
+                revwalk
+                    .take(n)
+                    .map(|oid| oid.map(Into::into))
+                    .collect::<Result<Vec<_>, _>>()
+            }
+            LogUntil::When(cond) => {
+                let mut revwalk = self.revwalk().context("failed to create revwalk")?;
+                revwalk
+                    .push(from)
+                    .context(format!("failed to push {}", from))?;
+                let mut oids: Vec<git2::Oid> = vec![];
+                for oid in revwalk {
+                    let oid = oid.context("failed to get oid")?;
+                    oids.push(oid);
+
+                    let commit = self.find_commit(oid).context("failed to find commit")?;
+
+                    if cond(&commit).context("failed to check condition")? {
+                        break;
+                    }
+                }
+                Ok(oids)
+            }
+            LogUntil::End => {
+                let mut revwalk = self.revwalk().context("failed to create revwalk")?;
+                revwalk
+                    .push(from)
+                    .context(format!("failed to push {}", from))?;
+                revwalk
+                    .map(|oid| oid.map(Into::into))
+                    .collect::<Result<Vec<_>, _>>()
+            }
+        }
+        .context("failed to collect oids")
+    }
+
+    // returns a list of commits from the first oid to the second oid
+    fn list_commits(&self, from: git2::Oid, to: LogUntil) -> Result<Vec<git2::Commit>> {
+        self.list_commit_oids(from, to)?
+            .into_iter()
+            .map(|oid| self.find_commit(oid))
+            .collect::<Result<Vec<_>, _>>()
+            .context("failed to collect commits")
+    }
+
+    // returns the number of commits between the first oid to the second oid
+    fn distance(&self, from: git2::Oid, to: git2::Oid) -> Result<u32> {
+        let oids = self.list_commit_oids(from, LogUntil::Commit(to))?;
+        Ok(oids.len().try_into()?)
+    }
 }
 
 /// Signs the buffer with the configured gpg key, returning the signature.

crates/gitbutler-core/src/project_repository/repository.rs

@@ -234,105 +234,6 @@ impl Repository {
         .context("failed to lookup reference")
     }
 
-    // returns a list of commit oids from the first oid to the second oid
-    pub fn l(&self, from: git2::Oid, to: LogUntil) -> Result<Vec<git2::Oid>> {
-        match to {
-            LogUntil::Commit(oid) => {
-                let mut revwalk = self
-                    .git_repository
-                    .revwalk()
-                    .context("failed to create revwalk")?;
-                revwalk
-                    .push(from)
-                    .context(format!("failed to push {}", from))?;
-                revwalk
-                    .hide(oid)
-                    .context(format!("failed to hide {}", oid))?;
-                revwalk
-                    .map(|oid| oid.map(Into::into))
-                    .collect::<Result<Vec<_>, _>>()
-            }
-            LogUntil::Take(n) => {
-                let mut revwalk = self
-                    .git_repository
-                    .revwalk()
-                    .context("failed to create revwalk")?;
-                revwalk
-                    .push(from)
-                    .context(format!("failed to push {}", from))?;
-                revwalk
-                    .take(n)
-                    .map(|oid| oid.map(Into::into))
-                    .collect::<Result<Vec<_>, _>>()
-            }
-            LogUntil::When(cond) => {
-                let mut revwalk = self
-                    .git_repository
-                    .revwalk()
-                    .context("failed to create revwalk")?;
-                revwalk
-                    .push(from)
-                    .context(format!("failed to push {}", from))?;
-                let mut oids: Vec<git2::Oid> = vec![];
-                for oid in revwalk {
-                    let oid = oid.context("failed to get oid")?;
-                    oids.push(oid);
-
-                    let commit = self
-                        .git_repository
-                        .find_commit(oid)
-                        .context("failed to find commit")?;
-
-                    if cond(&commit).context("failed to check condition")? {
-                        break;
-                    }
-                }
-                Ok(oids)
-            }
-            LogUntil::End => {
-                let mut revwalk = self
-                    .git_repository
-                    .revwalk()
-                    .context("failed to create revwalk")?;
-                revwalk
-                    .push(from)
-                    .context(format!("failed to push {}", from))?;
-                revwalk
-                    .map(|oid| oid.map(Into::into))
-                    .collect::<Result<Vec<_>, _>>()
-            }
-        }
-        .context("failed to collect oids")
-    }
-
-    // returns a list of oids from the first oid to the second oid
-    pub fn list(&self, from: git2::Oid, to: git2::Oid) -> Result<Vec<git2::Oid>> {
-        self.l(from, LogUntil::Commit(to))
-    }
-
-    pub fn list_commits(&self, from: git2::Oid, to: git2::Oid) -> Result<Vec<git2::Commit>> {
-        Ok(self
-            .list(from, to)?
-            .into_iter()
-            .map(|oid| self.git_repository.find_commit(oid))
-            .collect::<Result<Vec<_>, _>>()?)
-    }
-
-    // returns a list of commits from the first oid to the second oid
-    pub fn log(&self, from: git2::Oid, to: LogUntil) -> Result<Vec<git2::Commit>> {
-        self.l(from, to)?
-            .into_iter()
-            .map(|oid| self.git_repository.find_commit(oid))
-            .collect::<Result<Vec<_>, _>>()
-            .context("failed to collect commits")
-    }
-
-    // returns the number of commits between the first oid to the second oid
-    pub fn distance(&self, from: git2::Oid, to: git2::Oid) -> Result<u32> {
-        let oids = self.l(from, LogUntil::Commit(to))?;
-        Ok(oids.len().try_into()?)
-    }
-
     pub fn commit(
         &self,
         user: Option<&users::User>,

crates/gitbutler-core/src/rebase/mod.rs

@@ -14,7 +14,7 @@ pub fn cherry_rebase(
     end_commit_oid: git2::Oid,
 ) -> Result<Option<git2::Oid>> {
     // get a list of the commits to rebase
-    let mut ids_to_rebase = project_repository.l(
+    let mut ids_to_rebase = project_repository.repo().list_commit_oids(
         end_commit_oid,
         project_repository::LogUntil::Commit(start_commit_oid),
     )?;