remove unused idea of cherry picking

Author: Caleb-T-Owens

app/src/lib/components/BranchCard.svelte

@@ -17,12 +17,7 @@
 	import Resizer from '$lib/components/Resizer.svelte';
 	import { projectAiGenAutoBranchNamingEnabled } from '$lib/config/config';
 	import { projectAiGenEnabled } from '$lib/config/config';
-	import {
-		DraggableCommit,
-		DraggableFile,
-		DraggableHunk,
-		DraggableRemoteCommit
-	} from '$lib/dragging/draggables';
+	import { DraggableCommit, DraggableFile, DraggableHunk } from '$lib/dragging/draggables';
 	import { dropzone } from '$lib/dragging/dropzone';
 	import { showError } from '$lib/notifications/toasts';
 	import { persisted } from '$lib/persisted/persisted';
@@ -114,14 +109,6 @@
 		branchController.moveCommit(branch.id, data.commit.id);
 	}
 
-	function acceptCherrypick(data: any) {
-		return data instanceof DraggableRemoteCommit && data.branchId === branch.id;
-	}
-
-	function onCherrypicked(data: DraggableRemoteCommit) {
-		branchController.cherryPick(branch.id, data.remoteCommit.id);
-	}
-
 	function acceptBranchDrop(data: any) {
 		if (data instanceof DraggableHunk && data.branchId !== branch.id) {
 			return !data.hunk.locked;
@@ -203,8 +190,6 @@
 					/>
 					<PullRequestCard />
 					<!-- DROPZONES -->
-					<DropzoneOverlay class="cherrypick-dz-marker" label="Apply here" />
-					<DropzoneOverlay class="cherrypick-dz-marker" label="Apply here" />
 					<DropzoneOverlay class="lane-dz-marker" label="Move here" />
 
 					<div class="card">
@@ -217,13 +202,6 @@
 								onDrop: onCommitDrop,
 								disabled: isUnapplied
 							}}
-							use:dropzone={{
-								hover: 'cherrypick-dz-hover',
-								active: 'cherrypick-dz-active',
-								accepts: acceptCherrypick,
-								onDrop: onCherrypicked,
-								disabled: isUnapplied
-							}}
 							use:dropzone={{
 								hover: 'lane-dz-hover',
 								active: 'lane-dz-active',
@@ -232,7 +210,6 @@
 								disabled: isUnapplied
 							}}
 						>
-							<DropzoneOverlay class="cherrypick-dz-marker" label="Apply here" />
 							<DropzoneOverlay class="lane-dz-marker" label="Move here" />
 							<DropzoneOverlay class="move-commit-dz-marker" label="Move here" />
 

app/src/lib/dragging/draggables.ts

@@ -1,4 +1,4 @@
-import type { AnyCommit, AnyFile, Commit, Hunk, RemoteCommit } from '../vbranches/types';
+import type { AnyCommit, AnyFile, Commit, Hunk } from '../vbranches/types';
 
 export function nonDraggable() {
 	return {
@@ -36,11 +36,4 @@ export class DraggableCommit {
 	) {}
 }
 
-export class DraggableRemoteCommit {
-	constructor(
-		public readonly branchId: string,
-		public readonly remoteCommit: RemoteCommit
-	) {}
-}
-
 export type Draggable = DraggableFile | DraggableHunk | DraggableCommit;

app/src/lib/vbranches/branchController.ts

@@ -280,25 +280,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/project_repository/repository.rs

@@ -227,7 +227,10 @@ impl Repository {
                 Ok(())
             }
             Err(err) => match err.code() {
-                git2::ErrorCode::NotFound => Ok(()),
+                git2::ErrorCode::NotFound => {
+                    println!("not found!!!!");
+                    Ok(())
+                }
                 _ => Err(err),
             },
         }

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

@@ -366,6 +366,7 @@ pub fn update_base_branch<'repo>(
             .map(|(branch, _)| branch)
             .map(
                 |mut branch: branch::Branch| -> Result<Option<branch::Branch>> {
+                    println!("1");
                     let branch_tree = repo.find_tree(branch.tree)?;
 
                     let branch_head_commit = repo.find_commit(branch.head).context(format!(
@@ -416,12 +417,14 @@ pub fn update_base_branch<'repo>(
                         .context(format!("failed to merge trees for branch {}", branch.id))?;
 
                     if branch_tree_merge_index.has_conflicts() {
+                        println!("CONFLICTS DETECTED");
                         // branch tree conflicts with new target, unapply branch for now. we'll handle it later, when user applies it back.
                         let unapplied_real_branch = convert_to_real_branch(
                             project_repository,
                             branch.id,
                             Default::default(),
-                        )?;
+                        )
+                        .expect("Failed to convert to real branch");
                         unapplied_branch_names.push(unapplied_real_branch);
 
                         return Ok(Some(branch));
@@ -450,13 +453,15 @@ pub fn update_base_branch<'repo>(
                         ))?;
 
                     if branch_head_merge_index.has_conflicts() {
+                        println!("\n\nConflicts detected!!!\n");
                         // branch commits conflict with new target, make sure the branch is
                         // unapplied. conflicts witll be dealt with when applying it back.
                         let unapplied_real_branch = convert_to_real_branch(
                             project_repository,
                             branch.id,
                             Default::default(),
-                        )?;
+                        )
+                        .expect("2 failed to convert to real branch");
                         unapplied_branch_names.push(unapplied_real_branch);
 
                         return Ok(Some(branch));

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)?;