mirror of
https://github.com/garrytan/gstack.git
synced 2026-11-16 21:31:58 +01:00
* fix(stamp): name branch lines by position; carry and finish accept a kept VERSION claim (GST-979, GST-980) BranchSide carries the positions of the branch-added lines and stampOnlyLine takes the removed line position, so a base line whose text duplicates a branch line keeps the old-version floor. At equal versions only the branch own lines may move. stampOnlyText and stampedFiles accept a kept claim for those lines, and the carry leaves a stamp file out of the product comparison when its only change since the reviewed head is a stamp on the branch own rows and the base did not touch it. Failing-first: all five new tests fail on mainfc292e22f. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix: pre-landing review fixes (GST-980 carry reads the stamp file line by line at the branch's positions, and keeps its mode) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * docs(changelog): GST-979/980 entry counts the seven tests Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * docs: the receipt carry follows a stamp on the branch's own rows (GST-980) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * docs: keep docs/ship-policy.md at the reviewed text; its GST-980 sentence already states the carry rule Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * Revert "docs: keep docs/ship-policy.md at the reviewed text; its GST-980 sentence already states the carry rule" This reverts commitf926ccb0c2. * fix(stamp): a declared placeholder restamped on the branch's own row is a stamp; the carry names HEAD's version (GST-1026, GST-1030) stamp_placeholders (default []) lets a repo declare literals such as TBD that its restamp replaces with the new version inside a stamp_patterns template. stampOnlyLine accepts that move only on a branch line named by position; finish's stampedFiles, the receipt carry and the tree receipt share it. The carried receipt's version is HEAD's, read the way write reads it. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix: pre-landing review fixes (carry keeps a write --version receipt's version without a version source; a placeholder fill composes with a stamp move; a bare {version} template and a blank placeholder take no placeholder) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * docs(changelog): GST-1026/1030 fragment names the review fixes Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(ship-receipt): carry masks only package.json version on a pin-bump PR (GST-1030, GBEV-3) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * refactor(ship-policy): stamp key validation moves to lib/ship-policy-stamps.ts for the module-size ratchet Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(ship-policy): stamp_placeholders key names the next minor 1.95.0.0 1.94.0.0 shipped as #3901 without the key, so the released-key test reds once main's CHANGELOG is in the tree. The slot stamp moves the tentative value through stamp_paths. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test(restamp-mentions): set the stamp file's exec bit through the index so the mode-change carry case holds on Windows Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * unstamp: return VERSION, package.json, CHANGELOG and the digest to main f6d6215's values and restore the changelog fragment after #3892 left train 100 The tentative STAMP_PLACEHOLDERS_KEY_VERSION goes back to 1.95.0.0 for the next slot stamp to move. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> --------- Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
592 lines
41 KiB
TypeScript
592 lines
41 KiB
TypeScript
/**
|
|
* Restamp mention scanning and rewriting (gbrain #7640, gstack 1.91.246.0): a
|
|
* PR that stamped X lost its slot, merged the base, and the base was X by
|
|
* then, so the branch's VERSION equalled the base's (no branch stamp) and its
|
|
* quoted `since: 'X'` rows never moved: the mention scanner could not pass
|
|
* the opening quote and, with no branch stamp, nothing else named X. Pins
|
|
* the quoted forms (single, double, unquoted unchanged, quote style kept) in
|
|
* both the scanner and the rewrite table, the equal-version rule (the base
|
|
* version moves only on lines the branch added), and the negative control
|
|
* (a base-side quoted row carrying that version stays).
|
|
*/
|
|
import { afterAll, afterEach, describe, expect, test } from 'bun:test';
|
|
import * as fs from 'node:fs';
|
|
import * as path from 'node:path';
|
|
import { EXIT } from '../lib/headless-artifacts';
|
|
import { rewriteStamps, tentativeMentions } from '../lib/restamp';
|
|
import { STAMP_PLACEHOLDERS_KEY_VERSION } from '../lib/ship-policy';
|
|
import { extractReceipt } from '../lib/ship-receipt';
|
|
import type { GitFixtureTemplate } from './helpers/git-fixture-template';
|
|
import { BASE_POLICY, cleanup, cloneFixture, fixtureTemplate, makePr, mergeMain, mergeToMain, readFile, restamp, runBin, type FixtureRepo } from './helpers/restamp-fixture';
|
|
|
|
const repos: FixtureRepo[] = [];
|
|
afterEach(() => { while (repos.length) cleanup(repos.pop()!); });
|
|
|
|
/** The helper's makeFixtureRepo, built once per policy for this file and copied per test. */
|
|
const templates = new Map<string, GitFixtureTemplate<null>>();
|
|
afterAll(() => { for (const t of templates.values()) t.dispose(); });
|
|
function makeFixtureRepo(opts: { prefix: string; policy: Record<string, unknown> }): FixtureRepo {
|
|
const key = JSON.stringify(opts.policy);
|
|
if (!templates.has(key)) templates.set(key, fixtureTemplate({ policy: opts.policy, prefix: 'restamp-mentions-' }));
|
|
return cloneFixture(templates.get(key)!, opts.prefix);
|
|
}
|
|
|
|
const stageDetail = (out: string, name: string) => new RegExp(`^stage ${name}: (\\w+)(?: \\((.*)\\))?$`, 'm').exec(out);
|
|
|
|
describe('quoted stamp forms (pure)', () => {
|
|
test('rewriteStamps: since: with a single or double quote moves and keeps its quote; the unquoted form is unchanged', () => {
|
|
expect(rewriteStamps("{ since: '1.2.3.0', id: 'a' }", '1.2.3.0', '1.2.4.0')).toEqual({ text: "{ since: '1.2.4.0', id: 'a' }", count: 1 });
|
|
expect(rewriteStamps('{ since: "1.2.3.0", id: "a" }', '1.2.3.0', '1.2.4.0')).toEqual({ text: '{ since: "1.2.4.0", id: "a" }', count: 1 });
|
|
expect(rewriteStamps("since:'1.2.3.0'", '1.2.3.0', '1.2.4.0')).toEqual({ text: "since:'1.2.4.0'", count: 1 });
|
|
expect(rewriteStamps('since: 1.2.3.0', '1.2.3.0', '1.2.4.0')).toEqual({ text: 'since: 1.2.4.0', count: 1 });
|
|
// A quote is an exact boundary too: a longer version behind it is not X.
|
|
expect(rewriteStamps("since: '1.2.3.01'", '1.2.3.0', '1.2.4.0').count).toBe(0);
|
|
expect(rewriteStamps("since: '1.2.3.0.1'", '1.2.3.0', '1.2.4.0').count).toBe(0);
|
|
// An opened quote must close right after X: a quoted prerelease or a mismatched pair is not the form
|
|
// (the tree receipt and gate reuse share this table, so a looser match would call a real change a stamp).
|
|
expect(rewriteStamps("since: '1.2.3.0-beta'", '1.2.3.0', '1.2.4.0').count).toBe(0);
|
|
expect(rewriteStamps('since: "1.2.3.0-beta"', '1.2.3.0', '1.2.4.0').count).toBe(0);
|
|
expect(rewriteStamps("since: '1.2.3.0\"", '1.2.3.0', '1.2.4.0').count).toBe(0);
|
|
expect(rewriteStamps('since: 1.2.3.0-beta', '1.2.3.0', '1.2.4.0').count).toBe(1);
|
|
});
|
|
|
|
test('rewriteStamps: (was X) accepts a matching quote pair and keeps it; a mismatched pair is not the form; a quoted vX already matched', () => {
|
|
expect(rewriteStamps("(was '1.2.3.0')", '1.2.3.0', '1.2.4.0')).toEqual({ text: "(was '1.2.4.0')", count: 1 });
|
|
expect(rewriteStamps('(was "1.2.3.0")', '1.2.3.0', '1.2.4.0')).toEqual({ text: '(was "1.2.4.0")', count: 1 });
|
|
expect(rewriteStamps('(was 1.2.3.0)', '1.2.3.0', '1.2.4.0')).toEqual({ text: '(was 1.2.4.0)', count: 1 });
|
|
expect(rewriteStamps("(was '1.2.3.0\")", '1.2.3.0', '1.2.4.0').count).toBe(0);
|
|
expect(rewriteStamps("'v1.2.3.0'", '1.2.3.0', '1.2.4.0')).toEqual({ text: "'v1.2.4.0'", count: 1 });
|
|
// A bare pin equal to X is still not a stamp form, quoted or not.
|
|
expect(rewriteStamps("pinned: '1.2.3.0'", '1.2.3.0', '1.2.4.0').count).toBe(0);
|
|
});
|
|
|
|
test('rewriteStamps: a policy template that overlaps the built-in quoted form counts the mention once', () => {
|
|
const r = rewriteStamps(" { since: '1.2.3.0', id: 'x', text: 't' },", '1.2.3.0', '1.2.4.0', ["since: '{version}'"]);
|
|
expect(r).toEqual({ text: " { since: '1.2.4.0', id: 'x', text: 't' },", count: 1 });
|
|
});
|
|
|
|
test('tentativeMentions: quoted since: rows and template forms on branch-added lines are candidates like the unquoted ones', () => {
|
|
const added = new Map([['src/notice.ts', new Set([
|
|
" { since: '1.2.4.0', id: 'single', text: 't' },",
|
|
' { since: "1.2.5.0", id: "double", text: "t" },',
|
|
' since: 1.2.6.0',
|
|
'<!-- x-tree-stamp: 1.2.7.0 -->',
|
|
" pinned: '1.2.8.0'",
|
|
])]]);
|
|
expect(tentativeMentions(added, '1.2.3.0', '1.2.9.0').sort()).toEqual(['1.2.4.0', '1.2.5.0', '1.2.6.0']);
|
|
expect(tentativeMentions(added, '1.2.3.0', '1.2.9.0', ['<!-- x-tree-stamp: {version} -->']).sort()).toEqual(['1.2.4.0', '1.2.5.0', '1.2.6.0', '1.2.7.0']);
|
|
// The fork-version floor and the allocated version still apply to quoted mentions.
|
|
expect(tentativeMentions(added, '1.2.5.0', '1.2.6.0').sort()).toEqual([]);
|
|
// A quoted prerelease, a mismatched pair and an unclosed (was are not candidates; the bare prerelease still is.
|
|
const odd = new Map([['x', new Set(["since: '1.2.4.0-rc'", 'since: "1.2.5.0\'', "(was '1.2.6.0'x", '(was 1.2.7.0-rc)', 'since: 1.2.8.0-rc'])]]);
|
|
expect(tentativeMentions(odd, '1.2.3.0', '1.2.9.0').sort()).toEqual(['1.2.8.0']);
|
|
});
|
|
});
|
|
|
|
/** A gbrain-shaped fixture: a quoted-row source file in stamp_files, with and without the since: template. */
|
|
const NOTICE = 'src/notice.ts';
|
|
const row = (v: string, id: string) => ` { since: '${v}', id: '${id}', text: '${id}' },`;
|
|
const notice = (rows: string[]) => ['export const ROWS = [', ...rows, '];', ''].join('\n');
|
|
function policy(templates: boolean) {
|
|
return { ...BASE_POLICY, release_tool: null, stamp_files: ['VERSION', 'package.json', 'CHANGELOG.md', NOTICE], ...(templates ? { stamp_patterns: ["since: '{version}'"] } : {}) };
|
|
}
|
|
/** The policy plus the lockfile --next stamps, so the tree receipt's stamp_files allowlist covers the whole stamp commit. */
|
|
function receiptPolicy(templates: boolean) {
|
|
const p = policy(templates);
|
|
return { ...p, stamp_files: [...p.stamp_files, 'package-lock.json'] };
|
|
}
|
|
function write(repo: FixtureRepo, rel: string, text: string): void {
|
|
fs.mkdirSync(path.dirname(path.join(repo.work, rel)), { recursive: true });
|
|
fs.writeFileSync(path.join(repo.work, rel), text);
|
|
}
|
|
/** The repo's own stamp on the branch, the way gbrain's release:restamp leaves it: VERSION and the rows at X. */
|
|
function stampBranch(repo: FixtureRepo, v: string, rows: string[]): void {
|
|
write(repo, 'VERSION', v + '\n');
|
|
write(repo, NOTICE, notice(rows));
|
|
repo.git('commit', '-qam', `chore: bump version (v${v})`);
|
|
}
|
|
|
|
/**
|
|
* The reporter's state: the PR stamped 1.2.4.0 (VERSION and its row), another PR took the slot and the base
|
|
* is 1.2.4.0 with its own quoted 1.2.4.0 row, the PR merged the base. VERSION equals the base's on both sides.
|
|
*/
|
|
function lostSlot(repo: FixtureRepo): void {
|
|
write(repo, NOTICE, notice([row('1.2.3.0', 'base_row')]));
|
|
repo.git('add', '-A'); repo.git('commit', '-qm', 'notice rows'); repo.git('push', '-q', 'origin', 'main');
|
|
makePr(repo, 'pr-mine');
|
|
stampBranch(repo, '1.2.4.0', [row('1.2.3.0', 'base_row'), '', '', '', row('1.2.4.0', 'mine')]);
|
|
// The other PR takes the slot through the real stamp: VERSION 1.2.4.0, its CHANGELOG entry headed, its own 1.2.4.0 row.
|
|
makePr(repo, 'pr-other');
|
|
write(repo, NOTICE, notice([row('1.2.4.0', 'other'), row('1.2.3.0', 'base_row')]));
|
|
repo.git('commit', '-qam', 'other row');
|
|
expect(restamp(repo, ['--next']).status).toBe(EXIT.ok);
|
|
repo.git('commit', '-qam', 'stamp other');
|
|
mergeToMain(repo, 'pr-other');
|
|
repo.git('checkout', '-q', 'pr-mine');
|
|
mergeMain(repo);
|
|
expect(readFile(repo, 'VERSION')).toBe('1.2.4.0\n');
|
|
expect(repo.git('show', 'origin/main:VERSION')).toBe('1.2.4.0');
|
|
}
|
|
|
|
describe('a PR whose VERSION already equals the base (gbrain #7640)', () => {
|
|
test.each([['with the since: template', true], ['built-in quoted form alone', false]])('%s: the PR\'s quoted row moves, the base\'s own quoted rows stay, and the stage says why', (_, templates) => {
|
|
const repo = makeFixtureRepo({ prefix: 'restamp-mentions-', policy: policy(templates) }); repos.push(repo);
|
|
lostSlot(repo);
|
|
const dry = restamp(repo, ['--next', '--dry-run']);
|
|
expect(dry.status).toBe(EXIT.ok);
|
|
expect(dry.out).toMatch(/^- \{ since: '1\.2\.4\.0', id: 'mine', text: 'mine' \},$/m);
|
|
expect(dry.out).toMatch(/^\+ \{ since: '1\.2\.5\.0', id: 'mine', text: 'mine' \},$/m);
|
|
expect(repo.git('status', '--porcelain')).toBe('');
|
|
const r = restamp(repo, ['--next']);
|
|
expect(r.status).toBe(EXIT.ok);
|
|
expect(r.out).toContain('RESTAMP: 1.2.4.0 -> 1.2.5.0 (stamped;');
|
|
const sp = stageDetail(r.out, 'stamp_paths')!;
|
|
expect(sp[1]).toBe('done');
|
|
expect(sp[2]).toBe(`1 mention(s) in 1 file(s) (1.2.4.0 -> 1.2.5.0); VERSION equals base 1.2.4.0, so 1.2.4.0 moved only on lines this branch added and stayed on the base's own lines (${NOTICE}: 1 moved, 1 kept)`);
|
|
expect(readFile(repo, NOTICE)).toBe(notice([row('1.2.4.0', 'other'), row('1.2.3.0', 'base_row'), '', '', '', row('1.2.5.0', 'mine')]));
|
|
expect(readFile(repo, 'VERSION')).toBe('1.2.5.0\n');
|
|
// The base's rows are byte-identical to origin/main's: the 1.2.4.0 row is the base's release and never moved.
|
|
expect(repo.git('show', `origin/main:${NOTICE}`) + '\n').toBe(notice([row('1.2.4.0', 'other'), row('1.2.3.0', 'base_row')]));
|
|
const journal = JSON.parse(readFile(repo, '.gstack/tmp/restamp-journal.json'));
|
|
expect(journal.inputs).toMatchObject({ old_version: '1.2.4.0', new_version: '1.2.5.0' });
|
|
expect(journal.stages.find((s: any) => s.name === 'stamp_paths').detail).toContain('1 moved, 1 kept');
|
|
});
|
|
|
|
test('negative control: with no branch-added mention of the base version nothing moves, every base-side quoted row stays, and the stage says so', () => {
|
|
const repo = makeFixtureRepo({ prefix: 'restamp-mentions-neg-', policy: policy(true) }); repos.push(repo);
|
|
write(repo, NOTICE, notice([row('1.2.3.0', 'base_row')]));
|
|
repo.git('add', '-A'); repo.git('commit', '-qm', 'notice rows'); repo.git('push', '-q', 'origin', 'main');
|
|
makePr(repo, 'pr-mine');
|
|
// The PR adds a row of its own in another form entirely, plus an unrelated line in the stamp file.
|
|
write(repo, NOTICE, notice([row('1.2.3.0', 'base_row'), " { since: 'TBD', id: 'mine', text: 'mine' },"]));
|
|
repo.git('commit', '-qam', 'my row');
|
|
const r = restamp(repo, ['--next']);
|
|
expect(r.status).toBe(EXIT.ok);
|
|
const sp = stageDetail(r.out, 'stamp_paths')!;
|
|
expect(sp[1]).toBe('skipped');
|
|
expect(sp[2]).toBe('no tentative mention at or newer than the fork version 1.2.3.0 and none of base 1.2.3.0 on a line this branch added; VERSION equals base 1.2.3.0, so 1.2.3.0 moved only on lines this branch added and stayed on the base\'s own lines (src/notice.ts: 0 moved, 1 kept)');
|
|
expect(readFile(repo, NOTICE)).toBe(notice([row('1.2.3.0', 'base_row'), " { since: 'TBD', id: 'mine', text: 'mine' },"]));
|
|
expect(r.out).not.toMatch(/^[-+] \{ since: '1\.2\.3\.0'/m);
|
|
});
|
|
|
|
test('a branch forked at the base version (fork equals base, nothing stamped) still moves its own base-version row and keeps the base\'s', () => {
|
|
const repo = makeFixtureRepo({ prefix: 'restamp-mentions-fork-', policy: policy(true) }); repos.push(repo);
|
|
write(repo, NOTICE, notice([row('1.2.3.0', 'base_row')]));
|
|
repo.git('add', '-A'); repo.git('commit', '-qm', 'notice rows'); repo.git('push', '-q', 'origin', 'main');
|
|
makePr(repo, 'pr-mine');
|
|
write(repo, NOTICE, notice([row('1.2.3.0', 'base_row'), row('1.2.3.0', 'mine')]));
|
|
write(repo, 'docs/pr-mine.md', 'Requires v1.2.3.0 or later.\n');
|
|
repo.git('add', '-A'); repo.git('commit', '-qm', 'my row');
|
|
const r = restamp(repo, ['--next']);
|
|
expect(r.status).toBe(EXIT.ok);
|
|
expect(stageDetail(r.out, 'stamp_paths')![2]).toBe('2 mention(s) in 2 file(s) (1.2.3.0 -> 1.2.4.0); VERSION equals base 1.2.3.0, so 1.2.3.0 moved only on lines this branch added and stayed on the base\'s own lines (docs/pr-mine.md: 1 moved, 0 kept; src/notice.ts: 1 moved, 1 kept)');
|
|
expect(readFile(repo, NOTICE)).toBe(notice([row('1.2.3.0', 'base_row'), row('1.2.4.0', 'mine')]));
|
|
expect(readFile(repo, 'docs/pr-mine.md')).toBe('Requires v1.2.4.0 or later.\n');
|
|
expect(readFile(repo, 'docs/notes.md')).toBe('Previous release v1.2.3.0.\nleft-pad pinned at 1.2.3 (was 1.2.2)\n');
|
|
});
|
|
|
|
test('provenance is by position: a branch-added line whose text equals a base line moves alone, and the base copy stays', () => {
|
|
const repo = makeFixtureRepo({ prefix: 'restamp-mentions-dup-', policy: policy(true) }); repos.push(repo);
|
|
write(repo, NOTICE, notice([row('1.2.3.0', 'dup')]));
|
|
repo.git('add', '-A'); repo.git('commit', '-qm', 'notice rows'); repo.git('push', '-q', 'origin', 'main');
|
|
makePr(repo, 'pr-mine');
|
|
write(repo, NOTICE, notice([row('1.2.3.0', 'dup'), '', '', '', row('1.2.3.0', 'dup')]));
|
|
repo.git('commit', '-qam', 'my row, same text as the base row');
|
|
const r = restamp(repo, ['--next']);
|
|
expect(r.status).toBe(EXIT.ok);
|
|
expect(stageDetail(r.out, 'stamp_paths')![2]).toBe(`1 mention(s) in 1 file(s) (1.2.3.0 -> 1.2.4.0); VERSION equals base 1.2.3.0, so 1.2.3.0 moved only on lines this branch added and stayed on the base's own lines (${NOTICE}: 1 moved, 1 kept)`);
|
|
expect(readFile(repo, NOTICE)).toBe(notice([row('1.2.3.0', 'dup'), '', '', '', row('1.2.4.0', 'dup')]));
|
|
});
|
|
|
|
test('diff.interHunkContext joining two hunks around a base row still places each branch row by position', () => {
|
|
const repo = makeFixtureRepo({ prefix: 'restamp-mentions-ihc-', policy: policy(true) }); repos.push(repo);
|
|
write(repo, NOTICE, notice([' { since: "0.0.0.0", id: "first_placeholder" },', row('1.2.3.0', 'base_row'), ' { since: "0.0.0.0", id: "second_placeholder" },']));
|
|
repo.git('add', '-A'); repo.git('commit', '-qm', 'notice rows'); repo.git('push', '-q', 'origin', 'main');
|
|
repo.git('config', 'diff.interHunkContext', '1');
|
|
makePr(repo, 'pr-mine');
|
|
write(repo, NOTICE, notice([row('1.2.3.0', 'first'), row('1.2.3.0', 'base_row'), row('1.2.3.0', 'second')]));
|
|
repo.git('commit', '-qam', 'two rows around the base row');
|
|
// The joined hunk carries the base row as context between the two added lines.
|
|
expect(repo.git('diff', '--unified=0', 'origin/main', '--', NOTICE)).toMatch(/\n\+ \{ since: '1\.2\.3\.0', id: 'first'.*\n \{ since: '1\.2\.3\.0', id: 'base_row'.*\n-.*\n\+ \{ since: '1\.2\.3\.0', id: 'second'/);
|
|
const r = restamp(repo, ['--next']);
|
|
expect(r.status).toBe(EXIT.ok);
|
|
expect(stageDetail(r.out, 'stamp_paths')![2]).toContain(`${NOTICE}: 2 moved, 1 kept`);
|
|
expect(readFile(repo, NOTICE)).toBe(notice([row('1.2.4.0', 'first'), row('1.2.3.0', 'base_row'), row('1.2.4.0', 'second')]));
|
|
});
|
|
|
|
test('a CRLF checkout (core.autocrlf, eol=crlf) whose diff is LF-normalized still finds the branch-added row', () => {
|
|
const repo = makeFixtureRepo({ prefix: 'restamp-mentions-crlf-', policy: policy(true) }); repos.push(repo);
|
|
write(repo, '.gitattributes', `${NOTICE} text eol=crlf\n`);
|
|
write(repo, NOTICE, notice([row('1.2.3.0', 'base_row')]));
|
|
repo.git('config', 'core.autocrlf', 'true');
|
|
repo.git('add', '-A'); repo.git('commit', '-qm', 'notice rows'); repo.git('push', '-q', 'origin', 'main');
|
|
makePr(repo, 'pr-mine');
|
|
write(repo, NOTICE, notice([row('1.2.3.0', 'base_row'), row('1.2.3.0', 'mine')]).replace(/\n/g, '\r\n'));
|
|
repo.git('commit', '-qam', 'my row');
|
|
expect(repo.git('diff', '--unified=0', 'origin/main', '--', NOTICE)).toContain("+ { since: '1.2.3.0', id: 'mine'");
|
|
const r = restamp(repo, ['--next']);
|
|
expect(r.status).toBe(EXIT.ok);
|
|
expect(stageDetail(r.out, 'stamp_paths')![2]).toContain(`${NOTICE}: 1 moved, 1 kept`);
|
|
expect(readFile(repo, NOTICE)).toBe(notice([row('1.2.3.0', 'base_row'), row('1.2.4.0', 'mine')]).replace(/\n/g, '\r\n'));
|
|
});
|
|
|
|
test.skipIf(process.platform === 'win32' || process.getuid?.() === 0)('a stamp interrupted after VERSION was written retries as a stamp, not a noop: the journal restores the equal-base provenance', () => {
|
|
const repo = makeFixtureRepo({ prefix: 'restamp-mentions-retry-', policy: policy(true) }); repos.push(repo);
|
|
lostSlot(repo);
|
|
const dir = path.join(repo.work, path.dirname(NOTICE));
|
|
fs.chmodSync(dir, 0o555);
|
|
try {
|
|
const first = restamp(repo, ['--next']);
|
|
expect(first.status).not.toBe(EXIT.ok);
|
|
expect(first.err).toMatch(/EACCES|permission denied/i);
|
|
} finally { fs.chmodSync(dir, 0o755); }
|
|
expect(readFile(repo, 'VERSION')).toBe('1.2.5.0\n');
|
|
expect(readFile(repo, NOTICE)).toContain(row('1.2.4.0', 'mine'));
|
|
const again = restamp(repo, ['--next']);
|
|
expect(again.status).toBe(EXIT.ok);
|
|
expect(again.out).toContain('RESTAMP: 1.2.5.0 -> 1.2.5.0 (stamped;');
|
|
expect(stageDetail(again.out, 'stamp_paths')![2]).toContain(`${NOTICE}: 1 moved, 1 kept`);
|
|
expect(readFile(repo, NOTICE)).toBe(notice([row('1.2.4.0', 'other'), row('1.2.3.0', 'base_row'), '', '', '', row('1.2.5.0', 'mine')]));
|
|
expect(JSON.parse(readFile(repo, '.gstack/tmp/restamp-journal.json')).status).toBe('complete');
|
|
});
|
|
|
|
// Value: protects=the lost-slot stamp the stage writes is one the train's tree receipt accepts (GST-963 review: one bound
|
|
// for the writer and the checks); fails_when=the tree receipt reads the moved own row as a product change; seam=stampOnlyLine
|
|
test('the lost-slot stamp passes the tree receipt', () => {
|
|
const repo = makeFixtureRepo({ prefix: 'restamp-mentions-receipt-', policy: receiptPolicy(true) }); repos.push(repo);
|
|
lostSlot(repo);
|
|
const gated = repo.git('rev-parse', 'HEAD');
|
|
expect(restamp(repo, ['--next']).status).toBe(EXIT.ok);
|
|
repo.git('commit', '-qam', 'stamp mine');
|
|
const receipt = runBin(repo, 'gstack-tree-receipt', ['--gated', gated, '--base', 'main']);
|
|
expect(receipt.out, receipt.err).toContain('TREE: same-modulo-stamps');
|
|
});
|
|
|
|
test('--was still rewrites every line, the base\'s rows included: it is not the fix for this state', () => {
|
|
const repo = makeFixtureRepo({ prefix: 'restamp-mentions-was-', policy: policy(true) }); repos.push(repo);
|
|
lostSlot(repo);
|
|
const r = restamp(repo, ['--next', '--was', '1.2.4.0']);
|
|
expect(r.status).toBe(EXIT.ok);
|
|
expect(stageDetail(r.out, 'stamp_paths')![2]).toBe('2 mention(s) in 1 file(s) (1.2.4.0 -> 1.2.5.0)');
|
|
expect(readFile(repo, NOTICE)).toBe(notice([row('1.2.5.0', 'other'), row('1.2.3.0', 'base_row'), '', '', '', row('1.2.5.0', 'mine')]));
|
|
});
|
|
});
|
|
|
|
describe('a branch-added row left at the fork version after the base moved (GST-963, GBRA-277, gbrain #8425)', () => {
|
|
// Value: protects=a stamp-form row the branch added at its fork version (not a tentative next version) is its own
|
|
// stale stamp once the base has moved past the fork, so --next moves it; the base's rows at that version, and a
|
|
// branch-added row older than the fork, stay; fails_when=the stage skips with "no tentative mention newer than the
|
|
// fork version" and leaves the row at the fork version (gbrain #8425), or moves a base row or a pre-fork row;
|
|
// seam=lib/restamp.ts rewriteStampPaths; no_claim=finish's route (test/ship-rereview-triggers.test.ts)
|
|
test.each([['with the since: template', true], ['built-in quoted form alone', false]])('%s: the fork-version row moves, the base rows and an older branch row stay', (_, templates) => {
|
|
const repo = makeFixtureRepo({ prefix: 'restamp-fork-row-', policy: receiptPolicy(templates) }); repos.push(repo);
|
|
write(repo, NOTICE, notice([row('1.2.3.0', 'base_row')]));
|
|
repo.git('add', '-A'); repo.git('commit', '-qm', 'notice rows'); repo.git('push', '-q', 'origin', 'main');
|
|
makePr(repo, 'pr-mine');
|
|
write(repo, NOTICE, notice([row('1.2.3.0', 'base_row'), '', row('1.2.2.0', 'older'), '', row('1.2.3.0', 'mine')]));
|
|
repo.git('commit', '-qam', 'mine: a row at the fork version');
|
|
makePr(repo, 'pr-other');
|
|
write(repo, NOTICE, notice([row('1.2.4.0', 'other'), row('1.2.3.0', 'base_row')]));
|
|
repo.git('commit', '-qam', 'other row');
|
|
expect(restamp(repo, ['--next']).status).toBe(EXIT.ok);
|
|
repo.git('commit', '-qam', 'stamp other');
|
|
mergeToMain(repo, 'pr-other');
|
|
repo.git('checkout', '-q', 'pr-mine');
|
|
mergeMain(repo);
|
|
expect(readFile(repo, 'VERSION')).toBe('1.2.4.0\n');
|
|
const gated = repo.git('rev-parse', 'HEAD');
|
|
const r = restamp(repo, ['--next']);
|
|
expect(r.status).toBe(EXIT.ok);
|
|
expect(stageDetail(r.out, 'stamp_paths')![1]).toBe('done');
|
|
expect(readFile(repo, NOTICE)).toBe(notice([row('1.2.4.0', 'other'), row('1.2.3.0', 'base_row'), '', row('1.2.2.0', 'older'), '', row('1.2.5.0', 'mine')]));
|
|
repo.git('commit', '-qam', 'stamp mine');
|
|
const receipt = runBin(repo, 'gstack-tree-receipt', ['--gated', gated, '--base', 'main']);
|
|
expect(receipt.out, receipt.err).toContain('TREE: same-modulo-stamps');
|
|
});
|
|
|
|
// Value: protects=the four stamp checks share one bound, so a stamp the writer makes is one the train accepts;
|
|
// fails_when=the tree receipt (stamp, verify, gate-ahead replay) reads a moved fork-version row, or a base row at that
|
|
// version moved by hand, the same way; seam=lib/stamp-only.ts stampOnlyLine with the branch side
|
|
test('the tree receipt accepts the moved branch row and refuses the same move on a base row', () => {
|
|
const repo = makeFixtureRepo({ prefix: 'restamp-fork-row-receipt-', policy: receiptPolicy(true) }); repos.push(repo);
|
|
write(repo, NOTICE, notice([row('1.2.3.0', 'base_row')]));
|
|
repo.git('add', '-A'); repo.git('commit', '-qm', 'notice rows'); repo.git('push', '-q', 'origin', 'main');
|
|
makePr(repo, 'pr-mine');
|
|
write(repo, NOTICE, notice([row('1.2.3.0', 'base_row'), '', row('1.2.3.0', 'mine')]));
|
|
repo.git('commit', '-qam', 'mine: a row at the fork version');
|
|
makePr(repo, 'pr-other');
|
|
write(repo, 'other.txt', 'other\n');
|
|
repo.git('add', '-A'); repo.git('commit', '-qm', 'other');
|
|
expect(restamp(repo, ['--next']).status).toBe(EXIT.ok);
|
|
repo.git('commit', '-qam', 'stamp other');
|
|
mergeToMain(repo, 'pr-other');
|
|
repo.git('checkout', '-q', 'pr-mine');
|
|
mergeMain(repo);
|
|
const gated = repo.git('rev-parse', 'HEAD');
|
|
expect(restamp(repo, ['--next']).status).toBe(EXIT.ok);
|
|
write(repo, NOTICE, readFile(repo, NOTICE).replace(row('1.2.3.0', 'base_row'), row('1.2.5.0', 'base_row')));
|
|
repo.git('commit', '-qam', 'stamp mine, and move the base row by hand');
|
|
const receipt = runBin(repo, 'gstack-tree-receipt', ['--gated', gated, '--base', 'main']);
|
|
expect(receipt.out).toContain('TREE: changed');
|
|
expect(receipt.out).toContain("id: 'base_row'");
|
|
expect(receipt.out).not.toContain("id: 'mine'");
|
|
});
|
|
|
|
// Value: protects=a base row whose text a branch row duplicates keeps the old-version floor in the tree receipt
|
|
// (GST-979, the #3862 outside voice); fails_when=the side matches by text, so a hand move of the base copy reads as
|
|
// same-modulo-stamps; seam=lib/stamp-only.ts branchSides positions
|
|
test('a base row whose text the branch duplicates still refuses a hand move; the branch copy\'s own move passes (GST-979)', () => {
|
|
const repo = makeFixtureRepo({ prefix: 'restamp-dup-row-', policy: receiptPolicy(true) }); repos.push(repo);
|
|
write(repo, NOTICE, notice([row('1.2.3.0', 'base_row')]));
|
|
repo.git('add', '-A'); repo.git('commit', '-qm', 'notice rows'); repo.git('push', '-q', 'origin', 'main');
|
|
makePr(repo, 'pr-dup');
|
|
expect(restamp(repo, ['--version', '1.2.4.0']).status).toBe(EXIT.ok);
|
|
repo.git('commit', '-qam', 'stamp 1.2.4.0');
|
|
write(repo, NOTICE, notice([row('1.2.3.0', 'base_row'), '', '', row('1.2.3.0', 'base_row')]));
|
|
repo.git('commit', '-qam', 'dup: the same row text at the fork version');
|
|
const gated = repo.git('rev-parse', 'HEAD');
|
|
expect(restamp(repo, ['--version', '1.2.5.0']).status).toBe(EXIT.ok);
|
|
expect(readFile(repo, NOTICE)).toBe(notice([row('1.2.3.0', 'base_row'), '', '', row('1.2.5.0', 'base_row')]));
|
|
repo.git('commit', '-qam', 'stamp dup');
|
|
const own = runBin(repo, 'gstack-tree-receipt', ['--gated', gated, '--base', 'main']);
|
|
expect(own.out, own.err).toContain('TREE: same-modulo-stamps');
|
|
write(repo, NOTICE, notice([row('1.2.5.0', 'base_row'), '', '', row('1.2.5.0', 'base_row')]));
|
|
repo.git('commit', '-qam', 'move the base copy by hand');
|
|
const hand = runBin(repo, 'gstack-tree-receipt', ['--gated', gated, '--base', 'main']);
|
|
expect(hand.out, hand.err).toContain('TREE: changed');
|
|
});
|
|
|
|
// Value: protects=the receipt carry follows a stamp that moves the branch's own fork-version row, the move the writer
|
|
// makes since GST-963 (GST-980); fails_when=the carry keeps the branch-added row's bytes in both product patch-ids and
|
|
// refuses RECEIPT_CARRY_PRODUCT_CHANGED; seam=bin/gstack-ship-receipt carry walk
|
|
test('the carry follows a stamp that moves the branch\'s own fork-version row, and still refuses a product edit beside it (GST-980)', () => {
|
|
const repo = makeFixtureRepo({ prefix: 'restamp-carry-row-', policy: policy(true) }); repos.push(repo);
|
|
write(repo, NOTICE, notice([row('1.2.3.0', 'base_row')]));
|
|
fs.rmSync(path.join(repo.work, 'package-lock.json'));
|
|
repo.git('add', '-A'); repo.git('commit', '-qm', 'notice rows, no lockfile'); repo.git('push', '-q', 'origin', 'main');
|
|
makePr(repo, 'pr-carry');
|
|
expect(restamp(repo, ['--version', '1.2.4.0']).status).toBe(EXIT.ok);
|
|
repo.git('commit', '-qam', 'stamp 1.2.4.0');
|
|
write(repo, NOTICE, notice([row('1.2.3.0', 'base_row'), '', row('1.2.3.0', 'mine')]));
|
|
repo.git('commit', '-qam', 'mine: claims 1.2.4.0 with a row at the fork version');
|
|
const body = path.join(repo.root, 'body.md');
|
|
fs.writeFileSync(body, '## Summary\n');
|
|
const w = runBin(repo, 'gstack-ship-receipt', ['write', '--pr', '3', '--base', 'main', '--session-kind', 'x', '--body', body]);
|
|
expect(w.status, w.err).toBe(EXIT.ok);
|
|
expect(restamp(repo, ['--version', '1.2.5.0']).status).toBe(EXIT.ok);
|
|
expect(readFile(repo, NOTICE)).toBe(notice([row('1.2.3.0', 'base_row'), '', row('1.2.5.0', 'mine')]));
|
|
repo.git('commit', '-qam', 'stamp 1.2.5.0');
|
|
const carried = runBin(repo, 'gstack-ship-receipt', ['carry', '--body', body, '--base', 'main']);
|
|
expect(carried.err).not.toContain('RECEIPT_CARRY_PRODUCT_CHANGED');
|
|
expect(carried.out, carried.err).toContain('CARRY: carried');
|
|
write(repo, 'src.ts', 'export const x = 1;\n');
|
|
repo.git('add', '-A'); repo.git('commit', '-qm', 'a product change after the stamp');
|
|
const changed = runBin(repo, 'gstack-ship-receipt', ['carry', '--body', body, '--base', 'main']);
|
|
expect(changed.status).toBe(EXIT.refused);
|
|
expect(changed.err).toContain('RECEIPT_CARRY_PRODUCT_CHANGED');
|
|
});
|
|
|
|
/** The GST-980 carry state: a receipt written at the claim 1.2.4.0 with the branch's own row, then the stamp to 1.2.5.0, uncommitted. */
|
|
function carryAfterStamp(prefix: string, baseRows: string[], mine: string, stamped: string[]): { repo: FixtureRepo; body: string } {
|
|
const repo = makeFixtureRepo({ prefix, policy: policy(true) }); repos.push(repo);
|
|
write(repo, NOTICE, notice(baseRows));
|
|
fs.rmSync(path.join(repo.work, 'package-lock.json'));
|
|
repo.git('add', '-A'); repo.git('commit', '-qm', 'notice rows, no lockfile'); repo.git('push', '-q', 'origin', 'main');
|
|
makePr(repo, 'pr-carry');
|
|
expect(restamp(repo, ['--version', '1.2.4.0']).status).toBe(EXIT.ok);
|
|
repo.git('commit', '-qam', 'stamp 1.2.4.0');
|
|
write(repo, NOTICE, notice([...baseRows, '', mine]));
|
|
repo.git('commit', '-qam', 'mine: a row of its own');
|
|
const body = path.join(repo.root, 'body.md');
|
|
fs.writeFileSync(body, '## Summary\n');
|
|
const w = runBin(repo, 'gstack-ship-receipt', ['write', '--pr', '3', '--base', 'main', '--session-kind', 'x', '--body', body]);
|
|
expect(w.status, w.err).toBe(EXIT.ok);
|
|
expect(restamp(repo, ['--version', '1.2.5.0']).status).toBe(EXIT.ok);
|
|
expect(readFile(repo, NOTICE)).toBe(notice(stamped));
|
|
return { repo, body };
|
|
}
|
|
|
|
// Value: protects=the carry leaves out only a stamp on the branch's own rows, never a version edit on a base line of
|
|
// the same file (GST-980 review); fails_when=the carry trusts the whole-text version swap, so a hand move of a base
|
|
// line's version mention rides along with the row stamp; seam=bin/gstack-ship-receipt productSpec ownRows
|
|
test('the carry refuses a hand version edit on a base line of a stamp file whose own row it follows (GST-980)', () => {
|
|
const min = "export const MIN = '1.2.4.0';";
|
|
const { repo, body } = carryAfterStamp('restamp-carry-base-line-', [row('1.2.3.0', 'base_row'), min], row('1.2.4.0', 'mine'),
|
|
[row('1.2.3.0', 'base_row'), min, '', row('1.2.5.0', 'mine')]);
|
|
write(repo, NOTICE, notice([row('1.2.3.0', 'base_row'), min.replace('1.2.4.0', '1.2.5.0'), '', row('1.2.5.0', 'mine')]));
|
|
repo.git('commit', '-qam', 'stamp 1.2.5.0, and move the base pin by hand');
|
|
const carried = runBin(repo, 'gstack-ship-receipt', ['carry', '--body', body, '--base', 'main']);
|
|
expect(carried.status, carried.out).toBe(EXIT.refused);
|
|
expect(carried.err).toContain('RECEIPT_CARRY_PRODUCT_CHANGED');
|
|
});
|
|
|
|
// Value: protects=a mode change rides on no stamp: the carry leaves out a stamp file only when its mode is the
|
|
// reviewed one (GST-980 review); fails_when=the left-out stamp file drops its mode line from both patch-ids;
|
|
// seam=bin/gstack-ship-receipt productSpec ownRows
|
|
test('the carry refuses a mode change on a stamp file whose own row it follows (GST-980)', () => {
|
|
const { repo, body } = carryAfterStamp('restamp-carry-mode-', [row('1.2.3.0', 'base_row')], row('1.2.3.0', 'mine'),
|
|
[row('1.2.3.0', 'base_row'), '', row('1.2.5.0', 'mine')]);
|
|
fs.chmodSync(path.join(repo.work, NOTICE), 0o755);
|
|
repo.git('add', '-A');
|
|
repo.git('update-index', '--chmod=+x', '--', NOTICE);
|
|
repo.git('commit', '-qm', 'stamp 1.2.5.0, and make the file executable');
|
|
expect(repo.git('ls-tree', 'HEAD', '--', NOTICE)).toStartWith('100755 ');
|
|
const carried = runBin(repo, 'gstack-ship-receipt', ['carry', '--body', body, '--base', 'main']);
|
|
expect(carried.status, carried.out).toBe(EXIT.refused);
|
|
expect(carried.err).toContain('RECEIPT_CARRY_PRODUCT_CHANGED');
|
|
});
|
|
});
|
|
|
|
describe('declared placeholders and the receipt carry (GST-1026, GST-1030)', () => {
|
|
/** gbrain's policy (GST-1026): the since: template, and TBD declared as a placeholder when `declared`. */
|
|
const placeholderPolicy = (declared: boolean) => ({ ...receiptPolicy(true), ...(declared ? { stamp_placeholders: ['TBD'], min_gstack_version: STAMP_PLACEHOLDERS_KEY_VERSION } : {}) });
|
|
|
|
/** A branch row written as since: 'TBD' at the claim 1.2.4.0, then the stamp to 1.2.5.0 with the row restamped by hand (gbrain's release:restamp). */
|
|
function tbdStamp(prefix: string, pol: Record<string, unknown>, ownRow: string): { repo: FixtureRepo; gated: string } {
|
|
const repo = makeFixtureRepo({ prefix, policy: pol }); repos.push(repo);
|
|
write(repo, NOTICE, notice([row('TBD', 'base_row')]));
|
|
repo.git('add', '-A'); repo.git('commit', '-qm', 'notice rows'); repo.git('push', '-q', 'origin', 'main');
|
|
makePr(repo, 'pr-tbd');
|
|
expect(restamp(repo, ['--version', '1.2.4.0']).status).toBe(EXIT.ok);
|
|
repo.git('commit', '-qam', 'stamp 1.2.4.0');
|
|
write(repo, NOTICE, notice([row('TBD', 'base_row'), '', ownRow]));
|
|
repo.git('commit', '-qam', 'mine: a TBD row');
|
|
const gated = repo.git('rev-parse', 'HEAD');
|
|
expect(restamp(repo, ['--version', '1.2.5.0']).status).toBe(EXIT.ok);
|
|
return { repo, gated };
|
|
}
|
|
|
|
// Value: protects=the tree receipt (stamp, verify, gate-ahead replay) accepts gbrain's restamp of the branch's own
|
|
// since: 'TBD' row when the policy declares TBD, and refuses it undeclared, on a base row, or on a base row whose text
|
|
// the branch duplicates (GST-1026); fails_when=classifyFile reads the TBD move as a hand edit, or accepts it off the
|
|
// branch's own rows; seam=lib/tree-receipt.ts stampOnlyHunks
|
|
test('the tree receipt accepts a declared TBD row restamped on the branch, and refuses the same move on a base row (GST-1026)', () => {
|
|
const own = tbdStamp('restamp-tbd-receipt-', placeholderPolicy(true), row('TBD', 'mine'));
|
|
write(own.repo, NOTICE, readFile(own.repo, NOTICE).replace(row('TBD', 'mine'), row('1.2.5.0', 'mine')));
|
|
own.repo.git('commit', '-qam', 'stamp 1.2.5.0: the TBD row');
|
|
const accepted = runBin(own.repo, 'gstack-tree-receipt', ['--gated', own.gated, '--base', 'main']);
|
|
expect(accepted.out, accepted.err).toContain('TREE: same-modulo-stamps');
|
|
write(own.repo, NOTICE, readFile(own.repo, NOTICE).replace(row('TBD', 'base_row'), row('1.2.5.0', 'base_row')));
|
|
own.repo.git('commit', '-qam', 'move the base TBD row by hand');
|
|
const base = runBin(own.repo, 'gstack-tree-receipt', ['--gated', own.gated, '--base', 'main']);
|
|
expect(base.out, base.err).toContain('TREE: changed');
|
|
expect(base.out).toContain("id: 'base_row'");
|
|
});
|
|
|
|
test('the tree receipt refuses an undeclared TBD row restamped on the branch (GST-1026)', () => {
|
|
const undeclared = tbdStamp('restamp-tbd-undeclared-', placeholderPolicy(false), row('TBD', 'mine'));
|
|
write(undeclared.repo, NOTICE, readFile(undeclared.repo, NOTICE).replace(row('TBD', 'mine'), row('1.2.5.0', 'mine')));
|
|
undeclared.repo.git('commit', '-qam', 'stamp 1.2.5.0: the TBD row');
|
|
const refused = runBin(undeclared.repo, 'gstack-tree-receipt', ['--gated', undeclared.gated, '--base', 'main']);
|
|
expect(refused.out, refused.err).toContain('TREE: changed');
|
|
});
|
|
|
|
test('the tree receipt refuses a restamp of the base copy of a TBD row the branch duplicates (GST-1026)', () => {
|
|
const dup = tbdStamp('restamp-tbd-dup-', placeholderPolicy(true), row('TBD', 'base_row'));
|
|
write(dup.repo, NOTICE, notice([row('1.2.5.0', 'base_row'), '', row('TBD', 'base_row')]));
|
|
dup.repo.git('commit', '-qam', 'move the base copy of the duplicated TBD row');
|
|
const copy = runBin(dup.repo, 'gstack-tree-receipt', ['--gated', dup.gated, '--base', 'main']);
|
|
expect(copy.out, copy.err).toContain('TREE: changed');
|
|
});
|
|
|
|
/** A receipt written at the claim 1.2.4.0 after `own` changed the branch, then the stamp to 1.2.5.0, uncommitted. */
|
|
function receiptThenStamp(prefix: string, pol: Record<string, unknown>, own: (repo: FixtureRepo) => void): { repo: FixtureRepo; body: string } {
|
|
const repo = makeFixtureRepo({ prefix, policy: pol }); repos.push(repo);
|
|
write(repo, NOTICE, notice([row('TBD', 'base_row')]));
|
|
fs.rmSync(path.join(repo.work, 'package-lock.json'));
|
|
repo.git('add', '-A'); repo.git('commit', '-qm', 'notice rows, no lockfile'); repo.git('push', '-q', 'origin', 'main');
|
|
makePr(repo, 'pr-carry');
|
|
expect(restamp(repo, ['--version', '1.2.4.0']).status).toBe(EXIT.ok);
|
|
repo.git('commit', '-qam', 'stamp 1.2.4.0');
|
|
own(repo);
|
|
repo.git('add', '-A'); repo.git('commit', '-qm', 'mine');
|
|
const body = path.join(repo.root, 'body.md');
|
|
fs.writeFileSync(body, '## Summary\n');
|
|
const w = runBin(repo, 'gstack-ship-receipt', ['write', '--pr', '3', '--base', 'main', '--session-kind', 'x', '--body', body]);
|
|
expect(w.status, w.err).toBe(EXIT.ok);
|
|
expect(restamp(repo, ['--version', '1.2.5.0']).status).toBe(EXIT.ok);
|
|
return { repo, body };
|
|
}
|
|
const carry = (repo: FixtureRepo, body: string) => runBin(repo, 'gstack-ship-receipt', ['carry', '--body', body, '--base', 'main']);
|
|
|
|
// Value: protects=the receipt carry follows gbrain's restamp of the branch's own since: 'TBD' row when the policy
|
|
// declares TBD, and refuses it undeclared (GST-1026); fails_when=productSpec's own-row check ignores the policy's
|
|
// placeholders and refuses RECEIPT_CARRY_PRODUCT_CHANGED; seam=bin/gstack-ship-receipt productSpec ownRows
|
|
test.each([['declared', true], ['undeclared', false]])('the carry and a TBD row restamped on the branch: %s', (_, declared) => {
|
|
const { repo, body } = receiptThenStamp(`restamp-tbd-carry-${declared}-`, placeholderPolicy(declared), r => write(r, NOTICE, notice([row('TBD', 'base_row'), '', row('TBD', 'mine')])));
|
|
write(repo, NOTICE, readFile(repo, NOTICE).replace(row('TBD', 'mine'), row('1.2.5.0', 'mine')));
|
|
repo.git('commit', '-qam', 'stamp 1.2.5.0: the TBD row');
|
|
const carried = carry(repo, body);
|
|
if (declared) expect(carried.out, carried.err).toContain('CARRY: carried');
|
|
else expect([carried.status, carried.err.includes('RECEIPT_CARRY_PRODUCT_CHANGED')], carried.err).toEqual([EXIT.refused, true]);
|
|
});
|
|
|
|
// Value: protects=a carried receipt names the head's version, the one write would record there, after a main merge
|
|
// and a restamp (GST-1030 point 1, GGST-1); fails_when=carryReceipt copies version from the old receipt;
|
|
// seam=bin/gstack-ship-receipt cmdCarry
|
|
test('the carried receipt records the head\'s version after a main merge and a restamp (GST-1030)', () => {
|
|
const { repo, body } = receiptThenStamp('restamp-carry-version-', policy(true), r => write(r, 'src.ts', 'export const x = 0;\n'));
|
|
repo.git('reset', '-q', '--hard');
|
|
expect(readFile(repo, 'VERSION')).toBe('1.2.4.0\n');
|
|
makePr(repo, 'pr-other');
|
|
expect(restamp(repo, ['--next']).status).toBe(EXIT.ok);
|
|
repo.git('commit', '-qam', 'stamp other');
|
|
mergeToMain(repo, 'pr-other');
|
|
repo.git('checkout', '-q', 'pr-carry');
|
|
mergeMain(repo);
|
|
expect(restamp(repo, ['--next']).status).toBe(EXIT.ok);
|
|
repo.git('commit', '-qam', 'restamp after the lost slot');
|
|
expect(readFile(repo, 'VERSION')).toBe('1.2.5.0\n');
|
|
expect(extractReceipt(fs.readFileSync(body, 'utf8')).receipt?.version).toBe('1.2.4.0');
|
|
const carried = carry(repo, body);
|
|
expect(carried.out, carried.err).toContain('CARRY: carried');
|
|
expect(extractReceipt(fs.readFileSync(body, 'utf8')).receipt?.version).toBe('1.2.5.0');
|
|
});
|
|
|
|
/** package.json with its dependency pin set to `pin`, every other field kept. */
|
|
const pinned = (repo: FixtureRepo, pin: string) => {
|
|
const pkg = JSON.parse(readFile(repo, 'package.json'));
|
|
pkg.dependencies = { ...pkg.dependencies, 'left-pad': pin };
|
|
write(repo, 'package.json', JSON.stringify(pkg, null, 2) + '\n');
|
|
};
|
|
|
|
// Value: protects=a pin-bump PR's receipt carries across a main merge and a restamp when package.json's only change since
|
|
// review is its version field, and refuses when the pin itself moved (GST-1030, GBEV-3, gbrain-evals #306);
|
|
// fails_when=the carry counts the PR's package.json as product and refuses RECEIPT_CARRY_PRODUCT_CHANGED on a version-only
|
|
// move, or lets a changed dependency pin ride; seam=bin/gstack-ship-receipt cmdCarry walk
|
|
test.each([['the pin unchanged since review', false], ['the pin moved since review', true]])('the carry and a pin-bump PR after a main merge: %s (GST-1030)', (_, moved) => {
|
|
const { repo, body } = receiptThenStamp(`restamp-carry-pin-${moved}-`, policy(true), r => pinned(r, '1.3.0'));
|
|
repo.git('reset', '-q', '--hard');
|
|
makePr(repo, 'pr-other');
|
|
expect(restamp(repo, ['--next']).status).toBe(EXIT.ok);
|
|
repo.git('commit', '-qam', 'stamp other');
|
|
mergeToMain(repo, 'pr-other');
|
|
repo.git('checkout', '-q', 'pr-carry');
|
|
mergeMain(repo);
|
|
expect(restamp(repo, ['--next']).status).toBe(EXIT.ok);
|
|
if (moved) pinned(repo, '1.3.1');
|
|
repo.git('commit', '-qam', 'restamp after the lost slot');
|
|
expect(JSON.parse(readFile(repo, 'package.json')).version).toBe('1.2.5');
|
|
const carried = carry(repo, body);
|
|
if (moved) expect([carried.status, carried.err.includes('RECEIPT_CARRY_PRODUCT_CHANGED')], carried.err).toEqual([EXIT.refused, true]);
|
|
else expect(carried.out, carried.err).toContain('CARRY: carried');
|
|
});
|
|
|
|
// Value: protects=a version-only restamp of EVIDENCE.md is release metadata to the carry when the policy declares it in
|
|
// stamp_files, and product when it does not (GST-1030 point 2, GGST-1); fails_when=the carry counts the declared
|
|
// file's stamp as a product change (RECEIPT_CARRY_PRODUCT_CHANGED), or lets an undeclared file's version edit ride;
|
|
// seam=bin/gstack-ship-receipt productSpec, lib/ship-receipt.ts stampOnlyText
|
|
test.each([['declared in stamp_files', true], ['undeclared', false]])('the carry and a version-only restamp of EVIDENCE.md: %s (GST-1030)', (_, declared) => {
|
|
const base = policy(true);
|
|
const pol = declared ? { ...base, stamp_files: [...base.stamp_files, 'EVIDENCE.md'] } : base;
|
|
const { repo, body } = receiptThenStamp(`restamp-carry-evidence-${declared}-`, pol, r => write(r, 'EVIDENCE.md', '# Evidence\n\nVerified on v1.2.4.0 with the free suite\n'));
|
|
if (!declared) write(repo, 'EVIDENCE.md', '# Evidence\n\nVerified on v1.2.5.0 with the free suite\n');
|
|
expect(readFile(repo, 'EVIDENCE.md')).toBe('# Evidence\n\nVerified on v1.2.5.0 with the free suite\n');
|
|
repo.git('commit', '-qam', 'stamp 1.2.5.0');
|
|
const carried = carry(repo, body);
|
|
if (declared) expect(carried.out, carried.err).toContain('CARRY: carried');
|
|
else expect([carried.status, carried.err.includes('RECEIPT_CARRY_PRODUCT_CHANGED')], carried.err).toEqual([EXIT.refused, true]);
|
|
});
|
|
});
|
|
|