Merge remote-tracking branch 'origin/master' into base-branch-improve…

…ments

Cargo.toml

@@ -37,7 +37,7 @@ resolver = "2"
 [workspace.dependencies]
 bstr = "1.10.0"
 # Add the `tracing` or `tracing-detail` features to see more of gitoxide in the logs. Useful to see which programs it invokes.
-gix = { git = "https://github.com/Byron/gitoxide", rev = "0fe5133598c6f843fb3172a4e0c4f58932405647", default-features = false, features = [] }
+gix = { git = "https://github.com/Byron/gitoxide", rev = "72daa46bad9d397ef2cc48a3cffda23f414ccd8a", default-features = false, features = [] }
 git2 = { version = "0.18.3", features = [
     "vendored-openssl",
     "vendored-libgit2",
@@ -48,7 +48,6 @@ thiserror = "1.0.63"
 tokio = { version = "1.40.0", default-features = false }
 keyring = "2.3.3"
 anyhow = "1.0.86"
-fslock = "0.2.1"
 parking_lot = "0.12.3"
 futures = "0.3.30"
 toml = "0.8.13"

apps/desktop/src/lib/baseBranch/baseBranchService.ts

@@ -4,6 +4,10 @@ import { showError } from '$lib/notifications/toasts';
 import { plainToInstance } from 'class-transformer';
 import { writable } from 'svelte/store';
 
+export interface RemoteBranchInfo {
+	name: string;
+}
+
 export class BaseBranchService {
 	readonly base = writable<BaseBranch | null | undefined>(undefined, () => {
 		this.refresh();
@@ -86,7 +90,9 @@ export class BaseBranchService {
 	}
 }
 
-export async function getRemoteBranches(projectId: string | undefined) {
+export async function getRemoteBranches(
+	projectId: string | undefined
+): Promise<RemoteBranchInfo[]> {
 	if (!projectId) return [];
 	return await invoke<Array<string>>('git_remote_branches', { projectId }).then((branches) =>
 		branches

apps/desktop/src/lib/branch/BranchCard.svelte

@@ -65,6 +65,7 @@
 
 	let laneWidth: number | undefined = $state();
 
+	let commitDialog = $state<CommitDialog>();
 	let scrollViewport: HTMLElement | undefined = $state();
 	let rsViewport: HTMLElement | undefined = $state();
 
@@ -75,9 +76,7 @@
 	});
 
 	async function generateBranchName() {
-		console.log('before');
 		if (!aiGenEnabled) return;
-		console.log('after');
 
 		const hunks = branch.files.flatMap((f) => f.hunks);
 
@@ -174,6 +173,8 @@
 										files={branch.files}
 										showCheckboxes={$commitBoxOpen}
 										allowMultiple
+										commitDialogExpanded={commitBoxOpen}
+										focusCommitDialog={() => commitDialog?.focus()}
 									/>
 									{#if branch.conflicted}
 										<div class="card-notifications">
@@ -192,6 +193,7 @@
 								</Dropzones>
 
 								<CommitDialog
+									bind:this={commitDialog}
 									projectId={project.id}
 									expanded={commitBoxOpen}
 									hasSectionsAfter={branch.commits.length > 0}

apps/desktop/src/lib/branch/BranchLabel.svelte

@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { autoSelectBranchNameFeature } from '$lib/config/uiFeatureFlags';
 	import { resizeObserver } from '$lib/utils/resizeObserver';
 
 	interface Props {
@@ -34,6 +35,9 @@
 	onclick={(e) => {
 		e.stopPropagation();
 		inputEl.focus();
+		if ($autoSelectBranchNameFeature) {
+			inputEl.select();
+		}
 	}}
 	onblur={() => {
 		if (name === '') name = initialName;

apps/desktop/src/lib/branch/BranchLane.svelte

@@ -122,7 +122,7 @@
 					conflicted={selected.conflicted}
 					file={selected}
 					readonly={selected instanceof RemoteFile}
-					selectable={$commitBoxOpen}
+					selectable={$commitBoxOpen && commitId === undefined}
 					{commitId}
 					on:close={() => {
 						fileIdSelection.clear();

apps/desktop/src/lib/commit/CommitCard.svelte

@@ -1,4 +1,5 @@
 <script lang="ts">
+	import CommitContextMenu from './CommitContextMenu.svelte';
 	import CommitDragItem from './CommitDragItem.svelte';
 	import { Project } from '$lib/backend/projects';
 	import { BaseBranch } from '$lib/baseBranch/baseBranch';
@@ -51,6 +52,7 @@
 	const currentCommitMessage = persistedCommitMessage(project.id, branch?.id || '');
 
 	let draggableCommitElement: HTMLElement | null = null;
+	let contextMenu: CommitContextMenu;
 	let files: RemoteFile[] = [];
 	let showDetails = false;
 
@@ -153,11 +155,15 @@
 </script>
 
 <Modal bind:this={commitMessageModal} width="small" onSubmit={submitCommitMessageModal}>
-	<CommitMessageInput
-		bind:commitMessage={description}
-		bind:valid={commitMessageValid}
-		isExpanded={true}
-	/>
+	{#snippet children(_, close)}
+		<CommitMessageInput
+			focusOnMount
+			bind:commitMessage={description}
+			bind:valid={commitMessageValid}
+			isExpanded={true}
+			cancel={close}
+		/>
+	{/snippet}
 	{#snippet controls(close)}
 		<Button style="ghost" outline onclick={close}>Cancel</Button>
 		<Button style="neutral" type="submit" kind="solid" grow disabled={!commitMessageValid}>
@@ -189,6 +195,13 @@
 	{/snippet}
 </Modal>
 
+<CommitContextMenu
+	bind:this={contextMenu}
+	targetElement={draggableCommitElement}
+	{commit}
+	{commitUrl}
+/>
+
 <div
 	class="commit-row"
 	class:is-commit-open={showDetails}
@@ -222,6 +235,9 @@
 				on:keyup={onKeyup}
 				role="button"
 				tabindex="0"
+				on:contextmenu={(e) => {
+					contextMenu.open(e);
+				}}
 				on:dragenter={() => {
 					isDragTargeted = true;
 				}}

apps/desktop/src/lib/commit/CommitContextMenu.svelte

@@ -0,0 +1,51 @@
+<script lang="ts">
+	import ContextMenu from '$lib/components/contextmenu/ContextMenu.svelte';
+	import ContextMenuItem from '$lib/components/contextmenu/ContextMenuItem.svelte';
+	import ContextMenuSection from '$lib/components/contextmenu/ContextMenuSection.svelte';
+	import { copyToClipboard } from '$lib/utils/clipboard';
+	import { openExternalUrl } from '$lib/utils/url';
+	import type { Commit, DetailedCommit } from '$lib/vbranches/types';
+
+	interface Props {
+		targetElement: HTMLElement | null;
+		commit: DetailedCommit | Commit;
+		commitUrl: string | undefined;
+	}
+
+	const { targetElement, commit, commitUrl }: Props = $props();
+
+	const target = $derived(targetElement ?? undefined);
+
+	let contextMenu = $state<ContextMenu>();
+
+	export function open(e: MouseEvent) {
+		e.preventDefault();
+		e.stopPropagation();
+		contextMenu?.open(e);
+	}
+
+	function copySha() {
+		copyToClipboard(commit.id);
+		contextMenu?.close();
+	}
+
+	function openInBrowser() {
+		if (commitUrl) openExternalUrl(commitUrl);
+		contextMenu?.close();
+	}
+
+	function copyCommitMessage() {
+		copyToClipboard(commit.description);
+		contextMenu?.close();
+	}
+</script>
+
+<ContextMenu bind:this={contextMenu} {target} openByMouse>
+	<ContextMenuSection>
+		<ContextMenuItem label="Copy SHA" on:click={copySha} />
+		{#if commitUrl}
+			<ContextMenuItem label="Open in browser" on:click={openInBrowser} />
+		{/if}
+		<ContextMenuItem label="Copy commit message" on:click={copyCommitMessage} />
+	</ContextMenuSection>
+</ContextMenu>

apps/desktop/src/lib/commit/CommitDialog.svelte

@@ -21,6 +21,7 @@
 	const runCommitHooks = projectRunCommitHooks(projectId);
 	const commitMessage = persistedCommitMessage(projectId, $branch.id);
 
+	let commitMessageInput: CommitMessageInput;
 	let isCommitting = false;
 	let commitMessageValid = false;
 	let isInViewport = false;
@@ -40,6 +41,14 @@
 			isCommitting = false;
 		}
 	}
+
+	function close() {
+		$expanded = false;
+	}
+
+	export function focus() {
+		commitMessageInput.focus();
+	}
 </script>
 
 <div
@@ -62,24 +71,17 @@
 	}}
 >
 	<CommitMessageInput
+		bind:this={commitMessageInput}
 		bind:commitMessage={$commitMessage}
 		bind:valid={commitMessageValid}
 		isExpanded={$expanded}
+		cancel={close}
 		{commit}
 	/>
 	<div class="actions" class:commit-box__actions-expanded={$expanded}>
 		{#if $expanded && !isCommitting}
 			<div class="cancel-btn-wrapper" transition:slideFade={{ duration: 200, axis: 'x' }}>
-				<Button
-					style="ghost"
-					outline
-					id="commit-to-branch"
-					onclick={() => {
-						$expanded = false;
-					}}
-				>
-					Cancel
-				</Button>
+				<Button style="ghost" outline id="commit-to-branch" onclick={close}>Cancel</Button>
 			</div>
 		{/if}
 		<Button
@@ -96,6 +98,7 @@
 					commit();
 				} else {
 					$expanded = true;
+					commitMessageInput.focus();
 				}
 			}}
 		>

apps/desktop/src/lib/commit/CommitDragItem.svelte

@@ -17,12 +17,9 @@
 
 	const branch = maybeGetContextStore(VirtualBranch);
 
-	let actions = $state<CommitDragActions>();
-	$effect.pre(() => {
-		if (!$branch) return;
-
-		actions = commitDragActionsFactory.build($branch, commit);
-	});
+	const actions = $derived<CommitDragActions | undefined>(
+		$branch && commitDragActionsFactory.build($branch, commit)
+	);
 </script>
 
 <div class="dropzone-wrapper">

apps/desktop/src/lib/commit/CommitMessageInput.svelte

@@ -29,8 +29,10 @@
 
 	export let isExpanded: boolean;
 	export let commitMessage: string;
+	export let focusOnMount: boolean = false;
 	export let valid: boolean = false;
 	export let commit: (() => void) | undefined = undefined;
+	export let cancel: () => void;
 
 	const user = getContextStore(User);
 	const selectedOwnership = getContextStore(SelectedOwnership);
@@ -61,7 +63,7 @@
 	}
 
 	function focusTextAreaOnMount(el: HTMLTextAreaElement) {
-		el.focus();
+		if (focusOnMount) el.focus();
 	}
 
 	function updateFieldsHeight() {
@@ -125,6 +127,12 @@
 	function handleDescriptionKeyDown(e: KeyboardEvent & { currentTarget: HTMLTextAreaElement }) {
 		const value = e.currentTarget.value;
 
+		if (e.key === KeyName.Escape) {
+			e.preventDefault();
+			cancel();
+			return;
+		}
+
 		if (e.key === KeyName.Delete && value.length === 0) {
 			e.preventDefault();
 			if (titleTextArea) {
@@ -144,6 +152,12 @@
 	}
 
 	function handleSummaryKeyDown(e: KeyboardEvent & { currentTarget: HTMLTextAreaElement }) {
+		if (e.key === KeyName.Escape) {
+			e.preventDefault();
+			cancel();
+			return;
+		}
+
 		if (commit && (e.ctrlKey || e.metaKey) && e.key === KeyName.Enter) commit();
 		if (e.key === KeyName.Enter) {
 			e.preventDefault();
@@ -171,6 +185,10 @@
 			descriptionTextArea?.focus();
 		}
 	}
+
+	export function focus() {
+		titleTextArea?.focus();
+	}
 </script>
 
 {#if isExpanded}

apps/desktop/src/lib/components/ProjectSetup.svelte

@@ -2,7 +2,7 @@
 	import ProjectSetupTarget from './ProjectSetupTarget.svelte';
 	import newProjectSvg from '$lib/assets/illustrations/new-project.svg?raw';
 	import { Project, ProjectService } from '$lib/backend/projects';
-	import { BaseBranchService } from '$lib/baseBranch/baseBranchService';
+	import { BaseBranchService, type RemoteBranchInfo } from '$lib/baseBranch/baseBranchService';
 	import DecorativeSplitView from '$lib/components/DecorativeSplitView.svelte';
 	import { platformName } from '$lib/platform/platform';
 	import KeysForm from '$lib/settings/KeysForm.svelte';
@@ -11,7 +11,7 @@
 	import Button from '@gitbutler/ui/Button.svelte';
 	import { goto } from '$app/navigation';
 
-	export let remoteBranches: { name: string }[];
+	export let remoteBranches: RemoteBranchInfo[];
 
 	const project = getContext(Project);
 	const projectService = getContext(ProjectService);