GitCli.Worktree.Review (fnord v0.9.29)

View Source

Shared interactive flow for reviewing, merging, and cleaning up a fnord-managed worktree. Used by both Cmd.Ask (post-completion) and Cmd.Worktrees merge.

Includes pre-merge and post-merge validation gates that run the project's configured validation rules against the worktree (before merge) and the main checkout (after merge). Post-merge validation failure triggers an automatic revert, while merge command failures are returned to the caller.

Summary

Types

merge_range()
review_result()
worktree_info()

Functions

auto_merge(root, meta, opts \\ [])

Merges worktree changes and cleans up without prompting. Runs validation before and after merge. Pre-merge validation failure blocks the merge.

colorize_diff(diff)

Colorizes a unified diff string for terminal display.

interactive_review(root, meta, opts \\ [])

Walks the user through inspecting the diff, merging, and optionally deleting the worktree and its local branch. Runs validation before and after merge.

Types

merge_range()

@type merge_range() :: {String.t(), String.t()} | nil

review_result()

@type review_result() ::
  :ok
  | {:cleaned_up, merge_range(), :interactive | :auto}
  | {:validation_failed, :pre_merge | :post_merge, String.t()}
  | {:merge_failed, String.t()}

worktree_info()

@type worktree_info() :: %{
  path: String.t(),
  branch: String.t(),
  base_branch: String.t()
}

Functions

auto_merge(root, meta, opts \\ [])

@spec auto_merge(String.t(), worktree_info(), keyword()) :: review_result()

Merges worktree changes and cleans up without prompting. Runs validation before and after merge. Pre-merge validation failure blocks the merge.

colorize_diff(diff)

Colorizes a unified diff string for terminal display.

interactive_review(root, meta, opts \\ [])

@spec interactive_review(String.t(), worktree_info(), keyword()) :: review_result()

Walks the user through inspecting the diff, merging, and optionally deleting the worktree and its local branch. Runs validation before and after merge.