@@ -3,14 +3,21 @@ import { execFileSync } from 'node:child_process';
33import fs from 'node:fs' ;
44import path from 'node:path' ;
55import { 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' ;
711import { mkGitFixtureRepo } from './eager-closure-gate-fixtures.ts' ;
812
913test ( '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 ) ;
0 commit comments