many many changes

Author: Caleb-T-Owens

crates/gitbutler-core/src/project_repository/conflicts.rs

@@ -97,28 +97,20 @@ pub fn conflicting_files(repository: &Repository) -> Result<Vec<String>> {
 /// Check if `path` is conflicting in `repository`, or if `None`, check if there is any conflict.
 // TODO(ST): Should this not rather check the conflicting state in the index?
 pub fn is_conflicting(repository: &Repository, path: Option<&Path>) -> Result<bool> {
-    let conflicts_path = repository.repo().path().join("conflicts");
-    if !conflicts_path.exists() {
-        return Ok(false);
-    }
+    let mut status_options = git2::StatusOptions::new();
+    status_options.include_untracked(true);
 
-    let file = std::fs::File::open(conflicts_path)?;
-    let reader = std::io::BufReader::new(file);
-    // TODO(ST): This shouldn't work on UTF8 strings.
-    let mut files = reader.lines().map_ok(PathBuf::from);
-    if let Some(pathname) = path {
-        // check if pathname is one of the lines in conflicts_path file
-        for line in files {
-            let line = line?;
-
-            if line == pathname {
-                return Ok(true);
-            }
-        }
-        Ok(false)
-    } else {
-        Ok(files.next().transpose().map(|x| x.is_some())?)
+    if let Some(path) = path {
+        status_options.pathspec(path);
     }
+
+    let statuses = repository.repo().statuses(Some(&mut status_options))?;
+
+    let conflicted = statuses
+        .iter()
+        .any(|status| status.status().intersects(git2::Status::CONFLICTED));
+
+    Ok(conflicted)
 }
 
 // is this project still in a resolving conflict state?

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

@@ -396,6 +396,7 @@ pub fn update_base_branch<'repo>(
                                 &branch_tree,
                             )?;
                             if non_commited_files.is_empty() {
+                                println!("WFTFFF");
                                 // if there are no commited files, then the branch is fully merged
                                 // and we can delete it.
                                 vb_state.remove_branch(branch.id)?;
@@ -427,7 +428,7 @@ pub fn update_base_branch<'repo>(
                         .expect("Failed to convert to real branch");
                         unapplied_branch_names.push(unapplied_real_branch);
 
-                        return Ok(Some(branch));
+                        return Ok(None);
                     }
 
                     let branch_merge_index_tree_oid =
@@ -464,7 +465,7 @@ pub fn update_base_branch<'repo>(
                         .expect("2 failed to convert to real branch");
                         unapplied_branch_names.push(unapplied_real_branch);
 
-                        return Ok(Some(branch));
+                        return Ok(None);
                     }
 
                     // branch commits do not conflict with new target, so lets merge them

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

@@ -301,7 +301,7 @@ impl Controller {
         project_id: ProjectId,
         branch_id: BranchId,
         name_conflict_resolution: NameConflitResolution,
-    ) -> Result<()> {
+    ) -> Result<ReferenceName> {
         self.inner(project_id)
             .await
             .convert_to_real_branch(project_id, branch_id, name_conflict_resolution)
@@ -771,7 +771,7 @@ impl ControllerInner {
         project_id: ProjectId,
         branch_id: BranchId,
         name_conflict_resolution: NameConflitResolution,
-    ) -> Result<()> {
+    ) -> Result<ReferenceName> {
         let _permit = self.semaphore.acquire().await;
 
         self.with_verify_branch(project_id, |project_repository, _| {
@@ -787,7 +787,7 @@ impl ControllerInner {
                     .project()
                     .snapshot_branch_unapplied(snapshot_tree, result.as_ref())
             });
-            result.map(|_| ())
+            result.and_then(|b| b.reference_name())
         })
     }
 

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

