diff

Documentation

Index

• func ApplyHunk(base string, h Hunk) string
• func BaseContent(repoRoot string, staged bool, file string) (string, error)
• func FirstHunkLine(repoRoot string, staged bool, file string) int
• func ParallelStream(n int, work func(i int) string) <-chan string
• func RawNewFileDiff(repoRoot, file string) (string, error)
• func RawRangeDiff(repoRoot, base, target, file string) (string, error)
• func RawUnifiedDiff(repoRoot string, staged bool, file string) (string, error)
• func ShowFile(repoRoot, ref, file string) ([]byte, error)
• type DiffOpts
• type Display
  • func (d Display) Next() Display
• type Engine
  • func NewEngine() Engine
  • func NewPlainEngine() Engine
• type FileDiff
  • func ParseUnifiedDiff(raw string) []FileDiff
• type Hunk
  • func (h Hunk) Patch(fileHeader string) string

Functions

func ApplyHunk

func ApplyHunk(base string, h Hunk) string

ApplyHunk applies a single hunk to the base file content, producing a new file with only that hunk's changes. This gives difftastic a full file for tree-sitter parsing.

func BaseContent

func BaseContent(repoRoot string, staged bool, file string) (string, error)

BaseContent retrieves the base file content for diffing. For unstaged diffs: the index version (git show :file). For staged diffs: the HEAD version (git show HEAD:file).

func FirstHunkLine

func FirstHunkLine(repoRoot string, staged bool, file string) int

FirstHunkLine returns the new-file line of the first hunk in file's diff, so an editor can open at the change rather than the top of the file. Returns 0 (no specific line) when the diff can't be produced or parsed.

func ParallelStream

func ParallelStream(n int, work func(i int) string) <-chan string

ParallelStream runs work(0..n-1) concurrently, bounded to the CPU count, and returns a channel yielding each result in index order, closed when done. A changeset's files are diffed in parallel — difftastic is CPU-bound at ~1s per large file — while a progressive consumer gets each file as soon as the ones before it are ready. The channel is buffered to n so the workers never block if the consumer stops reading early (e.g. the user navigated away).

func RawNewFileDiff

func RawNewFileDiff(repoRoot, file string) (string, error)

RawNewFileDiff generates a unified diff for an untracked file by comparing /dev/null against the file.

func RawRangeDiff

func RawRangeDiff(repoRoot, base, target, file string) (string, error)

RawRangeDiff returns the unified diff of file between two commits (base..target).

func RawUnifiedDiff

func RawUnifiedDiff(repoRoot string, staged bool, file string) (string, error)

func ShowFile

func ShowFile(repoRoot, ref, file string) ([]byte, error)

ShowFile returns the content of file at a git ref (git show ref:file); an empty ref reads the staged/index version. It runs in repoRoot so linked-worktree layouts resolve.

Types

type DiffOpts

type DiffOpts struct {
	Staged  bool
	Base    string
	Target  string
	Color   bool
	Width   int
	Display Display
}

type Display

type Display int

Display selects difftastic's layout. Auto picks side-by-side only when the pane is wide enough, otherwise inline — side-by-side halves an already-narrow pane and difftastic doesn't reliably honor --width.

const (
	DisplayAuto Display = iota
	DisplayInline
	DisplaySideBySide
)

func (Display) Next

func (d Display) Next() Display

Next cycles Auto → Inline → SideBySide → Auto for the layout toggle.

type Engine

type Engine interface {
	Diff(ctx context.Context, repoRoot, file string, opts DiffOpts) (string, error)
	DiffHunks(ctx context.Context, hunks []Hunk, filename, baseContent string, color bool, width int) []string
	Name() string
}

func NewEngine

func NewEngine() Engine

func NewPlainEngine

func NewPlainEngine() Engine

NewPlainEngine returns the plain git-diff engine — the non-structural alternative offered by the engine toggle.

type FileDiff

type FileDiff struct {
	Header string
	Path   string
	Hunks  []Hunk
}

func ParseUnifiedDiff

func ParseUnifiedDiff(raw string) []FileDiff

type Hunk

type Hunk struct {
	Header   string
	OldStart int
	OldCount int
	NewStart int
	NewCount int
	Lines    []string
}

func (Hunk) Patch

func (h Hunk) Patch(fileHeader string) string