Opens all changes after open in worktree flow finished for PRs

Author: nzaytsev

package.json

@@ -17924,7 +17924,7 @@
 		"lint:fix": "pnpm run clean:lint && eslint . --fix",
 		"lint:webviews": "pnpm run clean:lint && eslint \"src/webviews/apps/**/*.ts?(x)\"",
 		"package": "vsce package --no-dependencies",
-		"package-pre": "pnpm run patch-pre && pnpm run package --pre-release",
+		"//package-pre": "pnpm run patch-pre && pnpm run package --pre-release",
 		"patch-pre": "node ./scripts/applyPreReleasePatch.mjs",
 		"prep-release": "node ./scripts/prep-release.mjs",
 		"pretty": "prettier --config .prettierrc --write .",
@@ -17946,7 +17946,7 @@
 		"update-emoji": "node ./scripts/generateEmojiShortcodeMap.mjs",
 		"update-licenses": "node ./scripts/generateLicenses.mjs",
 		"pretest": "pnpm run build:tests",
-		"vscode:prepublish": "pnpm run bundle"
+		"//vscode:prepublish": "pnpm run bundle"
 	},
 	"dependencies": {
 		"@gitkraken/gitkraken-components": "10.7.0",

src/commands/git/worktree.ts

@@ -102,6 +102,8 @@ interface CreateState {
 		title?: string;
 	};
 
+	prId?: string;
+
 	onWorkspaceChanging?: (() => Promise<void>) | (() => void);
 	skipWorktreeConfirmations?: boolean;
 }
@@ -128,6 +130,8 @@ interface OpenState {
 	worktree: GitWorktree;
 	flags: OpenFlags[];
 
+	prId?: string;
+
 	openOnly?: boolean;
 	overrides?: {
 		disallowBack?: boolean;

src/git/actions/worktree.ts

@@ -56,11 +56,15 @@ export function copyChangesToWorktree(
 	});
 }
 
