mirror of
https://github.com/stablyai/orca.git
synced 2026-11-03 02:27:43 +00:00
* [comment audit] Align legacy failure-read counts with cached display * [comment audit] Condense shared provider lifecycle and browser recovery comments [skip ci] * [comment audit] Condense shared generation, path and preview comments [skip ci] * [comment audit] Condense host, file and Git contract rationale [skip ci] * [comment audit] Tighten Git lifecycle and provider contract comments [skip ci] * [comment audit] Clarify shared host authority and launch isolation [skip ci] * [comment audit] simplify local access mobile and native chat contracts [skip ci] * [comment audit] simplify native chat presentation and state contracts [skip ci] * [comment audit] simplify native runtime and provider contracts [skip ci] * [comment audit] simplify migration and orchestration contracts [skip ci] * [comment audit] simplify plugin trust and process capture rationale [skip ci] * [comment audit] simplify terminal delivery and remote compatibility rationale [skip ci] * [comment audit] clarify remote recovery and launch wire rationale [skip ci] * [comment audit] shorten shared RPC compatibility and runtime evidence comments [skip ci] * [comment audit] simplify secure storage shell startup and sidebar rationale [skip ci] * [comment audit] clarify sidebar, skill and SSH invariants [skip ci] * [comment audit] condense structured chat delivery and timing rationale [skip ci] * [comment audit] condense terminal replay and telemetry invariants [skip ci] * [comment audit] clarify launch permission and terminal delivery rationale [skip ci] * [comment audit] clarify workspace ownership and layout contracts [skip ci] * [comment audit] wait for fitted and painted SSH terminal links * [comment audit] clarify layout persistence and session ownership [skip ci] * [comment audit] clarify host routing and workspace lifecycle contracts [skip ci] * [comment audit] clarify startup persistence and app lifetime comments [skip ci] * [comment audit] clarify recovery and activity boundaries [skip ci] * [comment audit] condense activity and artifact invariants [skip ci] * [comment audit] condense automation authority contracts [skip ci] * [comment audit] simplify automation scheduling and history contracts [skip ci] * [comment audit] clarify browser chrome and annotation lifecycles [skip ci] * [comment audit] clarify browser routing and retained guest ownership [skip ci] * [comment audit] clarify browser recovery and document ownership comments [skip ci] * [comment audit] restore hosted runners required by native IME fixtures * [comment audit] shorten preview, palette and dashboard invariants [skip ci] * [comment audit] clarify terminal preview, dashboard and retention comments [skip ci] * [comment audit] clarify diff-note recovery and editor lifecycle comments [skip ci] * [comment audit] shorten rich-text and combined-diff ownership comments [skip ci] * [comment audit] shorten autosave, draft recovery and model ownership comments [skip ci] * [comment audit] shorten save-queue, notebook and Markdown constraints [skip ci] * [comment audit] shorten Monaco, PDF and rich Markdown safeguards [skip ci] * [comment audit] clarify rich Markdown source and selection safeguards [skip ci] * [comment audit] clarify editor loading and emulator stream lifetimes [skip ci] * [comment audit] trim emulator and feature tour narration [skip ci] * [comment audit] clarify floating workspace and GitHub cache ownership [skip ci] * [comment audit] trim provider controls and Linear filter explanations [skip ci] * [comment audit] clarify pairing and chat resume lifetimes [skip ci] * [comment audit] clarify chat delivery and transcript lifetimes [skip ci] * [comment audit] clarify session options and host-owned status [skip ci] * [comment audit] clarify draft durability and live-status precedence [skip ci] * [comment audit] Trim chat send and model ownership explanations [skip ci] * [comment audit] Shorten transcript ownership and send recovery comments [skip ci] * [comment audit] Simplify native chat composer and transcript hook comments [skip ci] * [comment audit] Shorten native chat scroll and structured session explanations [skip ci] * [comment audit] Trim workspace picker and onboarding commentary [skip ci] * [comment audit] Simplify pet rendering, review cache and quick open comments [skip ci] * [comment audit] Trim sidebar and session history explanations [skip ci] * [comment audit] Condense session resume and review checks comments [skip ci] * [comment audit] Shorten checks state and file explorer refresh comments [skip ci] * [comment audit] Trim plugin bridge and source-control action rationale [skip ci] * [comment audit] Trim source-control listing and review rationale [skip ci] * [comment audit] Shorten sidebar lifecycle and explorer safeguards [skip ci] * [comment audit] Condense Settings account and appearance rationale [skip ci] * [comment audit] Trim pairing and repository Settings explanations [skip ci] * [comment audit] Condense Settings search SSH and terminal safeguards [skip ci] * [comment audit] Shorten Settings voice and provider ownership comments [skip ci] * [comment audit] Condense Settings draft persistence and host-state rationale [skip ci] * [comment audit] Trim Settings hooks and sidebar setup rationale [skip ci] * [comment audit] Condense sidebar deletion and board-filter safeguards [skip ci] * [comment audit] Condense worktree cards, host ownership and Markdown contracts [skip ci] * [comment audit] Condense sidebar drag, folder and filtering contracts [skip ci] * [comment audit] Condense sidebar parity, sleep and host ownership contracts [skip ci] * [comment audit] Prune focus-read baseline after comment cleanup * [comment audit] Clarify sidebar visibility, board drops and agent evidence [skip ci] * [comment audit] Tighten sidebar listing, drag and reveal contracts [skip ci] * [comment audit] Clarify viewport geometry and skill update safeguards [skip ci] * [comment audit] Tighten skill inventory, usage and host status comments [skip ci] * [comment audit] Clarify usage ownership and resource kill safeguards [skip ci] * [comment audit] Tighten tab selection, rename and search contracts [skip ci] * [comment audit] Tighten tab-strip geometry and drag ownership comments [skip ci] * [comment audit] Tighten Tasks recovery, pagination and mutation comments [skip ci] * [comment audit] Tighten provider loading and terminal recovery comments [skip ci] * [comment audit] Tighten completion, cadence and PTY ownership comments [skip ci] * [comment audit] Clarify terminal restore and parked-pane boundaries [skip ci] * [comment audit] Tighten PTY startup and replay explanations [skip ci] * [comment audit] Clarify PTY identity and delivery ownership [skip ci] * [comment audit] Shorten remote reconnect and input replay rationale [skip ci] * [comment audit] Condense terminal parking clipboard and file link comments [skip ci] * [comment audit] Clarify IME ownership and trim trace history [skip ci] * [comment audit] Shorten pane recovery and parked watcher explanations [skip ci] * [comment audit] Condense snapshot replay and visibility recovery rationale [skip ci] * [comment audit] Shorten terminal parking and keyboard ownership rationale [skip ci] * [comment audit] Trim renderer lifecycle and menu rationale [skip ci] * [comment audit] Condense workspace cleanup ownership and settlement notes [skip ci] * [comment audit] Clarify renderer hook evidence and source ownership [skip ci] * [comment audit] Tighten IPC ownership and reconnect explanations [skip ci] * [comment audit] Trim renderer focus, paste and attention comments [skip ci] * [comment audit] Shorten scroll, locale and agent lifecycle comments [skip ci] * [comment audit] Trim agent launch, resume and ownership commentary [skip ci] * [comment audit] Shorten account, browser and editor comments [skip ci] * [comment audit] Clarify host-mirror waits, previews and input ownership [skip ci] * [comment audit] Condense launch recovery and editor tokenization comments [skip ci] * [comment audit] Condense workspace selection and terminal pane rationale [skip ci] * [comment audit] Condense terminal fitting and rendering recovery comments [skip ci] * [comment audit] Condense terminal input and host routing explanations [skip ci] * [comment audit] Condense ownership and sleeping-session recovery rationale [skip ci] * [comment audit] Condense structured launch and terminal link explanations [skip ci] * [comment audit] Condense terminal ownership and workspace file routing rationale [skip ci] * [comment audit] Condense session persistence and workspace activation rationale [skip ci] * [comment audit] Condense workspace routing and browser ownership rationale [skip ci] * [comment audit] Condense mirror recovery and layout authority rationale [skip ci] * [comment audit] Condense runtime transport and file safety rationale [skip ci] * [comment audit] Condense runtime graph and structured session rationale [skip ci] * [comment audit] Condense browser creation and remote tab recovery rationale [skip ci] * [comment audit] Condense snapshot authority and publisher recovery rationale [skip ci] * [comment audit] Condense frame, startup and provider cache rationale [skip ci] * [comment audit] Condense host twin and agent lifecycle rationale [skip ci] * [comment audit] Condense browser authority and editor cleanup rationale [skip ci] * [comment audit] Condense editor buffer identity and review cache rationale [skip ci] * [comment audit] Condense provider lifetime and repository ownership rationale [skip ci] * [comment audit] Condense reconnect, hydration and terminal retirement rationale [skip ci] * [comment audit] Condense recovery, reconciliation and persistence rationale [skip ci] * [comment audit] Condense cleanup ownership and listing admission rationale [skip ci] * [comment audit] Condense teardown ordering and terminal ownership rationale [skip ci] * [comment audit] Condense recovery ledger and web host-boundary rationale [skip ci] * [comment audit] Condense web reconnect and credential lifecycle rationale [skip ci] * [comment audit] Condense cloud rollout and assignment safety rationale [skip ci] * [comment audit] Condense relay session and database recovery rationale [skip ci] * [comment audit] Condense relay placement and protocol compatibility rationale [skip ci] * [comment audit] Condense build and packaging constraints [skip ci] * [comment audit] Condense CI gates and validation isolation rationale [skip ci] * [comment audit] Condense catalog identity and browser validation rationale [skip ci] * [comment audit] Condense mobile browser and frame-budget rationale [skip ci] * [comment audit] Shorten mobile route and browser test explanations [skip ci] * [comment audit] Condense editor and session seam test rationale [skip ci] * [comment audit] Trim session and terminal closure history [skip ci] * [comment audit] Shorten terminal browser and census explanations [skip ci] * [comment audit] Preserve root-only E2E diagnostic baseline * [comment audit] Condense mobile seam and HTML preview test rationale [skip ci] * [comment audit] Condense preview instrumentation and render harness rationale [skip ci] * [comment audit] Condense bundle contracts and native-build constraints [skip ci] * [comment audit] Shorten native packaging and CI routing rationale [skip ci] * [comment audit] Condense release tooling and benchmark constraints [skip ci] * [comment audit] Condense packaging and platform gate rationale [skip ci] * [comment audit] Shorten mobile route and history rationale [skip ci] * [comment audit] Condense mobile browser and component rationale [skip ci] * [comment audit] Shorten drawer and workspace-form rationale [skip ci] * [comment audit] Trim mobile review and editor-document explanations [skip ci] * [comment audit] Condense editor lifecycle and Markdown explanations [skip ci] * [comment audit] Trim mobile file, diagnostics and dictation commentary [skip ci] * [comment audit] Simplify mobile host-list and workspace-view explanations [skip ci] * [comment audit] Clarify mobile shell lifetime and bridge delivery constraints [skip ci] * [comment audit] Condense bridge stream, native request and audio rationale [skip ci] * [comment audit] Reduce bridge schema and page-client commentary [skip ci] * [comment audit] Tighten mobile page bridge contracts [skip ci] * [comment audit] Clarify mobile cache and session constraints [skip ci] * [comment audit] Condense mobile route and lifecycle rationale [skip ci] * [comment audit] Tighten mobile shell hook timing rationale [skip ci] * [comment audit] Clarify route handoff and notification compatibility [skip ci] * [comment audit] Clarify push registration and dictation cleanup constraints [skip ci] * [comment audit] Condense keyboard geometry and native media ownership rationale [skip ci] * [comment audit] Tighten mobile chat scroll and composer concurrency rationale [skip ci] * [comment audit] Condense mobile reply compatibility and upload ownership rationale [skip ci] * [comment audit] Condense optimistic echo and scroll ownership rationale [skip ci] * [comment audit] Tighten stream replay and queued session ownership rationale [skip ci] * [comment audit] Condense mobile composer and reply-schema constraints [skip ci] * [comment audit] Clarify mobile transcript recovery and session ownership [skip ci] * [comment audit] Clarify mobile queue and source-control compatibility [skip ci] * [comment audit] Condense storage and task launch constraints [skip ci] * [comment audit] Clarify task schemas and terminal document ownership [skip ci] * [comment audit] Tighten terminal input and viewport rationale [skip ci] * [comment audit] Shorten terminal and RPC recorder contracts [skip ci] * [comment audit] Condense recorder engine and connection contracts [skip ci] * [comment audit] Shorten host credential and relay recovery comments [skip ci] * [comment audit] Tighten pairing recovery and bundle transport rationale [skip ci] * [comment audit] Clarify RPC delivery and workspace catalog boundaries [skip ci] * [comment audit] Condense catalog and relay entry contracts [skip ci] * [comment audit] Shorten shutdown and SSH relay delivery contracts [skip ci] * [comment audit] Condense WSL relay and E2E regression rationale [skip ci] * [comment audit] Shorten cross-version harness and renderer fixture explanations [skip ci] * [comment audit] Condense paired-host and E2E lifecycle rationale [skip ci] * [comment audit] Shorten layout oracle and regression explanations [skip ci] * [comment audit] Condense paired recovery and ownership regression contracts [skip ci] * [comment audit] Shorten restart, sidebar and SSH lifecycle contracts [skip ci] * [comment audit] Condense terminal rendering and IME regression rationale [skip ci] * [comment audit] Shorten terminal recovery and benchmark contracts [skip ci] * [comment audit] Condense tooling and Windows lifecycle proof rationale [skip ci] * [comment audit] Condense workflow routing and release rationale [skip ci] * [comment audit] Condense mobile security and installer contracts [skip ci] * [comment audit] Shorten native rationale and stylesheet workarounds [skip ci] * [comment audit] Shorten Windows visibility probe rationale [skip ci] * [comment audit] Condense embedded release and signing rationale [skip ci] * [comment audit] Retain current main test behavior in final reconciliation [skip ci] * [comment audit] Complete final comment review across current source inventory * [comment audit] Handle consolidated audit reports before final CI * [comment audit] Preserve credential storage census detail [skip ci] * [comment audit] Scale broad changed E2E selections with verified timing shards * [comment audit] Align E2E assertions with browser close and settled session metadata * [comment audit] Match existing E2Es to current resource and windowing contracts * [comment audit] Observe the shared server outage notice in reconnect coverage * [comment audit] Make existing renderer probes measure settled tab and PTY work * [comment audit] Align palette E2E selector with task search * [comment audit] Refresh remaining palette search selectors * [comment audit] Keep selector correction within selected audit specs * [comment audit] Await emoji fixture settings inside renderer evaluation * [comment audit] Cancel fixture fit retries between terminal tests --------- Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com>
438 lines
15 KiB
TypeScript
438 lines
15 KiB
TypeScript
import { describe, expect, it, vi } from 'vitest'
|
|
import {
|
|
branchHasNoUnmergedChangesOnAnyTarget,
|
|
branchHasNoUnmergedChangesWithLazyTargetRefresh,
|
|
refreshBranchCleanupTargetRefs,
|
|
type GitBranchCleanupExec
|
|
} from './git-branch-cleanup'
|
|
import { GitCapabilityCache } from './git-capability-cache'
|
|
import { GIT_FETCH_SKIP_AUTO_MAINTENANCE_CONFIG_ARGS } from './git-fetch-auto-maintenance'
|
|
|
|
function baseProofResponses(
|
|
responses: Partial<Record<string, string | Error>> = {}
|
|
): GitBranchCleanupExec {
|
|
return vi.fn<GitBranchCleanupExec>(async (args, options) => {
|
|
if (args[0] === 'patch-id' && options?.stdin === 'branch-diff') {
|
|
const response = responses.branchPatchId ?? 'branch-patch 0000000\n'
|
|
if (response instanceof Error) {
|
|
throw response
|
|
}
|
|
return { stdout: response }
|
|
}
|
|
if (args[0] === 'patch-id' && options?.stdin === 'squash-diff') {
|
|
const response = responses.squashPatchId ?? 'branch-patch squash\n'
|
|
if (response instanceof Error) {
|
|
throw response
|
|
}
|
|
return { stdout: response }
|
|
}
|
|
const key = args.join(' ')
|
|
const response =
|
|
responses[key] ??
|
|
{
|
|
'rev-parse --verify --quiet refs/remotes/origin/main^{commit}': 'target\n',
|
|
'merge-tree --write-tree target refs/heads/feature/test': 'merged-tree\n',
|
|
'rev-parse --verify --quiet target^{tree}': 'target-tree\n',
|
|
'rev-list --right-only --merges --count target...refs/heads/feature/test': '1\n',
|
|
'merge-base target refs/heads/feature/test': 'base\n',
|
|
'diff base refs/heads/feature/test': 'branch-diff',
|
|
'rev-list --ancestry-path --max-count=201 base..target': 'squash\n',
|
|
'show --format= squash': 'squash-diff',
|
|
'merge-tree --write-tree squash refs/heads/feature/test': 'squash-tree\n',
|
|
'rev-parse --verify --quiet squash^{tree}': 'squash-tree\n'
|
|
}[key] ??
|
|
''
|
|
if (response instanceof Error) {
|
|
throw response
|
|
}
|
|
return { stdout: response }
|
|
})
|
|
}
|
|
|
|
describe('refreshBranchCleanupTargetRefs', () => {
|
|
it('does not retry a failed network fetch separately for each target', async () => {
|
|
let fetches = 0
|
|
const runGit: GitBranchCleanupExec = async (args) => {
|
|
if (args[0] === 'remote') {
|
|
return { stdout: 'origin\n' }
|
|
}
|
|
if (args[0] === 'config') {
|
|
return { stdout: '+refs/heads/*:refs/remotes/origin/*\n' }
|
|
}
|
|
fetches += 1
|
|
throw new Error('connection timed out')
|
|
}
|
|
|
|
await expect(
|
|
refreshBranchCleanupTargetRefs(runGit, [
|
|
'refs/remotes/origin/base',
|
|
'refs/remotes/origin/main'
|
|
])
|
|
).resolves.toEqual([])
|
|
expect(fetches).toBe(1)
|
|
})
|
|
|
|
it('fetches each remote-tracking target remote once and prefers slashed remote names', async () => {
|
|
const runGit = vi.fn<GitBranchCleanupExec>(async (args) => {
|
|
if (args[0] === 'remote') {
|
|
return { stdout: 'origin\nfoo\nfoo/bar\n' }
|
|
}
|
|
if (args[0] === 'config') {
|
|
const remote = args[2].slice('remote.'.length, -'.fetch'.length)
|
|
return { stdout: `+refs/heads/*:refs/remotes/${remote}/*\n` }
|
|
}
|
|
return { stdout: '' }
|
|
})
|
|
|
|
await refreshBranchCleanupTargetRefs(runGit, [
|
|
'refs/remotes/origin/main',
|
|
'refs/remotes/foo/bar/feature',
|
|
'refs/remotes/foo/bar/another',
|
|
'HEAD'
|
|
])
|
|
|
|
expect(runGit.mock.calls.map((call) => call[0])).toEqual([
|
|
['remote'],
|
|
['config', '--get-all', 'remote.origin.fetch'],
|
|
[
|
|
...GIT_FETCH_SKIP_AUTO_MAINTENANCE_CONFIG_ARGS,
|
|
'fetch',
|
|
'--no-tags',
|
|
'origin',
|
|
'+refs/heads/main:refs/remotes/origin/main'
|
|
],
|
|
['config', '--get-all', 'remote.foo/bar.fetch'],
|
|
[
|
|
...GIT_FETCH_SKIP_AUTO_MAINTENANCE_CONFIG_ARGS,
|
|
'fetch',
|
|
'--no-tags',
|
|
'foo/bar',
|
|
'+refs/heads/feature:refs/remotes/foo/bar/feature',
|
|
'+refs/heads/another:refs/remotes/foo/bar/another'
|
|
]
|
|
])
|
|
})
|
|
|
|
it('keeps cleanup non-fatal when listing or fetching remotes fails', async () => {
|
|
const remoteListFails = vi.fn<GitBranchCleanupExec>().mockRejectedValue(new Error('offline'))
|
|
|
|
await expect(
|
|
refreshBranchCleanupTargetRefs(remoteListFails, ['refs/remotes/origin/main'])
|
|
).resolves.toEqual([])
|
|
|
|
const fetchFails = vi.fn<GitBranchCleanupExec>(async (args) => {
|
|
if (args[0] === 'remote') {
|
|
return { stdout: 'origin\n' }
|
|
}
|
|
if (args[0] === 'config') {
|
|
return { stdout: '+refs/heads/*:refs/remotes/origin/*\n' }
|
|
}
|
|
throw new Error('offline')
|
|
})
|
|
|
|
await expect(
|
|
refreshBranchCleanupTargetRefs(fetchFails, ['refs/remotes/origin/main'])
|
|
).resolves.toEqual([])
|
|
})
|
|
})
|
|
|
|
describe('branchHasNoUnmergedChangesOnAnyTarget', () => {
|
|
it('preserves a branch without simulating a merge when no common ancestor is available', async () => {
|
|
const runGit = baseProofResponses({
|
|
'merge-base target refs/heads/feature/test': new Error('no common ancestor')
|
|
})
|
|
|
|
await expect(
|
|
branchHasNoUnmergedChangesOnAnyTarget(
|
|
runGit,
|
|
'feature/test',
|
|
['refs/remotes/origin/main'],
|
|
new GitCapabilityCache()
|
|
)
|
|
).resolves.toBe(false)
|
|
|
|
expect(vi.mocked(runGit).mock.calls.some(([args]) => args[0] === 'merge-tree')).toBe(false)
|
|
expect(vi.mocked(runGit).mock.calls.some(([args]) => args[0] === 'cherry')).toBe(false)
|
|
})
|
|
|
|
it('accepts a branch with merge commits when a target squash commit matches its net patch', async () => {
|
|
const runGit = baseProofResponses()
|
|
|
|
await expect(
|
|
branchHasNoUnmergedChangesOnAnyTarget(
|
|
runGit,
|
|
'feature/test',
|
|
['refs/remotes/origin/main'],
|
|
new GitCapabilityCache()
|
|
)
|
|
).resolves.toBe(true)
|
|
|
|
expect(runGit).toHaveBeenCalledWith(['patch-id', '--stable'], { stdin: 'branch-diff' })
|
|
expect(runGit).toHaveBeenCalledWith(['patch-id', '--stable'], { stdin: 'squash-diff' })
|
|
expect(runGit).not.toHaveBeenCalledWith(['cherry', '-v', 'target', 'refs/heads/feature/test'])
|
|
// Only merge-tree's throwaway tree writes go to a scratch object store.
|
|
const discarding = vi
|
|
.mocked(runGit)
|
|
.mock.calls.filter(([, options]) => options?.discardWrittenObjects)
|
|
.map(([args]) => args[0])
|
|
expect(discarding.length).toBeGreaterThan(0)
|
|
expect(new Set(discarding)).toEqual(new Set(['merge-tree']))
|
|
})
|
|
|
|
describe('a merge-tree that exits 1', () => {
|
|
function exitOne(stdout: string): Error {
|
|
return Object.assign(new Error('Command failed: git merge-tree --write-tree'), {
|
|
code: 1,
|
|
stdout,
|
|
stderr: ''
|
|
})
|
|
}
|
|
|
|
async function scratchStoreRequestsOverTwoChecks(failure: Error): Promise<unknown[]> {
|
|
const runGit = baseProofResponses({
|
|
'merge-tree --write-tree target refs/heads/feature/test': failure,
|
|
'rev-list --right-only --merges --count target...refs/heads/feature/test': '0\n'
|
|
})
|
|
const capabilities = new GitCapabilityCache()
|
|
const check = () =>
|
|
branchHasNoUnmergedChangesOnAnyTarget(
|
|
runGit,
|
|
'feature/test',
|
|
['refs/remotes/origin/main'],
|
|
capabilities
|
|
)
|
|
|
|
await expect(check()).resolves.toBe(false)
|
|
await expect(check()).resolves.toBe(false)
|
|
|
|
return vi
|
|
.mocked(runGit)
|
|
.mock.calls.filter(([args]) => args[0] === 'merge-tree')
|
|
.map(([, options]) => options?.discardWrittenObjects)
|
|
}
|
|
|
|
it.each([
|
|
['SHA-1', 'a'.repeat(40)],
|
|
['SHA-256', 'b'.repeat(64)]
|
|
])(
|
|
'learns support from a conflict (%s tree ID), so the next check asks for a scratch store',
|
|
async (_label, treeId) => {
|
|
const conflict = exitOne(`${treeId}\n100644 ${'c'.repeat(40)} 1\tshared.txt\n\n`)
|
|
|
|
await expect(scratchStoreRequestsOverTwoChecks(conflict)).resolves.toEqual([false, true])
|
|
}
|
|
)
|
|
|
|
it.each([
|
|
['empty stdout', ''],
|
|
['stdout that is not a tree ID', 'merged-tree\n']
|
|
])('does not record support from %s', async (_label, stdout) => {
|
|
await expect(scratchStoreRequestsOverTwoChecks(exitOne(stdout))).resolves.toEqual([
|
|
false,
|
|
false
|
|
])
|
|
})
|
|
})
|
|
|
|
it('preserves a branch with merge commits when no target squash commit matches', async () => {
|
|
const runGit = baseProofResponses({ squashPatchId: 'other-patch squash\n' })
|
|
|
|
await expect(
|
|
branchHasNoUnmergedChangesOnAnyTarget(
|
|
runGit,
|
|
'feature/test',
|
|
['refs/remotes/origin/main'],
|
|
new GitCapabilityCache()
|
|
)
|
|
).resolves.toBe(false)
|
|
})
|
|
|
|
it('preserves when a matching squash candidate still changes after merging the branch', async () => {
|
|
const runGit = baseProofResponses({
|
|
'merge-tree --write-tree squash refs/heads/feature/test': 'different-tree\n'
|
|
})
|
|
|
|
await expect(
|
|
branchHasNoUnmergedChangesOnAnyTarget(
|
|
runGit,
|
|
'feature/test',
|
|
['refs/remotes/origin/main'],
|
|
new GitCapabilityCache()
|
|
)
|
|
).resolves.toBe(false)
|
|
})
|
|
|
|
it('preserves when the target squash scan exceeds the cap', async () => {
|
|
const commits = Array.from({ length: 201 }, (_, index) => `commit-${index}`).join('\n')
|
|
const runGit = baseProofResponses({
|
|
'rev-list --ancestry-path --max-count=201 base..target': `${commits}\n`
|
|
})
|
|
|
|
await expect(
|
|
branchHasNoUnmergedChangesOnAnyTarget(
|
|
runGit,
|
|
'feature/test',
|
|
['refs/remotes/origin/main'],
|
|
new GitCapabilityCache()
|
|
)
|
|
).resolves.toBe(false)
|
|
|
|
expect(runGit).not.toHaveBeenCalledWith(['show', '--format=', 'commit-0'])
|
|
})
|
|
|
|
it('preserves when patch-id cannot be computed', async () => {
|
|
const runGit = baseProofResponses({ branchPatchId: new Error('patch-id failed') })
|
|
|
|
await expect(
|
|
branchHasNoUnmergedChangesOnAnyTarget(
|
|
runGit,
|
|
'feature/test',
|
|
['refs/remotes/origin/main'],
|
|
new GitCapabilityCache()
|
|
)
|
|
).resolves.toBe(false)
|
|
})
|
|
|
|
it('does not repeat a rejected merge-tree --write-tree proof on old Git', async () => {
|
|
const unsupported = Object.assign(new Error('unknown option'), {
|
|
stderr: 'fatal: unknown rev --write-tree'
|
|
})
|
|
const runGit = baseProofResponses({
|
|
'merge-tree --write-tree target refs/heads/feature/test': unsupported,
|
|
'rev-list --right-only --merges --count target...refs/heads/feature/test': '0\n',
|
|
'cherry -v target refs/heads/feature/test': '+ branch-only commit\n'
|
|
})
|
|
const capabilities = new GitCapabilityCache()
|
|
|
|
await branchHasNoUnmergedChangesOnAnyTarget(
|
|
runGit,
|
|
'feature/test',
|
|
['refs/remotes/origin/main'],
|
|
capabilities
|
|
)
|
|
await branchHasNoUnmergedChangesOnAnyTarget(
|
|
runGit,
|
|
'feature/test',
|
|
['refs/remotes/origin/main'],
|
|
capabilities
|
|
)
|
|
|
|
const mergeTreeCalls = vi.mocked(runGit).mock.calls.filter(([args]) => args[0] === 'merge-tree')
|
|
expect(mergeTreeCalls).toHaveLength(1)
|
|
})
|
|
})
|
|
|
|
describe('branchHasNoUnmergedChangesWithLazyTargetRefresh', () => {
|
|
it('preserves a branch when refresh fails even if the stale remote ref would prove it merged', async () => {
|
|
const proof = baseProofResponses({
|
|
'rev-parse --verify --quiet target^{tree}': 'merged-tree\n'
|
|
})
|
|
const runGit = vi.fn<GitBranchCleanupExec>(async (args, options) => {
|
|
if (args[0] === 'remote') {
|
|
return { stdout: 'origin\n' }
|
|
}
|
|
if (args[0] === 'config') {
|
|
return { stdout: '+refs/heads/*:refs/remotes/origin/*\n' }
|
|
}
|
|
if (args.includes('fetch')) {
|
|
throw new Error('offline')
|
|
}
|
|
return proof(args, options)
|
|
})
|
|
|
|
await expect(
|
|
branchHasNoUnmergedChangesWithLazyTargetRefresh(
|
|
runGit,
|
|
'feature/test',
|
|
['refs/remotes/origin/main'],
|
|
new GitCapabilityCache()
|
|
)
|
|
).resolves.toBe(false)
|
|
expect(proof).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('skips refresh when local HEAD proves the branch changes are retained', async () => {
|
|
const runGit = vi.fn<GitBranchCleanupExec>(async (args) => {
|
|
const command = args.join(' ')
|
|
const stdout =
|
|
{
|
|
'rev-parse --verify --quiet HEAD^{commit}': 'local-target\n',
|
|
'merge-base local-target refs/heads/feature/test': 'base\n',
|
|
'merge-tree --write-tree local-target refs/heads/feature/test': 'local-tree\n',
|
|
'rev-parse --verify --quiet local-target^{tree}': 'local-tree\n'
|
|
}[command] ?? ''
|
|
return { stdout }
|
|
})
|
|
|
|
await expect(
|
|
branchHasNoUnmergedChangesWithLazyTargetRefresh(
|
|
runGit,
|
|
'feature/test',
|
|
['refs/remotes/origin/main', 'HEAD'],
|
|
new GitCapabilityCache()
|
|
)
|
|
).resolves.toBe(true)
|
|
|
|
expect(runGit.mock.calls.map(([args]) => args)).not.toContainEqual(['remote'])
|
|
})
|
|
|
|
it('refreshes before trusting a stale remote-tracking proof', async () => {
|
|
let refreshed = false
|
|
const runGit = vi.fn<GitBranchCleanupExec>(async (args) => {
|
|
const command = args.join(' ')
|
|
if (command === 'remote') {
|
|
return { stdout: 'origin\n' }
|
|
}
|
|
if (args[0] === 'config') {
|
|
return { stdout: '+refs/heads/*:refs/remotes/origin/*\n' }
|
|
}
|
|
if (args.includes('fetch')) {
|
|
refreshed = true
|
|
return { stdout: '' }
|
|
}
|
|
if (command === 'rev-parse --verify --quiet refs/remotes/origin/main^{commit}') {
|
|
return { stdout: 'remote-target\n' }
|
|
}
|
|
if (command === 'rev-parse --verify --quiet origin/main^{commit}') {
|
|
return { stdout: 'short-remote-target\n' }
|
|
}
|
|
if (command === 'rev-parse --verify --quiet HEAD^{commit}') {
|
|
return { stdout: 'local-target\n' }
|
|
}
|
|
if (args[0] === 'merge-base') {
|
|
return { stdout: 'base\n' }
|
|
}
|
|
if (command === 'merge-tree --write-tree remote-target refs/heads/feature/test') {
|
|
return { stdout: refreshed ? 'changed-tree\n' : 'remote-tree\n' }
|
|
}
|
|
if (command === 'merge-tree --write-tree short-remote-target refs/heads/feature/test') {
|
|
return { stdout: refreshed ? 'changed-tree\n' : 'short-remote-tree\n' }
|
|
}
|
|
if (command === 'rev-parse --verify --quiet remote-target^{tree}') {
|
|
return { stdout: 'remote-tree\n' }
|
|
}
|
|
if (command === 'rev-parse --verify --quiet short-remote-target^{tree}') {
|
|
return { stdout: 'short-remote-tree\n' }
|
|
}
|
|
return { stdout: '' }
|
|
})
|
|
|
|
await expect(
|
|
branchHasNoUnmergedChangesWithLazyTargetRefresh(
|
|
runGit,
|
|
'feature/test',
|
|
['refs/remotes/origin/main', 'origin/main', 'HEAD'],
|
|
new GitCapabilityCache()
|
|
)
|
|
).resolves.toBe(false)
|
|
|
|
expect(runGit.mock.calls.map(([args]) => args)).toContainEqual([
|
|
...GIT_FETCH_SKIP_AUTO_MAINTENANCE_CONFIG_ARGS,
|
|
'fetch',
|
|
'--no-tags',
|
|
'origin',
|
|
'+refs/heads/main:refs/remotes/origin/main'
|
|
])
|
|
})
|
|
})
|