Fix another!

Author: Caleb-T-Owens

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

@@ -10,8 +10,6 @@ impl CommitBuffer {
     pub fn new(buffer: &[u8]) -> Result<Self> {
         let buffer = str::from_utf8(buffer)?;
 
-        dbg!(&buffer);
-
         if let Some((heading, message)) = buffer.split_once("\n\n") {
             let heading = heading
                 .lines()

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 dbg!(&applied_branches) {
+        for branch in &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

@@ -440,19 +440,17 @@ pub fn apply_branch(
     vb_state.set_branch(branch.clone())?;
 
     ensure_selected_for_changes(&vb_state).context("failed to ensure selected for changes")?;
-
     // checkout the merge index
     repo.checkout_index_builder(&mut merge_index)
         .force()
         .checkout()
         .context("failed to checkout index")?;
 
-    super::integration::update_gitbutler_integration(&vb_state, project_repository)?;
-
     // Look for and handle the vbranch indicator commit
     {
         let head_commit = repo.find_commit(branch.head)?;
-        if let Some(header) = dbg!(head_commit.raw_header()) {
+
+        if let Some(header) = head_commit.raw_header() {
             if header
                 .lines()
                 .any(|line| line.starts_with("gitbutler-vbranch"))
@@ -471,6 +469,9 @@ pub fn apply_branch(
             }
         }
     }
+
+    super::integration::update_gitbutler_integration(&vb_state, project_repository)?;
+
     Ok(branch.name)
 }
 
@@ -2588,11 +2589,6 @@ fn is_commit_integrated(
         return Ok(true);
     }
 
-    // if it's an empty commit we can't base integration status on merge trees.
-    if commit.parent_count() == 1 && commit.parent(0)?.tree_id() == commit.tree_id() {
-        return Ok(false);
-    }
-
     // try to merge our tree into the upstream tree
     let mut merge_index = project_repository
         .repo()

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

@@ -194,7 +194,6 @@ async fn move_file_up_overlapping_hunks() {
         .find(|b| b.id == branch_id)
         .unwrap();
 
-    dbg!(&branch.commits);
     assert_eq!(branch.commits.len(), 4);
     //
 }

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

@@ -15,13 +15,15 @@ use std::{
 use anyhow::{Context, Result};
 use git2::TreeEntry;
 use gitbutler_core::{
-    git::{self, CommitExt, RepositoryExt},
+    git::{self, diff, CommitExt, RepositoryExt},
     virtual_branches::{
-        self, apply_branch,
+        self,
         branch::{BranchCreateRequest, BranchOwnershipClaims},
-        commit, create_virtual_branch, integrate_upstream_commits,
-        integration::verify_branch,
-        is_remote_branch_mergeable, list_remote_branches, unapply_ownership, update_branch,
+        commit, create_virtual_branch, create_virtual_branch_from_branch,
+        integrate_upstream_commits,
+        integration::{update_gitbutler_integration, verify_branch},
+        is_remote_branch_mergeable, list_remote_branches, list_virtual_branches, unapply_ownership,
+        update_branch,
     },
 };
 use pretty_assertions::assert_eq;
@@ -1159,20 +1161,43 @@ fn apply_unapply_added_deleted_files() -> Result<()> {
         },
     )?;
 
-    virtual_branches::convert_to_real_branch(project_repository, branch2_id, Default::default())?;
+    list_virtual_branches(project_repository).unwrap();
+
+    let real_branch_2 = virtual_branches::convert_to_real_branch(
+        project_repository,
+        branch2_id,
+        Default::default(),
+    )?;
+
     // check that file2 is back
     let contents = std::fs::read(Path::new(&project.path).join(file_path2))?;
     assert_eq!("file2\n", String::from_utf8(contents)?);
 
-    virtual_branches::convert_to_real_branch(project_repository, branch3_id, Default::default())?;
+    let real_branch_3 = virtual_branches::convert_to_real_branch(
+        project_repository,
+        branch3_id,
+        Default::default(),
+    )?;
     // check that file3 is gone
     assert!(!Path::new(&project.path).join(file_path3).exists());
 
-    apply_branch(project_repository, branch2_id, None)?;
+    create_virtual_branch_from_branch(
+        project_repository,
+        &git::Refname::try_from(&real_branch_2).unwrap(),
+        None,
+    )
+    .unwrap();
+
     // check that file2 is gone
     assert!(!Path::new(&project.path).join(file_path2).exists());
 
-    apply_branch(project_repository, branch3_id, None)?;
+    create_virtual_branch_from_branch(
+        project_repository,
+        &git::Refname::try_from(&real_branch_3).unwrap(),
+        None,
+    )
+    .unwrap();
+
     // check that file3 is back
     let contents = std::fs::read(Path::new(&project.path).join(file_path3))?;
     assert_eq!("file3\n", String::from_utf8(contents)?);