diff --git a/apps/mobile/src/features/review/useReviewDiffData.ts b/apps/mobile/src/features/review/useReviewDiffData.ts index cf6574d87b26b..35cf8f2f14b3c 100644 --- a/apps/mobile/src/features/review/useReviewDiffData.ts +++ b/apps/mobile/src/features/review/useReviewDiffData.ts @@ -215,6 +215,7 @@ export function useReviewDiffData(input: { request: { cwd, ...(lazySource.baseRef ? { baseRef: lazySource.baseRef } : {}), + ...(lazySource.mergeBase ? { mergeBase: lazySource.mergeBase } : {}), file: { path: file.path, previousPath: file.previousPath, diff --git a/apps/server/src/vcs/GitVcsDriverCore.test.ts b/apps/server/src/vcs/GitVcsDriverCore.test.ts index c6f90862380fe..e05df2f322101 100644 --- a/apps/server/src/vcs/GitVcsDriverCore.test.ts +++ b/apps/server/src/vcs/GitVcsDriverCore.test.ts @@ -865,6 +865,22 @@ it.effect.each(["on a branch", "detached", "unborn"] as const)( assert.deepStrictEqual(discoveries(), branchRead); if (state !== "detached") assert.equal(headRef(afterCheckout), "outside-checkout"); + // A file read under that preview reuses its merge base instead of resolving it again. + const branchFile = yield* driver.getReviewDiffPreview({ + cwd, + mergeBase: afterCheckout.sources.find((entry) => entry.kind === "branch-range")! + .mergeBase!, + file: { path: "new.txt", previousPath: null, sourceKind: "branch-range" }, + }); + assert.isFalse(spawnedArgs.some((args) => args.includes("merge-base"))); + assert.deepStrictEqual(discoveries(), warm); + assert.deepStrictEqual( + branchFile.sources + .find((source) => source.kind === "branch-range")! + .files!.map((file) => file.path), + ["new.txt"], + ); + yield* driver.getReviewBranchCommits({ cwd }); assert.deepStrictEqual(discoveries(), branchRead); @@ -4147,6 +4163,7 @@ it.layer(layerTest)("GitVcsDriver core integration", (it) => { const request = yield* decodeReviewDiffPreviewInput({ cwd, baseRef: initialBranch, + mergeBase: branch.mergeBase!, file: { path, previousPath: stat.previousPath, sourceKind: "branch-range" }, }); const result = yield* driver.getReviewDiffPreview(request); diff --git a/apps/server/src/vcs/GitVcsDriverCore.ts b/apps/server/src/vcs/GitVcsDriverCore.ts index 3691a03687bf0..e2bfa90fb32f7 100644 --- a/apps/server/src/vcs/GitVcsDriverCore.ts +++ b/apps/server/src/vcs/GitVcsDriverCore.ts @@ -4524,10 +4524,13 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function* }); } const sourceKind = input.file?.sourceKind ?? input.sourceKind; + const previewMergeBase = + input.file?.sourceKind === "branch-range" ? input.mergeBase : undefined; const needsCurrentBranch = input.commitSha === undefined && input.file?.sourceKind !== "commit" && - sourceKind !== "working-tree"; + sourceKind !== "working-tree" && + previewMergeBase === undefined; const reusesTracked = input.file === undefined && input.commitSha === undefined; const tracked = reusesTracked ? yield* takeTrackedReviewPreview(input) : undefined; const repository = @@ -4614,7 +4617,9 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function* tracked?.review ?? (sourceKind === "working-tree" ? { baseRef: input.baseRef ?? null, mergeBase: null } - : yield* resolveReviewMergeBase(cwd, repository.currentBranch, input.baseRef)); + : previewMergeBase !== undefined + ? { baseRef: input.baseRef ?? null, mergeBase: previewMergeBase } + : yield* resolveReviewMergeBase(cwd, repository.currentBranch, input.baseRef)); const diffArgs = [ ...REVIEW_DIFF_ARGS, @@ -4742,6 +4747,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function* title: review.baseRef ? `Changes vs ${review.baseRef}` : "Changes", baseRef: review.baseRef, headRef: repository.currentBranch ?? "HEAD", + ...(review.mergeBase === null ? {} : { mergeBase: review.mergeBase }), diff: baseDiff, ...(baseFiles === undefined ? {} : { files: baseFiles }), diffHash: baseDiffHash, diff --git a/apps/web/src/components/diffs/useReviewFilePatches.ts b/apps/web/src/components/diffs/useReviewFilePatches.ts index 4f68b51fb5edd..94fee877f0f4b 100644 --- a/apps/web/src/components/diffs/useReviewFilePatches.ts +++ b/apps/web/src/components/diffs/useReviewFilePatches.ts @@ -201,6 +201,7 @@ function reviewFileQueries({ cwd, ...(baseRef ? { baseRef } : {}), ...(source.kind === "commit" ? { commitSha: source.id } : {}), + ...(source.mergeBase ? { mergeBase: source.mergeBase } : {}), ignoreWhitespace, file: { path: file.path, diff --git a/packages/contracts/src/review.ts b/packages/contracts/src/review.ts index f8d8a6133358c..ab5cae42624d4 100644 --- a/packages/contracts/src/review.ts +++ b/packages/contracts/src/review.ts @@ -3,9 +3,16 @@ import { TrimmedNonEmptyString } from "./baseSchemas.ts"; import { GitCommandError } from "./git.ts"; import { VcsError } from "./vcs.ts"; +// An object id or HEAD, never an option-looking ref, since it is passed to git as a revision. +const ReviewMergeBase = Schema.String.check( + Schema.isPattern(/^(?:[0-9a-f]{40}|[0-9a-f]{64}|HEAD)$/), +); + export const ReviewDiffPreviewInput = Schema.Struct({ cwd: TrimmedNonEmptyString, baseRef: Schema.optional(TrimmedNonEmptyString), + // A branch-range file read reuses its preview's merge base instead of resolving it again. + mergeBase: Schema.optionalKey(ReviewMergeBase), commitSha: Schema.optional(TrimmedNonEmptyString), ignoreWhitespace: Schema.optionalKey(Schema.Boolean), sourceKind: Schema.optionalKey(Schema.Literals(["working-tree", "branch-range"])), @@ -74,6 +81,8 @@ export const ReviewDiffPreviewSource = Schema.Struct({ commitSubject: Schema.optionalKey(TrimmedNonEmptyString), baseRef: Schema.NullOr(TrimmedNonEmptyString), headRef: Schema.NullOr(TrimmedNonEmptyString), + // Branch-range only; older servers omit it. + mergeBase: Schema.optionalKey(ReviewMergeBase), diff: Schema.String, diffHash: TrimmedNonEmptyString, truncated: Schema.Boolean,