Uses fileset to manage different file loading

Loading commits w/ or w/o a pathspec which determines if filtered

Author: eamodio

src/commands/diffWithRevisionFrom.ts

@@ -55,7 +55,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.files?.some(f => f.path === path || f.originalPath === path) ?? true,
+					filter: c => c.fileset?.files.some(f => f.path === path || f.originalPath === path) ?? true,
 				},
 			);
 			if (pick == null) return;

src/commands/git/show.ts

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

src/commands/openFileAtRevisionFrom.ts

@@ -53,7 +53,7 @@ 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.files?.some(f => f.path === path || f.originalPath === path) ?? true },
+					{ filter: c => c.fileset?.files.some(f => f.path === path || f.originalPath === path) ?? true },
 				);
 				if (pick == null) return;
 

src/commands/patches.ts

@@ -421,9 +421,9 @@ async function createDraft(repository: Repository, args: CreatePatchCommandArgs)
 	if (commit == null) return undefined;
 
 	if (args.from == null) {
-		if (commit.files == null) return;
+		if (commit.fileset?.files == null) return;
 
-		change.files = [...commit.files];
+		change.files = [...commit.fileset.files];
 	} else {
 		const diff = await repository.git.diff().getDiff?.(to, args.from);
 		if (diff == null) return;

src/commands/quickCommand.steps.ts

@@ -2242,7 +2242,7 @@ export function* showCommitOrStashFilesStep<
 	context: Context,
 	options?: { picked?: string },
 ): StepResultGenerator<CommitFilesQuickPickItem | CommitFileQuickPickItem> {
-	if (state.reference.files == null) {
+	if (state.reference.fileset?.files == null) {
 		debugger;
 	}
 
@@ -2263,7 +2263,7 @@ export function* showCommitOrStashFilesStep<
 				hint: `Click to see ${isStash(state.reference) ? 'stash' : 'commit'} actions`,
 			}),
 			createQuickPickSeparator('Files'),
-			...(state.reference.files?.map(
+			...(state.reference.fileset?.files.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.files == null) {
+				if (args.commit.fileset?.files == null || args.commit.fileset?.filtered) {
 					await args.commit.ensureFullDetails();
 				}
 			}

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

@@ -139,16 +139,20 @@ export class StashGitSubProvider implements GitStashSubProvider {
 						message.split('\n', 1)[0] ?? '',
 						s.parents.split(' '),
 						message,
-						s.files?.map(
-							f =>
-								new GitFileChange(
-									this.container,
-									repoPath,
-									f.path,
-									f.status as GitFileStatus,
-									f.originalPath,
-								),
-						) ?? [],
+						{
+							files:
+								s.files?.map(
+									f =>
+										new GitFileChange(
+											this.container,
+											repoPath,
+											f.path,
+											f.status as GitFileStatus,
+											f.originalPath,
+										),
+								) ?? [],
+							filtered: false,
+						},
 						undefined,
 						[],
 						undefined,

src/git/actions/commit.ts

@@ -756,11 +756,11 @@ 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.files == null) {
+		if (commitOrFiles.fileset?.files == null || commitOrFiles.fileset?.filtered) {
 			await commitOrFiles.ensureFullDetails();
 		}
 
-		files = commitOrFiles.files ?? [];
+		files = commitOrFiles.fileset?.files ?? [];
 	} else {
 		files = commitOrFiles.map(f => new GitFileChange(container, f.repoPath!, f.path, f.status, f.originalPath));
 	}
@@ -848,13 +848,13 @@ async function getChangesRefArgs(
 		};
 	}
 
-	if (commitOrFiles.files == null) {
+	if (commitOrFiles.fileset?.files == null) {
 		await commitOrFiles.ensureFullDetails();
 	}
 
 	return {
 		commit: commitOrFiles,
-		files: commitOrFiles.files ?? [],
+		files: commitOrFiles.fileset?.files ?? [],
 		options: refOrOptions as TextDocumentShowOptions | undefined,
 		ref: {
 			repoPath: commitOrFiles.repoPath,
@@ -881,13 +881,13 @@ async function getChangesRefsArgs(
 		};
 	}
 
-	if (commitOrFiles.files == null) {
+	if (commitOrFiles.fileset?.files == null) {
 		await commitOrFiles.ensureFullDetails();
 	}
 
 	return {
 		commit: commitOrFiles,
-		files: commitOrFiles.files ?? [],
+		files: commitOrFiles.fileset?.files ?? [],
 		options: refsOrOptions as TextDocumentShowOptions | undefined,
 		refs: {
 			repoPath: commitOrFiles.repoPath,
@@ -904,12 +904,12 @@ async function getCommitChangesArgs(
 	commit: GitCommit,
 	filter?: (file: GitFileChange) => boolean,
 ): Promise<{ files: readonly GitFile[]; refs: RefRange }> {
-	if (commit.files == null) {
+	if (commit.fileset?.files == null) {
 		await commit.ensureFullDetails();
 	}
 
 	return {
-		files: (filter != null ? commit.files?.filter(filter) : commit.files) ?? [],
+		files: (filter != null ? commit.fileset?.files?.filter(filter) : commit.fileset?.files) ?? [],
 		refs: {
 			repoPath: commit.repoPath,
 			rhs: commit.sha,