gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-28 20:15:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

disconnect upstream when fully integrated

Browse Source
This commit is contained in:
Nikita Galaiko 2023-12-19 10:42:19 +01:00 committed by GitButler
parent 184aed0b61
commit ac51651568
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -350,6 +350,9 @@ pub fn update_base_branch(
// after merging the branch head with the new target the tree is the
// same as the new target tree. meaning we can safely use the new target commit
// as the new branch head.
branch.head = new_target_commit.id();
let non_commited_files = diff::trees(
&project_repository.git_repository,
&branch_head_tree,
@ -362,15 +365,22 @@ pub fn update_base_branch(
project_repository.delete_branch_reference(&branch)?;
return Ok(None);
}
// there are some uncommied files left. we should put them into the branch
// tree.
branch.head = new_target_commit.id();
branch.tree = branch_merge_index.write_tree_to(repo)?;
// we also disconnect this branch from upstream branch, since it's fully
// integrated
branch.upstream = None;
branch.upstream_head = None;
branch_writer.write(&mut branch)?;
return Ok(Some(branch));
}
let ok_with_force_push = project_repository.project().ok_with_force_push;
if branch.upstream.is_some() && !ok_with_force_push {
// branch was pushed to upstream, and user doesn't like force pushing.
// create a merge commit to avoid the need of force pushing then.
@ -489,7 +499,7 @@ pub fn update_base_branch(
// now we calculate and checkout new tree for the working directory
let final_tree = updated_vbranches
.into_iter()
.iter()
.filter(|branch| branch.applied)
.fold(new_target_commit.tree(), |final_tree, branch| {
let final_tree = final_tree?;

4
packages/tauri/tests/virtual_branches.rs
View File

@ -1666,6 +1666,7 @@ mod update_base_branch {
assert!(branches[0].base_current);
assert_eq!(branches[0].files.len(), 1);
assert_eq!(branches[0].commits.len(), 1);
assert!(branches[0].upstream.is_none());
assert!(controller
.can_apply_virtual_branch(&project_id, &branch_id)
.await
@ -1768,6 +1769,7 @@ mod update_base_branch {
assert!(branches[0].base_current);
assert_eq!(branches[0].files.len(), 1);
assert_eq!(branches[0].commits.len(), 0);
assert!(branches[0].upstream.is_none());
assert!(controller
.can_apply_virtual_branch(&project_id, &branch_id)
.await
@ -2792,6 +2794,7 @@ mod update_base_branch {
assert_eq!(branches[0].id, branch_id);
assert!(!branches[0].active);
assert!(branches[0].commits.is_empty());
assert!(branches[0].upstream.is_none());
assert!(!branches[0].files.is_empty());
}
@ -2869,6 +2872,7 @@ mod update_base_branch {
assert_eq!(branches[0].id, branch_id);
assert!(branches[0].active);
assert!(branches[0].commits.is_empty());
assert!(branches[0].upstream.is_none());
assert!(!branches[0].files.is_empty());
}