@@ -282,6 +282,7 @@ pub fn apply_branch(
             for branch in get_status_by_branch(project_repository, Some(&target_commit.id()))?
                 .0
                 .into_iter()
+                .filter(|(branch, _)| branch.id != branch_id)
                 .map(|(branch, _)| branch)
             {
                 convert_to_real_branch(project_repository, branch.id, Default::default())?;
@@ -1445,7 +1446,7 @@ pub fn delete_branch(
     branch_id: BranchId,
 ) -> Result<()> {
     let vb_state = project_repository.project().virtual_branches();
-    let Some(branch) = dbg!(vb_state.try_branch(branch_id))? else {
+    let Some(branch) = vb_state.try_branch(branch_id)? else {
         println!("I did nothing");
         return Ok(());
     };

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

@@ -27,8 +27,7 @@ async fn unapply_with_data() {
     assert!(!repository.path().join("file.txt").exists());
 
     let (branches, _) = controller.list_virtual_branches(*project_id).await.unwrap();
-    assert_eq!(branches.len(), 1);
-    assert!(!branches[0].active);
+    assert_eq!(branches.len(), 0);
 }
 
 #[tokio::test]
@@ -55,7 +54,7 @@ async fn conflicting() {
         .await
         .unwrap();
 
-    let branch_id = {
+    let branch_reference = {
         // make a conflicting branch, and stash it
 
         std::fs::write(repository.path().join("file.txt"), "conflict").unwrap();
@@ -72,36 +71,28 @@ async fn conflicting() {
         controller
             .convert_to_real_branch(*project_id, branches[0].id, Default::default())
             .await
-            .unwrap();
-
-        branches[0].id
+            .unwrap()
     };
 
     {
         // update base branch, causing conflict
-        controller.update_base_branch(*project_id).await.unwrap();
+        let unapplied_references = controller.update_base_branch(*project_id).await.unwrap();
 
         assert_eq!(
             std::fs::read_to_string(repository.path().join("file.txt")).unwrap(),
             "second"
         );
 
-        let branch = controller
-            .list_virtual_branches(*project_id)
-            .await
-            .unwrap()
-            .0
-            .into_iter()
-            .find(|branch| branch.id == branch_id)
-            .unwrap();
-        assert!(!branch.base_current);
-        assert!(!branch.active);
+        assert_eq!(unapplied_references.len(), 0);
     }
 
-    {
+    let branch_id = {
         // apply branch, it should conflict
-        controller
-            .apply_virtual_branch(*project_id, branch_id)
+        let branch_id = controller
+            .create_virtual_branch_from_branch(
+                *project_id,
+                &git::Refname::from_str(branch_reference.as_str()).unwrap(),
+            )
             .await
             .unwrap();
 
@@ -118,10 +109,11 @@ async fn conflicting() {
             .into_iter()
             .find(|b| b.id == branch_id)
             .unwrap();
-        assert!(branch.base_current);
         assert!(branch.conflicted);
         assert_eq!(branch.files[0].hunks[0].diff, "@@ -1 +1,5 @@\n-first\n\\ No newline at end of file\n+<<<<<<< ours\n+conflict\n+=======\n+second\n+>>>>>>> theirs\n");
-    }
+
+        branch_id
+    };
 
     {
         controller
@@ -134,21 +126,13 @@ async fn conflicting() {
             "second"
         );
 
-        let branch = controller
+        let branches = controller
             .list_virtual_branches(*project_id)
             .await
             .unwrap()
-            .0
-            .into_iter()
-            .find(|b| b.id == branch_id)
-            .unwrap();
-        assert!(!branch.active);
-        assert!(!branch.base_current);
-        assert!(!branch.conflicted);
-        assert_eq!(
-            branch.files[0].hunks[0].diff,
-            "@@ -1 +1 @@\n-first\n\\ No newline at end of file\n+conflict\n\\ No newline at end of file\n"
-        );
+            .0;
+
+        assert_eq!(branches.len(), 0);
     }
 }
 

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

@@ -809,32 +809,38 @@ mod applied_branch {
         repository.fetch();
 
         // The conflicted branch should be removed
-        {
-            controller.update_base_branch(*project_id).await.unwrap();
+        let unapplied_branch = {
+            let unapplied_branches = controller.update_base_branch(*project_id).await.unwrap();
+            assert_eq!(unapplied_branches.len(), 1);
 
             let (branches, _) = controller.list_virtual_branches(*project_id).await.unwrap();
-            dbg!(&branches);
             assert_eq!(branches.len(), 0);
-        }
+
+            unapplied_branches[0].clone()
+        };
 
         {
             controller
-                .apply_virtual_branch(*project_id, branch_id)
+                .create_virtual_branch_from_branch(
+                    *project_id,
+                    &git::Refname::from_str(unapplied_branch.as_str()).unwrap(),
+                )
                 .await
                 .unwrap();
 
             let (branches, _) = controller.list_virtual_branches(*project_id).await.unwrap();
             assert_eq!(branches.len(), 1);
             assert!(branches[0].active);
             assert!(branches[0].conflicted);
-            assert!(branches[0].base_current);
+            // assert!(branches[0].base_current);
             assert_eq!(branches[0].files.len(), 1);
             assert_eq!(branches[0].files[0].hunks.len(), 1);
             assert_eq!(
                 branches[0].files[0].hunks[0].diff,
                 "@@ -4,7 +4,11 @@\n 4\n 5\n 6\n-7\n+<<<<<<< ours\n+77\n+=======\n+17\n+>>>>>>> theirs\n 8\n 19\n 10\n"
             );
-            assert_eq!(branches[0].commits.len(), 0);
+            // We still have the WIP hunk
+            assert_eq!(branches[0].commits.len(), 1);
         }
     }