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
60 changes: 60 additions & 0 deletions apps/server/src/vcs/GitVcsDriverCore.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3158,6 +3158,66 @@ it.layer(layerTest)("GitVcsDriver core integration", (it) => {
}),
);

it.effect("reads Changes totals without minimizing and keeps review diffs minimal", () =>
Effect.gen(function* () {
const cwd = yield* makeTmpDir();
const { initialBranch } = yield* initRepoWithCommit(cwd);
const driver = yield* GitVcsDriver.GitVcsDriver;
yield* git(cwd, ["config", "diff.algorithm", "myers"]);
// Repeated lines make the default and minimal algorithms choose different edits.
const lines = Array.from({ length: 2000 }, (_, index) => index);
yield* writeTextFile(
cwd,
"repeated.txt",
lines.map((index) => `${(index ^ (index >> 3)) % 16}\n`).join(""),
);
yield* git(cwd, ["add", "."]);
yield* git(cwd, ["commit", "-m", "repeated lines"]);
yield* git(cwd, ["checkout", "-b", "feature/totals"]);
yield* writeTextFile(
cwd,
"repeated.txt",
lines.map((index) => `${(index ^ (index >> 5)) % 16}\n`).join(""),
);
const defaultStat = yield* git(cwd, ["diff", "--numstat", "HEAD", "--"]);
const minimalStat = yield* git(cwd, ["diff", "--minimal", "--numstat", "HEAD", "--"]);
assert.notEqual(defaultStat, minimalStat);
const [insertions, deletions] = defaultStat.split("\t");
const status = yield* driver.statusDetailsLocal(cwd, { includeBranchChanges: true });
assert.deepStrictEqual(status.branchChanges, {
baseRef: initialBranch,
insertions: Number(insertions),
deletions: Number(deletions),
});

const [additions, removals] = minimalStat.split("\t");
const minimalPatch = yield* git(cwd, [
"diff",
"--minimal",
"--patch",
"--no-color",
"--no-ext-diff",
"--no-textconv",
"--src-prefix=a/",
"--dst-prefix=b/",
"HEAD",
"--",
]);
const preview = yield* driver.getReviewDiffPreview({ cwd });
for (const source of preview.sources) {
assert.deepStrictEqual(source.files, [
{
path: "repeated.txt",
previousPath: null,
additions: Number(additions),
deletions: Number(removals),
},
]);
assert.strictEqual(source.diff.trim(), minimalPatch);
}
}),
);

it.effect.skipIf(!symlinksSupported)(
"lists the real repository through a symlink when a decoy repo occupies the lexical common dir",
() =>
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/vcs/GitVcsDriverCore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ const REVIEW_DIFF_ARGS = [
"--no-color",
"--no-ext-diff",
"--no-textconv",
"--minimal",
...PATCH_RENDER_PREFIX_ARGS,
];
const STATUS_UPSTREAM_REFRESH_INTERVAL = Duration.seconds(15);
Expand Down Expand Up @@ -3080,6 +3079,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*

const diffArgs = [
...REVIEW_DIFF_ARGS,
"--minimal",
...(input.ignoreWhitespace ? ["--ignore-all-space"] : []),
];
const readStats = Effect.fn("GitVcsDriver.getReviewDiffPreview.stat")(function* (
Expand Down
Loading