gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2025-01-02 14:31:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1243 from gitbutlerapp/add-checkout-tree-builder

Browse Source 
Add checkout tree builder
This commit is contained in:
Nikita Galaiko 2023-09-26 10:57:54 +02:00 committed by GitHub
commit 9daea8152b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 99 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
packages/tauri/src/git/repository.rs
View File

@ -330,25 +330,20 @@ impl Repository {
self.0.checkout_head(opts).map_err(Into::into)
}
pub fn checkout_index(
&self,
index: Option<&mut Index>,
opts: Option<&mut git2::build::CheckoutBuilder<'_>>,
) -> Result<()> {
self.0
.checkout_index(index.map(Into::into), opts)
.map_err(Into::into)
pub fn checkout_index<'a>(&'a self, index: &'a mut Index) -> CheckoutIndexBuilder {
CheckoutIndexBuilder {
index: index.into(),
repo: &self.0,
checkout_builder: git2::build::CheckoutBuilder::new(),
}
}
pub fn checkout_tree(
&self,
tree: &Tree<'_>,
opts: Option<&mut git2::build::CheckoutBuilder<'_>>,
) -> Result<()> {
let tree: &git2::Tree = tree.into();
self.0
.checkout_tree(tree.as_object(), opts)
.map_err(Into::into)
pub fn checkout_tree<'a>(&'a self, tree: &'a Tree<'a>) -> CheckoutTreeBuidler {
CheckoutTreeBuidler {
tree: tree.into(),
repo: &self.0,
checkout_builder: git2::build::CheckoutBuilder::new(),
}
}
pub fn set_head(&self, refname: &str) -> Result<()> {
@ -388,3 +383,56 @@ impl Repository {
.map_err(Into::into)
}
}
pub struct CheckoutTreeBuidler<'a> {
repo: &'a git2::Repository,
tree: &'a git2::Tree<'a>,
checkout_builder: git2::build::CheckoutBuilder<'a>,
}
impl CheckoutTreeBuidler<'_> {
pub fn force(&mut self) -> &mut Self {
self.checkout_builder.force();
self
}
pub fn remove_untracked(&mut self) -> &mut Self {
self.checkout_builder.remove_untracked(true);
self
}
pub fn checkout(&mut self) -> Result<()> {
self.repo
.checkout_tree(self.tree.as_object(), Some(&mut self.checkout_builder))
.map_err(Into::into)
}
}
pub struct CheckoutIndexBuilder<'a> {
repo: &'a git2::Repository,
index: &'a mut git2::Index,
checkout_builder: git2::build::CheckoutBuilder<'a>,
}
impl CheckoutIndexBuilder<'_> {
pub fn force(&mut self) -> &mut Self {
self.checkout_builder.force();
self
}
pub fn allow_conflicts(&mut self) -> &mut Self {
self.checkout_builder.allow_conflicts(true);
self
}
pub fn conflict_style_merge(&mut self) -> &mut Self {
self.checkout_builder.conflict_style_merge(true);
self
}
pub fn checkout(&mut self) -> Result<()> {
self.repo
.checkout_index(Some(&mut self.index), Some(&mut self.checkout_builder))
.map_err(Into::into)
}
}

4
packages/tauri/src/virtual_branches/base.rs
View File

@ -439,9 +439,7 @@ pub fn update_base_branch(
}
// now we can try to merge the upstream branch into our current working directory
let mut checkout_options = git2::build::CheckoutBuilder::new();
checkout_options.force();
repo.checkout_index(Some(&mut merge_index), Some(&mut checkout_options))?;
repo.checkout_index(&mut merge_index).force().checkout()?;
// write new target oid
let target_writer = target::Writer::new(gb_repository);

72
packages/tauri/src/virtual_branches/virtual.rs
View File

