gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-18 06:22:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

link to cross-repo unified diff on github

Browse Source
This commit is contained in:
Scott Chacon 2024-05-06 15:30:38 +02:00
parent 46fe51eeda
commit c3ac916c32
2 changed files with 45 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/lib/components/ProjectSetupTarget.svelte
View File

@ -109,8 +109,8 @@
</SelectItem>
</Select>
<p class="project-setup__description-text text-base-body-12">
You have branches from multiple remotes. If you want to specify a push target for creating
branches that is different from your production branch, change it here.
You have branches from multiple remotes. If you want to specify a remote for creating
branches that is different from the remote that your target branch is on, change it here.
</p>
</div>
{/if}

51
app/src/lib/vbranches/types.ts
View File

@ -347,23 +347,32 @@ export class BaseBranch {
return this.lastFetchedMs ? new Date(this.lastFetchedMs) : undefined;
}
get pushRepoBaseUrl(): string {
return this.cleanUrl(this.pushRemoteUrl);
}
get repoBaseUrl(): string {
if (this.pushRemoteUrl.startsWith('http')) {
return this.pushRemoteUrl.replace('.git', '');
return this.cleanUrl(this.remoteUrl);
}
// turn a git remote url into a web url (github, gitlab, bitbucket, etc)
private cleanUrl(url: string): string {
if (url.startsWith('http')) {
return url.replace('.git', '').trim();
} else {
return this.pushRemoteUrl.replace(':', '/').replace('git@', 'https://').replace('.git', '');
return url.replace(':', '/').replace('git@', 'https://').replace('.git', '').trim();
}
}
commitUrl(commitId: string): string | undefined {
// Different Git providers use different paths for the commit url:
if (this.isBitBucket) {
return `${this.repoBaseUrl}/commits/${commitId}`;
return `${this.pushRepoBaseUrl}/commits/${commitId}`;
}
if (this.isGitlab) {
return `${this.repoBaseUrl}/-/commit/${commitId}`;
return `${this.pushRepoBaseUrl}/-/commit/${commitId}`;
}
return `${this.repoBaseUrl}/commit/${commitId}`;
return `${this.pushRepoBaseUrl}/commit/${commitId}`;
}
get shortName() {
@ -374,11 +383,37 @@ export class BaseBranch {
if (!upstreamBranchName) return undefined;
const baseBranchName = this.branchName.split('/')[1];
const branchName = upstreamBranchName.split('/').slice(3).join('/');
if (this.pushRemoteName) {
if (this.isGitHub) {
// master...schacon:docs:Virtual-branch
const pushUsername = this.extractUsernameFromGitHubUrl(this.pushRemoteUrl);
const pushRepoName = this.extractRepoNameFromGitHubUrl(this.pushRemoteUrl);
return `${this.repoBaseUrl}/compare/${baseBranchName}...${pushUsername}:${pushRepoName}:${branchName}`;
}
}
if (this.isBitBucket) {
return `${this.repoBaseUrl.trim()}/branch/${branchName}?dest=${baseBranchName}`;
return `${this.repoBaseUrl}/branch/${branchName}?dest=${baseBranchName}`;
}
// The following branch path is good for at least Gitlab and Github:
return `${this.repoBaseUrl.trim()}/compare/${baseBranchName}...${branchName}`;
return `${this.repoBaseUrl}/compare/${baseBranchName}...${branchName}`;
}
private extractUsernameFromGitHubUrl(url: string): string | null {
const regex = /github\.com[/:]([a-zA-Z0-9_-]+)\/.*/;
const match = url.match(regex);
return match ? match[1] : null;
}
private extractRepoNameFromGitHubUrl(url: string): string | null {
const regex = /github\.com[/:]([a-zA-Z0-9_-]+)\/([a-zA-Z0-9_-]+)/;
const match = url.match(regex);
return match ? match[2] : null;
}
private get isGitHub(): boolean {
return this.repoBaseUrl.includes('github.com');
}
private get isBitBucket(): boolean {