defunkt/sandlot
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'difftastic-integration'

Browse Source
This commit is contained in:
Chris Wanstrath 2026-02-22 07:47:11 -08:00
commit 2eba71ce87
2 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/commands/diff.ts
View File

@ -1,6 +1,5 @@
import { $ } from "bun"
import * as git from "../git.ts"
import { pager } from "../fmt.ts"
import { requireSession } from "./helpers.ts"
export async function action(branch: string) {
@ -13,27 +12,26 @@ export async function action(branch: string) {
process.exit(1)
}
let diff: string
let args: string[]
if (status.text().trim().length > 0) {
// Show uncommitted changes (both staged and unstaged)
const result = await $`git -C ${session.worktree} diff --color=always HEAD`.nothrow().quiet()
if (result.exitCode !== 0) {
// HEAD may not exist yet (no commits); fall back to showing all tracked + untracked
const fallback = await $`git -C ${session.worktree} diff --color=always`.nothrow().quiet()
diff = fallback.text()
} else {
diff = result.text()
}
const hasHead = await $`git -C ${session.worktree} rev-parse --verify HEAD`.nothrow().quiet()
args = hasHead.exitCode === 0 ? ["diff", "HEAD"] : ["diff"]
} else {
// No uncommitted changes — show full branch diff vs main
const main = await git.mainBranch(session.worktree)
const result = await $`git -C ${session.worktree} diff --color=always ${main}...${branch}`.nothrow().quiet()
if (result.exitCode !== 0) {
console.error("✖ git diff failed")
process.exit(1)
}
diff = result.text()
args = ["diff", `${main}...${branch}`]
}
await pager(diff)
// Run git diff with inherited stdio so external diff tools (e.g. difftastic)
// see a real TTY and git can use its own pager
const proc = Bun.spawn(["git", "-C", session.worktree, ...args], {
stdin: "inherit",
stdout: "inherit",
stderr: "inherit",
})
const exitCode = await proc.exited
if (exitCode !== 0) {
process.exit(exitCode)
}
}

27
src/commands/show.ts
View File

@ -1,23 +1,24 @@
import { $ } from "bun"
import * as git from "../git.ts"
import { pager } from "../fmt.ts"
import { requireSession } from "./helpers.ts"
export async function action(branch: string) {
const { session } = await requireSession(branch)
const main = await git.mainBranch(session.worktree)
const result = await $`git -C ${session.worktree} diff --color=always ${main}...${branch}`.nothrow().quiet()
if (result.exitCode !== 0) {
console.error("git diff failed")
process.exit(1)
}
let output = ""
if (session.prompt) {
output += `PROMPT: ${session.prompt}\n\n`
process.stderr.write(`PROMPT: ${session.prompt}\n\n`)
}
output += result.text()
await pager(output)
const main = await git.mainBranch(session.worktree)
// Run git diff with inherited stdio so external diff tools (e.g. difftastic)
// see a real TTY and git can use its own pager
const proc = Bun.spawn(["git", "-C", session.worktree, "diff", `${main}...${branch}`], {
stdin: "inherit",
stdout: "inherit",
stderr: "inherit",
})
const exitCode = await proc.exited
if (exitCode !== 0) {
process.exit(exitCode)
}
}