Fixes virtual repos opened from forked PRs

Author: eamodio

CHANGELOG.md

@@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 ### Fixed
 
 - Fixes [#3592](https://github.com/gitkraken/vscode-gitlens/issues/3592) - Connecting to an integration via Remotes view (but likely others) doesn't work
+- Fixes an issue where virtual repositories for GitHub PRs from forks wouldn't load properly
 
 ## [15.5.1] - 2024-09-16
 

src/git/gitUri.authority.ts

@@ -7,3 +7,17 @@ export function decodeGitLensRevisionUriAuthority<T>(authority: string): T {
 export function encodeGitLensRevisionUriAuthority<T>(metadata: T): string {
 	return encodeUtf8Hex(JSON.stringify(metadata));
 }
+
+export function decodeRemoteHubAuthority<T>(authority: string): { scheme: string; metadata: T | undefined } {
+	const [scheme, encoded] = authority.split('+');
+
+	let metadata: T | undefined;
+	if (encoded) {
+		try {
+			const data = JSON.parse(decodeUtf8Hex(encoded));
+			metadata = data as T;
+		} catch {}
+	}
+
+	return { scheme: scheme, metadata: metadata };
+}

src/git/gitUri.ts

@@ -1,4 +1,3 @@
-import { decodeUtf8Hex } from '@env/hex';
 import { Uri } from 'vscode';
 import { getQueryDataFromScmGitUri } from '../@types/vscode.git.uri';
 import { Schemes } from '../constants';
@@ -12,7 +11,7 @@ import { formatPath } from '../system/vscode/formatPath';
 import { getBestPath, relativeDir, splitPath } from '../system/vscode/path';
 import { isVirtualUri } from '../system/vscode/utils';
 import type { RevisionUriData } from './gitProvider';
-import { decodeGitLensRevisionUriAuthority } from './gitUri.authority';
+import { decodeGitLensRevisionUriAuthority, decodeRemoteHubAuthority } from './gitUri.authority';
 import { uncommittedStaged } from './models/constants';
 import type { GitFile } from './models/file';
 import { isUncommitted, isUncommittedStaged, shortenRevision } from './models/reference';
@@ -93,7 +92,7 @@ export class GitUri extends (Uri as any as UriEx) {
 			const [, owner, repo] = uri.path.split('/', 3);
 			this.repoPath = uri.with({ path: `/${owner}/${repo}` }).toString();
 
-			const data = decodeRemoteHubAuthority<GitHubAuthorityMetadata>(uri);
+			const data = decodeRemoteHubAuthority<GitHubAuthorityMetadata>(uri.authority);
 
 			let ref = data.metadata?.ref?.id;
 			if (commitOrRepoPath != null && typeof commitOrRepoPath !== 'string') {
@@ -336,17 +335,3 @@ export const unknownGitUri = Object.freeze(new GitUri());
 export function isGitUri(uri: any): uri is GitUri {
 	return uri instanceof GitUri;
 }
-
-function decodeRemoteHubAuthority<T>(uri: Uri): { scheme: string; metadata: T | undefined } {
-	const [scheme, encoded] = uri.authority.split('+');
-
-	let metadata: T | undefined;
-	if (encoded) {
-		try {
-			const data = JSON.parse(decodeUtf8Hex(encoded));
-			metadata = data as T;
-		} catch {}
-	}
-
-	return { scheme: scheme, metadata: metadata };
-}

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

@@ -39,6 +39,7 @@ import type {
 	ScmRepository,
 } from '../../../../git/gitProvider';
 import { GitUri } from '../../../../git/gitUri';
+import { decodeRemoteHubAuthority } from '../../../../git/gitUri.authority';
 import type { GitBlame, GitBlameAuthor, GitBlameLine, GitBlameLines } from '../../../../git/models/blame';
 import type { BranchSortOptions } from '../../../../git/models/branch';
 import { getBranchId, getBranchNameWithoutRemote, GitBranch, sortBranches } from '../../../../git/models/branch';
@@ -103,7 +104,7 @@ import { serializeWebviewItemContext } from '../../../../system/webview';
 import type { CachedBlame, CachedLog, TrackedGitDocument } from '../../../../trackers/trackedDocument';
 import { GitDocumentState } from '../../../../trackers/trackedDocument';
 import type { GitHubAuthorityMetadata, Metadata, RemoteHubApi } from '../../../remotehub';
-import { getRemoteHubApi, HeadType } from '../../../remotehub';
+import { getRemoteHubApi, HeadType, RepositoryRefType } from '../../../remotehub';
 import type {
 	GraphBranchContextValue,
 	GraphItemContext,
@@ -116,6 +117,7 @@ import type {
 } from '../../authentication/integrationAuthentication';
 import { HostingIntegrationId } from '../models';
 import type { GitHubApi } from './github';
+import type { GitHubBranch } from './models';
 import { fromCommitFileStatus } from './models';
 
 const doubleQuoteRegex = /"/g;
@@ -924,7 +926,36 @@ export class GitHubGitProvider implements GitProvider, Disposable {
 		const {
 			values: [branch],
 		} = await this.getBranches(repoPath, { filter: b => b.current });
-		return branch;
+		if (branch != null) return branch;
+
+		try {
+			const { metadata } = await this.ensureRepositoryContext(repoPath!);
+
+			const revision = await metadata.getRevision();
+			switch (revision.type) {
+				case HeadType.Tag:
+				case HeadType.Commit:
+					return new GitBranch(
+						this.container,
+						repoPath!,
+						revision.name,
+						false,
+						true,
+						undefined,
+						revision.revision,
+						undefined,
+						undefined,
+						undefined,
+						true,
+					);
+			}
+
+			return undefined;
+		} catch (ex) {
+			debugger;
+			Logger.error(ex, getLogScope());
+			return undefined;
+		}
 	}
 
 	@log({ args: { 1: false } })
@@ -946,11 +977,39 @@ export class GitHubGitProvider implements GitProvider, Disposable {
 				try {
 					const { metadata, github, session } = await this.ensureRepositoryContext(repoPath!);
 
-					const revision = await metadata.getRevision();
-					const current = revision.type === 0 /* HeadType.Branch */ ? revision.name : undefined;
-
 					const branches: GitBranch[] = [];
 
+					function addBranches(container: Container, branch: GitHubBranch, current: boolean) {
+						const date = new Date(
+							configuration.get('advanced.commitOrdering') === 'author-date'
+								? branch.target.authoredDate
+								: branch.target.committedDate,
+						);
+						const ref = branch.target.oid;
+
+						branches.push(
+							new GitBranch(container, repoPath!, branch.name, false, current, date, ref, {
+								name: `origin/${branch.name}`,
+								missing: false,
+							}),
+							new GitBranch(container, repoPath!, `origin/${branch.name}`, true, false, date, ref),
+						);
+					}
+
+					let currentBranch: string | undefined;
+
+					const revision = await metadata.getRevision();
+					switch (revision.type) {
+						case HeadType.Branch:
+							currentBranch = revision.name;
+							break;
+						case HeadType.RemoteBranch: {
+							const index = revision.name.indexOf(':');
+							currentBranch = index === -1 ? revision.name : revision.name.substring(index + 1);
+							break;
+						}
+					}
+
 					let cursor = options?.paging?.cursor;
 					const loadAll = cursor == null;
 
@@ -963,37 +1022,7 @@ export class GitHubGitProvider implements GitProvider, Disposable {
 						);
 
 						for (const branch of result.values) {
-							const date = new Date(
-								configuration.get('advanced.commitOrdering') === 'author-date'
-									? branch.target.authoredDate
-									: branch.target.committedDate,
-							);
-							const ref = branch.target.oid;
-
-							branches.push(
-								new GitBranch(
-									this.container,
-									repoPath!,
-									branch.name,
-									false,
-									branch.name === current,
-									date,
-									ref,
-									{
-										name: `origin/${branch.name}`,
-										missing: false,
-									},
-								),
-								new GitBranch(
-									this.container,
-									repoPath!,
-									`origin/${branch.name}`,
-									true,
-									false,
-									date,
-									ref,
-								),
-							);
+							addBranches(this.container, branch, branch.name === currentBranch);
 						}
 
 						if (!result.paging?.more || !loadAll) return { ...result, values: branches };
@@ -3436,6 +3465,18 @@ export class GitHubGitProvider implements GitProvider, Disposable {
 			throw new OpenVirtualRepositoryError(repoPath, OpenVirtualRepositoryErrorReason.NotAGitHubRepository);
 		}
 
+		const data = decodeRemoteHubAuthority<GitHubAuthorityMetadata>(uri.authority);
+		// If the virtual repository is opened to a PR, then we need to ensure the owner is the owner of the current branch
+		if (data.metadata?.ref?.type === RepositoryRefType.PullRequest) {
+			const revision = await metadata.getRevision();
+			if (revision.type === HeadType.RemoteBranch) {
+				const [remote] = revision.name.split(':');
+				if (remote !== metadata.repo.owner) {
+					metadata.repo.owner = remote;
+				}
+			}
+		}
+
 		let github;
 		let session;
 		try {