hl-valdemar/vamp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Wiki Activity

fix: preserve lazy snapshots for conflicted jj revisions

Browse Source 
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.
This commit is contained in:
Valdemar Lorenzen
2026-10-14 15:32:52 +02:00
parent f26237af78
commit dcfa50319c
5 changed files with 168 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TODO.md
+1
View File
@@ -1,4 +1,5 @@
- [ ] jj conflict resolution with ui akin to the diff viewer
- [ ] make selecting a file in the diff view file picker focus the after buffer instead of the before buffer
- [ ] improve the lsp hover floating window:
- it should be taller
- [ ] add `*` on word to highlights and searches in buffer in one action.