Adds copy patch for multiselect of commit files

Ensures copy patch multiselect of unstaged files handles untracked files

Author: eamodio

contributions.json

@@ -394,7 +394,7 @@
 						"order": 97
 					},
 					{
-						"when": "viewItem =~ /gitlens:file(\\b(?=.*?\\b\\+committed\\b)|:results)/ && !listMultiSelection && !gitlens:hasVirtualFolders && !gitlens:untrusted",
+						"when": "viewItem =~ /gitlens:file(\\b(?=.*?\\b\\+committed\\b)|:results)/ && !gitlens:hasVirtualFolders && !gitlens:untrusted",
 						"group": "7_gitlens_cutcopypaste",
 						"order": 3
 					}

package.json

@@ -16212,7 +16212,7 @@
 				},
 				{
 					"command": "gitlens.copyPatchToClipboard",
-					"when": "viewItem =~ /gitlens:file(\\b(?=.*?\\b\\+committed\\b)|:results)/ && !listMultiSelection && !gitlens:hasVirtualFolders && !gitlens:untrusted",
+					"when": "viewItem =~ /gitlens:file(\\b(?=.*?\\b\\+committed\\b)|:results)/ && !gitlens:hasVirtualFolders && !gitlens:untrusted",
 					"group": "7_gitlens_cutcopypaste@3"
 				},
 				{

src/commands/commandBase.ts

@@ -2,7 +2,6 @@ import type { TextEditor, TextEditorEdit } from 'vscode';
 import { commands, Disposable } from 'vscode';
 import type { GlCommands } from '../constants.commands';
 import { registerCommand } from '../system/-webview/command';
-import { runSequentially } from '../system/function';
 import type { CommandContext } from './commandContext';
 import type { CommandContextParsingOptions } from './commandContext.utils';
 import { parseCommandContext } from './commandContext.utils';
@@ -38,16 +37,6 @@ export abstract class GlCommandBase implements Disposable {
 
 	protected _execute(command: GlCommands, ...args: any[]): Promise<unknown> {
 		const [context, rest] = parseCommandContext(command, { ...this.contextParsingOptions }, ...args);
-
-		// If there an array of contexts, then we want to execute the command for each
-		if (Array.isArray(context)) {
-			return runSequentially(
-				this.preExecute,
-				context.map<[CommandContext, ...any[]]>((c: CommandContext) => [c, ...rest]),
-				this,
-			);
-		}
-
 		return this.preExecute(context, ...rest);
 	}
 }

src/commands/commandContext.utils.ts

@@ -161,7 +161,7 @@ export function parseCommandContext(
 	command: GlCommands,
 	options?: CommandContextParsingOptions,
 	...args: any[]
-): [CommandContext | CommandContext[], any[]] {
+): [CommandContext, any[]] {
 	let editor: TextEditor | undefined = undefined;
 
 	const originalArgs = [...args];
@@ -219,25 +219,15 @@ export function parseCommandContext(
 	}
 
 	if (firstArg instanceof ViewNode) {
-		let [node, ...rest] = args as [ViewNode, unknown];
-
-		// If there is a node followed by an array of nodes, then we want to execute the command for each
-		firstArg = rest[0];
-		if (Array.isArray(firstArg) && firstArg[0] instanceof ViewNode) {
-			let nodes;
-			[nodes, ...rest] = rest as unknown as [ViewNode[], unknown];
-
-			const contexts: CommandContext[] = [];
-			for (const n of nodes) {
-				if (n?.constructor === node.constructor) {
-					contexts.push({ command: command, type: 'viewItem', args: originalArgs, node: n, uri: n.uri });
-				}
-			}
+		const [active, selection, ...rest] = args as [ViewNode, unknown];
 
-			return [contexts, rest];
+		// If there is a node followed by an array of nodes, then check how we want to execute the command
+		if (active instanceof ViewNode && Array.isArray(selection) && selection[0] instanceof ViewNode) {
+			const nodes = selection.filter((n): n is ViewNode => n?.constructor === active.constructor);
+			return [{ command: command, type: 'viewItems', args: originalArgs, node: active, nodes: nodes }, rest];
 		}
 
-		return [{ command: command, type: 'viewItem', args: originalArgs, node: node, uri: node.uri }, rest];
+		return [{ command: command, type: 'viewItem', args: originalArgs, node: active, uri: active.uri }, rest];
 	}
 
 	if (isScmResourceState(firstArg)) {

src/commands/patches.ts

@@ -2,7 +2,7 @@ import { EntityIdentifierUtils } from '@gitkraken/provider-apis/entity-identifie
 import type { TextEditor } from 'vscode';
 import { env, Uri, window, workspace } from 'vscode';
 import type { ScmResource } from '../@types/vscode.git.resources';
-import { ScmResourceGroupType } from '../@types/vscode.git.resources.enums';
+import { ScmResourceGroupType, ScmStatus } from '../@types/vscode.git.resources.enums';
 import type { GlCommands } from '../constants.commands';
 import { GlCommand } from '../constants.commands';
 import type { IntegrationId } from '../constants.integrations';
@@ -22,6 +22,7 @@ import { getRepositoryOrShowPicker } from '../quickpicks/repositoryPicker';
 import { command } from '../system/-webview/command';
 import { map } from '../system/iterable';
 import { Logger } from '../system/logger';
+import { isViewRefFileNode } from '../views/nodes/utils/-webview/node.utils';
 import type { Change, CreateDraft } from '../webviews/plus/patchDetails/protocol';
 import { ActiveEditorCommand, GlCommandBase } from './commandBase';
 import type { CommandContext } from './commandContext';
@@ -38,6 +39,8 @@ export interface CreatePatchCommandArgs {
 	repoPath?: string;
 	uris?: Uri[];
 
+	includeUntracked?: boolean;
+
 	title?: string;
 	description?: string;
 }
@@ -56,10 +59,13 @@ abstract class CreatePatchCommandBase extends GlCommandBase {
 				const resourcesByGroup = new Map<ScmResourceGroupType, ScmResource[]>();
 				const uris = new Set<string>();
 
+				let includeUntracked = false;
+
 				let repo;
 				for (const resource of context.scmResourceStates as ScmResource[]) {
 					repo ??= await this.container.git.getOrOpenRepository(resource.resourceUri);
 
+					includeUntracked = includeUntracked || resource.type === ScmStatus.UNTRACKED;
 					uris.add(resource.resourceUri.toString());
 
 					let groupResources = resourcesByGroup.get(resource.resourceGroupType!);
@@ -81,6 +87,7 @@ abstract class CreatePatchCommandBase extends GlCommandBase {
 					from: 'HEAD',
 					uris: [...map(uris, u => Uri.parse(u))],
 					title: to === uncommittedStaged ? 'Staged Changes' : 'Uncommitted Changes',
+					includeUntracked: includeUntracked ? true : undefined,
 				};
 			} else if (context.type === 'scm-groups') {
 				const group = context.scmResourceGroups[0];
@@ -131,6 +138,22 @@ abstract class CreatePatchCommandBase extends GlCommandBase {
 						uris: [context.node.uri],
 					};
 				}
+			} else if (context.type === 'viewItems') {
+				if (isViewRefFileNode(context.node)) {
+					args = {
+						repoPath: context.node.repoPath,
+						to: context.node.ref.sha,
+						from: `${context.node.ref.sha}^`,
+						uris: [context.node.uri],
+						title: `Changes (partial) in ${shortenRevision(context.node.ref.sha)}`,
+					};
+
+					for (const node of context.nodes) {
+						if (isViewRefFileNode(node) && node !== context.node && node.ref.sha === args.to) {
+							args.uris!.push(node.uri);
+						}
+					}
+				}
 			}
 		}
 
@@ -147,13 +170,10 @@ abstract class CreatePatchCommandBase extends GlCommandBase {
 
 		return repo.git
 			.diff()
-			.getDiff?.(
-				args?.to ?? uncommitted,
-				args?.from ?? 'HEAD',
-				args?.uris?.length
-					? { uris: args.uris }
-					: { includeUntracked: args?.to != null || args?.to === uncommitted },
-			);
+			.getDiff?.(args?.to ?? uncommitted, args?.from ?? 'HEAD', {
+				includeUntracked: args?.includeUntracked ?? (args?.to != null || args?.to === uncommitted),
+				uris: args?.uris,
+			});
 	}
 
 	abstract override execute(args?: CreatePatchCommandArgs): Promise<void>;

src/env/node/git/sub-providers/diff.ts

@@ -73,10 +73,7 @@ export class DiffGitSubProvider implements GitDiffSubProvider {
 		repoPath: string,
 		to: string,
 		from?: string,
-		options?:
-			| { context?: number; includeUntracked?: never; uris?: never }
-			| { context?: number; includeUntracked?: never; uris: Uri[] }
-			| { context?: number; includeUntracked: boolean; uris?: never },
+		options?: { context?: number; includeUntracked: boolean; uris?: Uri[] },
 	): Promise<GitDiff | undefined> {
 		const scope = getLogScope();
 		const args = [`-U${options?.context ?? 3}`];
@@ -110,15 +107,27 @@ export class DiffGitSubProvider implements GitDiffSubProvider {
 			args.push(from, to);
 		}
 
+		let paths: Set<string> | undefined;
 		let untrackedPaths: string[] | undefined;
 
 		if (options?.uris) {
-			args.push('--', ...options.uris.map(u => u.fsPath));
-		} else if (options?.includeUntracked && to === uncommitted) {
+			paths = new Set<string>(options.uris.map(u => this.provider.getRelativePath(u, repoPath)));
+			args.push('--', ...paths);
+		}
+
+		if (options?.includeUntracked && to === uncommitted) {
 			const status = await this.provider.status?.getStatus(repoPath);
+
 			untrackedPaths = status?.untrackedChanges.map(f => f.path);
+
 			if (untrackedPaths?.length) {
-				await this.provider.staging?.stageFiles(repoPath, untrackedPaths, { intentToAdd: true });
+				if (paths?.size) {
+					untrackedPaths = untrackedPaths.filter(p => paths.has(p));
+				}
+
+				if (untrackedPaths.length) {
+					await this.provider.staging?.stageFiles(repoPath, untrackedPaths, { intentToAdd: true });
+				}
 			}
 		}
 
@@ -135,7 +144,7 @@ export class DiffGitSubProvider implements GitDiffSubProvider {
 			Logger.error(ex, scope);
 			return undefined;
 		} finally {
-			if (untrackedPaths != null) {
+			if (untrackedPaths?.length) {
 				await this.provider.staging?.unstageFiles(repoPath, untrackedPaths);
 			}
 		}

src/git/gitProvider.ts

@@ -363,10 +363,7 @@ export interface GitDiffSubProvider {
 		repoPath: string | Uri,
 		to: string,
 		from?: string,
-		options?:
-			| { context?: number; includeUntracked?: never; uris?: never }
-			| { context?: number; includeUntracked?: never; uris: Uri[] }
-			| { context?: number; includeUntracked: boolean; uris?: never },
+		options?: { context?: number; includeUntracked?: boolean; uris?: Uri[] },
 	): Promise<GitDiff | undefined>;
 	getDiffFiles?(repoPath: string | Uri, contents: string): Promise<GitDiffFiles | undefined>;
 	getDiffStatus(

src/webviews/plus/graph/graphWebview.ts

@@ -453,8 +453,7 @@ export class GraphWebviewProvider implements WebviewProvider<State, State, Graph
 			}
 
 			if (this.repository == null && this.container.git.repositoryCount > 1) {
-				const [contexts] = parseCommandContext(GlCommand.ShowGraph, undefined, ...args);
-				const context = Array.isArray(contexts) ? contexts[0] : contexts;
+				const [context] = parseCommandContext(GlCommand.ShowGraph, undefined, ...args);
 
 				if (context.type === 'scm' && context.scm.rootUri != null) {
 					this.repository = this.container.git.getRepository(context.scm.rootUri);