Enable single branch mode

Author: mtsgrd

apps/desktop/cypress/e2e/support/mock/settings.ts

@@ -11,7 +11,8 @@ export const MOCK_FEATURE_FLAGS: FeatureFlags = {
 	ws3: false,
 	actions: false,
 	butbot: false,
-	rules: false
+	rules: false,
+	singleBranch: false
 };
 
 export const MOCK_APP_SETTINGS: AppSettings = {

apps/desktop/src/components/BranchCard.svelte

@@ -54,7 +54,8 @@
 	interface StackBranchProps extends BranchCardProps {
 		type: 'stack-branch';
 		iconName: keyof typeof iconsJson;
-		stackId: string;
+		stackId?: string;
+		laneId: string;
 		selected: boolean;
 		trackingBranch?: string;
 		isNewBranch?: boolean;
@@ -99,7 +100,7 @@
 	);
 
 	const stackState = $derived(
-		args.type === 'stack-branch' ? uiState.stack(args.stackId) : undefined
+		args.type === 'stack-branch' ? uiState.stack(args.laneId) : undefined
 	);
 	const selection = $derived(stackState ? stackState.selection.current : undefined);
 	const selected = $derived(selection?.branchName === branchName);
@@ -113,9 +114,11 @@
 				uiState.global.draftBranchName.set(normalized);
 			}
 		} else if (args.type === 'stack-branch') {
+			if (!args.stackId) return;
 			updateName({
 				projectId,
 				stackId: args.stackId,
+				laneId: args.laneId,
 				branchName,
 				newName: title
 			});
@@ -135,11 +138,15 @@
 	data-testid={TestId.BranchCard}
 >
 	{#if args.type === 'stack-branch'}
-		{@const moveHandler = new MoveCommitDzHandler(stackService, args.stackId, projectId)}
-		{#if !args.prNumber}
+		{@const moveHandler = args.stackId
+			? new MoveCommitDzHandler(stackService, args.stackId, projectId)
+			: undefined}
+		{#if !args.prNumber && args.stackId}
 			<PrNumberUpdater {projectId} stackId={args.stackId} {branchName} />
 		{/if}
-		<Dropzone handlers={args.first ? [moveHandler, ...args.dropzones] : args.dropzones}>
+		<Dropzone
+			handlers={args.first && moveHandler ? [moveHandler, ...args.dropzones] : args.dropzones}
+		>
 			{#snippet overlay({ hovered, activated, handler })}
 				{@const label =
 					handler instanceof MoveCommitDzHandler

apps/desktop/src/components/BranchCommitList.svelte

@@ -34,6 +34,7 @@
 	import { inject } from '@gitbutler/shared/context';
 	import { Button, Modal, TestId } from '@gitbutler/ui';
 	import { getTimeAgo } from '@gitbutler/ui/utils/timeAgo';
+	import { isDefined } from '@gitbutler/ui/utils/typeguards';
 	import type { Commit } from '$lib/branches/v3';
 	import type { CommitStatusType } from '$lib/commits/commit';
 	import type { BranchDetails } from '$lib/stacks/stack';
@@ -60,7 +61,8 @@
 	interface Props {
 		active: boolean;
 		projectId: string;
-		stackId: string;
+		stackId?: string;
+		laneId: string;
 		branchName: string;
 		firstBranch: boolean;
 		lastBranch: boolean;
@@ -82,6 +84,7 @@
 		active,
 		projectId,
 		stackId,
+		laneId,
 		branchName,
 		branchDetails,
 		firstBranch,
@@ -108,7 +111,7 @@
 	const isCommitting = $derived(
 		exclusiveAction?.type === 'commit' && exclusiveAction.stackId === stackId
 	);
-	const stackState = $derived(uiState.stack(stackId));
+	const stackState = $derived(uiState.stack(laneId));
 	const selection = $derived(stackState.selection);
 	const runHooks = $derived(projectRunCommitHooks(projectId));
 
@@ -127,6 +130,7 @@
 	let confirmResetModal = $state<ReturnType<typeof Modal>>();
 
 	async function integrate(strategy?: SeriesIntegrationStrategy): Promise<void> {
+		if (!stackId) return;
 		await integrateUpstreamCommits({
 			projectId,
 			stackId,
@@ -315,35 +319,41 @@
 						isIntegrated: isLocalAndRemoteCommit(commit) && commit.state.type === 'Integrated',
 						hasConflicts: isLocalAndRemoteCommit(commit) && commit.hasConflicts,
 					}}
-					{@const amendHandler = new AmendCommitWithChangeDzHandler(
-						projectId,
-						stackService,
-						hooksService,
-						stackId,
-						$runHooks,
-						dzCommit,
-						(newId) => uiState.stack(stackId).selection.set({ branchName, commitId: newId }),
-						uiState
-					)}
-					{@const squashHandler = new SquashCommitDzHandler({
-						stackService,
-						projectId,
-						stackId,
-						commit: dzCommit
-					})}
-					{@const hunkHandler = new AmendCommitWithHunkDzHandler({
-						stackService,
-						hooksService,
-						projectId,
-						stackId,
-						commit: dzCommit,
-						runHooks: $runHooks,
-						// TODO: Use correct value!
-						okWithForce: true,
-						uiState
-					})}
+					{@const amendHandler = stackId
+						? new AmendCommitWithChangeDzHandler(
+								projectId,
+								stackService,
+								hooksService,
+								stackId,
+								$runHooks,
+								dzCommit,
+								(newId) => uiState.stack(stackId).selection.set({ branchName, commitId: newId }),
+								uiState
+							)
+						: undefined}
+					{@const squashHandler = stackId
+						? new SquashCommitDzHandler({
+								stackService,
+								projectId,
+								stackId,
+								commit: dzCommit
+							})
+						: undefined}
+					{@const hunkHandler = stackId
+						? new AmendCommitWithHunkDzHandler({
+								stackService,
+								hooksService,
+								projectId,
+								stackId,
+								commit: dzCommit,
+								runHooks: $runHooks,
+								// TODO: Use correct value!
+								okWithForce: true,
+								uiState
+							})
+						: undefined}
 					{@const tooltip = commitStatusLabel(commit.state.type)}
-					<Dropzone handlers={[amendHandler, squashHandler, hunkHandler]}>
+					<Dropzone handlers={[amendHandler, squashHandler, hunkHandler].filter(isDefined)}>
 						{#snippet overlay({ hovered, activated, handler })}
 							{@const label =
 								handler instanceof AmendCommitWithChangeDzHandler ||
@@ -361,18 +371,20 @@
 								date: getTimeAgo(commit.createdAt),
 								authorImgUrl: undefined,
 								commitType: commit.state.type,
-								data: new CommitDropData(
-									stackId,
-									{
-										id: commitId,
-										isRemote: !!branchDetails.remoteTrackingBranch,
-										hasConflicts: isLocalAndRemoteCommit(commit) && commit.hasConflicts,
-										isIntegrated:
-											isLocalAndRemoteCommit(commit) && commit.state.type === 'Integrated'
-									},
-									false,
-									branchName
-								),
+								data: stackId
+									? new CommitDropData(
+											stackId,
+											{
+												id: commitId,
+												isRemote: !!branchDetails.remoteTrackingBranch,
+												hasConflicts: isLocalAndRemoteCommit(commit) && commit.hasConflicts,
+												isIntegrated:
+													isLocalAndRemoteCommit(commit) && commit.state.type === 'Integrated'
+											},
+											false,
+											branchName
+										)
+									: undefined,
 								viewportId: 'board-viewport',
 								dropzoneRegistry,
 								dragStateService

apps/desktop/src/components/BranchHeaderContextMenu.svelte

@@ -40,6 +40,7 @@
 	type Props = {
 		projectId: string;
 		stackId?: string;
+		laneId: string;
 		openId?: string;
 		rightClickTrigger?: HTMLElement;
 		contextData: BranchHeaderContextData;
@@ -48,6 +49,7 @@
 	let {
 		projectId,
 		stackId,
+		laneId,
 		openId = $bindable(),
 		rightClickTrigger,
 		contextData
@@ -116,6 +118,7 @@
 			await updateBranchNameMutation({
 				projectId: projectId,
 				stackId,
+				laneId,
 				branchName,
 				newName: newBranchName
 			});
@@ -259,6 +262,7 @@
 							renameBranchModalContext = {
 								projectId,
 								stackId,
+								laneId,
 								branchName,
 								isPushed: !!branch.remoteTrackingBranch
 							};

apps/desktop/src/components/BranchList.svelte

@@ -31,13 +31,14 @@
 
 	type Props = {
 		projectId: string;
-		stackId: string;
+		stackId?: string;
+		laneId: string;
 		branches: BranchDetails[];
 		focusedStackId?: string;
 		onselect?: () => void;
 	};
 
-	const { projectId, branches, stackId, focusedStackId, onselect }: Props = $props();
+	const { projectId, branches, stackId, laneId, focusedStackId, onselect }: Props = $props();
 	const stackService = inject(STACK_SERVICE);
 	const uiState = inject(UI_STATE);
 	const modeService = inject(MODE_SERVICE);
@@ -54,7 +55,7 @@
 	const isCommitting = $derived(
 		exclusiveAction?.type === 'commit' && exclusiveAction?.stackId === stackId
 	);
-	const stackState = $derived(uiState.stack(stackId));
+	const stackState = $derived(uiState.stack(laneId));
 	const selection = $derived(stackState.selection);
 	const selectedCommitId = $derived(selection.current?.commitId);
 
@@ -64,6 +65,7 @@
 		$state<ReturnType<typeof ConflictResolutionConfirmModal>>();
 
 	async function handleUncommit(commitId: string, branchName: string) {
+		if (!stackId) return;
 		await stackService.uncommit({ projectId, stackId, branchName, commitId: commitId });
 	}
 
@@ -83,6 +85,7 @@
 		hasConflicts: boolean;
 		isAncestorMostConflicted: boolean;
 	}) {
+		if (!stackId) return;
 		if (args.type === 'LocalAndRemote' && args.hasConflicts && !args.isAncestorMostConflicted) {
 			conflictResolutionConfirmationModal?.show();
 			return;
@@ -111,7 +114,7 @@
 	const stackingReorderDropzoneManagerFactory = inject(STACKING_REORDER_DROPZONE_MANAGER_FACTORY);
 	const stackingReorderDropzoneManager = $derived(
 		stackingReorderDropzoneManagerFactory.build(
-			stackId,
+			laneId,
 			branches.map((s) => ({ name: s.name, commitIds: s.commits.map((p) => p.id) }))
 		)
 	);
@@ -164,6 +167,7 @@
 					type="stack-branch"
 					{projectId}
 					{stackId}
+					{laneId}
 					{branchName}
 					{lineColor}
 					{first}
@@ -181,8 +185,8 @@
 					trackingBranch={branch.remoteTrackingBranch ?? undefined}
 					readonly={!!branch.remoteTrackingBranch}
 					onclick={() => {
-						uiState.stack(stackId).selection.set({ branchName });
-						intelligentScrollingService.show(projectId, stackId, 'details');
+						uiState.stack(laneId).selection.set({ branchName });
+						intelligentScrollingService.show(projectId, laneId, 'details');
 						onselect?.();
 					}}
 				>
@@ -193,6 +197,7 @@
 							kind="outline"
 							tooltip="Create empty commit"
 							onclick={async () => {
+								if (!stackId) return;
 								await insertBlankCommitInBranch({
 									projectId,
 									stackId,
@@ -218,6 +223,7 @@
 								kind="outline"
 								tooltip="Create new branch"
 								onclick={async () => {
+									if (!stackId) return;
 									addDependentBranchModalContext = {
 										projectId,
 										stackId
@@ -284,7 +290,13 @@
 							first,
 							stackLength: branches.length
 						}}
-						<BranchHeaderContextMenu {projectId} {stackId} {rightClickTrigger} contextData={data} />
+						<BranchHeaderContextMenu
+							{projectId}
+							{stackId}
+							{laneId}
+							{rightClickTrigger}
+							contextData={data}
+						/>
 					{/snippet}
 
 					{#snippet branchContent()}
@@ -294,6 +306,7 @@
 							active={focusedStackId === stackId}
 							{projectId}
 							{stackId}
+							{laneId}
 							{branchName}
 							{branchDetails}
 							{stackingReorderDropzoneManager}

apps/desktop/src/components/BranchRenameModal.svelte

@@ -1,7 +1,8 @@
 <script lang="ts" module>
 	export type BranchRenameModalProps = {
 		projectId: string;
-		stackId: string;
+		stackId?: string;
+		laneId: string;
 		branchName: string;
 		isPushed: boolean;
 	};
@@ -12,7 +13,7 @@
 	import { inject } from '@gitbutler/shared/context';
 	import { Button, ElementId, Modal, TestId, Textbox } from '@gitbutler/ui';
 
-	const { projectId, stackId, branchName, isPushed }: BranchRenameModalProps = $props();
+	const { projectId, stackId, laneId, branchName, isPushed }: BranchRenameModalProps = $props();
 	const stackService = inject(STACK_SERVICE);
 
 	const [renameBranch, renameResult] = stackService.updateBranchName;
@@ -34,7 +35,7 @@
 	bind:this={modal}
 	onSubmit={async (close) => {
 		if (newName) {
-			renameBranch({ projectId, stackId, branchName, newName });
+			renameBranch({ projectId, stackId, laneId, branchName, newName });
 		}
 		close();
 	}}