gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2025-01-03 15:06:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add try/catch to creating pr

Browse Source
This commit is contained in:
Mattias Granlund 2024-01-23 11:54:34 +01:00
parent d798ef84c0
commit 2bab8d5cb5
1 changed files with 44 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
gitbutler-ui/src/routes/[projectId]/components/CommitListFooter.svelte
View File

@ -7,6 +7,7 @@
import type { GitHubService } from '$lib/github/service';
import toast from 'svelte-french-toast';
import { startTransaction } from '@sentry/sveltekit';
import { sleep } from '$lib/utils/sleep';
export let branch: Branch;
export let type: CommitStatus;
@ -33,39 +34,53 @@
isPushing = true;
const txn = startTransaction({ name: 'pull_request_create' });
if (!githubService.isEnabled()) {
toast.error('Cannot create PR without GitHub credentials');
return;
}
try {
if (!githubService.isEnabled()) {
toast.error('Cannot create PR without GitHub credentials');
return;
}
if (!base?.shortName) {
toast.error('Cannot create PR without base branch');
return;
}
if (!base?.shortName) {
toast.error('Cannot create PR without base branch');
return;
}
// Push if local commits
if (branch.commits.some((c) => !c.isRemote)) {
const pushBranchSpan = txn.startChild({ op: 'branch_push' });
await branchController.pushBranch(branch.id, branch.requiresForce);
pushBranchSpan.finish();
}
// Push if local commits
if (branch.commits.some((c) => !c.isRemote)) {
const pushBranchSpan = txn.startChild({ op: 'branch_push' });
await branchController.pushBranch(branch.id, branch.requiresForce);
pushBranchSpan.finish();
}
if (!branch.upstreamName) {
toast.error('Cannot create PR without remote branch name');
return;
}
let waitRetries = 0;
while (!branch.upstreamName) {
console.log('waiting for branch name');
await sleep(200);
if (waitRetries++ > 100) break;
}
const createPrSpan = txn.startChild({ op: 'pr_api_create' });
const resp = await githubService.createPullRequest(
base.shortName,
branch.name,
branch.notes,
branch.id,
branch.upstreamName
);
createPrSpan.finish();
isPushing = false;
return resp;
if (!branch.upstreamName) {
toast.error('Cannot create PR without remote branch name');
return;
}
const createPrSpan = txn.startChild({ op: 'pr_api_create' });
const resp = await githubService.createPullRequest(
base.shortName,
branch.name,
branch.notes,
branch.id,
branch.upstreamName
);
createPrSpan.finish();
return resp;
} catch (e) {
console.error('Failed to create PR', e);
toast.error('Failed to create pull request');
} finally {
isPushing = false;
txn.finish();
}
}
</script>