Merge pull request #13661 from gitbutlerapp/ui-hide-split

UI: Remove the split branch options

Author: estib-vega

apps/desktop/src/components/shared/ChangedFilesContextMenu.svelte

@@ -1,6 +1,5 @@
 <!-- This is a V3 replacement for `FileContextMenu.svelte` -->
 <script lang="ts">
-	import ReduxResult from "$components/shared/ReduxResult.svelte";
 	import AbsorbPlanModal from "$components/stack/AbsorbPlanModal.svelte";
 	import DiscardChangesModal from "$components/workspace/DiscardChangesModal.svelte";
 	import StashIntoBranchModal from "$components/workspace/StashIntoBranchModal.svelte";
@@ -81,16 +80,9 @@
 	const clipboardService = inject(CLIPBOARD_SERVICE);
 	const backend = inject(BACKEND);
 	const [, absorbingChanges] = stackService.absorb;
-	const [splitOffChanges] = stackService.splitBranch;
-	const [splitBranchIntoDependentBranch] = stackService.splitBranchIntoDependentBranch;
-
 	const projectService = inject(PROJECTS_SERVICE);
 
 	const isUncommitted = $derived(selectionId.type === "worktree");
-	const isBranchFiles = $derived(selectionId.type === "branch");
-	const selectionBranchName = $derived(
-		selectionId.type === "branch" ? selectionId.branchName : undefined,
-	);
 
 	// Platform-specific label for "Show in Finder/Explorer/File Manager"
 	const showInFolderLabel = (() => {
@@ -165,91 +157,6 @@
 			}
 		});
 	}