-export function open(worktree: GitWorktree, options?: { location?: OpenWorkspaceLocation; openOnly?: boolean }) {
+export function open(
+	worktree: GitWorktree,
+	options?: { location?: OpenWorkspaceLocation; openOnly?: boolean; prId?: string },
+) {
 	return executeGitCommand({
 		command: 'worktree',
 		state: {
 			subcommand: 'open',
+			prId: options?.prId,
 			repo: worktree.repoPath,
 			worktree: worktree,
 			flags: convertLocationToOpenFlags(options?.location),

src/plus/launchpad/launchpadProvider.ts

@@ -1023,6 +1023,7 @@ export function getPullRequestBranchDeepLink(
 	headRefBranchName: string,
 	remoteUrl: string,
 	action?: DeepLinkActionType,
+	prId?: string,
 ) {
 	const schemeOverride = configuration.get('deepLinks.schemeOverride');
 	const scheme = typeof schemeOverride === 'string' ? schemeOverride : env.uriScheme;
@@ -1033,7 +1034,7 @@ export function getPullRequestBranchDeepLink(
 			DeepLinkType.Branch
 		}/${encodeURIComponent(headRefBranchName)}?url=${encodeURIComponent(ensureRemoteUrl(remoteUrl))}${
 			action != null ? `&action=${action}` : ''
-		}`,
+		}${prId != null ? `&prId=${prId}` : ''}`,
 	);
 }
 

src/uris/deepLinks/deepLink.ts

@@ -92,6 +92,7 @@ export interface DeepLink {
 	secondaryTargetId?: string;
 	secondaryRemoteUrl?: string;
 	action?: string;
+	prId?: string;
 	params?: URLSearchParams;
 }
 
@@ -170,6 +171,7 @@ export function parseDeepLinkUri(uri: Uri): DeepLink | undefined {
 				secondaryRemoteUrl: secondaryRemoteUrl,
 				action: action,
 				params: urlParams,
+				prId: urlParams.get('prId') ?? undefined,
 			};
 		}
 		case DeepLinkType.Draft: {
@@ -231,6 +233,7 @@ export const enum DeepLinkServiceState {
 	OpenInspect,
 	SwitchToRef,
 	RunCommand,
+	OpenAllPrChanges,
 }
 
 export const enum DeepLinkServiceAction {
@@ -263,6 +266,7 @@ export const enum DeepLinkServiceAction {
 	OpenFile,
 	OpenInspect,
 	OpenSwitch,
+	OpenAllPrChanges,
 }
 
 export type DeepLinkRepoOpenType = 'clone' | 'folder' | 'workspace' | 'current';
@@ -284,6 +288,7 @@ export interface DeepLinkServiceContext {
 	targetSha?: string | undefined;
 	secondaryTargetSha?: string | undefined;
 	action?: string | undefined;
+	prId?: string | undefined;
 	repoOpenLocation?: OpenWorkspaceLocation | undefined;
 	repoOpenUri?: Uri | undefined;
 	params?: URLSearchParams | undefined;
@@ -409,6 +414,12 @@ export const deepLinkStateTransitionTable: Record<string, Record<string, DeepLin
 		[DeepLinkServiceAction.DeepLinkCancelled]: DeepLinkServiceState.Idle,
 	},
 	[DeepLinkServiceState.OpenInspect]: {
+		[DeepLinkServiceAction.OpenAllPrChanges]: DeepLinkServiceState.OpenAllPrChanges,
+		[DeepLinkServiceAction.DeepLinkResolved]: DeepLinkServiceState.Idle,
+		[DeepLinkServiceAction.DeepLinkErrored]: DeepLinkServiceState.Idle,
+		[DeepLinkServiceAction.DeepLinkCancelled]: DeepLinkServiceState.Idle,
+	},
+	[DeepLinkServiceState.OpenAllPrChanges]: {
 		[DeepLinkServiceAction.DeepLinkResolved]: DeepLinkServiceState.Idle,
 		[DeepLinkServiceAction.DeepLinkErrored]: DeepLinkServiceState.Idle,
 		[DeepLinkServiceAction.DeepLinkCancelled]: DeepLinkServiceState.Idle,

src/uris/deepLinks/deepLinkService.ts

@@ -4,10 +4,12 @@ import { Commands } from '../../constants.commands';
 import type { StoredDeepLinkContext, StoredNamedRef } from '../../constants.storage';
 import type { Container } from '../../container';
 import { executeGitCommand } from '../../git/actions';
-import { openFileAtRevision } from '../../git/actions/commit';
+import { openComparisonChanges, openFileAtRevision } from '../../git/actions/commit';
 import type { GitBranch } from '../../git/models/branch';
 import { getBranchNameWithoutRemote } from '../../git/models/branch';
 import type { GitCommit } from '../../git/models/commit';
+import type { PullRequest } from '../../git/models/pullRequest';
+import { getComparisonRefsForPullRequest } from '../../git/models/pullRequest';
 import type { GitReference } from '../../git/models/reference';
 import { createReference, isSha } from '../../git/models/reference';
 import type { Repository, RepositoryChangeEvent } from '../../git/models/repository';
@@ -19,6 +21,7 @@ import { missingRepositoryId } from '../../gk/models/repositoryIdentities';
 import { ensureAccount, ensurePaidPlan } from '../../plus/utils';
 import type { ShowInCommitGraphCommandArgs } from '../../plus/webviews/graph/protocol';
 import { createQuickPickSeparator } from '../../quickpicks/items/common';
+import { debug } from '../../system/decorators/log';
 import { once } from '../../system/event';
 import { Logger } from '../../system/logger';
 import { normalizePath } from '../../system/path';
@@ -68,10 +71,7 @@ export class DeepLinkService implements Disposable {
 		this._disposables.push(container.uri.onDidReceiveUri(async (uri: Uri) => this.processDeepLinkUri(uri)));
 
 		const pendingDeepLink = this.container.storage.get('deepLinks:pending');
-		if (pendingDeepLink != null) {
-			void this.container.storage.delete('deepLinks:pending');
-			void this.processPendingDeepLink(pendingDeepLink);
-		}
+		void this.processPendingDeepLink(pendingDeepLink);
 	}
 
 	dispose() {
@@ -114,6 +114,7 @@ export class DeepLinkService implements Disposable {
 			targetId: link.targetId,
 			secondaryTargetId: link.secondaryTargetId,
 			secondaryRemoteUrl: link.secondaryRemoteUrl,
+			prId: link.prId,
 			action: link.action,
 			params: link.params,
 		};
@@ -241,8 +242,10 @@ export class DeepLinkService implements Disposable {
 		}
 	}
 
-	private async processPendingDeepLink(pendingDeepLink: StoredDeepLinkContext) {
-		if (pendingDeepLink.url == null) return;
+	@debug()
+	private async processPendingDeepLink(pendingDeepLink: StoredDeepLinkContext | undefined) {
+		if (pendingDeepLink?.url == null) return;
+		void this.container.storage.delete('deepLinks:pending');
 
 		const link = parseDeepLinkUri(Uri.parse(pendingDeepLink.url));
 		if (link == null) return;
@@ -312,6 +315,19 @@ export class DeepLinkService implements Disposable {
 		return repo.git.getBranch(targetId);
 	}
 
+	private async getPullRequest(targetId: string): Promise<PullRequest | undefined> {
+		const { repo, remote } = this._context;
+		if (!repo) return undefined;
+		const pullRequests = remote
+			? await this.container.integrations.getMyPullRequestsForRemotes(remote)
+			: await this.container.integrations.getMyPullRequests();
+
+		if (!pullRequests?.value) {
+			return;
+		}
+		return pullRequests.value.find(x => x.pullRequest.id === targetId)?.pullRequest;
+	}
+
 	private async getCommit(targetId: string): Promise<GitCommit | undefined> {
 		const { repo } = this._context;
 		if (!repo) return undefined;
@@ -509,6 +525,7 @@ export class DeepLinkService implements Disposable {
 	// TODO @axosoft-ramint: Move all the logic for matching a repo, prompting to add repo, matching remote, etc. for a target (branch, PR, etc.)
 	// to a separate service where it can be used outside of the context of deep linking. Then the deep link service should leverage it,
 	// and we should stop using deep links to process things like Launchpad switch actions, Open in Worktree command, etc.
+	@debug()
 	private async processDeepLink(
 		initialAction: DeepLinkServiceAction = DeepLinkServiceAction.DeepLinkEventFired,
 		useProgress: boolean = true,
@@ -1373,7 +1390,6 @@ export class DeepLinkService implements Disposable {
 				case DeepLinkServiceState.OpenInspect: {
 					// If we arrive at this step, clear any stored data used for the "new window" option
 					await this.container.storage.delete('deepLinks:pending');
-
 					if (!repo) {
 						action = DeepLinkServiceAction.DeepLinkErrored;
 						message = 'Missing repository.';
@@ -1386,6 +1402,25 @@ export class DeepLinkService implements Disposable {
 						repository: repo,
 						source: 'launchpad',
 					} satisfies ShowWipArgs);
+					if (this._context.prId) {
+						action = DeepLinkServiceAction.OpenAllPrChanges;
+					} else {
+						action = DeepLinkServiceAction.DeepLinkResolved;
+					}
+					break;
+				}
+				case DeepLinkServiceState.OpenAllPrChanges: {
+					const pr = await this.getPullRequest(this._context.prId!);
+					const refs = getComparisonRefsForPullRequest(this._context.repoPath!, pr!.refs!);
+					await openComparisonChanges(
+						this.container,
+						{
+							repoPath: refs.repoPath,
+							lhs: refs.base.ref,
+							rhs: refs.head.ref,
+						},
+						{ title: `Changes in Pull Request "${pr!.title}"` },
+					);
 					action = DeepLinkServiceAction.DeepLinkResolved;
 					break;
 				}

src/views/viewCommands.ts

@@ -808,6 +808,7 @@ export class ViewCommands {
 				pr.refs.head.branch,
 				repoIdentity.remote.url,
 				DeepLinkActionType.SwitchToPullRequestWorktree,
+				pr.id,
 			);
 
 			const prRepo = await getOrOpenPullRequestRepository(this.container, pr, {