Fixes oid vs ref on trees

Author: eamodio

src/env/node/git/git.ts

@@ -539,8 +539,8 @@ export class Git {
 		);
 	}
 
-	async cat_file__size(repoPath: string, object: string): Promise<number> {
-		const data = await this.git<string>({ cwd: repoPath }, 'cat-file', '-s', object);
+	async cat_file__size(repoPath: string, oid: string): Promise<number> {
+		const data = await this.git<string>({ cwd: repoPath }, 'cat-file', '-s', oid);
 		return data.length ? parseInt(data.trim(), 10) : 0;
 	}
 
@@ -1343,13 +1343,13 @@ export class Git {
 
 	async log__find_object(
 		repoPath: string,
-		objectId: string,
+		oid: string,
 		ref: string,
 		ordering: 'date' | 'author-date' | 'topo' | null,
 		file?: string,
 		cancellation?: CancellationToken,
 	) {
-		const params = ['log', '-n1', '--no-renames', '--format=%H', `--find-object=${objectId}`, ref];
+		const params = ['log', '-n1', '--no-renames', '--format=%H', `--find-object=${oid}`, ref];
 
 		if (ordering) {
 			params.push(`--${ordering}-order`);

src/env/node/git/localGitProvider.ts

@@ -4844,25 +4844,26 @@ export class LocalGitProvider implements GitProvider, Disposable {
 			const [result] = parseGitLsFiles(data);
 			if (result == null) return undefined;
 
-			const size = await this.git.cat_file__size(repoPath, result.object);
+			const size = await this.git.cat_file__size(repoPath, result.oid);
 			return {
-				commitSha: ref,
+				ref: ref,
+				oid: result.oid,
 				path: relativePath,
 				size: size,
 				type: 'blob',
 			};
 		}
 
 		const data = await this.git.ls_tree(root, ref, relativePath);
-		return parseGitTree(data)[0];
+		return parseGitTree(data, ref)[0];
 	}
 
 	@log()
 	async getTreeForRevision(repoPath: string, ref: string): Promise<GitTreeEntry[]> {
 		if (repoPath == null) return [];
 
 		const data = await this.git.ls_tree(repoPath, ref);
-		return parseGitTree(data);
+		return parseGitTree(data, ref);
 	}
 
 	@log({ args: { 1: false } })

src/git/fsProvider.ts

@@ -142,7 +142,7 @@ export class GitFileSystemProvider implements FileSystemProvider, Disposable {
 		const trees = await this.container.git.getTreeForRevision(repoPath, ref);
 
 		// Add a fake root folder so that searches will work
-		searchTree.set('~', { commitSha: '', path: '~', size: 0, type: 'tree' });
+		searchTree.set('~', { ref: '', oid: '', path: '~', size: 0, type: 'tree' });
 		for (const item of trees) {
 			searchTree.set(`~/${item.path}`, item);
 		}

src/git/models/tree.ts

@@ -1,13 +1,14 @@
 export interface GitTreeEntry {
-	commitSha: string;
+	ref: string;
+	oid: string;
 	path: string;
 	size: number;
 	type: 'blob' | 'tree';
 }
 
 export interface GitLsFilesEntry {
 	mode: string;
+	oid: string;
 	path: string;
-	object: string;
 	stage: number;
 }

src/git/parsers/treeParser.ts

@@ -4,14 +4,14 @@ import type { GitLsFilesEntry, GitTreeEntry } from '../models/tree';
 const treeRegex = /(?:.+?)\s+(.+?)\s+(.+?)\s+(.+?)\s+(.+)/gm;
 const filesRegex = /^(\S+)\s+(\S+)\s+(\S+)\s+(.*)$/gm;
 
-export function parseGitTree(data: string | undefined): GitTreeEntry[] {
+export function parseGitTree(data: string | undefined, ref: string): GitTreeEntry[] {
 	using sw = maybeStopWatch(`Git.parseTree`, { log: false, logLevel: 'debug' });
 
 	const trees: GitTreeEntry[] = [];
 	if (!data) return trees;
 
 	let type;
-	let sha;
+	let oid;
 	let size;
 	let filePath;
 
@@ -20,11 +20,12 @@ export function parseGitTree(data: string | undefined): GitTreeEntry[] {
 		match = treeRegex.exec(data);
 		if (match == null) break;
 
-		[, type, sha, size, filePath] = match;
+		[, type, oid, size, filePath] = match;
 
 		trees.push({
+			ref: ref,
 			// Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869
-			commitSha: sha == null || sha.length === 0 ? '' : ` ${sha}`.substr(1),
+			oid: oid == null || oid.length === 0 ? '' : ` ${oid}`.substr(1),
 			// Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869
 			path: filePath == null || filePath.length === 0 ? '' : ` ${filePath}`.substr(1),
 			size: Number(size) || 0,
@@ -46,23 +47,23 @@ export function parseGitLsFiles(data: string | undefined): GitLsFilesEntry[] {
 
 	let filePath;
 	let mode;
-	let object;
+	let oid;
 	let stage;
 
 	let match;
 	do {
 		match = filesRegex.exec(data);
 		if (match == null) break;
 
-		[, mode, object, stage, filePath] = match;
+		[, mode, oid, stage, filePath] = match;
 
 		files.push({
 			// Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869
-			path: filePath == null || filePath.length === 0 ? '' : ` ${filePath}`.substr(1),
+			mode: mode == null || mode.length === 0 ? '' : ` ${mode}`.substr(1),
 			// Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869
-			object: object == null || object.length === 0 ? '' : ` ${object}`.substr(1),
+			oid: oid == null || oid.length === 0 ? '' : ` ${oid}`.substr(1),
 			// Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869
-			mode: mode == null || mode.length === 0 ? '' : ` ${mode}`.substr(1),
+			path: filePath == null || filePath.length === 0 ? '' : ` ${filePath}`.substr(1),
 			stage: parseInt(stage, 10),
 		});
 	} while (true);

src/plus/integrations/providers/github/githubGitProvider.ts

@@ -2740,8 +2740,9 @@ export class GitHubGitProvider implements GitProvider, Disposable {
 		if (stats == null) return undefined;
 
 		return {
+			ref: ref,
+			oid: '',
 			path: this.getRelativePath(uri, repoPath),
-			commitSha: ref,
 			size: stats.size,
 			type: (stats.type & FileType.Directory) === FileType.Directory ? 'tree' : 'blob',
 		};
@@ -2772,8 +2773,9 @@ export class GitHubGitProvider implements GitProvider, Disposable {
 			// const stats = await workspace.fs.stat(uri);
 
 			result.push({
+				ref: ref,
+				oid: '',
 				path: this.getRelativePath(path, uri),
-				commitSha: ref,
 				size: 0, // stats?.size,
 				type: (type & FileType.Directory) === FileType.Directory ? 'tree' : 'blob',
 			});