|
| 1 | +import { expect, test } from 'vitest'; |
| 2 | +import { execFileSync } from 'node:child_process'; |
| 3 | +import fs from 'node:fs'; |
| 4 | +import path from 'node:path'; |
| 5 | +import { eagerClosureGraphOf } from '@agent-device/test-kit'; |
| 6 | +import { createCommittedSourceTree, renamedSince } from './committed-source-tree.ts'; |
| 7 | +import { mkGitFixtureRepo } from './eager-closure-gate-fixtures.ts'; |
| 8 | + |
| 9 | +test('a PR merge retains branch rename history and measures the merged tree', () => { |
| 10 | + const repo = mkGitFixtureRepo('renamed-since-pr-merge-'); |
| 11 | + const git = (...args: string[]) => execFileSync('git', args, { cwd: repo }).toString().trim(); |
| 12 | + const original = 'packages/demo/src/entry.ts'; |
| 13 | + const moved = 'packages/demo/src/moved.ts'; |
| 14 | + const base = git('rev-parse', 'HEAD'); |
| 15 | + git('checkout', '-qb', 'pr'); |
| 16 | + git('mv', original, moved); |
| 17 | + git('commit', '-qm', 'move'); |
| 18 | + fs.appendFileSync( |
| 19 | + path.join(repo, moved), |
| 20 | + "export * from './main.ts';\n" + '// documentation\n'.repeat(100), |
| 21 | + ); |
| 22 | + git('commit', '-aqm', 'document'); |
| 23 | + const pr = git('rev-parse', 'HEAD'); |
| 24 | + git('checkout', '-qb', 'advanced-main', base); |
| 25 | + fs.writeFileSync(path.join(repo, 'packages/demo/src/main.ts'), 'export const main = 1;\n'); |
| 26 | + git('add', '.'); |
| 27 | + git('commit', '-qm', 'advance main'); |
| 28 | + const main = git('rev-parse', 'HEAD'); |
| 29 | + git('merge', '--no-ff', '-qm', 'merge PR', pr); |
| 30 | + const merge = git('rev-parse', 'HEAD'); |
| 31 | + expect(git('rev-parse', 'HEAD^1')).toBe(main); |
| 32 | + expect(git('rev-parse', 'HEAD^2')).toBe(pr); |
| 33 | + expect(renamedSince(repo, main, merge).get(moved)).toBe(renamedSince(repo, base, pr).get(moved)); |
| 34 | + expect(renamedSince(repo, main, merge).get(moved)).toBe(original); |
| 35 | + expect( |
| 36 | + createCommittedSourceTree(repo, merge).isFile(path.join(repo, 'packages/demo/src/main.ts')), |
| 37 | + ).toBe(true); |
| 38 | + expect( |
| 39 | + eagerClosureGraphOf(path.join(repo, moved), createCommittedSourceTree(repo, pr)).size, |
| 40 | + ).toBe(1); |
| 41 | + expect( |
| 42 | + eagerClosureGraphOf(path.join(repo, moved), createCommittedSourceTree(repo, merge)).size, |
| 43 | + ).toBe(2); |
| 44 | + git('checkout', '-qb', 'deleted-in-merge', main); |
| 45 | + git('merge', '--no-ff', '--no-commit', pr); |
| 46 | + git('rm', '-f', moved); |
| 47 | + git('commit', '-qm', 'merge without entry'); |
| 48 | + expect(renamedSince(repo, main, 'HEAD').has(moved)).toBe(false); |
| 49 | + git('checkout', '-q', 'advanced-main'); |
| 50 | + git('rm', moved); |
| 51 | + git('commit', '-qm', 'delete moved entry'); |
| 52 | + fs.writeFileSync(path.join(repo, moved), 'export const replacement = true;\n'); |
| 53 | + git('add', moved); |
| 54 | + git('commit', '-qm', 'replace entry'); |
| 55 | + expect(renamedSince(repo, main, 'HEAD').has(moved)).toBe(false); |
| 56 | +}); |
| 57 | + |
| 58 | +test('a merge does not claim an origin replaced on its first parent', () => { |
| 59 | + const repo = mkGitFixtureRepo('renamed-since-pr-replaced-base-'); |
| 60 | + const git = (...args: string[]) => execFileSync('git', args, { cwd: repo }).toString().trim(); |
| 61 | + const original = 'packages/demo/src/entry.ts'; |
| 62 | + const moved = 'packages/demo/src/moved.ts'; |
| 63 | + const base = git('rev-parse', 'HEAD'); |
| 64 | + git('checkout', '-qb', 'pr'); |
| 65 | + git('mv', original, moved); |
| 66 | + git('commit', '-qm', 'move'); |
| 67 | + fs.appendFileSync(path.join(repo, moved), '// documentation\n'.repeat(100)); |
| 68 | + git('commit', '-aqm', 'document'); |
| 69 | + const pr = git('rev-parse', 'HEAD'); |
| 70 | + git('checkout', '-qb', 'advanced-main', base); |
| 71 | + fs.writeFileSync(path.join(repo, original), 'export const replacement = true;\n'); |
| 72 | + git('commit', '-aqm', 'replace original'); |
| 73 | + const main = git('rev-parse', 'HEAD'); |
| 74 | + try { |
| 75 | + git('merge', '--no-ff', '--no-commit', pr); |
| 76 | + } catch { |
| 77 | + git('rm', original); |
| 78 | + } |
| 79 | + git('commit', '-qm', 'merge PR'); |
| 80 | + expect(renamedSince(repo, main, 'HEAD').has(moved)).toBe(false); |
| 81 | + expect(renamedSince(repo, pr, 'HEAD').has(moved)).toBe(false); |
| 82 | +}); |
0 commit comments