mirror of
https://github.com/stablyai/orca.git
synced 2026-09-26 00:02:34 +00:00
Creating a worktree from a cross-repository (fork) PR previously named the local branch with the maintainer's branch prefix (e.g. `me/866`) and pushed to origin instead of the contributor's fork, so maintainer edits never reached the PR. Fork PRs now adopt the contributor's branch name (matching same-repo PRs) and resolve a fork push target, with a non-blocking warning when the PR disables maintainer edits and an indicator showing where a push will land. - pr-start-point: return branchNameOverride/headSha/maintainerCanModify for cross-repo PRs (previously only same-repo PRs received these) - github client: surface maintainer_can_modify alongside the fork push target - composer: warn (but still allow) when "Allow edits from maintainers" is off - source control: show the fork push target (owner:branch) before pushing - extract fork-remote cleanup and setup into dedicated, unit-tested modules Adds unit suites for the cleanup multi-fork matrix, fork-remote setup, push-target resolution, the warning decision, and the push-target label. Note: pre-commit react-doctor hook bypassed — its warnings in useComposerState are pre-existing (identical count on base) and not enforced by CI. Co-authored-by: Neil <4138956+nwparker@users.noreply.github.com>
187 lines
6.4 KiB
TypeScript
187 lines
6.4 KiB
TypeScript
import { describe, expect, it, vi, type Mock } from 'vitest'
|
|
import type { GitPushTarget } from '../../shared/types'
|
|
import type { GitRemoteExec } from './worktree-push-target-cleanup'
|
|
import {
|
|
configureCreatedWorktreePushTargetWithExec,
|
|
ensureUniqueRemoteName,
|
|
findRemoteForUrl,
|
|
prepareWorktreePushTargetWithExec
|
|
} from './worktree-push-target-setup'
|
|
|
|
type ExecMock = Mock<GitRemoteExec>
|
|
|
|
const REPO = '/repo-root'
|
|
const FORK_SSH = 'git@github.com:contributor/orca.git'
|
|
const FORK_HTTPS = 'https://github.com/contributor/orca.git'
|
|
|
|
// A stateful fake git: `remotes` maps name -> url. `remote add` mutates it so
|
|
// later lookups see the new remote, matching real git behavior.
|
|
function makeRepoExec(remotes: Record<string, string>): ExecMock {
|
|
return vi.fn<GitRemoteExec>(async (args: string[]) => {
|
|
if (args[0] === 'remote' && args.length === 1) {
|
|
return { stdout: Object.keys(remotes).join('\n'), stderr: '' }
|
|
}
|
|
if (args[0] === 'remote' && args[1] === 'get-url') {
|
|
const url = remotes[args[2]!]
|
|
if (!url) {
|
|
throw new Error(`No such remote ${args[2]}`)
|
|
}
|
|
return { stdout: `${url}\n`, stderr: '' }
|
|
}
|
|
if (args[0] === 'remote' && args[1] === 'add') {
|
|
remotes[args[2]!] = args[3]!
|
|
return { stdout: '', stderr: '' }
|
|
}
|
|
return { stdout: '', stderr: '' }
|
|
})
|
|
}
|
|
|
|
function callsMatching(exec: ExecMock, head: string[]): string[][] {
|
|
return exec.mock.calls
|
|
.map(([args]) => args)
|
|
.filter((args) => head.every((part, i) => args[i] === part))
|
|
}
|
|
|
|
function forkTarget(overrides: Partial<GitPushTarget> = {}): GitPushTarget {
|
|
return {
|
|
remoteName: 'pr-contributor-orca',
|
|
branchName: 'contributor/fix',
|
|
remoteUrl: FORK_SSH,
|
|
...overrides
|
|
}
|
|
}
|
|
|
|
describe('prepareWorktreePushTargetWithExec', () => {
|
|
it('adds a new fork remote and fetches its head when none matches', async () => {
|
|
const exec = makeRepoExec({ origin: 'git@github.com:stablyai/orca.git' })
|
|
|
|
const result = await prepareWorktreePushTargetWithExec(exec, REPO, forkTarget(), () => false)
|
|
|
|
expect(callsMatching(exec, ['remote', 'add'])).toEqual([
|
|
['remote', 'add', 'pr-contributor-orca', FORK_SSH]
|
|
])
|
|
expect(callsMatching(exec, ['fetch'])).toEqual([
|
|
[
|
|
'fetch',
|
|
'pr-contributor-orca',
|
|
'+refs/heads/contributor/fix:refs/remotes/pr-contributor-orca/contributor/fix'
|
|
]
|
|
])
|
|
expect(result).toEqual({
|
|
remoteName: 'pr-contributor-orca',
|
|
branchName: 'contributor/fix',
|
|
remoteUrl: FORK_SSH,
|
|
remoteCreated: true
|
|
})
|
|
})
|
|
|
|
it('reuses an existing remote pointing at the same fork (SSH vs HTTPS) without adding', async () => {
|
|
const exec = makeRepoExec({
|
|
origin: 'git@github.com:stablyai/orca.git',
|
|
'pr-contributor-orca': FORK_HTTPS
|
|
})
|
|
|
|
const result = await prepareWorktreePushTargetWithExec(exec, REPO, forkTarget(), () => false)
|
|
|
|
expect(callsMatching(exec, ['remote', 'add'])).toEqual([])
|
|
expect(callsMatching(exec, ['fetch'])).toEqual([
|
|
[
|
|
'fetch',
|
|
'pr-contributor-orca',
|
|
'+refs/heads/contributor/fix:refs/remotes/pr-contributor-orca/contributor/fix'
|
|
]
|
|
])
|
|
// remoteCreated omitted because the predicate says no known worktree owns it.
|
|
expect(result).toEqual({
|
|
remoteName: 'pr-contributor-orca',
|
|
branchName: 'contributor/fix',
|
|
remoteUrl: FORK_SSH
|
|
})
|
|
})
|
|
|
|
it('inherits remoteCreated when the predicate says a known worktree created the reused remote', async () => {
|
|
const exec = makeRepoExec({ 'fork-x': FORK_HTTPS })
|
|
|
|
const result = await prepareWorktreePushTargetWithExec(exec, REPO, forkTarget(), () => true)
|
|
|
|
expect(result.remoteName).toBe('fork-x')
|
|
expect(result.remoteCreated).toBe(true)
|
|
})
|
|
|
|
it('disambiguates with a numeric suffix when the preferred remote name is taken by a different URL', async () => {
|
|
const exec = makeRepoExec({ 'pr-contributor-orca': 'git@github.com:someone-else/orca.git' })
|
|
|
|
const result = await prepareWorktreePushTargetWithExec(exec, REPO, forkTarget(), () => false)
|
|
|
|
expect(callsMatching(exec, ['remote', 'add'])).toEqual([
|
|
['remote', 'add', 'pr-contributor-orca-2', FORK_SSH]
|
|
])
|
|
expect(result.remoteName).toBe('pr-contributor-orca-2')
|
|
expect(result.remoteCreated).toBe(true)
|
|
})
|
|
|
|
it('strips an incoming remoteCreated flag and fetches the given remote when there is no remoteUrl', async () => {
|
|
const exec = makeRepoExec({ origin: 'git@github.com:stablyai/orca.git' })
|
|
|
|
const result = await prepareWorktreePushTargetWithExec(
|
|
exec,
|
|
REPO,
|
|
{ remoteName: 'origin', branchName: 'feature', remoteCreated: true },
|
|
() => false
|
|
)
|
|
|
|
expect(callsMatching(exec, ['remote', 'add'])).toEqual([])
|
|
expect(callsMatching(exec, ['fetch'])).toEqual([
|
|
['fetch', 'origin', '+refs/heads/feature:refs/remotes/origin/feature']
|
|
])
|
|
expect(result).toEqual({ remoteName: 'origin', branchName: 'feature' })
|
|
})
|
|
})
|
|
|
|
describe('findRemoteForUrl', () => {
|
|
it('matches by GitHub owner/repo across URL protocols', async () => {
|
|
const exec = makeRepoExec({
|
|
origin: 'git@github.com:stablyai/orca.git',
|
|
fork: FORK_SSH
|
|
})
|
|
await expect(findRemoteForUrl(exec, REPO, FORK_HTTPS)).resolves.toBe('fork')
|
|
})
|
|
|
|
it('returns null when no remote points at the fork', async () => {
|
|
const exec = makeRepoExec({ origin: 'git@github.com:stablyai/orca.git' })
|
|
await expect(findRemoteForUrl(exec, REPO, FORK_SSH)).resolves.toBeNull()
|
|
})
|
|
})
|
|
|
|
describe('ensureUniqueRemoteName', () => {
|
|
it('returns the preferred name when it is free', async () => {
|
|
const exec = makeRepoExec({ origin: 'x' })
|
|
await expect(ensureUniqueRemoteName(exec, REPO, 'fork')).resolves.toBe('fork')
|
|
})
|
|
|
|
it('suffixes past taken names', async () => {
|
|
const exec = makeRepoExec({ fork: 'x', 'fork-2': 'y' })
|
|
await expect(ensureUniqueRemoteName(exec, REPO, 'fork')).resolves.toBe('fork-3')
|
|
})
|
|
})
|
|
|
|
describe('configureCreatedWorktreePushTargetWithExec', () => {
|
|
it('points the new branch upstream at the fork remote', async () => {
|
|
const exec = makeRepoExec({})
|
|
const target = forkTarget()
|
|
|
|
const result = await configureCreatedWorktreePushTargetWithExec(
|
|
exec,
|
|
'/wt/path',
|
|
'local-branch',
|
|
target
|
|
)
|
|
|
|
expect(exec).toHaveBeenCalledWith(
|
|
['branch', '--set-upstream-to', 'pr-contributor-orca/contributor/fix', 'local-branch'],
|
|
'/wt/path'
|
|
)
|
|
expect(result).toBe(target)
|
|
})
|
|
})
|