Merge branch 'master' into fix/create-pr-from-fork

Author: matthewevans

apps/desktop/src/components/v3/CommitView.svelte

@@ -52,8 +52,6 @@
 			? stackService.upstreamCommitById(projectId, commitKey)
 			: stackService.commitById(projectId, commitKey)
 	);
-	const isUnapplied = false; // TODO
-	const branchRefName = undefined; // TODO
 
 	const changesResult = $derived(stackService.commitChanges(projectId, commitKey.commitId));
 
@@ -118,14 +116,11 @@
 	}
 
 	function canEdit() {
-		if (isUnapplied) return false;
-		if (!modeService) return false;
-
-		return true;
+		return modeService !== undefined;
 	}
 
 	async function editPatch() {
-		if (!canEdit() || !branchRefName) return;
+		if (!canEdit()) return;
 		await modeService!.enterEditMode(commitKey.commitId, stackId);
 	}
 </script>

crates/gitbutler-branch-actions/src/integration.rs

@@ -246,40 +246,42 @@ pub fn update_workspace_commit(
     index.read_tree(&workspace_tree)?;
     index.write()?;
 
-    // finally, update the refs/gitbutler/ heads to the states of the current virtual branches
-    for branch in &virtual_branches {
-        let wip_tree = repo.find_tree(branch.tree(ctx)?)?;
-        let mut branch_head = repo.find_commit(branch.head_oid(&gix_repo)?.to_git2())?;
-        let head_tree = branch_head.tree()?;
-
-        // create a wip commit if there is wip
-        if head_tree.id() != wip_tree.id() {
-            let mut message = "GitButler WIP Commit".to_string();
-            message.push_str("\n\n");
-            message.push_str("This is a WIP commit for the virtual branch '");
-            message.push_str(branch.name.as_str());
-            message.push_str("'\n\n");
-            message.push_str("This commit is used to store the state of the virtual branch\n");
-            message.push_str("while you are working on it. It is not meant to be used for\n");
-            message.push_str("anything else.\n\n");
-            let branch_head_oid = repo.commit(
-                None,
-                &committer,
-                &committer,
-                &message,
-                &wip_tree,
-                &[&branch_head],
-                // None,
+    if !ctx.app_settings().feature_flags.v3 {
+        // finally, update the refs/gitbutler/ heads to the states of the current virtual branches
+        for branch in &virtual_branches {
+            let wip_tree = repo.find_tree(branch.tree(ctx)?)?;
+            let mut branch_head = repo.find_commit(branch.head_oid(&gix_repo)?.to_git2())?;
+            let head_tree = branch_head.tree()?;
+
+            // create a wip commit if there is wip
+            if head_tree.id() != wip_tree.id() {
+                let mut message = "GitButler WIP Commit".to_string();
+                message.push_str("\n\n");
+                message.push_str("This is a WIP commit for the virtual branch '");
+                message.push_str(branch.name.as_str());
+                message.push_str("'\n\n");
+                message.push_str("This commit is used to store the state of the virtual branch\n");
+                message.push_str("while you are working on it. It is not meant to be used for\n");
+                message.push_str("anything else.\n\n");
+                let branch_head_oid = repo.commit(
+                    None,
+                    &committer,
+                    &committer,
+                    &message,
+                    &wip_tree,
+                    &[&branch_head],
+                    // None,
+                )?;
+                branch_head = repo.find_commit(branch_head_oid)?;
+            }
+
+            repo.reference(
+                &branch.refname()?.to_string(),
+                branch_head.id(),
+                true,
+                "update virtual branch",
             )?;
-            branch_head = repo.find_commit(branch_head_oid)?;
         }
-
-        repo.reference(
-            &branch.refname()?.to_string(),
-            branch_head.id(),
-            true,
-            "update virtual branch",
-        )?;
     }
 
     Ok(final_commit)

crates/gitbutler-branch-actions/src/upstream_integration.rs

@@ -406,6 +406,19 @@ pub fn upstream_integration_statuses(
     let (merge_options_fail_fast, _conflict_kind) =
         gix_repo.merge_options_no_rewrites_fail_fast()?;
 
+    let merge_outcome = gix_repo.merge_trees(
+        merge_base_tree,
+        gix_repo.head()?.peel_to_commit_in_place()?.tree_id()?,
+        target_tree,
+        gix_repo.default_merge_labels(),
+        merge_options_fail_fast.clone(),
+    )?;
+    let committed_conflicts = merge_outcome
+        .conflicts
+        .iter()
+        .filter(|c| c.is_unresolved(TreatAsUnresolved::git()))
+        .collect::<Vec<_>>();
+
     let worktree_conflicts = gix_repo
         .merge_trees(
             merge_base_tree,
@@ -417,6 +430,8 @@ pub fn upstream_integration_statuses(
         .conflicts
         .iter()
         .filter(|c| c.is_unresolved(TreatAsUnresolved::git()))
+        // only include conflicts that are not in the list committed_conflicts
+        .filter(|c| !committed_conflicts.iter().any(|cc| cc.ours == c.ours))
         .map(|c| c.ours.location().into())
         .collect::<Vec<BStringForFrontend>>();