Skip to content

Commit bbb1467

Browse files
committed
fix(server): skip PR lookup for unknown providers
1 parent 1a003e3 commit bbb1467

2 files changed

Lines changed: 35 additions & 8 deletions

File tree

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

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import {
2525
GitCommandError,
2626
ProviderDriverKind,
2727
ProviderInstanceId,
28+
type SourceControlProviderKind,
2829
TextGenerationError,
2930
} from "@t3tools/contracts";
3031
import * as GitHubCli from "../sourceControl/GitHubCli.ts";
@@ -618,6 +619,7 @@ function makeManager(input?: {
618619
textGeneration?: Partial<FakeGitTextGeneration>;
619620
serverSettings?: Parameters<typeof ServerSettings.layerTest>[0];
620621
setupScriptRunner?: ProjectSetupScriptRunner.ProjectSetupScriptRunner["Service"];
622+
sourceControlProviderKind?: SourceControlProviderKind;
621623
}) {
622624
const { service: gitHubCli, ghCalls } = createGitHubCliWithFakeGh(input?.ghScenario);
623625
const textGeneration = createTextGeneration(input?.textGeneration);
@@ -635,14 +637,18 @@ function makeManager(input?: {
635637
const sourceControlRegistryLayer = Layer.effect(
636638
SourceControlProviderRegistry.SourceControlProviderRegistry,
637639
GitHubSourceControlProvider.make.pipe(
638-
Effect.map((provider) =>
639-
SourceControlProviderRegistry.SourceControlProviderRegistry.of({
640-
get: () => Effect.succeed(provider),
641-
resolveHandle: () => Effect.succeed({ provider, context: null }),
642-
resolve: () => Effect.succeed(provider),
640+
Effect.map((provider) => {
641+
const sourceControlProvider = {
642+
...provider,
643+
kind: input?.sourceControlProviderKind ?? provider.kind,
644+
};
645+
return SourceControlProviderRegistry.SourceControlProviderRegistry.of({
646+
get: () => Effect.succeed(sourceControlProvider),
647+
resolveHandle: () => Effect.succeed({ provider: sourceControlProvider, context: null }),
648+
resolve: () => Effect.succeed(sourceControlProvider),
643649
discover: Effect.succeed([]),
644-
}),
645-
),
650+
});
651+
}),
646652
Effect.provide(Layer.succeed(GitHubCli.GitHubCli, gitHubCli)),
647653
),
648654
);
@@ -917,6 +923,23 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
917923
}),
918924
);
919925

926+
it.effect("status skips the PR lookup for repositories without remotes", () =>
927+
Effect.gen(function* () {
928+
const repoDir = yield* makeTempDir("t3code-git-manager-");
929+
yield* initRepo(repoDir);
930+
const { manager, ghCalls } = yield* makeManager({
931+
sourceControlProviderKind: "unknown",
932+
});
933+
934+
const status = yield* manager.status({ cwd: repoDir });
935+
936+
expect(status.isRepo).toBe(true);
937+
expect(status.hasPrimaryRemote).toBe(false);
938+
expect(status.pr).toBeNull();
939+
expect(ghCalls.filter((call) => call.startsWith("pr list "))).toHaveLength(0);
940+
}),
941+
);
942+
920943
it.effect("status briefly caches repeated lookups for the same cwd", () =>
921944
Effect.gen(function* () {
922945
const repoDir = yield* makeTempDir("t3code-git-manager-");

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1292,10 +1292,14 @@ export const make = Effect.gen(function* () {
12921292
cwd: string,
12931293
headContext: BranchHeadContext,
12941294
) {
1295+
const provider = yield* sourceControlProvider(cwd);
1296+
if (provider.kind === "unknown") {
1297+
return null;
1298+
}
12951299
const parsedByNumber = new Map<number, PullRequestInfo>();
12961300

12971301
for (const headSelector of headContext.headSelectors) {
1298-
const pullRequests = yield* (yield* sourceControlProvider(cwd)).listChangeRequests({
1302+
const pullRequests = yield* provider.listChangeRequests({
12991303
cwd,
13001304
headSelector,
13011305
state: "all",

0 commit comments

Comments
 (0)