Skip to content

Commit fd546e6

Browse files
fix(gitcafe): an unfinished file listing caches no line totals
Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 97dcc4e commit fd546e6

2 files changed

Lines changed: 21 additions & 11 deletions

File tree

‎packages/source-control-gitcafe/src/server/GitCafePullRequestProvider.test.ts‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1230,7 +1230,8 @@ describe("GitCafePullRequestProvider", () => {
12301230
let comparisonBaseOid = baseOid;
12311231
let tips = { targetBranch: "main", observedBaseOid: baseOid };
12321232
let pullReads = 0;
1233-
let hunksDown = true;
1233+
let listingCut = true;
1234+
let hunksDown = false;
12341235
const hunks = (request: SentRequest) => ({
12351236
version: 4,
12361237
headOid,
@@ -1244,12 +1245,15 @@ describe("GitCafePullRequestProvider", () => {
12441245
const server = fakeGitCafe({
12451246
// A comment moves the version without moving the compared commits.
12461247
"GET /repos/owner/repo/pulls/7": () => ({ ...pull, ...tips, version: 4 + pullReads++ }),
1247-
"GET /repos/owner/repo/pulls/7/changes": () => ({
1248+
"GET /repos/owner/repo/pulls/7/changes": (request: SentRequest) => ({
12481249
version: 4,
12491250
headOid,
12501251
comparisonBaseOid,
1251-
items: [{ path: "a.ts" }, { path: "b.ts" }],
1252-
next: null,
1252+
...(!listingCut
1253+
? { items: [{ path: "a.ts" }, { path: "b.ts" }], next: null }
1254+
: request.query.has("after")
1255+
? { items: [], next: "more" }
1256+
: { items: [{ path: "a.ts" }], next: "more" }),
12531257
}),
12541258
get "POST /repos/owner/repo/pulls/7/diff-files"() {
12551259
return hunksDown
@@ -1261,6 +1265,10 @@ describe("GitCafePullRequestProvider", () => {
12611265
server.sent.filter((request) => request.path.endsWith(suffix)).length;
12621266
return Effect.gen(function* () {
12631267
const provider = yield* GitCafePullRequestProvider.make;
1268+
// A listing that stops before its last page holds nothing for its commits.
1269+
yield* provider.getChangeRequestSummary!(target);
1270+
listingCut = false;
1271+
hunksDown = true;
12641272
// Unread hunks leave the lines unknown, and are read again next time.
12651273
const unread = yield* provider.getChangeRequestSummary!(target);
12661274
assert.strictEqual(unread.additions, undefined);
@@ -1270,18 +1278,18 @@ describe("GitCafePullRequestProvider", () => {
12701278
assert.deepInclude(first, { additions: 6, deletions: 2, changedFiles: 2 });
12711279
assert.deepInclude(second, { additions: 6, deletions: 2, changedFiles: 2 });
12721280
// Neither the head nor the target tip moved, so the file list is not read again.
1273-
assert.deepStrictEqual([reads("/changes"), reads("/diff-files")], [2, 2]);
1281+
assert.deepStrictEqual([reads("/changes"), reads("/diff-files")], [4, 3]);
12741282
// The target branch advancing keeps the merge base, so only the file list is read.
12751283
tips = { ...tips, observedBaseOid: mainTip };
12761284
const third = yield* provider.getChangeRequestSummary!(target);
12771285
assert.deepInclude(third, { additions: 6, deletions: 2, changedFiles: 2 });
1278-
assert.deepStrictEqual([reads("/changes"), reads("/diff-files")], [3, 2]);
1286+
assert.deepStrictEqual([reads("/changes"), reads("/diff-files")], [5, 3]);
12791287
// A landed parent layer retargets the pull and moves the comparison base under the same head.
12801288
comparisonBaseOid = landedBase;
12811289
tips = { targetBranch: "trunk", observedBaseOid: mainTip };
12821290
const fourth = yield* provider.getChangeRequestSummary!(target);
12831291
assert.deepInclude(fourth, { additions: 2, deletions: 2, changedFiles: 2 });
1284-
assert.deepStrictEqual([reads("/changes"), reads("/diff-files")], [4, 3]);
1292+
assert.deepStrictEqual([reads("/changes"), reads("/diff-files")], [6, 4]);
12851293
}).pipe(Effect.provide(server.layer));
12861294
});
12871295

‎packages/source-control-gitcafe/src/server/GitCafePullRequestProvider.ts‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -684,8 +684,10 @@ export const make = Effect.gen(function* () {
684684
const key = `${input.host} ${input.repository.toLowerCase()} ${input.number} ${revision.baseOid} ${revision.headOid}`;
685685
const held = lineTotals.get(key);
686686
const { headOid } = revision;
687+
// A listing that stopped before its last page counts only part of the diff, so nothing is held.
688+
const listed = after === null;
687689
if (held !== undefined)
688-
return { headOid, complete: true, stats: { changedFiles: files.length, ...held } };
690+
return { headOid, complete: listed, stats: { changedFiles: files.length, ...held } };
689691
const tooMany = files.length > LINE_STATS_MAX_FILES;
690692
const details = files.some((file) => file.additions !== undefined)
691693
? Option.some(files)
@@ -701,14 +703,14 @@ export const make = Effect.gen(function* () {
701703
);
702704
// Unread hunks leave the lines unknown rather than zero; the file count still stands.
703705
if (Option.isNone(details))
704-
return { headOid, complete: tooMany, stats: { changedFiles: files.length } };
706+
return { headOid, complete: listed && tooMany, stats: { changedFiles: files.length } };
705707
const counted = details.value;
706708
const totals = {
707709
additions: counted.reduce((total, file) => total + (file.additions ?? 0), 0),
708710
deletions: counted.reduce((total, file) => total + (file.deletions ?? 0), 0),
709711
};
710-
remember(lineTotals, key, totals);
711-
return { headOid, complete: true, stats: { changedFiles: files.length, ...totals } };
712+
if (listed) remember(lineTotals, key, totals);
713+
return { headOid, complete: listed, stats: { changedFiles: files.length, ...totals } };
712714
});
713715

714716
const readLineStats = Effect.fn("GitCafePullRequestProvider.readLineStats")(function* (

0 commit comments

Comments
 (0)