-
-	async function split(changes: TreeChange[]) {
-		if (!stackId) {
-			chipToasts.error("No stack selected to split off changes.");
-			return;
-		}
-
-		if (selectionId.type !== "branch") {
-			chipToasts.error("Please select a branch to split off changes.");
-			return;
-		}
-
-		const branchName = selectionId.branchName;
-
-		const fileNames = changes.map((change) => change.path);
-
-		try {
-			await chipToasts.promise(
-				(async () => {
-					const newBranchName = await stackService.fetchNewBranchName(projectId);
-
-					if (!newBranchName) {
-						throw new Error("Failed to generate a new branch name.");
-					}
-
-					await splitOffChanges({
-						projectId,
-						sourceStackId: stackId,
-						sourceBranchName: branchName,
-						fileChangesToSplitOff: fileNames,
-						newBranchName: newBranchName,
-					});
-				})(),
-				{
-					loading: "Splitting off changes",
-					success: "Changes split off into a new branch",
-					error: "Failed to split off changes",
-				},
-			);
-		} catch (error) {
-			console.error("Failed to split off changes:", error);
-		}
-	}
-
-	async function splitIntoDependentBranch(changes: TreeChange[]) {
-		if (!stackId) {
-			chipToasts.error("No stack selected to split off changes.");
-			return;
-		}
-
-		if (selectionId.type !== "branch") {
-			chipToasts.error("Please select a branch to split off changes.");
-			return;
-		}
-
-		const branchName = selectionId.branchName;
-		const fileNames = changes.map((change) => change.path);
-
-		try {
-			await chipToasts.promise(
-				(async () => {
-					const newBranchName = await stackService.fetchNewBranchName(projectId);
-
-					if (!newBranchName) {
-						throw new Error("Failed to generate a new branch name.");
-					}
-
-					await splitBranchIntoDependentBranch({
-						projectId,
-						sourceStackId: stackId,
-						sourceBranchName: branchName,
-						fileChangesToSplitOff: fileNames,
-						newBranchName: newBranchName,
-					});
-				})(),
-				{
-					loading: "Splitting into dependent branch",
-					success: "Changes split into a dependent branch",
-					error: "Failed to split into dependent branch",
-				},
-			);
-		} catch (error) {
-			console.error("Failed to split into dependent branch:", error);
-		}
-	}
 </script>
 
 {#if menuOpen && menuItem}
@@ -309,36 +216,6 @@
 							onclick={async () => uncommitChanges(stackId, commitId, changes)}
 						/>
 					{/if}
-
-					{#if isBranchFiles && stackId && selectionBranchName}
-						{@const branchIsConflicted = stackService.isBranchConflicted(
-							projectId,
-							stackId,
-							selectionBranchName,
-						)}
-						<ReduxResult {projectId} result={branchIsConflicted?.result}>
-							{#snippet children(isConflicted)}
-								{#if isConflicted === false}
-									<ContextMenuItem
-										label="Split off changes"
-										icon="split"
-										onclick={() => {
-											menuOpen = false;
-											split(changes);
-										}}
-									/>
-									<ContextMenuItem
-										label="Split into dependent branch"
-										icon="stack-plus"
-										onclick={() => {
-											menuOpen = false;
-											splitIntoDependentBranch(changes);
-										}}
-									/>
-								{/if}
-							{/snippet}
-						</ReduxResult>
-					{/if}
 				</ContextMenuSection>
 			{/if}
 

apps/desktop/src/lib/dragging/dropHandlers/stackDropHandler.ts

@@ -10,7 +10,6 @@ import { unstackPRs, updateStackPrs } from "$lib/forge/shared/prFooter";
 import StackMacros from "$lib/stacks/macros";
 import { toMoveBranchWarning } from "$lib/stacks/stack";
 import { ensureValue } from "$lib/utils/validation";
-import { chipToasts } from "@gitbutler/ui";
 import type { DropResult } from "$lib/dragging/dropResult";
 import type { DropzoneHandler } from "$lib/dragging/handler";
 import type { ForgePrService } from "$lib/forge/interface/forgePrService";
@@ -43,6 +42,7 @@ export class OutsideLaneDzHandler implements DropzoneHandler {
 	private acceptsChangeDropData(data: unknown): data is ChangeDropData {
 		if (!(data instanceof FileChangeDropData || data instanceof FolderChangeDropData)) return false;
 		if (data.selectionId.type === "commit" && data.stackId === undefined) return false;
+		if (data.selectionId.type === "branch") return false;
 		return true;
 	}
 
@@ -71,43 +71,6 @@ export class OutsideLaneDzHandler implements DropzoneHandler {
 
 	async ondropChangeData(data: ChangeDropData) {
 		switch (data.selectionId.type) {
-			case "branch": {
-				const newBranchName = await this.stackService.fetchNewBranchName(this.projectId);
-
-				if (!newBranchName) {
-					throw new Error("Failed to generate a new branch name.");
-				}
-
-				if (!data.stackId) {
-					throw new Error("Change drop data must specify the source stackId");
-				}
-
-				const sourceStackId = data.stackId;
-				const sourceBranchName = data.selectionId.branchName;
-
-				await chipToasts.promise(
-					(async () => {
-						const fileNames = await data
-							.treeChanges()
-							.then((changes) => changes.map((c) => c.path));
-
-						await this.stackService.splitBranchMutation({
-							projectId: this.projectId,
-							sourceStackId,
-							sourceBranchName,
-							fileChangesToSplitOff: fileNames,
-							newBranchName: newBranchName,
-						});
-					})(),
-					{
-						loading: "Splitting branch into a new branch...",
-						success: "Branch split successfully",
-						error: "Failed to split branch",
-					},
-				);
-
-				break;
-			}
 			case "commit": {
 				const { stack, outcome, branchName } = await this.macros.createNewStackAndCommit();
 

apps/desktop/src/lib/stacks/stackEndpoints.ts

@@ -904,44 +904,6 @@ export function buildStackEndpoints(build: BackendEndpointBuilder) {
 			transformResponse: (commits: Commit[]) =>
 				commitAdapter.addMany(commitAdapter.getInitialState(), commits),
 		}),
-		splitBranch: build.mutation<
-			{ replacedCommits: [string, string][] },
-			{
-				projectId: string;
-				sourceStackId: string;
-				sourceBranchName: string;
-				newBranchName: string;
-				fileChangesToSplitOff: string[];
-			}
-		>({
-			extraOptions: {
-				command: "split_branch",
-			},
-			query: (args) => args,
-			invalidatesTags: (_result, _error, args) => [
-				invalidatesList(ReduxTag.HeadSha),
-				invalidatesItem(ReduxTag.BranchChanges, args.sourceStackId),
-			],
-		}),
-		splitBranchIntoDependentBranch: build.mutation<
-			{ replacedCommits: [string, string][] },
-			{
-				projectId: string;
-				sourceStackId: string;
-				sourceBranchName: string;
-				newBranchName: string;
-				fileChangesToSplitOff: string[];
-			}
-		>({
-			extraOptions: {
-				command: "split_branch_into_dependent_branch",
-			},
-			query: (args) => args,
-			invalidatesTags: (_result, _error, args) => [
-				invalidatesList(ReduxTag.HeadSha),
-				invalidatesItem(ReduxTag.BranchChanges, args.sourceStackId),
-			],
-		}),
 		createReference: build.mutation<
 			void,
 			{ projectId: string; stackId: string; request: CreateRefRequest }

apps/desktop/src/lib/stacks/stackService.svelte.ts

@@ -841,18 +841,6 @@ export class StackService {
 		);
 	}
 
-	get splitBranch() {
-		return this.backendApi.endpoints.splitBranch.useMutation();
-	}
-
-	get splitBranchMutation() {
-		return this.backendApi.endpoints.splitBranch.mutate;
-	}
-
-	get splitBranchIntoDependentBranch() {
-		return this.backendApi.endpoints.splitBranchIntoDependentBranch.useMutation();
-	}
-
 	invalidateStacksAndDetails() {
 		this.dispatch(
 			this.backendApi.util.invalidateTags([