Skip to content

Commit 133b3ed

Browse files
Merge main into fix/issue-15720
2 parents 1e0934a + 52bb5c8 commit 133b3ed

6 files changed

Lines changed: 274 additions & 32 deletions

File tree

‎packages/source-control-forgejo/src/server/ForgejoPullRequestProvider.ts‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -465,11 +465,25 @@ export const make = Effect.gen(function* () {
465465
runAction: (input) => {
466466
switch (input.action) {
467467
case "merge":
468-
return write({
469-
...input,
470-
path: `${pullPath(input)}/merge`,
471-
method: "POST",
472-
body: { Do: input.mergeMethod ?? "merge" },
468+
return Effect.gen(function* () {
469+
const deleteBranch = (yield* getRepo(input)).default_delete_branch_after_merge ?? false;
470+
yield* write({
471+
...input,
472+
path: `${pullPath(input)}/merge`,
473+
method: "POST",
474+
body: { Do: input.mergeMethod ?? "merge", delete_branch_after_merge: deleteBranch },
475+
}).pipe(
476+
Effect.catchTags({
477+
// Forgejo merges before deleting the branch, so a refused deletion still merged.
478+
PullRequestProviderError: (error) =>
479+
deleteBranch
480+
? getPull(input).pipe(
481+
Effect.mapError(() => error),
482+
Effect.flatMap((pr) => (pr.merged ? Effect.void : Effect.fail(error))),
483+
)
484+
: Effect.fail(error),
485+
}),
486+
);
473487
});
474488
case "close":
475489
case "reopen":

‎packages/source-control-forgejo/src/server/ForgejoSourceControlProvider.test.ts‎

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { SourceControlProviderKind } from "@t3tools/contracts";
22
import { assert, it } from "@effect/vitest";
33
import * as Effect from "effect/Effect";
4+
import * as Exit from "effect/Exit";
45
import * as FileSystem from "effect/FileSystem";
56
import * as Layer from "effect/Layer";
67
import * as Option from "effect/Option";
@@ -139,6 +140,125 @@ it.effect.each([
139140
),
140141
);
141142

143+
const forgejoMergeProvider = (repository: Effect.Effect<string, ForgejoCli.ForgejoCliError>) => {
144+
const writes: Array<ForgejoCli.ForgejoApiInput> = [];
145+
const provider = ForgejoPullRequestProvider.make.pipe(
146+
Effect.provide(
147+
Layer.mock(ForgejoCli.ForgejoCli)({
148+
api: (input) => {
149+
if (input.method !== undefined && input.method !== "GET") writes.push(input);
150+
return (input.path === "repos/reviewer/project" ? repository : Effect.succeed("")).pipe(
151+
Effect.map((stdout) => ({
152+
exitCode: ChildProcessSpawner.ExitCode(0),
153+
stdout,
154+
stderr: "",
155+
stdoutTruncated: false,
156+
stderrTruncated: false,
157+
})),
158+
);
159+
},
160+
}),
161+
),
162+
);
163+
return { provider, writes };
164+
};
165+
const forgejoMergeInput = {
166+
cwd: "/forgejo",
167+
repository: "reviewer/project",
168+
host: "forge.example:3000",
169+
number: 1,
170+
action: "merge",
171+
mergeMethod: "squash",
172+
} as const;
173+
174+
it.effect("follows the Forgejo repository's delete-branch-after-merge setting", () =>
175+
Effect.gen(function* () {
176+
for (const [setting, deleteBranch] of [
177+
[{ default_delete_branch_after_merge: true }, true],
178+
[{ default_delete_branch_after_merge: false }, false],
179+
[{}, false],
180+
] as const) {
181+
const { provider, writes } = forgejoMergeProvider(
182+
Effect.succeed(JSON.stringify({ full_name: "reviewer/project", ...setting })),
183+
);
184+
yield* (yield* provider).runAction(forgejoMergeInput);
185+
assert.deepStrictEqual(
186+
writes.map((write) => [write.path, write.body]),
187+
[
188+
[
189+
"repos/reviewer/project/pulls/1/merge",
190+
{ Do: "squash", delete_branch_after_merge: deleteBranch },
191+
],
192+
],
193+
`repository setting ${JSON.stringify(setting)}`,
194+
);
195+
}
196+
}),
197+
);
198+
199+
it.effect("does not merge on Forgejo when the repository settings cannot be read", () =>
200+
Effect.gen(function* () {
201+
const { provider, writes } = forgejoMergeProvider(
202+
Effect.fail(
203+
new ForgejoCli.ForgejoCliError({
204+
command: "tea",
205+
cwd: "/forgejo",
206+
detail: "Forgejo is unavailable.",
207+
}),
208+
),
209+
);
210+
const exit = yield* Effect.exit((yield* provider).runAction(forgejoMergeInput));
211+
assert.deepStrictEqual(
212+
writes.map((write) => write.path),
213+
[],
214+
"merged without knowing whether to delete the source branch",
215+
);
216+
assert.isTrue(Exit.isFailure(exit));
217+
}),
218+
);
219+
220+
it.effect.each([
221+
[true, false],
222+
[false, true],
223+
] as const)(
224+
"reports a Forgejo merge whose branch deletion was refused by whether it merged (merged: %s)",
225+
([merged, fails]) => {
226+
const refused = new ForgejoCli.ForgejoCliError({
227+
command: "fj",
228+
cwd: "/repo",
229+
detail: "branch is protected",
230+
httpStatus: 403,
231+
reason: "forbidden",
232+
});
233+
return Effect.gen(function* () {
234+
const provider = yield* ForgejoPullRequestProvider.make;
235+
const exit = yield* Effect.exit(
236+
provider.runAction({ ...requiredChecksInput, action: "merge", mergeMethod: "merge" }),
237+
);
238+
assert.strictEqual(exit._tag === "Failure", fails);
239+
}).pipe(
240+
Effect.provide(
241+
Layer.mock(ForgejoCli.ForgejoCli)({
242+
api: (input) => {
243+
const respond = (response: unknown) =>
244+
encodeJsonEffect(response).pipe(Effect.orDie, Effect.map(processOutput));
245+
switch (input.path) {
246+
case "repos/acme/web":
247+
return respond({ full_name: "acme/web", default_delete_branch_after_merge: true });
248+
case "repos/acme/web/pulls/7/merge":
249+
return Effect.fail(refused);
250+
case "repos/acme/web/pulls/7":
251+
return respond({ ...requiredChecksPullRequest, merged });
252+
default:
253+
return Effect.die(`Unexpected Forgejo request: ${input.path}`);
254+
}
255+
},
256+
}),
257+
),
258+
);
259+
},
260+
);
261+
142262
// regression: #18775 a failed branch-protection read surfaces; only 403/404 are treated as no policy
143263
it.effect.each([
144264
["rate limit", { reason: "rate-limit", httpStatus: 429 }, "rate-limited"],

‎packages/source-control-forgejo/src/server/forgejoPullRequestJson.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ export const ForgejoRepository = Schema.Struct({
3232
allow_squash_merge: Schema.optional(Schema.Boolean),
3333
allow_rebase: Schema.optional(Schema.Boolean),
3434
allow_rebase_update: Schema.optional(Schema.Boolean),
35+
default_delete_branch_after_merge: Schema.optional(Schema.Boolean),
3536
});
3637
const Branch = Schema.Struct({
3738
ref: Schema.String,

‎packages/source-control-gitcafe/src/server/GitCafePullRequestProvider.test.ts‎

Lines changed: 74 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,23 @@ describe("GitCafePullRequestProvider", () => {
271271
}).pipe(Effect.provide(server.layer));
272272
});
273273

274+
it.effect("keeps the timeline when GitCafe no longer has the head's commits", () => {
275+
const comment = { ...root, id: "c1", threadId: "c1", body: "Looks good", path: null };
276+
const server = fakeGitCafe({
277+
"GET /repos/owner/repo/pulls/7": { ...pull, state: "closed", closedAt: timestamp },
278+
"GET /repos/owner/repo/pulls/7/comments": { items: [comment], next: null },
279+
"GET /repos/owner/repo/pulls/7/reviews": { items: [], next: null },
280+
});
281+
return Effect.gen(function* () {
282+
const provider = yield* GitCafePullRequestProvider.make;
283+
const activity = yield* provider.getChangeRequestActivity(target);
284+
assert.deepStrictEqual(
285+
activity.comments.map((entry) => entry.body),
286+
["Looks good"],
287+
);
288+
}).pipe(Effect.provide(server.layer));
289+
});
290+
274291
it.effect("submits a review against the pull request's current head", () => {
275292
const server = fakeGitCafe({
276293
"GET /repos/owner/repo/pulls/7": pull,
@@ -381,9 +398,7 @@ describe("GitCafePullRequestProvider", () => {
381398
["reviewing", "reviewers"],
382399
] as const)("filters %s pull requests by the viewer's actor on GitCafe", ([involvement, key]) => {
383400
const server = fakeGitCafe({
384-
"GET /repos/owner/repo/filter-options": {
385-
actors: [{ actorId: "act_one", handle: "Alice" }],
386-
},
401+
"GET /auth/principal": { actorId: "act_one", handle: "Alice" },
387402
"GET /repos/owner/repo/pulls": { items: [pull], next: null },
388403
});
389404
return Effect.gen(function* () {
@@ -403,9 +418,9 @@ describe("GitCafePullRequestProvider", () => {
403418
}).pipe(Effect.provide(server.layer));
404419
});
405420

406-
it.effect("lists nothing for a viewer GitCafe has no actor for", () => {
421+
it.effect("lists nothing for a viewer the token does not belong to", () => {
407422
const server = fakeGitCafe({
408-
"GET /repos/owner/repo/filter-options": { actors: [] },
423+
"GET /auth/principal": { actorId: "act_two", handle: "bob" },
409424
});
410425
return Effect.gen(function* () {
411426
const provider = yield* GitCafePullRequestProvider.make;
@@ -419,7 +434,7 @@ describe("GitCafePullRequestProvider", () => {
419434
assert.deepStrictEqual(page.items, []);
420435
assert.deepStrictEqual(
421436
server.sent.map((request) => request.path),
422-
["/repos/owner/repo/filter-options"],
437+
["/auth/principal"],
423438
);
424439
}).pipe(Effect.provide(server.layer));
425440
});
@@ -557,6 +572,59 @@ describe("GitCafePullRequestProvider", () => {
557572
}).pipe(Effect.provide(server.layer));
558573
});
559574

575+
const detailWith = (overrides: Record<string, unknown>, reasons: ReadonlyArray<string> = []) =>
576+
fakeGitCafe({
577+
"GET /repos/owner/repo/pulls/7": { ...pull, headOid: null, ...overrides },
578+
"GET /repos/owner/repo/pulls/7/reviewers": { items: [], next: null },
579+
"GET /repos/owner/repo/pulls/7/labels": { items: [], next: null },
580+
"GET /repos/owner/repo/pulls/7/status": {
581+
merge: { conflicts: "none", fastForward: null, strategies: ["squash"], reasons },
582+
checks: { pending: 0, failing: 0, total: 0 },
583+
},
584+
});
585+
586+
it.effect("shows a merge GitCafe accepted as armed until it lands", () => {
587+
const server = detailWith({}, ["provider-merge-pending"]);
588+
return Effect.gen(function* () {
589+
const provider = yield* GitCafePullRequestProvider.make;
590+
const detail = yield* provider.getChangeRequest(target);
591+
assert.strictEqual(detail.autoMergeEnabled, true);
592+
assert.notInclude(detail.viewerPermissions?.actions ?? [], "merge");
593+
}).pipe(Effect.provide(server.layer));
594+
});
595+
596+
it.effect("reads a pull request GitHub merged as merged before the sync reports it", () => {
597+
const mergedAt = "2026-09-12T13:00:00Z";
598+
const server = detailWith({ providerMerge: { mergedAt } });
599+
return Effect.gen(function* () {
600+
const provider = yield* GitCafePullRequestProvider.make;
601+
const detail = yield* provider.getChangeRequest(target);
602+
assert.strictEqual(detail.state, "merged");
603+
assert.strictEqual(detail.mergedAt, mergedAt);
604+
}).pipe(Effect.provide(server.layer));
605+
});
606+
607+
it.effect.each([
608+
["their own pull request", actor],
609+
[
610+
"the pull request GitHub sync opened for them",
611+
{
612+
kind: "github",
613+
actorId: "act_github",
614+
login: "alice",
615+
avatarUrl: null,
616+
linkedProfile: { handle: "alice", actorId: "act_one" },
617+
},
618+
],
619+
] as const)("leaves the author only a comment on %s", ([, author]) => {
620+
const server = detailWith({ author, viewerActorId: "act_one" });
621+
return Effect.gen(function* () {
622+
const provider = yield* GitCafePullRequestProvider.make;
623+
const detail = yield* provider.getChangeRequest(target);
624+
assert.deepStrictEqual(detail.viewerPermissions?.verdicts, ["comment"]);
625+
}).pipe(Effect.provide(server.layer));
626+
});
627+
560628
it.effect("requests and withdraws reviewers by rewriting the whole list", () => {
561629
const bob = { ...actor, actorId: "act_two", handle: "bob" };
562630
let requested = [{ id: "act_two", actor: bob }];

0 commit comments

Comments
 (0)