Commit Graph

168 Commits

Author SHA1 Message Date
hl-valdemar 4aff22377f fix: focus After when opening a diff file 2026-10-14 21:47:23 +02:00
Valdemar Lorenzen ef4c38d8a7 feat: resolve conflicts through focused two-way drafts
Replace the marker-filled three-pane resolver with a marker-free native
Draft versus frozen Alternative projected from current working text.
Preserve preexisting outside edits, native undo, dirty-save guards, all
sides/bases, and draft caret/viewports across separate History views.
Reuse DiffState alignment/highlighting/excerpts for Resolution and merge
its base-aligned rows for readonly three-way History. Hide explorer and
source-selector chrome by default.

Verified 926 tests plus actual terminal projection, History highlighting,
hunk choice, optional explorer, and guarded jj-confirmed save workflows.
Clippy completes with pre-existing warnings only. Smoke fixtures stay
unresolved in this ancestry; remove that ancestry before publication.

Size exception: approximately 1650 implementation added/deleted lines,
excluding tests/docs, kept coherent because native draft lifecycle and
aligned rendering must change together without parallel legacy modes.
2026-10-14 17:01:45 +02:00
Valdemar Lorenzen a3aef713e2 feat: resolve current jj working-copy conflicts
Add a dedicated native resolver workspace with all side/base inputs,
shared editable Results, region choices, retained per-file status,
responsive rendering, and explicit nontext file choices.

Guard writes with jj working-copy locking, frozen checkout identity,
exact disk baselines, native dirty-buffer protection, and asynchronous
jj snapshot/status confirmation. Historical comparisons remain readonly.

Verified all 916 tests and live isolated terminal workflows covering text
regions, narrow layouts, binary bytes and symlink targets/types.
Clippy completes with pre-existing warnings only.

Size exception: 2614 implementation additions/deletions excluding tests
and docs. Native workspace integration, explicit file choices and the
safe save/check operation are retained as one complete behavioral slice.
2026-10-14 16:04:15 +02:00
Valdemar Lorenzen dcfa50319c fix: preserve lazy snapshots for conflicted jj revisions
Conflicted revisions read every file through jj file show, which returns
empty output for symlinks and causes repository-wide subprocess fanout.
Keep ordinary Git blob sources and immutable identities; render only
selected conflicted paths through jj.

