Generates Bitbucket Data Center PR URL and retrieves repoId for cross-forks

(#4142, #4184)

Author: sergeibbb

src/git/remotes/bitbucket-server.ts

@@ -2,6 +2,8 @@ import type { Range, Uri } from 'vscode';
 import type { AutolinkReference, DynamicAutolinkReference } from '../../autolinks/models/autolinks';
 import type { Source } from '../../constants.telemetry';
 import type { Container } from '../../container';
+import { HostingIntegration } from '../../plus/integrations/integration';
+import { remoteProviderIdToIntegrationId } from '../../plus/integrations/integrationService';
 import type { Brand, Unbrand } from '../../system/brand';
 import type { CreatePullRequestRemoteResource } from '../models/remoteResource';
 import type { Repository } from '../models/repository';
@@ -62,18 +64,16 @@ export class BitbucketServerRemote extends RemoteProvider {
 	}
 
 	protected override get baseUrl(): string {
-		const [project, repo] = this.splitPath();
+		const [project, repo] = this.splitPath(this.path);
 		return `${this.protocol}://${this.domain}/projects/${project}/repos/${repo}`;
 	}
 
-	protected override splitPath(): [string, string] {
-		if (this.path.startsWith('scm/') && this.path.indexOf('/') !== this.path.lastIndexOf('/')) {
-			const path = this.path.replace('scm/', '');
-			const index = path.indexOf('/');
-			return [path.substring(0, index), path.substring(index + 1)];
+	protected override splitPath(path: string): [string, string] {
+		if (path.startsWith('scm/') && path.indexOf('/') !== path.lastIndexOf('/')) {
+			return super.splitPath(path.replace('scm/', ''));
 		}
 
-		return super.splitPath();
+		return super.splitPath(path);
 	}
 
 	override get icon(): string {
@@ -191,7 +191,13 @@ export class BitbucketServerRemote extends RemoteProvider {
 	}
 
 	protected override getUrlForComparison(base: string, head: string, _notation: GitRevisionRangeNotation): string {
-		return this.encodeUrl(`${this.baseUrl}/branches/compare/${base}%0D${head}`).replaceAll('%250D', '%0D');
+		return this.encodeUrl(`${this.baseUrl}/branches/compare/${head}\r${base}`);
+	}
+
+	override async isReadyForForCrossForkPullRequestUrls(): Promise<boolean> {
+		const integrationId = remoteProviderIdToIntegrationId(this.id);
+		const integration = integrationId && (await this.container.integrations.get(integrationId));
+		return integration?.maybeConnected ?? integration?.isConnected() ?? false;
 	}
 
 	protected override async getUrlForCreatePullRequest(
@@ -210,17 +216,33 @@ export class BitbucketServerRemote extends RemoteProvider {
 		}
 
 		const query = new URLSearchParams({ sourceBranch: head.branch, targetBranch: base.branch ?? '' });
-		// TODO: figure this out
-		// query.set('targetRepoId', base.repoId);
-
+		const [baseOwner, baseName] = this.splitPath(base.remote.path);
+		if (base.remote.url !== head.remote.url) {
+			const targetDesc = {
+				owner: baseOwner,
+				name: baseName,
+			};
+			const integrationId = remoteProviderIdToIntegrationId(this.id);
+			const integration = integrationId && (await this.container.integrations.get(integrationId));
+			let targetRepoId = undefined;
+			if (integration?.isConnected && integration instanceof HostingIntegration) {
+				targetRepoId = (await integration.getRepoInfo?.(targetDesc))?.id;
+			}
+			if (!targetRepoId) {
+				return undefined;
+			}
+			query.set('targetRepoId', targetRepoId);
+		}
 		if (details?.title) {
 			query.set('title', details.title);
 		}
 		if (details?.description) {
 			query.set('description', details.description);
 		}
-
-		return `${this.encodeUrl(`${this.baseUrl}/pull-requests?create`)}&${query.toString()}`;
+		const [headOwner, headName] = this.splitPath(head.remote.path);
+		return `${this.encodeUrl(
+			`${this.protocol}://${this.domain}/projects/${headOwner}/repos/${headName}/pull-requests?create`,
+		)}&${query.toString()}`;
 	}
 
 	protected getUrlForFile(fileName: string, branch?: string, sha?: string, range?: Range): string {

src/git/remotes/custom.ts

@@ -128,7 +128,7 @@ export class CustomRemote extends RemoteProvider {
 	}
 
 	private getContext(additionalContext?: Record<string, string>) {
-		const [repoBase, repoPath] = this.splitPath();
+		const [repoBase, repoPath] = this.splitPath(this.path);
 		const context: Record<string, string> = {
 			repo: this.path,
 			repoBase: repoBase,

src/git/remotes/github.ts

@@ -183,7 +183,7 @@ export class GitHubRemote extends RemoteProvider<GitHubRepositoryDescriptor> {
 	}
 
 	override get avatarUri(): Uri {
-		const [owner] = this.splitPath();
+		const [owner] = this.splitPath(this.path);
 		return Uri.parse(`https://avatars.githubusercontent.com/${owner}`);
 	}
 
@@ -207,7 +207,7 @@ export class GitHubRemote extends RemoteProvider<GitHubRepositoryDescriptor> {
 
 	@memoize()
 	override get repoDesc(): GitHubRepositoryDescriptor {
-		const [owner, repo] = this.splitPath();
+		const [owner, repo] = this.splitPath(this.path);
 		return { key: this.remoteKey, owner: owner, name: repo };
 	}
 

src/git/remotes/gitlab.ts

@@ -305,7 +305,7 @@ export class GitLabRemote extends RemoteProvider<GitLabRepositoryDescriptor> {
 
 	@memoize()
 	override get repoDesc(): GitLabRepositoryDescriptor {
-		const [owner, repo] = this.splitPath();
+		const [owner, repo] = this.splitPath(this.path);
 		return { key: this.remoteKey, owner: owner, name: repo };
 	}
 

src/git/remotes/remoteProvider.ts

@@ -82,7 +82,7 @@ export abstract class RemoteProvider<T extends ResourceDescriptor = ResourceDesc
 	}
 
 	get owner(): string | undefined {
-		return this.splitPath()[0];
+		return this.splitPath(this.path)[0];
 	}
 
 	@memoize()
@@ -108,7 +108,7 @@ export abstract class RemoteProvider<T extends ResourceDescriptor = ResourceDesc
 	}
 
 	get repoName(): string | undefined {
-		return this.splitPath()[1];
+		return this.splitPath(this.path)[1];
 	}
 
 	abstract get id(): RemoteProviderId;
@@ -186,9 +186,9 @@ export abstract class RemoteProvider<T extends ResourceDescriptor = ResourceDesc
 		return `${name}${this.custom ? ` (${this.domain})` : ''}`;
 	}
 
-	protected splitPath(): [string, string] {
-		const index = this.path.indexOf('/');
-		return [this.path.substring(0, index), this.path.substring(index + 1)];
+	protected splitPath(path: string): [string, string] {
+		const index = path.indexOf('/');
+		return [path.substring(0, index), path.substring(index + 1)];
 	}
 
 	protected abstract getUrlForBranch(branch: string): string;

src/plus/integrations/providers/bitbucket-server.ts

@@ -13,6 +13,7 @@ import type { IntegrationAuthenticationService } from '../authentication/integra
 import type { ProviderAuthenticationSession } from '../authentication/models';
 import { HostingIntegration } from '../integration';
 import type { BitbucketRepositoryDescriptor } from './bitbucket/models';
+import type { ProviderRepository } from './models';
 import { fromProviderPullRequest, providersMetadata } from './models';
 import type { ProvidersApi } from './providersApi';
 
@@ -155,6 +156,14 @@ export class BitbucketServerIntegration extends HostingIntegration<
 		return Promise.resolve(undefined);
 	}
 
+	public override async getRepoInfo(repo: { owner: string; name: string }): Promise<ProviderRepository | undefined> {
+		const api = await this.getProvidersApi();
+		return api.getRepo(this.id, repo.owner, repo.name, undefined, {
+			accessToken: this._session?.accessToken,
+			baseUrl: this.apiBaseUrl,
+		});
+	}
+
 	protected override async getProviderRepositoryMetadata(
 		_session: AuthenticationSession,
 		_repo: BitbucketRepositoryDescriptor,

src/plus/integrations/providers/providersApi.ts

@@ -221,6 +221,7 @@ export class ProvidersApi {
 			[SelfHostedIntegrationId.BitbucketServer]: {
 				...providersMetadata[SelfHostedIntegrationId.BitbucketServer],
 				provider: providerApis.bitbucketServer,
+				getRepoFn: providerApis.bitbucketServer.getRepo.bind(providerApis.bitbucketServer),
 				getCurrentUserFn: providerApis.bitbucketServer.getCurrentUser.bind(
 					providerApis.bitbucketServer,
 				) as GetCurrentUserFn,