Commit Graph

80 Commits

Author SHA1 Message Date
Valdemar Lorenzen 2772e6878a refactor: move embedded tests into dedicated test directory 2026-10-16 18:53:02 +02:00
Valdemar Lorenzen de6a57e67d feat: add configurable three-pane conflict views 2026-10-16 18:53:01 +02:00
Valdemar Lorenzen b558f82094 feat: persist local reviews automatically in SQLite 2026-10-16 18:53:01 +02:00
Valdemar Lorenzen 0446ec86c7 feat: add local diff review workflow 2026-10-16 18:52:57 +02:00
Valdemar Lorenzen d1048df345 refactor: name configurable viewport scroll steps accurately 2026-10-16 18:52:53 +02:00
Valdemar Lorenzen 284ddd3713 feat: configure half-page viewport scroll distance 2026-10-16 18:52:52 +02:00
Valdemar Lorenzen c32d4a7590 feat: refresh diffs when selected jj bookmarks move 2026-10-16 18:52:49 +02:00
Valdemar Lorenzen f5c6d098f8 fix: retain current occurrence when submitting search 2026-10-16 18:52:44 +02:00
Valdemar Lorenzen 168e12160a refactor: route conflict resolution through the diff workspace
Use the active DiffState, native FilePicker and existing diff input,
layout, focus, source navigation and scrolling paths for Resolution.
Delete separate resolver filtering, file-list rendering and scroll APIs.
Keep projections, source choices, History and guarded jj saves distinct.

Verify native parity for picker remaps, current-file selection, excerpt
initialization, folded search, wheel focus, layouts, buffer transitions
and per-file viewports. All 932 tests pass; actual terminal smoke covers
Space-e explorer, Down/Enter file selection and guarded confirmed save.
Clippy completes with existing warnings only.

Size exception: 1197 implementation added/deleted lines excluding tests
and docs; input routing, native buffer lifecycle and rendering are kept
as one coherent cutover, without a parallel legacy resolver path.
2026-10-15 10:21:10 +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 1cb9a0ddfc fix: retain repository status between picker openings 2026-10-14 14:56:55 +02:00
Valdemar Lorenzen 0000089f42 feat: stream newest pull requests by category 2026-10-14 14:26:22 +02:00
Valdemar Lorenzen af6496bd5a feat: browse GitHub GitLab and Gitea pull requests 2026-10-14 13:40:43 +02:00
Valdemar Lorenzen 6a43fb9e0c feat: configure spaces on Tab per language 2026-10-14 13:12:46 +02:00
hl-valdemar 11b31d2621 feat: dim whitespace markers and configure scope and newlines 2026-10-13 23:33:42 +02:00
hl-valdemar 2357b5be46 feat: add configurable whitespace markers 2026-10-13 22:58:18 +02:00
hl-valdemar e2f33519d1 feat: add opt-in trailing whitespace highlighting 2026-10-13 22:53:32 +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 55cdee1a13 feat: add Git and Jujutsu gutter indicators 2026-10-13 20:46:44 +02:00
hl-valdemar 99fa5a2aff feat: track checkout identity for pinned diff editability 2026-10-13 17:28:59 +02:00
Valdemar Lorenzen bfdb7c544f feat: follow forward working-checkout changes in diffs 2026-10-13 13:49:10 +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 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 298d586c3e feat: reload clean buffers and guard external-change writes 2026-10-12 23:40:50 +02:00
Valdemar Lorenzen 1b8b669ca0 feat: preserve diff context during LSP navigation 2026-10-12 14:27:16 +02:00
Valdemar Lorenzen 6eb99a792a feat: configure command and search popup anchors 2026-10-12 14:02:04 +02:00
Valdemar Lorenzen 52915ffacf feat: redesign status chrome and floating prompts 2026-10-12 12:55:17 +02:00
Valdemar Lorenzen 8c6a050171 feat: show live battery charge by default 2026-10-12 12:11:19 +02:00
Valdemar Lorenzen 0d3fbc01f8 feat: configure interchangeable top and bottom bars 2026-10-12 11:59:59 +02:00
Valdemar Lorenzen 4cfd068f1c feat: configure chrome segments and anchor groups 2026-10-12 11:35:14 +02:00
Valdemar Lorenzen d55b7b65d2 feat: support configurable tabline status label 2026-10-12 11:06:05 +02:00
Valdemar Lorenzen fc382529c5 feat: add editor tabs 2026-10-12 09:41:28 +02:00
hl-valdemar 2756b79f89 feat: support configurable modified-key binding sequences 2026-10-11 19:20:51 +02:00
hl-valdemar ad9b214b8f feat: add panes and shared-buffer splits 2026-10-11 18:17:06 +02:00
hl-valdemar 2e05725a38 perf: avoid eager diff loading and full-file typing work 2026-10-11 15:54:42 +02:00
hl-valdemar 0d4601b612 feat: support horizontal mouse scrolling in buffers 2026-10-11 14:22:38 +02:00
hl-valdemar 5186714ef5 feat: enable native readonly diff interaction and synchronized pane cursors 2026-10-11 12:34:38 +02:00
hl-valdemar 976cfc9e62 fix: target caret excerpts and retain diff viewport offsets 2026-10-11 11:00:13 +02:00
hl-valdemar 54bb196192 refactor: derive canonical commands from core actions and centralize aliases 2026-10-11 02:57:10 +02:00
hl-valdemar 9a34669c08 feat: edit working-checkout comparisons with normal editor actions 2026-10-11 02:44:24 +02:00
hl-valdemar 704dce2539 feat: add expandable diff excerpts with configurable context 2026-10-11 01:49:40 +02:00
hl-valdemar 81a2bf9a02 feat: add local and remote repository diff views 2026-10-11 00:08:58 +02:00
hl-valdemar f6da7922a1 fix: defer diagnostic display until leaving Insert mode 2026-10-11 00:08:58 +02:00
hl-valdemar b6059d5ed9 feat: add live-cycling LSP completion 2026-10-10 18:48:45 +02:00