@ -206,12 +206,11 @@ pub fn apply_branch(
writer.write(&apply_branch)?;
// checkout the conflicts
let mut checkout_options = git2::build::CheckoutBuilder::new();
checkout_options
.allow_conflicts(true)
.conflict_style_merge(true)
.force();
repo.checkout_index(Some(&mut merge_index), Some(&mut checkout_options))?;
repo.checkout_index(&mut merge_index)
.allow_conflicts()
.conflict_style_merge()
.force()
.checkout()?;
// mark conflicts
let conflicts = merge_index.conflicts()?;
@ -282,9 +281,7 @@ pub fn apply_branch(
writer.write(&apply_branch)?;
// checkout the merge index
let mut checkout_options = git2::build::CheckoutBuilder::new();
checkout_options.force();
repo.checkout_index(Some(&mut merge_index), Some(&mut checkout_options))?;
repo.checkout_index(&mut merge_index).force().checkout()?;
}
super::integration::update_gitbutler_integration(gb_repository, project_repository)?;
@ -346,13 +343,12 @@ pub fn unapply_branch(
.find(|(s, _)| s.id == branch_id)
.context("failed to find status for branch");
let target_commit = gb_repository
.git_repository
let repo = &project_repository.git_repository;
let target_commit = repo
.find_commit(default_target.sha)
.context("failed to find target commit")?;
let repo = &project_repository.git_repository;
if let Ok((_, files)) = status {
let tree = write_tree(project_repository, &default_target, files)?;
@ -363,29 +359,30 @@ pub fn unapply_branch(
// ok, update the wd with the union of the rest of the branches
let base_tree = target_commit.tree()?;
let mut final_tree = target_commit.tree()?;
// go through the other applied branches and merge them into the final tree
// then check that out into the working directory
for (branch, files) in applied_statuses {
if branch.id != branch_id {
let tree_oid = write_tree(project_repository, &default_target, &files)?;
let branch_tree = repo.find_tree(tree_oid)?;
if let Ok(mut result) = repo.merge_trees(&base_tree, &final_tree, &branch_tree) {
let final_tree = applied_statuses
.into_iter()
.filter(|(branch, _)| branch.id != branch_id)
.fold(
target_commit.tree().context("failed to get target tree"),
|final_tree, status| {
let final_tree = final_tree?;
let tree_oid = write_tree(project_repository, &default_target, &status.1)?;
let branch_tree = repo.find_tree(tree_oid)?;
let mut result = repo.merge_trees(&base_tree, &final_tree, &branch_tree)?;
let final_tree_oid = result.write_tree_to(repo)?;
final_tree = repo.find_tree(final_tree_oid)?;
}
}
}
// convert the final tree into an object
let final_tree_oid = final_tree.id();
let final_tree = repo.find_tree(final_tree_oid)?;
repo.find_tree(final_tree_oid)
.context("failed to find tree")
},
)?;
// checkout final_tree into the working directory
let mut checkout_options = git2::build::CheckoutBuilder::new();
checkout_options.force();
checkout_options.remove_untracked(true);
repo.checkout_tree(&final_tree, Some(&mut checkout_options))?;
repo.checkout_tree(&final_tree)
.force()
.remove_untracked()
.checkout()?;
super::integration::update_gitbutler_integration(gb_repository, project_repository)?;
@ -903,12 +900,11 @@ pub fn merge_virtual_branch_upstream(
if merge_index.has_conflicts() {
// checkout the conflicts
let mut checkout_options = git2::build::CheckoutBuilder::new();
checkout_options
.allow_conflicts(true)
.conflict_style_merge(true)
.force();
repo.checkout_index(Some(&mut merge_index), Some(&mut checkout_options))?;
repo.checkout_index(&mut merge_index)
.allow_conflicts()
.conflict_style_merge()
.force()
.checkout()?;
// mark conflicts
let conflicts = merge_index.conflicts()?;
@ -957,9 +953,7 @@ pub fn merge_virtual_branch_upstream(
}?;
// checkout the merge tree
let mut checkout_options = git2::build::CheckoutBuilder::new();
checkout_options.force();
repo.checkout_tree(&merge_tree, Some(&mut checkout_options))?;
repo.checkout_tree(&merge_tree).force().checkout()?;
// write the branch data
let branch_writer = branch::Writer::new(gb_repository);