Remove unused and kinda borked cherry_commit code

Author: Caleb-T-Owens

app/src/lib/vbranches/branchController.ts

@@ -291,25 +291,6 @@ You can find them in the 'Branches' sidebar in order to resolve conflicts.`;
 		}
 	}
 
-	async cherryPick(branchId: string, targetCommitOid: string) {
-		try {
-			await invoke<void>('cherry_pick_onto_virtual_branch', {
-				projectId: this.projectId,
-				branchId,
-				targetCommitOid
-			});
-		} catch (err: any) {
-			// TODO: Probably we wanna have error code checking in a more generic way
-			if (err.code === 'errors.commit.signing_failed') {
-				showSignError(err);
-			} else {
-				showError('Failed to cherry-pick commit', err);
-			}
-		} finally {
-			this.targetBranchService.reload();
-		}
-	}
-
 	async markResolved(path: string) {
 		try {
 			await invoke<void>('mark_resolved', { projectId: this.projectId, path });

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

@@ -321,18 +321,6 @@ impl Controller {
             .await
     }
 
-    pub async fn cherry_pick(
-        &self,
-        project_id: ProjectId,
-        branch_id: BranchId,
-        commit_oid: git2::Oid,
-    ) -> Result<Option<git2::Oid>> {
-        self.inner(project_id)
-            .await
-            .cherry_pick(project_id, branch_id, commit_oid)
-            .await
-    }
-
     pub async fn list_remote_branches(
         &self,
         project_id: ProjectId,
@@ -818,22 +806,6 @@ impl ControllerInner {
         .await?
     }
 
-    pub async fn cherry_pick(
-        &self,
-        project_id: ProjectId,
-        branch_id: BranchId,
-        commit_oid: git2::Oid,
-    ) -> Result<Option<git2::Oid>> {
-        let _permit = self.semaphore.acquire().await;
-
-        self.with_verify_branch(project_id, |project_repository, _| {
-            let _ = project_repository
-                .project()
-                .create_snapshot(SnapshotDetails::new(OperationKind::CherryPick));
-            super::cherry_pick(project_repository, branch_id, commit_oid).map_err(Into::into)
-        })
-    }
-
     pub fn list_remote_branches(&self, project_id: ProjectId) -> Result<Vec<super::RemoteBranch>> {
         let project = self.projects.get(project_id)?;
         let project_repository = project_repository::Repository::open(&project)?;

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

@@ -3213,185 +3213,6 @@ pub fn undo_commit(
     Ok(())
 }
 
-pub fn cherry_pick(
-    project_repository: &project_repository::Repository,
-    branch_id: BranchId,
-    target_commit_id: git2::Oid,
-) -> Result<Option<git2::Oid>> {
-    project_repository.assure_unconflicted()?;
-
-    let vb_state = project_repository.project().virtual_branches();
-
-    let mut branch = vb_state
-        .get_branch(branch_id)
-        .context("failed to read branch")?;
-
-    if !branch.applied {
-        // todo?
-        bail!("can not cherry pick a branch that is not applied")
-    }
-
-    let target_commit = project_repository
-        .repo()
-        .find_commit(target_commit_id)
-        .map_err(|err| match err {
-            err if err.code() == git2::ErrorCode::NotFound => {
-                anyhow!("commit {target_commit_id} not found ")
-            }
-            err => err.into(),
-        })?;
-
-    let branch_head_commit = project_repository
-        .repo()
-        .find_commit(branch.head)
-        .context("failed to find branch tree")?;
-
-    let default_target = vb_state.get_default_target()?;
-
-    // if any other branches are applied, unapply them
-    let applied_branches = vb_state
-        .list_branches()
-        .context("failed to read virtual branches")?
-        .into_iter()
-        .filter(|b| b.applied)
-        .collect::<Vec<_>>();
-
-    let integration_commit_id = get_workspace_head(&vb_state, project_repository)?;
-
-    let (applied_statuses, _) = get_applied_status(
-        project_repository,
-        &integration_commit_id,
-        &default_target.sha,
-        applied_branches,
-    )?;
-
-    let branch_files = applied_statuses
-        .iter()
-        .find(|(b, _)| b.id == branch_id)
-        .map(|(_, f)| f)
-        .context("branch status not found")?;
-
-    // create a wip commit. we'll use it to offload cherrypick conflicts calculation to libgit.
-    let wip_commit = {
-        let wip_tree_oid = write_tree(project_repository, &branch.head, branch_files)?;
-        let wip_tree = project_repository
-            .repo()
-            .find_tree(wip_tree_oid)
-            .context("failed to find tree")?;
-
-        let signature = git2::Signature::now("GitButler", "gitbutler@gitbutler.com")
-            .context("failed to make gb signature")?;
-        let oid = project_repository
-            .repo()
-            .commit_with_signature(
-                None,
-                &signature,
-                &signature,
-                "wip cherry picking commit",
-                &wip_tree,
-                &[&branch_head_commit],
-                None,
-            )
-            .context("failed to commit wip work")?;
-        project_repository
-            .repo()
-            .find_commit(oid)
-            .context("failed to find wip commit")?
-    };
-
-    let mut cherrypick_index = project_repository
-        .repo()
-        .cherrypick_commit(&target_commit, &wip_commit, 0, None)
-        .context("failed to cherry pick")?;
-
-    // unapply other branches
-    for other_branch in applied_statuses
-        .iter()
-        .filter(|(b, _)| b.id != branch.id)
-        .map(|(b, _)| b)
-    {
-        convert_to_real_branch(project_repository, other_branch.id, Default::default())
-            .context("failed to unapply branch")?;
-    }
-
-    let commit_oid = if cherrypick_index.has_conflicts() {
-        // checkout the conflicts
-        project_repository
-            .repo()
-            .checkout_index_builder(&mut cherrypick_index)
-            .allow_conflicts()
-            .conflict_style_merge()
-            .force()
-            .checkout()
-            .context("failed to checkout conflicts")?;
-
-        // mark conflicts
-        let conflicts = cherrypick_index
-            .conflicts()
-            .context("failed to get conflicts")?;
-        let mut merge_conflicts = Vec::new();
-        for path in conflicts.flatten() {
-            if let Some(ours) = path.our {
-                let path = std::str::from_utf8(&ours.path)
-                    .context("failed to convert path")?
-                    .to_string();
-                merge_conflicts.push(path);
-            }
-        }
-        conflicts::mark(project_repository, &merge_conflicts, Some(branch.head))?;
-
-        None
-    } else {
-        let merge_tree_oid = cherrypick_index
-            .write_tree_to(project_repository.repo())
-            .context("failed to write merge tree")?;
-        let merge_tree = project_repository
-            .repo()
-            .find_tree(merge_tree_oid)
-            .context("failed to find merge tree")?;
-
-        let branch_head_commit = project_repository
-            .repo()
-            .find_commit(branch.head)
-            .context("failed to find branch head commit")?;
-
-        let change_id = target_commit.change_id();
-        let commit_oid = project_repository
-            .repo()
-            .commit_with_signature(
-                None,
-                &target_commit.author(),
-                &target_commit.committer(),
-                &target_commit.message_bstr().to_str_lossy(),
-                &merge_tree,
-                &[&branch_head_commit],
-                change_id.as_deref(),
-            )
-            .context("failed to create commit")?;
-
-        // checkout final_tree into the working directory
-        project_repository
-            .repo()
-            .checkout_tree_builder(&merge_tree)
-            .force()
-            .remove_untracked()
-            .checkout()
-            .context("failed to checkout final tree")?;
-
-        // update branch status
-        branch.head = commit_oid;
-        branch.updated_timestamp_ms = crate::time::now_ms();
-        vb_state.set_branch(branch.clone())?;
-
-        Some(commit_oid)
-    };
-
-    super::integration::update_gitbutler_integration(&vb_state, project_repository)
-        .context("failed to update gitbutler integration")?;
-
-    Ok(commit_oid)
-}
-
 /// squashes a commit from a virtual branch into its parent.
 pub fn squash(
     project_repository: &project_repository::Repository,