Fixes file loading for merge commits

Refactors fileset model to maintain the filtered set of files (if any)
 - Allows for more flexibility in the future for displaying search results

Author: eamodio

src/commands/diffWithRevisionFrom.ts

@@ -56,7 +56,7 @@ export class DiffWithRevisionFromCommand extends ActiveEditorCommand {
 				{
 					empty: `No stashes with '${gitUri.getFormattedFileName()}' found`,
 					// Stashes should always come with files, so this should be fine (but protect it just in case)
-					filter: c => c.fileset?.files.some(f => f.path === path || f.originalPath === path) ?? true,
+					filter: c => c.anyFiles?.some(f => f.path === path || f.originalPath === path) ?? true,
 				},
 			);
 			if (pick == null) return;

src/commands/git/show.ts

@@ -175,7 +175,7 @@ export class ShowGitCommand extends QuickCommand<State> {
 			assertsStateStepCommit(state);
 
 			if (state.counter < 3) {
-				if (state.reference.fileset?.files == null || state.reference.fileset?.filtered) {
+				if (!state.reference.hasFullDetails({ allowFilteredFiles: true })) {
 					await state.reference.ensureFullDetails();
 				}
 

src/commands/openFileAtRevisionFrom.ts

@@ -53,7 +53,9 @@ export class OpenFileAtRevisionFromCommand extends ActiveEditorCommand {
 					`${title}${gitUri.getFormattedFileName({ truncateTo: quickPickTitleMaxChars - title.length })}`,
 					'Choose a stash to compare with',
 					// Stashes should always come with files, so this should be fine (but protect it just in case)
-					{ filter: c => c.fileset?.files.some(f => f.path === path || f.originalPath === path) ?? true },
+					{
+						filter: c => c.anyFiles?.some(f => f.path === path || f.originalPath === path) ?? true,
+					},
 				);
 				if (pick == null) return;
 

src/commands/quickCommand.steps.ts

@@ -2353,7 +2353,7 @@ export function* showCommitOrStashFilesStep<
 				hint: `Click to see ${isStash(state.reference) ? 'stash' : 'commit'} actions`,
 			}),
 			createQuickPickSeparator('Files'),
-			...(state.reference.fileset?.files.map(
+			...(state.reference.anyFiles?.map(
 				fs => new CommitFileQuickPickItem(state.reference, fs, options?.picked === fs.path),
 			) ?? []),
 		] as (CommitFilesQuickPickItem | CommitFileQuickPickItem)[],

src/commands/showQuickCommitFile.ts

@@ -128,7 +128,7 @@ export class ShowQuickCommitFileCommand extends ActiveEditorCachedCommand {
 
 			const path = args.commit?.file?.path ?? gitUri.fsPath;
 			if (isCommit(args.commit)) {
-				if (args.commit.fileset?.files == null || args.commit.fileset?.filtered) {
+				if (!args.commit.hasFullDetails({ allowFilteredFiles: true })) {
 					await args.commit.ensureFullDetails();
 				}
 			}

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

@@ -31,6 +31,7 @@ import type {
 	CommitsLogParser,
 	CommitsWithFilesLogParser,
 	ParsedCommit,
+	ParsedStash,
 } from '../../../../git/parsers/logParser';
 import {
 	getCommitsLogParser,
@@ -185,11 +186,7 @@ export class CommitsGitSubProvider implements GitCommitsSubProvider {
 					f.status as GitFileStatus,
 					f.originalPath,
 					undefined,
-					{
-						additions: f.additions,
-						deletions: f.deletions,
-						changes: 0,
-					},
+					{ additions: f.additions, deletions: f.deletions, changes: 0 },
 				),
 		);
 
@@ -1255,35 +1252,36 @@ function createCommit(
 	);
 }
 
-function createCommitFileset(
+export function createCommitFileset(
 	container: Container,
-	c: ParsedCommit,
+	c: ParsedCommit | ParsedStash,
 	repoPath: string,
 	pathspec: string | undefined,
 ): GitCommitFileset {
-	return {
-		files:
-			c.files?.map(
-				f =>
-					new GitFileChange(
-						container,
-						repoPath,
-						f.path,
-						f.status as GitFileStatus,
-						f.originalPath,
-						undefined,
-						{
-							additions: f.additions ?? 0,
-							deletions: f.deletions ?? 0,
-							changes: 0,
-						},
-						undefined,
-						f.range ? { startLine: f.range.startLine, endLine: f.range.endLine } : undefined,
-					),
-			) ?? [],
-		filtered: Boolean(pathspec),
-		pathspec: pathspec,
-	};
+	// If the files are missing or it's a merge commit without files or pathspec, then consider the files unloaded
+	if (c.files == null || (!c.files.length && pathspec == null && c.parents.includes(' '))) {
+		return {
+			files: undefined,
+			filtered: pathspec ? { files: undefined, pathspec: pathspec } : undefined,
+		};
+	}
+
+	const files = c.files.map(
+		f =>
+			new GitFileChange(
+				container,
+				repoPath,
+				f.path,
+				f.status as GitFileStatus,
+				f.originalPath,
+				undefined,
+				{ additions: f.additions ?? 0, deletions: f.deletions ?? 0, changes: 0 },
+				undefined,
+				f.range ? { startLine: f.range.startLine, endLine: f.range.endLine } : undefined,
+			),
+	);
+
+	return pathspec ? { files: undefined, filtered: { files: files, pathspec: pathspec } } : { files: files };
 }
 
 function getGitStartEnd(range: Range): [number, number] {
@@ -1326,15 +1324,19 @@ async function parseCommits(
 				if (stash != null) {
 					if (commits.has(stash.sha)) {
 						countStashChildCommits++;
-					} else {
+					} else if (allowFilteredFiles) {
 						commits.set(
 							stash.sha,
-							stash.with(
-								allowFilteredFiles
-									? { fileset: createCommitFileset(container, c, repoPath, pathspec) }
-									: {},
-							),
+							stash.with({
+								fileset: {
+									...createCommitFileset(container, c, repoPath, pathspec),
+									// Add the full stash files back into the fileset
+									files: stash.fileset?.files,
+								},
+							}),
 						);
+					} else {
+						commits.set(stash.sha, stash);
 					}
 					continue;
 				}
@@ -1366,15 +1368,19 @@ async function parseCommits(
 			if (stash != null) {
 				if (commits.has(stash.sha)) {
 					countStashChildCommits++;
-				} else {
+				} else if (allowFilteredFiles) {
 					commits.set(
 						stash.sha,
-						stash.with(
-							allowFilteredFiles
-								? { fileset: createCommitFileset(container, c, repoPath, pathspec) }
-								: {},
-						),
+						stash.with({
+							fileset: {
+								...createCommitFileset(container, c, repoPath, pathspec),
+								// Add the full stash files back into the fileset
+								files: stash.fileset?.files,
+							},
+						}),
 					);
+				} else {
+					commits.set(stash.sha, stash);
 				}
 				continue;
 			}

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

@@ -24,6 +24,7 @@ import { getSettledValue } from '../../../../system/promise';
 import type { Git } from '../git';
 import { maxGitCliLength } from '../git';
 import { RunError } from '../shell.errors';
+import { createCommitFileset } from './commits';
 
 const stashSummaryRegex =
 	// eslint-disable-next-line no-control-regex
@@ -382,11 +383,11 @@ export function convertStashesToStdin(stashOrStashes: GitStash | Map<string, Git
 }
 
 function createStash(container: Container, s: ParsedStash, repoPath: string): GitStashCommit {
+	let message = s.summary.trim();
+
 	let onRef;
 	let summary;
-	let message;
-
-	const match = stashSummaryRegex.exec(s.summary);
+	const match = stashSummaryRegex.exec(message);
 	if (match?.groups != null) {
 		onRef = match.groups.onref;
 		summary = match.groups.summary.trim();
@@ -398,35 +399,20 @@ function createStash(container: Container, s: ParsedStash, repoPath: string): Gi
 		} else {
 			message = summary;
 		}
-	} else {
-		message = s.summary.trim();
 	}
 
+	const index = message.indexOf('\n');
+
 	return new GitCommit(
 		container,
 		repoPath,
 		s.sha,
 		new GitCommitIdentity('You', undefined, new Date((s.authorDate as unknown as number) * 1000)),
 		new GitCommitIdentity('You', undefined, new Date((s.committedDate as unknown as number) * 1000)),
-		message.split('\n', 1)[0] ?? '',
-		s.parents.split(' '),
+		index !== -1 ? message.substring(0, index) : message,
+		s.parents.split(' ') ?? [],
 		message,
-		{
-			files:
-				s.files?.map(
-					f =>
-						new GitFileChange(
-							container,
-							repoPath,
-							f.path,
-							f.status as GitFileStatus,
-							f.originalPath,
-							undefined,
-							{ additions: f.additions ?? 0, deletions: f.deletions ?? 0, changes: 0 },
-						),
-				) ?? [],
-			filtered: false,
-		},
+		createCommitFileset(container, s, repoPath, undefined),
 		s.stats,
 		undefined,
 		undefined,

src/git/actions/commit.ts

@@ -769,7 +769,7 @@ export async function openOnlyChangedFiles(container: Container, files: GitFile[
 export async function openOnlyChangedFiles(container: Container, commitOrFiles: GitCommit | GitFile[]): Promise<void> {
 	let files;
 	if (isCommit(commitOrFiles)) {
-		if (commitOrFiles.fileset?.files == null || commitOrFiles.fileset?.filtered) {
+		if (commitOrFiles.hasFullDetails()) {
 			await commitOrFiles.ensureFullDetails();
 		}