Skip to content

Commit 2847cd6

Browse files
committed
fix(gates): ignore upstream-only merge renames
1 parent c277d72 commit 2847cd6

2 files changed

Lines changed: 26 additions & 4 deletions

File tree

‎scripts/__tests__/committed-source-tree.test.ts‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,21 @@ import { execFileSync } from 'node:child_process';
33
import fs from 'node:fs';
44
import path from 'node:path';
55
import { eagerClosureGraphOf } from '@agent-device/test-kit';
6-
import { createCommittedSourceTree, renamedSince } from './committed-source-tree.ts';
6+
import {
7+
baseProductionPathOf,
8+
createCommittedSourceTree,
9+
renamedSince,
10+
} from './committed-source-tree.ts';
711
import { mkGitFixtureRepo } from './eager-closure-gate-fixtures.ts';
812

913
test('a PR merge retains branch rename history and measures the merged tree', () => {
1014
const repo = mkGitFixtureRepo('renamed-since-pr-merge-');
1115
const git = (...args: string[]) => execFileSync('git', args, { cwd: repo }).toString().trim();
1216
const original = 'packages/demo/src/entry.ts';
1317
const moved = 'packages/demo/src/moved.ts';
18+
const upstreamOriginal = 'packages/demo/src/facades/top.ts';
19+
const upstreamMoved = 'packages/demo/src/facades/upstream.ts';
20+
const newEntry = 'packages/demo/src/new-entry.ts';
1421
const base = git('rev-parse', 'HEAD');
1522
git('checkout', '-qb', 'pr');
1623
git('mv', original, moved);
@@ -19,9 +26,12 @@ test('a PR merge retains branch rename history and measures the merged tree', ()
1926
path.join(repo, moved),
2027
"export * from './main.ts';\n" + '// documentation\n'.repeat(100),
2128
);
29+
fs.writeFileSync(path.join(repo, newEntry), 'export const newlyIntroduced = true;\n');
30+
git('add', newEntry);
2231
git('commit', '-aqm', 'document');
2332
const pr = git('rev-parse', 'HEAD');
2433
git('checkout', '-qb', 'advanced-main', base);
34+
git('mv', upstreamOriginal, upstreamMoved);
2535
fs.writeFileSync(path.join(repo, 'packages/demo/src/main.ts'), 'export const main = 1;\n');
2636
git('add', '.');
2737
git('commit', '-qm', 'advance main');
@@ -32,6 +42,14 @@ test('a PR merge retains branch rename history and measures the merged tree', ()
3242
expect(git('rev-parse', 'HEAD^2')).toBe(pr);
3343
expect(renamedSince(repo, main, merge).get(moved)).toBe(renamedSince(repo, base, pr).get(moved));
3444
expect(renamedSince(repo, main, merge).get(moved)).toBe(original);
45+
const mergeRenames = renamedSince(repo, main, merge);
46+
const mainTree = createCommittedSourceTree(repo, main);
47+
expect(createCommittedSourceTree(repo, pr).isFile(path.join(repo, upstreamMoved))).toBe(false);
48+
expect(mainTree.isFile(path.join(repo, upstreamMoved))).toBe(true);
49+
expect(createCommittedSourceTree(repo, merge).isFile(path.join(repo, upstreamMoved))).toBe(true);
50+
expect(mergeRenames.has(upstreamMoved)).toBe(false);
51+
expect(baseProductionPathOf(repo, upstreamMoved, mainTree, mergeRenames)).toBe(upstreamMoved);
52+
expect(baseProductionPathOf(repo, newEntry, mainTree, mergeRenames)).toBe(null);
3553
expect(
3654
createCommittedSourceTree(repo, merge).isFile(path.join(repo, 'packages/demo/src/main.ts')),
3755
).toBe(true);

‎scripts/__tests__/committed-source-tree.ts‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ function endOriginsChangedOnBase(
9494
* erase a recorded rename. Added or deleted paths end that lineage. The aggregate diff still finds
9595
* a move spread across commits or staged in the working tree. For a merge into the measured base,
9696
* follow its second parent's history, invalidate origins changed on the first parent, and apply the
97-
* second-parent-to-merge diff. Unlimited detection handles bulk moves.
97+
* second-parent-to-merge diff to tracked lineage only. Unlimited detection handles bulk moves.
9898
*/
9999
export function renamedSince(
100100
repoRoot: string,
@@ -104,8 +104,9 @@ export function renamedSince(
104104
const origins = new Map<string, string | null>();
105105
const ended = new Set<string>();
106106
const flags = ['--name-status', '-M', '--diff-filter=ADR', '-z'];
107-
const follow = (status: Buffer): void => {
107+
const follow = (status: Buffer, trackedOnly = false): void => {
108108
for (const { renamed, from, to } of nameStatusRecords(status)) {
109+
if (trackedOnly && !origins.has(from)) continue;
109110
const origin = renamed && origins.has(from) ? origins.get(from)! : from;
110111
if (!renamed && typeof origins.get(from) === 'string') ended.add(from);
111112
origins.set(from, null);
@@ -142,7 +143,10 @@ export function renamedSince(
142143
);
143144
if (isMergeIntoBase) {
144145
endOriginsChangedOnBase(repoRoot, historyBase, baseCommit, origins, ended);
145-
follow(git(repoRoot, ['-c', 'diff.renameLimit=0', 'diff', ...flags, historyHead, measured]));
146+
follow(
147+
git(repoRoot, ['-c', 'diff.renameLimit=0', 'diff', ...flags, historyHead, measured]),
148+
true,
149+
);
146150
}
147151
if (!head) follow(git(repoRoot, ['-c', 'diff.renameLimit=0', 'diff', ...flags, 'HEAD']));
148152
const renamed = new Map<string, string>();

0 commit comments

Comments
 (0)