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
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
f26237af78
perf: batch queued cursor navigation events
2026-10-14 15:32:52 +02:00
1cb9a0ddfc
fix: retain repository status between picker openings
2026-10-14 14:56:55 +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
99fa5a2aff
feat: track checkout identity for pinned diff editability
2026-10-13 17:28:59 +02:00
e36c28c981
perf: cache file attribution for instant blame navigation
2026-10-13 12:41:46 +02:00
7a3c27c30e
feat: show current-line git blame by default
2026-10-13 12:29:21 +02:00
b94739183d
perf: avoid JXA startup for macOS clipboard writes
2026-10-13 11:20:02 +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
9f1ea04f4d
style: move diff metadata into pane borders
2026-10-12 15:23:30 +02:00
054225686e
fix: restore tab and diff context through jump history
2026-10-12 15:04:44 +02:00
1b8b669ca0
feat: preserve diff context during LSP navigation
2026-10-12 14:27:16 +02:00
6eb99a792a
feat: configure command and search popup anchors
2026-10-12 14:02:04 +02:00
52915ffacf
feat: redesign status chrome and floating prompts
2026-10-12 12:55:17 +02:00
8c6a050171
feat: show live battery charge by default
2026-10-12 12:11:19 +02:00
0d3fbc01f8
feat: configure interchangeable top and bottom bars
2026-10-12 11:59:59 +02:00
4cfd068f1c
feat: configure chrome segments and anchor groups
2026-10-12 11:35:14 +02:00
fc382529c5
feat: add editor tabs
2026-10-12 09:41:28 +02:00
hl-valdemar
b41db31831
fix: refresh cached diff colors for external theme updates
2026-10-11 22:01:31 +02:00
hl-valdemar
ffdd42fcce
fix: refresh diff colors on terminal theme changes
2026-10-11 21:28:02 +02:00
hl-valdemar
d6f6203fb6
fix: blend diff highlights with terminal theme colors
2026-10-11 21:05:21 +02:00
hl-valdemar
a80f97309b
feat: highlight character-level changes in diff panes
2026-10-11 20:14:17 +02:00
hl-valdemar
2756b79f89
feat: support configurable modified-key binding sequences
2026-10-11 19:20:51 +02:00
hl-valdemar
503342bff0
fix: render floating windows and explorer outside workspace panes
2026-10-11 18:28:54 +02:00
hl-valdemar
db5d417a17
feat: add syntax-aware diff backgrounds and diagonal gap shading
2026-10-11 01:26:56 +02:00
hl-valdemar
2f595ca4ca
feat: toggle diff explorer and show file change indicators
2026-10-11 01:03:52 +02:00
hl-valdemar
83c37f5a19
feat: reuse the docked file tree for diff navigation
2026-10-11 00:27:33 +02:00
hl-valdemar
81a2bf9a02
feat: add local and remote repository diff views
2026-10-11 00:08:58 +02:00
hl-valdemar
3f05287d79
refactor: unify core actions and Ex command aliases
2026-10-10 22:11:10 +02:00
hl-valdemar
4e9378816e
feat: add counted cc and dd line actions
2026-10-10 21:27:11 +02:00
hl-valdemar
232be6a032
feat: expand completion snippets and navigate placeholders
2026-10-10 19:42:29 +02:00
hl-valdemar
b6059d5ed9
feat: add live-cycling LSP completion
2026-10-10 18:48:45 +02:00
hl-valdemar
9d3b25e9d3
feat: add gt and gb document navigation
2026-10-10 18:08:02 +02:00
hl-valdemar
287865735f
fix: limit linewise highlighting to copied text
2026-10-10 17:50:58 +02:00
hl-valdemar
27b94744f0
feat: add linewise Visual selection and paste
2026-10-10 17:50:58 +02:00
hl-valdemar
dc0bdd60d0
feat: enlarge floating hover and highlight Markdown content
2026-10-10 16:19:51 +02:00
hl-valdemar
99028daa9d
fix: stage complete frames before suspending terminal presentation
2026-10-10 05:05:01 +02:00
hl-valdemar
6152ae6d36
fix: avoid redraw backlogs during rapid mouse scrolling
2026-10-10 01:52:36 +02:00
hl-valdemar
d8e2425c65
feat: scroll viewports with mouse wheel without moving the caret
2026-10-10 01:39:44 +02:00
hl-valdemar
455108a909
perf: fast-path grapheme counts and cache terminal layouts
2026-10-10 00:52:35 +02:00
hl-valdemar
05c044bd02
fix: hide the painting cursor and synchronize terminal frames
2026-10-10 00:19:23 +02:00
Valdemar Lorenzen
hl-valdemar