Adds rename detection back to status methods

Author: eamodio

src/commands/diffWithWorking.ts

@@ -85,7 +85,9 @@ export class DiffWithWorkingCommand extends ActiveEditorCommand {
 
 		// If we are a fake "staged" sha, check the status
 		if (gitUri.isUncommittedStaged) {
-			const status = await this.container.git.status(gitUri.repoPath!).getStatusForFile?.(gitUri);
+			const status = await this.container.git
+				.status(gitUri.repoPath!)
+				.getStatusForFile?.(gitUri, { renames: false });
 			if (status?.indexStatus != null) {
 				void (await executeCommand<DiffWithCommandArgs>('gitlens.diffWith', {
 					repoPath: gitUri.repoPath,

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

@@ -501,7 +501,6 @@ export class CommitsGitSubProvider implements GitCommitsSubProvider {
 
 			// If we didn't find any history from the working tree, check to see if the file was renamed
 			if (rev == null && pathspec && !commits.size) {
-				// TODO@eamodio this currently won't work because getStatusForFile won't return the original path
 				const status = await this.provider.status?.getStatusForFile(repoPath, pathspec);
 				if (status?.originalPath != null) {
 					pathspec = status.originalPath;

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

@@ -523,30 +523,53 @@ export class StatusGitSubProvider implements GitStatusSubProvider {
 		return status;
 	}
 
-	@gate()
 	@log()
-	async getStatusForFile(repoPath: string, pathOrUri: string | Uri): Promise<GitStatusFile | undefined> {
-		const files = await this.getStatusForPath(repoPath, pathOrUri);
+	async getStatusForFile(
+		repoPath: string,
+		pathOrUri: string | Uri,
+		options?: { renames?: boolean },
+	): Promise<GitStatusFile | undefined> {
+		const files = await this.getStatusForPathCore(repoPath, pathOrUri, { ...options, exact: true });
 		return files?.[0];
 	}
 
-	@gate()
 	@log()
-	async getStatusForPath(repoPath: string, pathOrGlob: string | Uri): Promise<GitStatusFile[] | undefined> {
+	async getStatusForPath(
+		repoPath: string,
+		pathOrGlob: string | Uri,
+		options?: { renames?: boolean },
+	): Promise<GitStatusFile[] | undefined> {
+		return this.getStatusForPathCore(repoPath, pathOrGlob, { ...options, exact: false });
+	}
+
+	@gate()
+	private async getStatusForPathCore(
+		repoPath: string,
+		pathOrGlob: string | Uri,
+		options: { exact: boolean; renames?: boolean },
+	): Promise<GitStatusFile[] | undefined> {
 		const [relativePath] = splitPath(pathOrGlob, repoPath);
 
 		const porcelainVersion = (await this.git.supports('git:status:porcelain-v2')) ? 2 : 1;
+		const renames = options.renames !== false;
 
 		const result = await this.git.status(
 			repoPath,
 			porcelainVersion,
-			{
-				similarityThreshold: configuration.get('advanced.similarityThreshold') ?? undefined,
-			},
-			relativePath,
+			{ similarityThreshold: configuration.get('advanced.similarityThreshold') ?? undefined },
+			// If we want renames, don't include the path as Git won't do rename detection
+			...(renames ? [] : [relativePath]),
 		);
 
 		const status = parseGitStatus(this.container, result.stdout, repoPath, porcelainVersion);
-		return status?.files;
+		if (!renames) return status?.files;
+
+		if (options.exact) {
+			const file = status?.files.find(f => f.path === relativePath);
+			return file ? [file] : undefined;
+		}
+
+		const files = status?.files.filter(f => f.path.startsWith(relativePath));
+		return files;
 	}
 }

src/git/gitProvider.ts

@@ -587,9 +587,42 @@ export interface GitStashSubProvider {
 }
 
 export interface GitStatusSubProvider {
+	/**
+	 * Get the status of the repository
+	 * @param repoPath Repository path
+	 * @returns A promise of the status
+	 */
 	getStatus(repoPath: string | undefined): Promise<GitStatus | undefined>;
-	getStatusForFile?(repoPath: string, uri: Uri): Promise<GitStatusFile | undefined>;
-	getStatusForPath?(repoPath: string, pathOrGlob: Uri): Promise<GitStatusFile[] | undefined>;
+	/**
+	 * Get the status of a file
+	 * @param repoPath Repository path
+	 * @param uri Uri of the file to get the status for
+	 * @param options Options to control how the status is retrieved
+	 * @returns A promise of the file's status
+	 */
+	getStatusForFile?(
+		repoPath: string,
+		uri: Uri,
+		options?: {
+			/** If false, will avoid rename detection (faster) */
+			renames?: boolean;
+		},
+	): Promise<GitStatusFile | undefined>;
+	/**
+	 * Get the status of a path or glob
+	 * @param repoPath Repository path
+	 * @param pathOrGlob Path or "glob" (globs can only end with `/*`) to get the status for
+	 * @param options Options to control how the status is retrieved
+	 * @returns A promise of the path's status
+	 */
+	getStatusForPath?(
+		repoPath: string,
+		pathOrGlob: Uri,
+		options?: {
+			/** If false, will avoid rename detection (faster) */
+			renames?: boolean;
+		},
+	): Promise<GitStatusFile[] | undefined>;
 
 	getPausedOperationStatus?(repoPath: string): Promise<GitPausedOperationStatus | undefined>;
 	abortPausedOperation?(repoPath: string, options?: { quit?: boolean }): Promise<void>;