Verified all 905 tests and the original local bookmark comparison with
25 correct paths in 0.522s, plus actual terminal conflict viewing.
Strict Clippy is blocked by existing diagnostics outside this change.
2026-10-14 15:49:26 +02:00
Valdemar Lorenzen 1cb9a0ddfc fix: retain repository status between picker openings 2026-10-14 14:56:55 +02:00
Valdemar Lorenzen 77a9111f45 fix: align diff picker review checkmarks 2026-10-14 14:36:15 +02:00
Valdemar Lorenzen 6b27fab075 fix: read macOS clipboard without subprocess startup 2026-10-14 14:26:22 +02:00
Valdemar Lorenzen 0000089f42 feat: stream newest pull requests by category 2026-10-14 14:26:22 +02:00
Valdemar Lorenzen 5243de66fe fix: resolve SSH aliases for forge discovery 2026-10-14 13:51:49 +02:00
Valdemar Lorenzen af6496bd5a feat: browse GitHub GitLab and Gitea pull requests 2026-10-14 13:40:43 +02:00
Valdemar Lorenzen 15968a328c fix: preserve diff backgrounds and align file markers 2026-10-14 13:40:41 +02:00
Valdemar Lorenzen c5f80f27a6 fix: replace selected ranges instead of ignoring visual paste 2026-10-14 13:13:01 +02:00
Valdemar Lorenzen 6a43fb9e0c feat: configure spaces on Tab per language 2026-10-14 13:12:46 +02:00
hl-valdemar cd427f74dc fix: replace selected characters with visual r 2026-10-14 00:09:42 +02:00
hl-valdemar b58fb085a3 feat: configure cursor distance from viewport edges 2026-10-13 22:42:23 +02:00
hl-valdemar 00628e0efd fix: stop hiding cached gutter markers while edits refresh 2026-10-13 22:10:03 +02:00
hl-valdemar 9526876b04 feat: show repository changes in normal file pickers 2026-10-13 21:46:53 +02:00
hl-valdemar e90d1c3945 fix: add spacing between line numbers and repository markers 2026-10-13 21:04:51 +02:00
hl-valdemar fd59c05f80 fix: separate gutter bars visually from line numbers 2026-10-13 20:50:50 +02:00
hl-valdemar 55cdee1a13 feat: add Git and Jujutsu gutter indicators 2026-10-13 20:46:44 +02:00
hl-valdemar e84d70463f feat: add counted word change actions
Add cw/cb and configurable core actions using the same line-local spans as dw/db. Enter Insert with grouped replacement undo and native dot repeat.
2026-10-13 17:43:13 +02:00
hl-valdemar 983f43e710 fix: keep counted word deletions within the current line
Word deletion reused cross-line word motion destinations. Constrain token traversal and boundary fallbacks to each caret’s current row while preserving cross-line navigation.
2026-10-13 17:35:09 +02:00
hl-valdemar 99fa5a2aff feat: track checkout identity for pinned diff editability 2026-10-13 17:28:59 +02:00
hl-valdemar e3e087f16f fix: use two columns between buffer IDs and filenames 2026-10-13 17:03:57 +02:00
hl-valdemar 33942b2671 fix: place current buffer marker before its ID 2026-10-13 16:38:14 +02:00
hl-valdemar 0eec3fc3b9 fix: refine buffer picker markers and paths 2026-10-13 16:31:53 +02:00
hl-valdemar 9d6a0eaeca feat: align buffer picker with editor UI 2026-10-13 16:31:53 +02:00
Valdemar Lorenzen f5ba61624f feat: add a searchable buffer picker 2026-10-13 14:30:36 +02:00
Valdemar Lorenzen bfdb7c544f feat: follow forward working-checkout changes in diffs 2026-10-13 13:49:10 +02:00
Valdemar Lorenzen b16232aa1d feat: jump to a line with counted g 2026-10-13 13:32:42 +02:00
Valdemar Lorenzen 8f87b8d3d1 feat: toggle diff file review with c in the file picker 2026-10-13 13:18:40 +02:00
Valdemar Lorenzen 38fcf86195 feat: mark diff files as reviewed 2026-10-13 13:16:57 +02:00
Valdemar Lorenzen c912abaf17 fix: yank whole lines with yy and preserve paste shape 2026-10-13 13:04:48 +02:00
Valdemar Lorenzen c4f72a45ba fix: center LSP definition destinations in the viewport 2026-10-13 12:56:52 +02:00
Valdemar Lorenzen e36c28c981 perf: cache file attribution for instant blame navigation 2026-10-13 12:41:46 +02:00
Valdemar Lorenzen 7a3c27c30e feat: show current-line git blame by default 2026-10-13 12:29:21 +02:00
Valdemar Lorenzen 5382307fcc feat: rank fuzzy revision and reference searches in diff selectors 2026-10-13 12:20:00 +02:00
Valdemar Lorenzen b94739183d perf: avoid JXA startup for macOS clipboard writes 2026-10-13 11:20:02 +02:00
Valdemar Lorenzen 8c5d218c11 fix: dim etched diff areas to match gutter text 2026-10-13 11:03:58 +02:00
Valdemar Lorenzen d7fbf9a144 feat: add normal-mode change yank replace and word delete actions 2026-10-13 11:03:20 +02:00
Valdemar Lorenzen 6c254f9b0d feat: default diffs to branch changes 2026-10-13 10:48:24 +02:00
hl-valdemar fafec2a6b0 refactor: name diff orientations vertical and horizontal 2026-10-13 08:45:43 +02:00
hl-valdemar d1855dbdb7 feat: add configurable diff modes and split orientation 2026-10-13 08:45:43 +02:00
hl-valdemar c35abe0f03 fix: retain alternate screen across executable restart 2026-10-12 23:40:51 +02:00
hl-valdemar d85998e1cb feat: add guarded and forceful editor restart actions 2026-10-12 23:40:51 +02:00
hl-valdemar 298d586c3e feat: reload clean buffers and guard external-change writes 2026-10-12 23:40:50 +02:00
hl-valdemar bb5c247ab2 style: shorten default bar fade decorations 2026-10-12 22:21:19 +02:00
hl-valdemar 1cd56cf3f6 feat: bind Ctrl-U to backward line deletion 2026-10-12 22:09:43 +02:00
hl-valdemar 2260817fc0 feat: support macOS modified backspace deletion 2026-10-12 22:09:43 +02:00
hl-valdemar 5e6b602127 feat: highlight Markdown list markers 2026-10-12 22:09:43 +02:00