Skip to content

DAN-67: Make arbitrary branch comparison discoverable - #124

Merged
danielss-dev merged 4 commits into
mainfrom
danielsdev/dan-67-strand-compare-any-two-branches-content-file-list
Sep 7, 2026
Merged

DAN-67: Make arbitrary branch comparison discoverable#124
danielss-dev merged 4 commits into
mainfrom
danielsdev/dan-67-strand-compare-any-two-branches-content-file-list

Conversation

@danielss-dev

@danielss-dev danielss-dev commented Sep 7, 2026

Copy link
Copy Markdown
Owner

Compare branches was buried in ref context menus, required a local checkout, and seeded the HEAD menu with the first other ref. Add Compare branches… to palette Actions and Branch actions, and share deliberate defaults: current vs upstream, then main/master, then the first available pair. Current stays on the To side; detached HEAD can compare any two available branches without checkout.

Local, remote, and tag context menus remain available while detached. The palette opens after its focus restoration completes. All entry points reuse CompareRefsDialogtauri.repoDiffBetweenRepo::diff_between; Commits multi-select Compare is preserved. Update the README, user guide, and planning documents.

Linear: DAN-67

Validation:

  • pnpm --filter ./ui exec tsc --noEmit — passed.
  • pnpm --filter ./ui test — 482 tests passed across 86 files, including 13 focused defaults tests.
  • git diff --check — passed.
  • Commands ran through npx --yes pnpm@9.0.0; a frozen-lockfile install restored the existing Pierre dependency patch.
  • Native UI interaction was not exercised in this Linux environment.

After / Screenshots

Captured from the Strand web demo (vite --mode demo against the in-browser acme-api sample repo) on this PR head. Native Tauri desktop was not available here.

Entry points

Command palette filtered to Compare branches…

Branches section Branch actions menu with Compare branches…

CompareRefsDialog

Compare dialog defaults: From upstream origin/feature/auth-retry → To local feature/auth-retry with file list and diff

Compare main → feature/auth-retry with non-empty file list (4 files) and docs/auth.md diff

Empty state: No changes between these revisions (main → main)

Near-fullscreen CompareRefsDialog with file list and side-by-side (split) diff

Compare dialog crop: From/To pickers, DiffLayoutToggle, side-by-side panes

Compare dialog: full union file tree (15 files, 4 changed marked) with unchanged src/api/client.ts selected showing identical tip

Make the revision compare dialog near-fullscreen so file list + content are usable, and surface DiffLayoutToggle in the dialog chrome for Unified / Side-by-side.
Raise specificity after .dialog-wide so From/To compare uses the full workbench size for side-by-side diffs.
@danielss-dev
danielss-dev merged commit 425c5f2 into main Sep 7, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant