Skip to content

Commit 39f6e2b

Browse files
refactor(source-control): git and process behaviour comes from forge hooks (pingdotgg#23995)
Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent 7368bd3 commit 39f6e2b

26 files changed

Lines changed: 630 additions & 565 deletions

‎apps/server/src/git/GitManager.test.ts‎

Lines changed: 84 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -3053,6 +3053,47 @@ it.layer(layerGitManagerTest)("GitManager", (it) => {
30533053
}),
30543054
);
30553055

3056+
it.effect("hands the branch base to the host when a failed first push is retried", () =>
3057+
Effect.gen(function* () {
3058+
const repoDir = yield* makeTempDir("t3code-git-manager-");
3059+
yield* initRepo(repoDir);
3060+
const remoteDir = yield* createBareRemote();
3061+
yield* runGit(repoDir, ["remote", "add", "origin", remoteDir]);
3062+
yield* runGit(repoDir, ["push", "-u", "origin", "HEAD:main"]);
3063+
yield* runGit(repoDir, ["checkout", "-b", "feature/retried-push", "--track", "origin/main"]);
3064+
NodeFS.writeFileSync(NodePath.join(repoDir, "retried.txt"), "retried\n");
3065+
yield* runGit(repoDir, ["add", "retried.txt"]);
3066+
yield* runGit(repoDir, ["commit", "-m", "Retried push"]);
3067+
const rejectOnce = NodePath.join(remoteDir, "reject-once");
3068+
NodeFS.writeFileSync(rejectOnce, "");
3069+
NodeFS.writeFileSync(
3070+
NodePath.join(remoteDir, "hooks", "pre-receive"),
3071+
`#!/bin/sh\nif [ -f "${rejectOnce}" ]; then rm "${rejectOnce}"; exit 1; fi\n`,
3072+
{ mode: 0o755 },
3073+
);
3074+
3075+
const recorded: Array<{ branch: string; baseBranch: string }> = [];
3076+
const { service } = createGitHubProviderWithFakeGh();
3077+
const { manager } = yield* makeManager({
3078+
sourceControlProvider: {
3079+
...service,
3080+
recordBranchBase: ({ branch, baseBranch }) =>
3081+
Effect.sync(() => {
3082+
recorded.push({ branch, baseBranch });
3083+
}),
3084+
},
3085+
});
3086+
const failed = yield* runStackedAction(manager, { cwd: repoDir, action: "push" }).pipe(
3087+
Effect.flip,
3088+
);
3089+
expect(failed).toBeDefined();
3090+
const result = yield* runStackedAction(manager, { cwd: repoDir, action: "push" });
3091+
3092+
expect(result.push.status).toBe("pushed");
3093+
expect(recorded).toEqual([{ branch: "feature/retried-push", baseBranch: "main" }]);
3094+
}),
3095+
);
3096+
30563097
it.effect("create_pr targets the remote default branch when it is not main", () =>
30573098
Effect.gen(function* () {
30583099
const repoDir = yield* makeTempDir("t3code-git-manager-");
@@ -4576,63 +4617,6 @@ it.layer(layerGitManagerTest)("GitManager", (it) => {
45764617
}),
45774618
);
45784619

4579-
it.effect("derives fork repository identity from PR URL when GitHub omits nameWithOwner", () =>
4580-
Effect.gen(function* () {
4581-
const repoDir = yield* makeTempDir("t3code-git-manager-");
4582-
yield* initRepo(repoDir);
4583-
const originDir = yield* createBareRemote();
4584-
const forkDir = yield* createBareRemote();
4585-
yield* runGit(repoDir, ["remote", "add", "origin", originDir]);
4586-
yield* runGit(repoDir, ["push", "-u", "origin", "main"]);
4587-
yield* runGit(repoDir, ["remote", "add", "binbandit-seed", forkDir]);
4588-
yield* runGit(repoDir, ["checkout", "-b", "fix/git-action-default-without-origin"]);
4589-
NodeFS.writeFileSync(NodePath.join(repoDir, "derived-fork.txt"), "derived fork\n");
4590-
yield* runGit(repoDir, ["add", "derived-fork.txt"]);
4591-
yield* runGit(repoDir, ["commit", "-m", "Derived fork PR branch"]);
4592-
yield* runGit(repoDir, [
4593-
"push",
4594-
"-u",
4595-
"binbandit-seed",
4596-
"fix/git-action-default-without-origin",
4597-
]);
4598-
yield* runGit(repoDir, ["checkout", "main"]);
4599-
yield* runGit(repoDir, ["branch", "-D", "fix/git-action-default-without-origin"]);
4600-
4601-
const { manager } = yield* makeManager({
4602-
ghScenario: {
4603-
pullRequest: {
4604-
number: 642,
4605-
title: "fix: use commit as the default git action without origin",
4606-
url: "https://github.com/pingdotgg/t3code/pull/642",
4607-
baseRefName: "main",
4608-
headRefName: "fix/git-action-default-without-origin",
4609-
state: "open",
4610-
isCrossRepository: true,
4611-
headRepositoryOwnerLogin: "binbandit",
4612-
},
4613-
repositoryCloneUrls: {
4614-
"binbandit/t3code": {
4615-
url: forkDir,
4616-
sshUrl: forkDir,
4617-
},
4618-
},
4619-
},
4620-
});
4621-
4622-
const result = yield* preparePullRequestThread(manager, {
4623-
cwd: repoDir,
4624-
reference: "642",
4625-
mode: "local",
4626-
});
4627-
4628-
expect(result.branch).toBe("fix/git-action-default-without-origin");
4629-
expect(result.worktreePath).toBeNull();
4630-
expect(
4631-
(yield* runGit(repoDir, ["rev-parse", "--abbrev-ref", "@{upstream}"])).stdout.trim(),
4632-
).toBe("binbandit-seed/fix/git-action-default-without-origin");
4633-
}),
4634-
);
4635-
46364620
it.effect("refreshes a reused PR worktree onto the updated pull request head", () =>
46374621
Effect.gen(function* () {
46384622
const repoDir = yield* makeTempDir("t3code-git-manager-");
@@ -5058,6 +5042,49 @@ it.layer(layerGitManagerTest)("GitManager", (it) => {
50585042
}),
50595043
);
50605044

5045+
it.effect("creates a merge request worktree from the host's own head ref", () =>
5046+
Effect.gen(function* () {
5047+
const repoDir = yield* makeTempDir("t3code-git-manager-");
5048+
yield* initRepo(repoDir);
5049+
const remoteDir = yield* createBareRemote();
5050+
yield* runGit(repoDir, ["remote", "add", "origin", remoteDir]);
5051+
yield* runGit(repoDir, ["push", "-u", "origin", "main"]);
5052+
yield* runGit(repoDir, ["checkout", "-b", "feature/mr-ref-only"]);
5053+
NodeFS.writeFileSync(NodePath.join(repoDir, "mr.txt"), "merge request\n");
5054+
yield* runGit(repoDir, ["add", "mr.txt"]);
5055+
yield* runGit(repoDir, ["commit", "-m", "Merge request ref only"]);
5056+
const head = (yield* runGit(repoDir, ["rev-parse", "HEAD"])).stdout.trim();
5057+
yield* runGit(repoDir, ["push", "origin", "HEAD:refs/merge-requests/93/head"]);
5058+
yield* runGit(repoDir, ["checkout", "main"]);
5059+
yield* runGit(repoDir, ["branch", "-D", "feature/mr-ref-only"]);
5060+
5061+
const { service } = createGitHubProviderWithFakeGh({
5062+
pullRequest: {
5063+
number: 93,
5064+
title: "Merge request ref only",
5065+
url: "https://gitlab.com/pingdotgg/codething-mvp/-/merge_requests/93",
5066+
baseRefName: "main",
5067+
headRefName: "feature/mr-ref-only",
5068+
state: "open",
5069+
},
5070+
});
5071+
const { manager } = yield* makeManager({
5072+
sourceControlProvider: { ...service, kind: SourceControlProviderKind.make("gitlab") },
5073+
});
5074+
5075+
const result = yield* preparePullRequestThread(manager, {
5076+
cwd: repoDir,
5077+
reference: "93",
5078+
mode: "worktree",
5079+
});
5080+
5081+
expect(result.isOnPullRequestHead).toBe(true);
5082+
expect(
5083+
(yield* runGit(result.worktreePath as string, ["rev-parse", "HEAD"])).stdout.trim(),
5084+
).toBe(head);
5085+
}),
5086+
);
5087+
50615088
it.effect("preserves an unrelated local branch and upstream that share the fork head name", () =>
50625089
Effect.gen(function* () {
50635090
const repoDir = yield* makeTempDir("t3code-git-manager-");

0 commit comments

Comments
 (0)