Fix two tests

Author: Caleb-T-Owens

app/src/lib/vbranches/virtualBranch.ts

@@ -58,10 +58,8 @@ export class VirtualBranchService {
 			tap((branches) => {
 				branches.forEach((branch) => {
 					branch.files.sort((a) => (a.conflicted ? -1 : 0));
-					branch.isMergeable = invoke<boolean>('can_apply_virtual_branch', {
-						projectId: projectId,
-						branchId: branch.id
-					});
+					// This is always true now
+					branch.isMergeable = Promise.resolve(true);
 				});
 				this.fresh$.next(); // Notification for fresh reload
 			}),

crates/gitbutler-core/src/virtual_branches/controller.rs

@@ -73,16 +73,6 @@ impl Controller {
             .can_apply_remote_branch(project_id, branch_name)
     }
 
-    pub async fn can_apply_virtual_branch(
-        &self,
-        project_id: ProjectId,
-        branch_id: BranchId,
-    ) -> Result<bool> {
-        self.inner(project_id)
-            .await
-            .can_apply_virtual_branch(project_id, branch_id)
-    }
-
     pub async fn list_virtual_branches(
         &self,
         project_id: ProjectId,
@@ -473,16 +463,6 @@ impl ControllerInner {
         super::is_remote_branch_mergeable(&project_repository, branch_name).map_err(Into::into)
     }
 
-    pub fn can_apply_virtual_branch(
-        &self,
-        project_id: ProjectId,
-        branch_id: BranchId,
-    ) -> Result<bool> {
-        let project = self.projects.get(project_id)?;
-        let project_repository = project_repository::Repository::open(&project)?;
-        super::is_virtual_branch_mergeable(&project_repository, branch_id).map_err(Into::into)
-    }
-
     pub async fn list_virtual_branches(
         &self,
         project_id: ProjectId,

crates/gitbutler-core/src/virtual_branches/integration.rs

@@ -60,7 +60,7 @@ pub fn get_workspace_head(
         let merge_base = repo.merge_base(first_branch.head, merge_parent)?;
         workspace_tree = repo.find_commit(merge_base)?.tree()?;
     } else {
-        for branch in &applied_branches {
+        for branch in dbg!(&applied_branches) {
             let branch_tree = repo.find_commit(branch.head)?.tree()?;
             let merge_tree = repo.find_commit(target.sha)?.tree()?;
             let mut index = repo.merge_trees(&merge_tree, &workspace_tree, &branch_tree, None)?;

crates/gitbutler-core/src/virtual_branches/virtual.rs

@@ -2632,56 +2632,6 @@ pub fn is_remote_branch_mergeable(
     Ok(mergeable)
 }
 
-pub fn is_virtual_branch_mergeable(
-    project_repository: &project_repository::Repository,
-    branch_id: BranchId,
-) -> Result<bool> {
-    let vb_state = project_repository.project().virtual_branches();
-    let branch = vb_state.get_branch(branch_id)?;
-    if branch.applied {
-        return Ok(true);
-    }
-
-    let default_target = vb_state.get_default_target()?;
-    // determine if this branch is up to date with the target/base
-    let merge_base = project_repository
-        .repo()
-        .merge_base(default_target.sha, branch.head)
-        .context("failed to find merge base")?;
-
-    if merge_base != default_target.sha {
-        return Ok(false);
-    }
-
-    let branch_commit = project_repository
-        .repo()
-        .find_commit(branch.head)
-        .context("failed to find branch commit")?;
-
-    let target_commit = project_repository
-        .repo()
-        .find_commit(default_target.sha)
-        .context("failed to find target commit")?;
-
-    let base_tree = find_base_tree(project_repository.repo(), &branch_commit, &target_commit)?;
-
-    let wd_tree = project_repository.repo().get_wd_tree()?;
-
-    // determine if this tree is mergeable
-    let branch_tree = project_repository
-        .repo()
-        .find_tree(branch.tree)
-        .context("failed to find branch tree")?;
-
-    let is_mergeable = !project_repository
-        .repo()
-        .merge_trees(&base_tree, &branch_tree, &wd_tree, None)
-        .context("failed to merge trees")?
-        .has_conflicts();
-
-    Ok(is_mergeable)
-}
-
 // this function takes a list of file ownership from a "from" commit and "moves"
 // those changes to a "to" commit in a branch. This allows users to drag changes
 // from one commit to another.

crates/gitbutler-core/tests/suite/virtual_branches/apply_virtual_branch.rs

@@ -40,12 +40,6 @@ async fn deltect_conflict() {
     }
 
     {
-        // it should not be possible to apply the first branch
-        assert!(!controller
-            .can_apply_virtual_branch(*project_id, branch1_id)
-            .await
-            .unwrap());
-
         assert!(matches!(
             controller
                 .apply_virtual_branch(*project_id, branch1_id)

crates/gitbutler-core/tests/suite/virtual_branches/update_base_branch.rs

@@ -53,10 +53,6 @@ mod applied_branch {
             assert!(!branches[0].base_current);
             assert_eq!(branches[0].files.len(), 1);
             assert_eq!(branches[0].commits.len(), 0);
-            assert!(!controller
-                .can_apply_virtual_branch(*project_id, branch_id)
-                .await
-                .unwrap());
         }
 
         {
@@ -134,10 +130,6 @@ mod applied_branch {
             assert!(!branches[0].base_current);
             assert_eq!(branches[0].files.len(), 0);
             assert_eq!(branches[0].commits.len(), 1);
-            assert!(!controller
-                .can_apply_virtual_branch(*project_id, branch_id)
-                .await
-                .unwrap());
         }
 
         {
@@ -220,10 +212,6 @@ mod applied_branch {
             assert!(!branches[0].base_current);
             assert_eq!(branches[0].files.len(), 0);
             assert_eq!(branches[0].commits.len(), 1);
-            assert!(!controller
-                .can_apply_virtual_branch(*project_id, branch_id)
-                .await
-                .unwrap());
         }
 
         {
@@ -303,10 +291,6 @@ mod applied_branch {
             assert!(!branches[0].base_current); // TODO: should be true
             assert_eq!(branches[0].files.len(), 1);
             assert_eq!(branches[0].commits.len(), 1);
-            assert!(!controller
-                .can_apply_virtual_branch(*project_id, branch_id)
-                .await
-                .unwrap()); // TODO: should be true
         }
 
         {
@@ -386,10 +370,6 @@ mod applied_branch {
             assert!(!branches[0].base_current); // TODO: should be true
             assert_eq!(branches[0].commits.len(), 1); // TODO: should be 2
             assert_eq!(branches[0].files.len(), 1);
-            assert!(!controller
-                .can_apply_virtual_branch(*project_id, branch_id)
-                .await
-                .unwrap()); // TODO: should be true
         }
 
         {
@@ -488,10 +468,6 @@ mod applied_branch {
                 assert_eq!(branches[0].commits.len(), 1);
                 assert!(!branches[0].commits[0].is_remote);
                 assert!(!branches[0].commits[0].is_integrated);
-                assert!(controller
-                    .can_apply_virtual_branch(*project_id, branch_id)
-                    .await
-                    .unwrap());
             }
         }
 
@@ -571,10 +547,6 @@ mod applied_branch {
                 assert!(!branches[0].commits[0].is_integrated);
                 assert!(branches[0].commits[1].is_remote);
                 assert!(!branches[0].commits[1].is_integrated);
-                assert!(controller
-                    .can_apply_virtual_branch(*project_id, branch_id)
-                    .await
-                    .unwrap());
             }
         }
     }
@@ -634,10 +606,6 @@ mod applied_branch {
             assert!(branches[0].base_current);
             assert_eq!(branches[0].files.len(), 1);
             assert_eq!(branches[0].commits.len(), 1);
-            assert!(controller
-                .can_apply_virtual_branch(*project_id, branch_id)
-                .await
-                .unwrap());
         }
 
         {
@@ -735,10 +703,6 @@ mod applied_branch {
             assert!(branches[0].base_current);
             assert_eq!(branches[0].files.len(), 1);
             assert_eq!(branches[0].commits.len(), 0);
-            assert!(controller
-                .can_apply_virtual_branch(*project_id, branch_id)
-                .await
-                .unwrap());
         }
 
         {

crates/gitbutler-core/tests/virtual_branches/mod.rs

@@ -21,8 +21,7 @@ use gitbutler_core::{
         branch::{BranchCreateRequest, BranchOwnershipClaims, BranchUpdateRequest},
         commit, create_virtual_branch, integrate_upstream_commits,
         integration::verify_branch,
-        is_remote_branch_mergeable, is_virtual_branch_mergeable, list_remote_branches,
-        unapply_ownership, update_branch,
+        is_remote_branch_mergeable, list_remote_branches, unapply_ownership, update_branch,
     },
 };
 use pretty_assertions::assert_eq;
@@ -1180,6 +1179,7 @@ fn apply_unapply_added_deleted_files() -> Result<()> {
     Ok(())
 }
 
+// Verifies that we are able to detect when a remote branch is conflicting with the current applied branches.
 #[test]
 fn detect_mergeable_branch() -> Result<()> {
     let suite = Suite::default();
@@ -1299,17 +1299,6 @@ fn detect_mergeable_branch() -> Result<()> {
     };
     vb_state.set_branch(branch4.clone())?;
 
-    let (branches, _) = virtual_branches::list_virtual_branches(project_repository)?;
-    assert_eq!(branches.len(), 4);
-
-    let branch1 = &branches.iter().find(|b| b.id == branch1_id).unwrap();
-    assert!(!branch1.active);
-    assert!(!is_virtual_branch_mergeable(project_repository, branch1.id).unwrap());
-
-    let branch2 = &branches.iter().find(|b| b.id == branch2_id).unwrap();
-    assert!(!branch2.active);
-    assert!(is_virtual_branch_mergeable(project_repository, branch2.id).unwrap());
-
     let remotes = list_remote_branches(project_repository).expect("failed to list remotes");
     let _remote1 = &remotes
         .iter()

crates/gitbutler-tauri/src/main.rs

@@ -191,7 +191,6 @@ fn main() {
                     virtual_branches::commands::reset_files,
                     virtual_branches::commands::push_virtual_branch,
                     virtual_branches::commands::create_virtual_branch_from_branch,
-                    virtual_branches::commands::can_apply_virtual_branch,
                     virtual_branches::commands::can_apply_remote_branch,
                     virtual_branches::commands::list_remote_commit_files,
                     virtual_branches::commands::reset_virtual_branch,

crates/gitbutler-tauri/src/virtual_branches.rs

@@ -277,20 +277,6 @@ pub mod commands {
         Ok(())
     }
 
-    #[tauri::command(async)]
-    #[instrument(skip(handle), err(Debug))]
-    pub async fn can_apply_virtual_branch(
-        handle: AppHandle,
-        project_id: ProjectId,
-        branch_id: BranchId,
-    ) -> Result<bool, Error> {
-        handle
-            .state::<Controller>()
-            .can_apply_virtual_branch(project_id, branch_id)
-            .await
-            .map_err(Into::into)
-    }
-
     #[tauri::command(async)]
     #[instrument(skip(handle), err(Debug))]
     pub async fn can_apply_remote_branch(