defunkt/sandlot
1
0
Fork 0
Code Pull Requests Activity

Rename spinner variables and add rebase-in-progress guard with improved error messages

Browse Source
This commit is contained in:
Chris Wanstrath 2026-02-20 20:12:44 -08:00
parent 603c92b595
commit 0932fd5ef5
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/commands/rebase.ts
View File

@ -16,23 +16,23 @@ export async function action(branch: string) {
} }
const main = await git.mainBranch(root) const main = await git.mainBranch(root)
const spin = spinner("Fetching origin", branch) const fetchSpin = spinner("Fetching origin", branch)
await $`git -C ${root} fetch origin ${main}`.nothrow().quiet() await $`git -C ${root} fetch origin ${main}`.nothrow().quiet()
spin.text = `Rebasing onto origin/${main}` fetchSpin.text = `Rebasing onto origin/${main}`
let conflicts = await git.rebase(`origin/${main}`, worktree) let conflicts = await git.rebase(`origin/${main}`, worktree)
if (conflicts.length === 0) { if (conflicts.length === 0) {
spin.succeed(`Rebased ${branch} onto ${main}`) fetchSpin.succeed(`Rebased ${branch} onto ${main}`)
return return
} }
spin.stop() fetchSpin.stop()
console.log(`◆ Rebase conflicts in ${conflicts.length} file(s). Resolving with Claude...`) console.log(`◆ Rebase conflicts in ${conflicts.length} file(s). Resolving with Claude...`)
const spin2 = spinner("Starting container", branch) const resolveSpin = spinner("Starting container", branch)
try { try {
await vm.ensure((msg) => { spin2.text = msg }) await vm.ensure((msg) => { resolveSpin.text = msg })
let round = 1 let round = 1
while (conflicts.length > 0) { while (conflicts.length > 0) {
@ -41,16 +41,16 @@ export async function action(branch: string) {
} }
await resolveConflicts(conflicts, worktree, (file) => { await resolveConflicts(conflicts, worktree, (file) => {
spin2.text = `Resolving ${file} (round ${round})` resolveSpin.text = `Resolving ${file} (round ${round})`
}) })
conflicts = await git.rebaseContinue(worktree) conflicts = await git.rebaseContinue(worktree)
round++ round++
} }
spin2.succeed(`Rebased ${branch} onto ${main} (resolved ${round - 1} conflict round(s))`) resolveSpin.succeed(`Rebased ${branch} onto ${main} (resolved ${round - 1} conflict round(s))`)
} catch (err) { } catch (err) {
spin2.fail(String((err as Error).message ?? err)) resolveSpin.fail(String((err as Error).message ?? err))
await git.rebaseAbort(worktree) await git.rebaseAbort(worktree)
process.exit(1) process.exit(1)
} }

10
src/git.ts
View File

@ -121,6 +121,12 @@ export async function abortMerge(cwd: string): Promise<void> {
/** Rebase the current branch onto another. Returns conflicted file paths, or empty array if clean. */ /** Rebase the current branch onto another. Returns conflicted file paths, or empty array if clean. */
export async function rebase(onto: string, cwd: string): Promise<string[]> { export async function rebase(onto: string, cwd: string): Promise<string[]> {
// Bail early if a rebase is already in progress
const inProgress = await $`git -C ${cwd} rev-parse --verify --quiet REBASE_HEAD`.nothrow().quiet()
if (inProgress.exitCode === 0) {
throw new Error(`A rebase is already in progress. Run "git -C ${cwd} rebase --abort" to cancel it first.`)
}
const result = await $`git rebase ${onto}`.cwd(cwd).nothrow().quiet() const result = await $`git rebase ${onto}`.cwd(cwd).nothrow().quiet()
if (result.exitCode === 0) return [] if (result.exitCode === 0) return []
@ -128,7 +134,9 @@ export async function rebase(onto: string, cwd: string): Promise<string[]> {
const files = unmerged.trim().split("\n").filter(Boolean) const files = unmerged.trim().split("\n").filter(Boolean)
if (files.length > 0) return files if (files.length > 0) return files
throw new Error(`Failed to rebase onto "${onto}": ${result.stderr.toString().trim()}`) // No conflicts but rebase still failed — include stderr for diagnostics
const stderr = result.stderr.toString().trim()
throw new Error(`Rebase onto "${onto}" failed: ${stderr || "(no output from git)"}`)
} }
/** Continue a rebase after resolving conflicts. Returns conflicted files for the next commit, or empty if done. */ /** Continue a rebase after resolving conflicts. Returns conflicted files for the next commit, or empty if done. */