gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-10-06 08:58:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

move get_wd_tree to git2::Repository extension trait

Browse Source 
This way we reduce drilling and allow ourselves to eventually remove core::git types
This commit is contained in:
Kiril Videlov 2024-05-28 23:17:54 +02:00
parent 203e43b9d1
commit ce5e57d5ac
5 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crates/gitbutler-core/src/git/mod.rs
View File

@ -39,3 +39,6 @@ pub use config::*;
mod url;
pub use self::url::*;
mod repository_ext;
pub use repository_ext::*;

7
crates/gitbutler-core/src/git/repository.rs
View File

@ -580,13 +580,6 @@ impl Repository {
.map_err(Into::into)
}
pub fn get_wd_tree(&self) -> Result<Tree> {
let mut index = self.0.index()?;
index.add_all(["*"], git2::IndexAddOption::DEFAULT, None)?;
let oid = index.write_tree()?;
self.0.find_tree(oid).map(Into::into).map_err(Into::into)
}
pub fn remote(&self, name: &str, url: &Url) -> Result<Remote> {
self.0
.remote(name, &url.to_string())

18
crates/gitbutler-core/src/git/repository_ext.rs Normal file
View File

@ -0,0 +1,18 @@
use anyhow::Result;
use git2::{Repository, Tree};
/// Extension trait for `git2::Repository`.
///
/// For now, it collects useful methods from `gitbutler-core::git::Repository`
pub trait RepositoryExt {
fn get_wd_tree(&self) -> Result<Tree>;
}
impl RepositoryExt for Repository {
fn get_wd_tree(&self) -> Result<Tree> {
let mut index = self.index()?;
index.add_all(["*"], git2::IndexAddOption::DEFAULT, None)?;
let oid = index.write_tree()?;
self.find_tree(oid).map(Into::into).map_err(Into::into)
}
}

10
crates/gitbutler-core/src/project_repository/repository.rs
View File

@ -136,11 +136,6 @@ impl Repository {
Ok(head)
}
pub fn get_wd_tree(&self) -> Result<git::Tree> {
let tree = self.git_repository.get_wd_tree()?;
Ok(tree)
}
pub fn is_path_ignored<P: AsRef<std::path::Path>>(&self, path: P) -> Result<bool> {
let path = path.as_ref();
let ignored = self.git_repository.is_path_ignored(path)?;
@ -617,6 +612,11 @@ impl Repository {
.add_remote(name, url)
.map_err(anyhow::Error::from)
}
pub fn repo(&self) -> &git2::Repository {
let r = &self.git_repository;
r.into()
}
}
#[derive(Debug, thiserror::Error)]

21
crates/gitbutler-core/src/virtual_branches/virtual.rs
View File

@ -26,6 +26,7 @@ use super::{
};
use crate::error::{self, AnyhowContextExt, Code};
use crate::git::diff::{diff_files_into_hunks, trees, FileDiff};
use crate::git::RepositoryExt;
use crate::time::now_since_unix_epoch_ms;
use crate::virtual_branches::branch::HunkHash;
use crate::{
@ -431,7 +432,7 @@ pub fn apply_branch(
vb_state.set_branch(branch.clone())?;
}
let wd_tree = project_repository.get_wd_tree()?;
let wd_tree = project_repository.repo().get_wd_tree()?;
let branch_tree = repo
.find_tree(branch.tree)
@ -439,7 +440,7 @@ pub fn apply_branch(
// check index for conflicts
let mut merge_index = repo
.merge_trees(&target_tree, &wd_tree, &branch_tree)
.merge_trees(&target_tree, &wd_tree.into(), &branch_tree)
.context("failed to merge trees")?;
if merge_index.has_conflicts() {
@ -1263,12 +1264,12 @@ pub fn integrate_upstream_commits(
let new_head_tree = repo.find_commit(new_head)?.tree()?;
let head_commit = repo.find_commit(new_head)?;
let wd_tree = project_repository.get_wd_tree()?;
let wd_tree = project_repository.repo().get_wd_tree()?;
let integration_tree = repo
.find_commit(get_workspace_head(&vb_state, project_repository)?)?
.tree()?;
let mut merge_index = repo.merge_trees(&integration_tree, &new_head_tree, &wd_tree)?;
let mut merge_index = repo.merge_trees(&integration_tree, &new_head_tree, &wd_tree.into())?;
if merge_index.has_conflicts() {
repo.checkout_index(&mut merge_index)
@ -1306,13 +1307,13 @@ pub fn integrate_with_merge(
upstream_commit: &git::Commit,
merge_base: git::Oid,
) -> Result<git::Oid> {
let wd_tree = project_repository.get_wd_tree()?;
let wd_tree = project_repository.repo().get_wd_tree()?;
let repo = &project_repository.git_repository;
let remote_tree = upstream_commit.tree().context("failed to get tree")?;
let upstream_branch = branch.upstream.as_ref().context("upstream not found")?;
let merge_tree = repo.find_commit(merge_base).and_then(|c| c.tree())?;
let mut merge_index = repo.merge_trees(&merge_tree, &wd_tree, &remote_tree)?;
let mut merge_index = repo.merge_trees(&merge_tree, &wd_tree.into(), &remote_tree)?;
if merge_index.has_conflicts() {
let conflicts = merge_index.conflicts()?;
@ -2574,12 +2575,12 @@ pub fn is_remote_branch_mergeable(
&target_commit,
)?;
let wd_tree = project_repository.get_wd_tree()?;
let wd_tree = project_repository.repo().get_wd_tree()?;
let branch_tree = branch_commit.tree().context("failed to find branch tree")?;
let mergeable = !project_repository
.git_repository
.merge_trees(&base_tree, &branch_tree, &wd_tree)
.merge_trees(&base_tree, &branch_tree, &wd_tree.into())
.context("failed to merge trees")?
.has_conflicts();
@ -2633,7 +2634,7 @@ pub fn is_virtual_branch_mergeable(
&target_commit,
)?;
let wd_tree = project_repository.get_wd_tree()?;
let wd_tree = project_repository.repo().get_wd_tree()?;
// determine if this tree is mergeable
let branch_tree = project_repository
@ -2643,7 +2644,7 @@ pub fn is_virtual_branch_mergeable(
let is_mergeable = !project_repository
.git_repository
.merge_trees(&base_tree, &branch_tree, &wd_tree)
.merge_trees(&base_tree, &branch_tree, &wd_tree.into())
.context("failed to merge trees")?
.has_conflicts();