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
72 changes: 69 additions & 3 deletions apps/server/src/git/GitManager.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -465,9 +465,9 @@ function createFakeSourceControlProvider(scenario: FakeProviderScenario = {}): {
: {
headBranchProbe:
scenario.headBranchProbe ??
(({ headSelectors, defaultBranchHeadSelector }) => ({
headSelectors: defaultBranchHeadSelector
? [defaultBranchHeadSelector]
(({ headSelectors, ownerHeadSelector }) => ({
headSelectors: ownerHeadSelector
? [ownerHeadSelector]
: headSelectors.filter((selector) => !selector.includes(":")),
limit: 100,
})),
Expand Down Expand Up @@ -2270,6 +2270,72 @@ it.layer(layerGitManagerTest)("GitManager", (it) => {
}),
);

it.effect("finds a fork branch's open PR past a full page of other forks' PRs", () =>
Effect.gen(function* () {
const repoDir = yield* makeTempDir("t3code-git-manager-");
yield* initRepo(repoDir);
const originDir = yield* createBareRemote();
const forkDir = yield* createBareRemote();
yield* runGit(repoDir, ["remote", "add", "origin", originDir]);
yield* runGit(repoDir, ["push", "-u", "origin", "main"]);
yield* runGit(repoDir, ["remote", "add", "fork", forkDir]);
yield* runGit(repoDir, ["checkout", "-b", "feature"]);
yield* runGit(repoDir, ["push", "-u", "fork", "feature"]);
yield* configureVisibleRemoteUrlWithLocalRewrite(
repoDir,
"origin",
"git@github.com:team/repository.git",
originDir,
);
yield* configureVisibleRemoteUrlWithLocalRewrite(
repoDir,
"fork",
"git@github.com:alice/repository.git",
forkDir,
);
const otherForks: FakeChangeRequest[] = Array.from({ length: 100 }, (_, index) => ({
number: 200 - index,
title: "Update docs",
url: `https://github.com/team/repository/pull/${200 - index}`,
baseRefName: "main",
headRefName: "feature",
state: "open",
isCrossRepository: true,
headRepositoryNameWithOwner: `fork-${index + 1}/repository`,
headRepositoryOwnerLogin: `fork-${index + 1}`,
}));
const { manager, providerCalls } = yield* makeManager({
providerScenario: {
prListSequenceByHeadSelector: { feature: [otherForks, otherForks] },
prListByHeadSelector: {
"alice:feature": [
{
number: 1,
title: "This fork",
url: "https://github.com/team/repository/pull/1",
baseRefName: "main",
headRefName: "feature",
state: "open",
isCrossRepository: true,
headRepositoryNameWithOwner: "alice/repository",
headRepositoryOwnerLogin: "alice",
},
],
},
},
});

expect(yield* manager.branchPullRequest({ cwd: repoDir, branch: "feature" })).toMatchObject({
number: 1,
state: "open",
});
expect(listed(providerCalls).map((call) => [call.headSelector, call.state])).toEqual([
["feature", "all"],
["alice:feature", "open"],
]);
}),
);

it.effect.each([
{ remoteUrl: "git@gitlab.com:Group/Subgroup/Fork.git", setUpstream: true },
{ remoteUrl: "git@gitlab.com:Group/Subgroup/Fork.git", setUpstream: false },
Expand Down
20 changes: 17 additions & 3 deletions apps/server/src/git/GitManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -629,10 +629,10 @@ function headBranchProbe(
provider: SourceControlProvider.SourceControlProvider["Service"],
headSelectors: ReadonlyArray<string>,
state: "open" | "all",
defaultBranchHeadSelector?: string,
ownerHeadSelector?: string,
) {
return (
provider.headBranchProbe?.({ headSelectors, state, defaultBranchHeadSelector }) ?? {
provider.headBranchProbe?.({ headSelectors, state, ownerHeadSelector }) ?? {
headSelectors,
limit: state === "open" ? 1 : 20,
}
Expand Down Expand Up @@ -1980,9 +1980,10 @@ export const make = Effect.gen(function* () {
| "headRepositoryOwnerLogin"
| "isCrossRepository"
>,
ownerHeadSelector?: string,
) {
const provider = yield* sourceControlProvider(cwd);
const probe = headBranchProbe(provider, headContext.headSelectors, "open");
const probe = headBranchProbe(provider, headContext.headSelectors, "open", ownerHeadSelector);
for (const headSelector of probe.headSelectors) {
const pullRequests = yield* provider.listChangeRequests({
cwd,
Expand Down Expand Up @@ -2023,13 +2024,15 @@ export const make = Effect.gen(function* () {
? `${headContext.headRepositoryOwnerLogin}:${defaultBranch}`
: undefined,
);
let pageWasFull = false;
for (const headSelector of probe.headSelectors) {
const pullRequests = yield* provider.listChangeRequests({
cwd,
headSelector,
state: "all",
limit: probe.limit,
});
pageWasFull ||= pullRequests.length >= probe.limit;

for (const pr of pullRequests.map(toPullRequestInfo)) {
if (!matchesBranchHeadContext(pr, headContext)) {
Expand All @@ -2045,6 +2048,17 @@ export const make = Effect.gen(function* () {
if (latestOpenPr) {
return latestOpenPr;
}
// Forks reusing the head name can fill the page before the branch's own open PR.
if (pageWasFull) {
const openPr = yield* findOpenPr(
cwd,
headContext,
headContext.headRepositoryOwnerLogin
? `${headContext.headRepositoryOwnerLogin}:${headContext.headBranch}`
: undefined,
);
if (openPr) return openPr;
}
return parsed[0] ?? null;
});
const buildCompletionToast = Effect.fn("buildCompletionToast")(function* (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ export class SourceControlProvider extends Context.Service<
readonly headBranchProbe?: (input: {
readonly headSelectors: ReadonlyArray<string>;
readonly state: "open" | "all";
/** `owner:branch` when the head is the default branch, a name most forks share. */
readonly defaultBranchHeadSelector?: string | undefined;
/** `owner:branch` to read instead of bare names, when the caller knows the head's owner. */
readonly ownerHeadSelector?: string | undefined;
}) => { readonly headSelectors: ReadonlyArray<string>; readonly limit: number };
readonly readChangeRequestTemplate?: (input: {
readonly cwd: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -453,11 +453,11 @@ describe("GitHubSourceControlProvider change request lookups by head", () => {
});
return Effect.gen(function* () {
const gh = yield* GitHubSourceControlProvider.make;
const probe = (defaultBranchHeadSelector?: string) =>
const probe = (ownerHeadSelector?: string) =>
gh.headBranchProbe?.({
headSelectors: ["me:main", "main"],
state: "all",
defaultBranchHeadSelector,
ownerHeadSelector,
}).headSelectors;
assert.deepStrictEqual([probe(), probe("me:main")], [["main"], ["me:main"]]);
const read = (state: "open" | "merged") =>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -972,9 +972,9 @@ export const make = Effect.gen(function* () {
),
// GitHub matches bare heads; read a full page to disambiguate forks by owner. A default branch
// collides with most forks, so its owner-qualified lookup has GitHub filter by owner instead.
headBranchProbe: ({ headSelectors, defaultBranchHeadSelector }) => ({
headSelectors: defaultBranchHeadSelector
? [defaultBranchHeadSelector]
headBranchProbe: ({ headSelectors, ownerHeadSelector }) => ({
headSelectors: ownerHeadSelector
? [ownerHeadSelector]
: headSelectors.filter((selector) => !selector.includes(":")),
limit: 100,
}),
Expand Down
Loading