Expands getChangedFilesCount range support

Author: eamodio

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

@@ -43,17 +43,28 @@ export class DiffGitSubProvider implements GitDiffSubProvider {
 	) {}
 
 	@log()
-	async getChangedFilesCount(repoPath: string, ref?: string): Promise<GitDiffShortStat | undefined> {
+	async getChangedFilesCount(
+		repoPath: string,
+		to?: string,
+		from?: string,
+		options?: { uris?: Uri[] },
+	): Promise<GitDiffShortStat | undefined> {
 		const scope = getLogScope();
 
+		const args: string[] = [];
+		if (to != null) {
+			prepareToFromDiffArgs(to, from, args);
+		}
+
 		try {
 			const data = await this.git.exec(
 				{ cwd: repoPath, configs: gitDiffDefaultConfigs },
 				'diff',
 				'--shortstat',
 				'--no-ext-diff',
-				ref ? ref : undefined,
+				...args,
 				'--',
+				options?.uris?.map(u => this.provider.getRelativePath(u, repoPath)) ?? undefined,
 			);
 			if (!data) return undefined;
 			return parseGitDiffShortStat(data);
@@ -78,34 +89,7 @@ export class DiffGitSubProvider implements GitDiffSubProvider {
 		const scope = getLogScope();
 		const args = [`-U${options?.context ?? 3}`];
 
-		if (to === uncommitted) {
-			if (from != null) {
-				args.push(from);
-			} else {
-				// Get only unstaged changes
-				from = 'HEAD';
-			}
-		} else if (to === uncommittedStaged) {
-			args.push('--staged');
-			if (from != null) {
-				args.push(from);
-			} else {
-				// Get only staged changes
-				from = 'HEAD';
-			}
-		} else if (from == null) {
-			if (to === '' || to.toUpperCase() === 'HEAD') {
-				from = 'HEAD';
-				args.push(from);
-			} else {
-				from = `${to}^`;
-				args.push(from, to);
-			}
-		} else if (to === '') {
-			args.push(from);
-		} else {
-			args.push(from, to);
-		}
+		from = prepareToFromDiffArgs(to, from, args);
 
 		let paths: Set<string> | undefined;
 		let untrackedPaths: string[] | undefined;
@@ -641,3 +625,34 @@ export class DiffGitSubProvider implements GitDiffSubProvider {
 		}
 	}
 }
+function prepareToFromDiffArgs(to: string, from: string | undefined, args: string[]) {
+	if (to === uncommitted) {
+		if (from != null) {
+			args.push(from);
+		} else {
+			// Get only unstaged changes
+			from = 'HEAD';
+		}
+	} else if (to === uncommittedStaged) {
+		args.push('--staged');
+		if (from != null) {
+			args.push(from);
+		} else {
+			// Get only staged changes
+			from = 'HEAD';
+		}
+	} else if (from == null) {
+		if (to === '' || to.toUpperCase() === 'HEAD') {
+			from = 'HEAD';
+			args.push(from);
+		} else {
+			from = `${to}^`;
+			args.push(from, to);
+		}
+	} else if (to === '') {
+		args.push(from);
+	} else {
+		args.push(from, to);
+	}
+	return from;
+}

src/git/gitProvider.ts

@@ -358,7 +358,12 @@ export interface GitContributorsSubProvider {
 }
 
 export interface GitDiffSubProvider {
-	getChangedFilesCount(repoPath: string, ref?: string): Promise<GitDiffShortStat | undefined>;
+	getChangedFilesCount(
+		repoPath: string,
+		to?: string,
+		from?: string,
+		options?: { uris?: Uri[] },
+	): Promise<GitDiffShortStat | undefined>;
 	getDiff?(
 		repoPath: string | Uri,
 		to: string,