Adds actions in home for paused git operations

Author: d13

src/constants.commands.ts

@@ -694,7 +694,11 @@ type HomeWebviewCommands = `home.${
 	| 'mergeIntoCurrent'
 	| 'rebaseCurrentOnto'
 	| 'startWork'
-	| 'createCloudPatch'}`;
+	| 'createCloudPatch'
+	| 'skipPausedOperation'
+	| 'continuePausedOperation'
+	| 'abortPausedOperation'
+	| 'openRebaseEditor'}`;
 
 type GraphWebviewCommands = `graph.${
 	| 'switchToEditorLayout'

src/webviews/apps/plus/home/components/merge-rebase-status.ts

@@ -1,8 +1,12 @@
 import { css, html, LitElement, nothing } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
+import { when } from 'lit/directives/when.js';
 import type { GitPausedOperationStatus } from '../../../../../git/models/pausedOperationStatus';
 import { pausedOperationStatusStringsByType } from '../../../../../git/utils/pausedOperationStatus.utils';
+import { createCommandLink } from '../../../../../system/commands';
 import { getReferenceLabel } from '../../../shared/git-utils';
+import '../../../shared/components/actions/action-item';
+import '../../../shared/components/actions/action-nav';
 import '../../../shared/components/overlays/tooltip';
 
 @customElement('gl-merge-rebase-status')
@@ -53,6 +57,30 @@ export class GlMergeConflictWarning extends LitElement {
 	@property({ type: Object })
 	pausedOpStatus?: GitPausedOperationStatus;
 
+	private get onSkipUrl() {
+		return createCommandLink('gitlens.home.skipPausedOperation', {
+			operation: this.pausedOpStatus,
+		});
+	}
+
+	private get onContinueUrl() {
+		return createCommandLink('gitlens.home.continuePausedOperation', {
+			operation: this.pausedOpStatus,
+		});
+	}
+
+	private get onAbortUrl() {
+		return createCommandLink('gitlens.home.abortPausedOperation', {
+			operation: this.pausedOpStatus,
+		});
+	}
+
+	private get onOpenEditorUrl() {
+		return createCommandLink('gitlens.home.openRebaseEditor', {
+			operation: this.pausedOpStatus,
+		});
+	}
+
 	override render() {
 		if (this.pausedOpStatus == null) return nothing;
 
@@ -68,14 +96,15 @@ export class GlMergeConflictWarning extends LitElement {
 		if (pausedOpStatus.type !== 'rebase') {
 			const strings = pausedOperationStatusStringsByType[pausedOpStatus.type];
 			return html`<span class="label"
-				>${this.conflicts ? strings.conflicts : strings.label}
-				<code-icon
-					icon="${pausedOpStatus.incoming.refType === 'branch' ? 'git-branch' : 'git-commit'}"
-					class="icon"
-				></code-icon>
-				${getReferenceLabel(pausedOpStatus.incoming, { expand: false, icon: false })} ${strings.directionality}
-				${getReferenceLabel(pausedOpStatus.current, { expand: false, icon: false })}</span
-			>`;
+					>${this.conflicts ? strings.conflicts : strings.label}
+					<code-icon
+						icon="${pausedOpStatus.incoming.refType === 'branch' ? 'git-branch' : 'git-commit'}"
+						class="icon"
+					></code-icon>
+					${getReferenceLabel(pausedOpStatus.incoming, { expand: false, icon: false })}
+					${strings.directionality}
+					${getReferenceLabel(pausedOpStatus.current, { expand: false, icon: false })}</span
+				>${this.renderActions()}`;
 		}
 
 		const started = pausedOpStatus.steps.total > 0;
@@ -95,6 +124,35 @@ export class GlMergeConflictWarning extends LitElement {
 				? html`<span class="steps"
 						>(${pausedOpStatus.steps.current.number}/${pausedOpStatus.steps.total})</span
 				  >`
-				: nothing}`;
+				: nothing}${this.renderActions()}`;
+	}
+
+	private renderActions() {
+		if (this.pausedOpStatus == null) return nothing;
+
+		const status = this.pausedOpStatus.type;
+
+		return html`<action-nav>
+			${when(
+				status !== 'revert',
+				() => html`
+					<action-item label="Continue" icon="debug-continue" href=${this.onContinueUrl}></action-item>
+				`,
+			)}
+			${when(
+				status !== 'merge',
+				() => html`<action-item label="Skip" icon="debug-step-over" href=${this.onSkipUrl}></action-item>`,
+			)}
+			<action-item label="Abort" href=${this.onAbortUrl} icon="circle-slash"></action-item>
+			${when(
+				status === 'rebase',
+				() =>
+					html`<action-item
+						label="Open in Rebase Editor"
+						href=${this.onOpenEditorUrl}
+						icon="edit"
+					></action-item>`,
+			)}
+		</action-nav>`;
 	}
 }

src/webviews/home/homeWebview.ts

@@ -1,5 +1,5 @@
 import type { ConfigurationChangeEvent } from 'vscode';
-import { Disposable, workspace } from 'vscode';
+import { Disposable, Uri, workspace } from 'vscode';
 import type { CreatePullRequestActionContext } from '../../api/gitlens';
 import type { EnrichedAutolink } from '../../autolinks';
 import { getAvatarUriFromGravatarEmail } from '../../avatars';
@@ -23,6 +23,7 @@ import type { GitBranch } from '../../git/models/branch';
 import { getAssociatedIssuesForBranch, getBranchTargetInfo } from '../../git/models/branch.utils';
 import type { GitFileChangeShape } from '../../git/models/file';
 import type { Issue } from '../../git/models/issue';
+import type { GitPausedOperationStatus } from '../../git/models/pausedOperationStatus';
 import type { PullRequest } from '../../git/models/pullRequest';
 import { getComparisonRefsForPullRequest } from '../../git/models/pullRequest';
 import { getReferenceFromBranch } from '../../git/models/reference.utils';
@@ -49,7 +50,7 @@ import type { Deferrable } from '../../system/function';
 import { debounce } from '../../system/function';
 import { filterMap } from '../../system/iterable';
 import { getSettledValue } from '../../system/promise';
-import { executeActionCommand, executeCommand, registerCommand } from '../../system/vscode/command';
+import { executeActionCommand, executeCommand, executeCoreCommand, registerCommand } from '../../system/vscode/command';
 import { configuration } from '../../system/vscode/configuration';
 import { getContext, onDidChangeContext } from '../../system/vscode/context';
 import { openUrl, openWorkspace } from '../../system/vscode/utils';
@@ -114,6 +115,9 @@ interface BranchRef {
 	repoPath: string;
 	branchId: string;
 }
+interface GitPausedOperationCommandArgs {
+	operation: GitPausedOperationStatus;
+}
 
 // type AutolinksInfo = Awaited<GetOverviewBranch['autolinks']>;
 type BranchMergeTargetStatusInfo = Awaited<GetOverviewBranch['mergeTarget']>;
@@ -309,6 +313,10 @@ export class HomeWebviewProvider implements WebviewProvider<State, State, HomeWe
 			registerCommand('gitlens.home.rebaseCurrentOnto', this.rebaseCurrentOnto, this),
 			registerCommand('gitlens.home.startWork', this.startWork, this),
 			registerCommand('gitlens.home.createCloudPatch', this.createCloudPatch, this),
+			registerCommand('gitlens.home.skipPausedOperation', this.skipPausedOperation, this),
+			registerCommand('gitlens.home.continuePausedOperation', this.continuePausedOperation, this),
+			registerCommand('gitlens.home.abortPausedOperation', this.abortPausedOperation, this),
+			registerCommand('gitlens.home.openRebaseEditor', this.openRebaseEditor, this),
 		];
 	}
 
@@ -454,6 +462,33 @@ export class HomeWebviewProvider implements WebviewProvider<State, State, HomeWe
 		});
 	}
 
+	private async abortPausedOperation(pausedOpArgs: GitPausedOperationCommandArgs) {
+		await this.container.git.status(pausedOpArgs.operation.repoPath).abortPausedOperation?.();
+	}
+
+	private async continuePausedOperation(pausedOpArgs: GitPausedOperationCommandArgs) {
+		if (pausedOpArgs.operation.type === 'revert') return;
+		await this.container.git.status(pausedOpArgs.operation.repoPath).continuePausedOperation?.();
+	}
+
+	private async skipPausedOperation(pausedOpArgs: GitPausedOperationCommandArgs) {
+		if (pausedOpArgs.operation.type === 'merge') return;
+
+		await this.container.git.status(pausedOpArgs.operation.repoPath).continuePausedOperation?.({ skip: true });
+	}
+
+	private async openRebaseEditor(pausedOpArgs: GitPausedOperationCommandArgs) {
+		if (pausedOpArgs.operation.type !== 'rebase') return;
+
+		const repo = this._repositoryBranches.get(pausedOpArgs.operation.repoPath)?.repo;
+		if (repo == null) return;
+
+		const rebaseTodoUri = Uri.joinPath(repo.uri, '.git', 'rebase-merge', 'git-rebase-todo');
+		await executeCoreCommand('vscode.openWith', rebaseTodoUri, 'gitlens.rebase', {
+			preview: false,
+		});
+	}
+
 	private async createCloudPatch(refs: BranchRef) {
 		const status = await this.container.git.status(refs.repoPath).getStatus();
 		if (status == null) return;