Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions apps/server/src/git/GitManager.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3091,6 +3091,56 @@ it.layer(layerGitManagerTest)("GitManager", (it) => {
}),
);

it.effect("create_pr reports a created PR when the lookup after creation fails", () =>
Effect.gen(function* () {
const repoDir = yield* makeTempDir("t3code-git-manager-");
yield* initRepo(repoDir);
yield* runGit(repoDir, ["checkout", "-b", "feature/lookup-after-create"]);
const remoteDir = yield* createBareRemote();
yield* runGit(repoDir, ["remote", "add", "origin", remoteDir]);
NodeFS.writeFileSync(NodePath.join(repoDir, "lookup.txt"), "lookup\n");
yield* runGit(repoDir, ["add", "lookup.txt"]);
yield* runGit(repoDir, ["commit", "-m", "Lookup after create"]);
yield* runGit(repoDir, ["push", "-u", "origin", "feature/lookup-after-create"]);

const { service: github } = createFakeSourceControlProvider();
let created = false;
const { manager } = yield* makeManager({
sourceControlProvider: {
...github,
createChangeRequest: (input) =>
github.createChangeRequest(input).pipe(
Effect.tap(() =>
Effect.sync(() => {
created = true;
}),
),
),
listChangeRequests: (input) =>
created
? Effect.fail(
new SourceControlProviderFailure({
provider: github.kind,
operation: "listChangeRequests",
cwd: input.cwd,
detail: "GitHub API rate limit exceeded.",
}),
)
: github.listChangeRequests(input),
},
});

const result = yield* runStackedAction(manager, { cwd: repoDir, action: "create_pr" });

expect(created).toBe(true);
expect(result.pr).toMatchObject({
status: "created",
headBranch: "feature/lookup-after-create",
});
expect(result.pr.url).toBeUndefined();
}),
);

it.effect("returns existing PR metadata for commit/push/pr action", () =>
Effect.gen(function* () {
const repoDir = yield* makeTempDir("t3code-git-manager-");
Expand Down
10 changes: 9 additions & 1 deletion apps/server/src/git/GitManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2339,7 +2339,15 @@ export const make = Effect.gen(function* () {
})
.pipe(Effect.ensuring(fileSystem.remove(bodyFile).pipe(Effect.ignore)));

const created = yield* findOpenPr(cwd, headContext);
// The PR already exists at this point, so a failed lookup only loses its metadata.
const created = yield* findOpenPr(cwd, headContext).pipe(
Effect.catch((error) =>
Effect.logWarning("GitManager.runPrStep lookup after create failed", {
provider: provider.kind,
errorTag: error._tag,
}).pipe(Effect.as(null)),
),
);
if (!created) {
return {
status: "created" as const,
Expand Down
Loading