jb/paseo
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Archive merged PR workspaces from settings (#1313)

Browse Source 
* Add workspace settings for merged PR cleanup

* Fix worktree branch ahead status

* Handle PR worktree upstream status

* Remove stale checkout tracking field

* Update settings E2E host section slugs

* Treat unknown upstream as unsafe for auto-archive
This commit is contained in:
Mohamed Boudra
2026-06-03 23:17:08 +08:00
committed by GitHub
parent bd4889e243
commit 369adced52
14 changed files with 262 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/server/src/utils/checkout-git.test.ts
+89 -3
View File
@@ -522,6 +522,92 @@ const x = 1;
expect(divergedStatus.behindOfOrigin).toBe(1);
});
it("reports a PR worktree as not ahead when its branch is pushed to the configured PR remote", async () => {
setupRemoteTrackingMain(repoDir, tempDir);
const prRemoteDir = join(tempDir, "pr-remote.git");
execFileSync("git", ["init", "--bare", "-b", "main", prRemoteDir]);
execFileSync("git", ["checkout", "-b", "aaronzhongg/open-button-targets-active-file"], {
cwd: repoDir,
});
commitFile(repoDir, "feature.txt", "feature\n", "feature commit");
execFileSync("git", ["remote", "add", "paseo-pr-1285", prRemoteDir], { cwd: repoDir });
execFileSync(
"git",
["push", "paseo-pr-1285", "HEAD:refs/heads/open-button-targets-active-file"],
{ cwd: repoDir },
);
execFileSync(
"git",
["config", "branch.aaronzhongg/open-button-targets-active-file.remote", "paseo-pr-1285"],
{
cwd: repoDir,
},
);
execFileSync(
"git",
[
"config",
"branch.aaronzhongg/open-button-targets-active-file.merge",
"refs/heads/open-button-targets-active-file",
],
{ cwd: repoDir },
);
const status = await getCheckoutStatus(repoDir);
expect(status).toMatchObject({
isGit: true,
currentBranch: "aaronzhongg/open-button-targets-active-file",
aheadOfOrigin: 0,
});
});
it("reports a PR worktree as behind when its configured PR remote has newer commits", async () => {
setupRemoteTrackingMain(repoDir, tempDir);
const prRemoteDir = join(tempDir, "pr-remote.git");
const prCloneDir = join(tempDir, "pr-clone");
execFileSync("git", ["init", "--bare", "-b", "main", prRemoteDir]);
execFileSync("git", ["checkout", "-b", "aaronzhongg/open-button-targets-active-file"], {
cwd: repoDir,
});
commitFile(repoDir, "feature.txt", "feature\n", "feature commit");
execFileSync("git", ["remote", "add", "paseo-pr-1285", prRemoteDir], { cwd: repoDir });
execFileSync(
"git",
["push", "paseo-pr-1285", "HEAD:refs/heads/open-button-targets-active-file"],
{ cwd: repoDir },
);
execFileSync(
"git",
["config", "branch.aaronzhongg/open-button-targets-active-file.remote", "paseo-pr-1285"],
{ cwd: repoDir },
);
execFileSync(
"git",
[
"config",
"branch.aaronzhongg/open-button-targets-active-file.merge",
"refs/heads/open-button-targets-active-file",
],
{ cwd: repoDir },
);
execFileSync("git", ["clone", prRemoteDir, prCloneDir]);
execFileSync("git", ["checkout", "open-button-targets-active-file"], { cwd: prCloneDir });
execFileSync("git", ["config", "user.email", "test@test.com"], { cwd: prCloneDir });
execFileSync("git", ["config", "user.name", "Test"], { cwd: prCloneDir });
commitFile(prCloneDir, "remote.txt", "remote\n", "remote update");
execFileSync("git", ["push"], { cwd: prCloneDir });
execFileSync("git", ["fetch", "paseo-pr-1285"], { cwd: repoDir });
const status = await getCheckoutStatus(repoDir);
expect(status).toMatchObject({
isGit: true,
currentBranch: "aaronzhongg/open-button-targets-active-file",
behindOfOrigin: 1,
});
});
it("does not report the full branch history as ahead when the current branch remote is gone", async () => {
setupRemoteTrackingMain(repoDir, tempDir);
execFileSync("git", ["checkout", "-b", "feature"], { cwd: repoDir });
@@ -557,11 +643,11 @@ const x = 1;
isPaseoOwnedWorktree: true,
baseRef: "main",
aheadBehind: { ahead: 0, behind: 0 },
aheadOfOrigin: 0,
aheadOfOrigin: null,
});
});
it("reports local-only worktree commits as unpushed relative to base", async () => {
it("does not report local-only no-track worktree commits as ahead of origin", async () => {
setupRemoteTrackingMain(repoDir, tempDir);
commitFile(repoDir, "second.txt", "second\n", "second commit");
execFileSync("git", ["push"], { cwd: repoDir });
@@ -581,7 +667,7 @@ const x = 1;
isPaseoOwnedWorktree: true,
baseRef: "main",
aheadBehind: { ahead: 1, behind: 0 },
aheadOfOrigin: 1,
aheadOfOrigin: null,
});
});