Substitutes repository of the selected issue

(#3621, #3698)

Author: sergeibbb

src/commands/git/branch.ts

@@ -63,6 +63,11 @@ interface CreateState {
 	flags: CreateFlags[];
 
 	suggestNameOnly?: boolean;
+	suggestRepoOnly?: boolean;
+}
+
+function isCreateState(state: Partial<State> | undefined): state is Partial<CreateState> {
+	return state?.subcommand === 'create';
 }
 
 type DeleteFlags = '--force' | '--remotes';
@@ -172,6 +177,10 @@ export class BranchGitCommand extends QuickCommand {
 						counter++;
 					}
 
+					if (args.state.suggestRepoOnly && args.state.repo != null) {
+						counter--;
+					}
+
 					break;
 				case 'delete':
 				case 'prune':
@@ -251,7 +260,12 @@ export class BranchGitCommand extends QuickCommand {
 				state.subcommand,
 			);
 
-			if (state.counter < 2 || state.repo == null || typeof state.repo === 'string') {
+			if (
+				state.counter < 2 ||
+				state.repo == null ||
+				typeof state.repo === 'string' ||
+				(isCreateState(state) && state.suggestRepoOnly)
+			) {
 				skippedStepTwo = false;
 				if (context.repos.length === 1) {
 					skippedStepTwo = true;

src/git/models/issue.ts

@@ -1,6 +1,10 @@
-import { ColorThemeKind, ThemeColor, ThemeIcon, window } from 'vscode';
+import { ColorThemeKind, ThemeColor, ThemeIcon, Uri, window } from 'vscode';
+import { Schemes } from '../../constants';
 import type { Colors } from '../../constants.colors';
+import type { Container } from '../../container';
+import type { RepositoryIdentityDescriptor } from '../../gk/models/repositoryIdentities';
 import type { ProviderReference } from './remoteProvider';
+import type { Repository } from './repository';
 
 export type IssueOrPullRequestType = 'issue' | 'pullrequest';
 export type IssueOrPullRequestState = 'opened' | 'closed' | 'merged';
@@ -45,6 +49,7 @@ export interface IssueRepository {
 	owner: string;
 	repo: string;
 	accessLevel?: RepositoryAccessLevel;
+	url?: string;
 }
 
 export interface IssueShape extends IssueOrPullRequest {
@@ -217,6 +222,7 @@ export function serializeIssue(value: IssueShape): IssueShape {
 				: {
 						owner: value.repository.owner,
 						repo: value.repository.repo,
+						url: value.repository.url,
 				  },
 		assignees: value.assignees.map(assignee => ({
 			id: assignee.id,
@@ -261,3 +267,67 @@ export class Issue implements IssueShape {
 		public readonly body?: string,
 	) {}
 }
+
+export type IssueRepositoryIdentityDescriptor = RequireSomeWithProps<
+	RequireSome<RepositoryIdentityDescriptor<string>, 'provider'>,
+	'provider',
+	'id' | 'domain' | 'repoDomain' | 'repoName'
+> &
+	RequireSomeWithProps<RequireSome<RepositoryIdentityDescriptor<string>, 'remote'>, 'remote', 'domain'>;
+
+export function getRepositoryIdentityForIssue(issue: IssueShape | Issue): IssueRepositoryIdentityDescriptor {
+	if (issue.repository == null) throw new Error('Missing repository');
+
+	return {
+		remote: {
+			url: issue.repository.url,
+			domain: issue.provider.domain,
+		},
+		name: `${issue.repository.owner}/${issue.repository.repo}`,
+		provider: {
+			id: issue.provider.id,
+			domain: issue.provider.domain,
+			repoDomain: issue.repository.owner,
+			repoName: issue.repository.repo,
+			repoOwnerDomain: issue.repository.owner,
+		},
+	};
+}
+
+export function getVirtualUriForIssue(issue: IssueShape | Issue): Uri | undefined {
+	if (issue.repository == null) throw new Error('Missing repository');
+	if (issue.provider.id !== 'github') return undefined;
+
+	const uri = Uri.parse(issue.repository.url ?? issue.url);
+	return uri.with({ scheme: Schemes.Virtual, authority: 'github', path: uri.path });
+}
+
+export async function getOrOpenIssueRepository(
+	container: Container,
+	issue: IssueShape | Issue,
+	options?: { promptIfNeeded?: boolean; skipVirtual?: boolean },
+): Promise<Repository | undefined> {
+	const identity = getRepositoryIdentityForIssue(issue);
+	let repo = await container.repositoryIdentity.getRepository(identity, {
+		openIfNeeded: true,
+		keepOpen: false,
+		prompt: false,
+	});
+
+	if (repo == null && !options?.skipVirtual) {
+		const virtualUri = getVirtualUriForIssue(issue);
+		if (virtualUri != null) {
+			repo = await container.git.getOrOpenRepository(virtualUri, { closeOnOpen: true, detectNested: false });
+		}
+	}
+
+	if (repo == null && options?.promptIfNeeded) {
+		repo = await container.repositoryIdentity.getRepository(identity, {
+			openIfNeeded: true,
+			keepOpen: false,
+			prompt: true,
+		});
+	}
+
+	return repo;
+}

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

@@ -190,6 +190,7 @@ repository {
 		login
 	}
 	viewerPermission
+	url
 }
 `;
 

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

@@ -133,6 +133,7 @@ export interface GitHubIssue extends Omit<GitHubIssueOrPullRequest, '__typename'
 			login: string;
 		};
 		viewerPermission: GitHubViewerPermission;
+		url: string;
 	};
 	body: string;
 }
@@ -421,6 +422,7 @@ export function fromGitHubIssue(value: GitHubIssue, provider: Provider): Issue {
 			owner: value.repository.owner.login,
 			repo: value.repository.name,
 			accessLevel: fromGitHubViewerPermissionToAccessLevel(value.repository.viewerPermission),
+			url: value.repository.url,
 		},
 		value.assignees.nodes.map(assignee => ({
 			id: assignee.login,

src/plus/startWork/startWork.ts

@@ -24,6 +24,7 @@ import { HostingIntegrationId } from '../../constants.integrations';
 import type { Source, Sources, StartWorkTelemetryContext } from '../../constants.telemetry';
 import type { Container } from '../../container';
 import type { SearchedIssue } from '../../git/models/issue';
+import { getOrOpenIssueRepository } from '../../git/models/issue';
 import type { QuickPickItemOfT } from '../../quickpicks/items/common';
 import { createQuickPickItemOfT } from '../../quickpicks/items/common';
 import type { DirectiveQuickPickItem } from '../../quickpicks/items/directive';
@@ -138,6 +139,9 @@ export class StartWorkCommand extends QuickCommand<State> {
 			assertsStartWorkStepState(state);
 			state.action = 'start';
 
+			const issue = state.item.item.issue;
+			const repo = await getOrOpenIssueRepository(this.container, issue);
+
 			if (typeof state.action === 'string') {
 				switch (state.action) {
 					case 'start':
@@ -147,9 +151,10 @@ export class StartWorkCommand extends QuickCommand<State> {
 								command: 'branch',
 								state: {
 									subcommand: 'create',
-									repo: undefined,
-									name: slug(`${state.item.item.issue.id}-${state.item.item.issue.title}`),
+									repo: repo,
+									name: slug(`${issue.id}-${issue.title}`),
 									suggestNameOnly: true,
+									suggestRepoOnly: true,
 								},
 							},
 							this.pickedVia,