Skip to content

Commit 2371fb1

Browse files
devchaudhary24kjuliusmarminge
authored andcommitted
refactor(server): make push timeout explicit
1 parent c955a62 commit 2371fb1

1 file changed

Lines changed: 21 additions & 23 deletions

File tree

‎apps/server/src/vcs/GitVcsDriverCore.ts‎

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -909,12 +909,9 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
909909
operation: string,
910910
cwd: string,
911911
args: readonly string[],
912-
allowNonZeroExit = false,
912+
options: ExecuteGitOptions = {},
913913
): Effect.Effect<void, GitCommandError> =>
914-
executeGit(operation, cwd, args, {
915-
allowNonZeroExit,
916-
...(args[0] === "push" ? { timeoutMs: null } : {}),
917-
}).pipe(Effect.asVoid);
914+
executeGit(operation, cwd, args, options).pipe(Effect.asVoid);
918915

919916
const runGitStdout = (
920917
operation: string,
@@ -1912,12 +1909,12 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
19121909
const requestedRemoteName = options?.remoteName?.trim() || null;
19131910
if (requestedRemoteName) {
19141911
const publishBranch = yield* resolvePublishBranchName(cwd, branch);
1915-
yield* runGit("GitVcsDriver.pushCurrentBranch.pushWithRequestedRemote", cwd, [
1916-
"push",
1917-
"-u",
1918-
requestedRemoteName,
1919-
`HEAD:refs/heads/${publishBranch}`,
1920-
]);
1912+
yield* runGit(
1913+
"GitVcsDriver.pushCurrentBranch.pushWithRequestedRemote",
1914+
cwd,
1915+
["push", "-u", requestedRemoteName, `HEAD:refs/heads/${publishBranch}`],
1916+
{ timeoutMs: null },
1917+
);
19211918
return {
19221919
status: "pushed" as const,
19231920
branch,
@@ -1975,12 +1972,12 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
19751972
});
19761973
}
19771974
const publishBranch = yield* resolvePublishBranchName(cwd, branch);
1978-
yield* runGit("GitVcsDriver.pushCurrentBranch.pushWithUpstream", cwd, [
1979-
"push",
1980-
"-u",
1981-
publishRemoteName,
1982-
`HEAD:refs/heads/${publishBranch}`,
1983-
]);
1975+
yield* runGit(
1976+
"GitVcsDriver.pushCurrentBranch.pushWithUpstream",
1977+
cwd,
1978+
["push", "-u", publishRemoteName, `HEAD:refs/heads/${publishBranch}`],
1979+
{ timeoutMs: null },
1980+
);
19841981
return {
19851982
status: "pushed" as const,
19861983
branch,
@@ -1993,11 +1990,12 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
19931990
Effect.orElseSucceed(() => null),
19941991
);
19951992
if (currentUpstream) {
1996-
yield* runGit("GitVcsDriver.pushCurrentBranch.pushUpstream", cwd, [
1997-
"push",
1998-
currentUpstream.remoteName,
1999-
`HEAD:refs/heads/${currentUpstream.branchName}`,
2000-
]);
1993+
yield* runGit(
1994+
"GitVcsDriver.pushCurrentBranch.pushUpstream",
1995+
cwd,
1996+
["push", currentUpstream.remoteName, `HEAD:refs/heads/${currentUpstream.branchName}`],
1997+
{ timeoutMs: null },
1998+
);
20011999
return {
20022000
status: "pushed" as const,
20032001
branch,
@@ -2006,7 +2004,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
20062004
};
20072005
}
20082006

2009-
yield* runGit("GitVcsDriver.pushCurrentBranch.push", cwd, ["push"]);
2007+
yield* runGit("GitVcsDriver.pushCurrentBranch.push", cwd, ["push"], { timeoutMs: null });
20102008
return {
20112009
status: "pushed" as const,
20122010
branch,

0 commit comments

Comments
 (0)