Follow vim-fugitive's quickfix flows in diff and merge views
I maintainer di solito rispondono entro 1 giorno
Valutazione
- Difficoltà
- 5/5
- Tempo stimato
- Più di una settimana
- Idoneità per principianti
- 35/100
Direzione di ricerca
Start by reading the :DiffBanditMerge and diff view entry points, then trace how sessions handle buffer changes, quickfix navigation, and Git commands from fugitive buffers; the issue does not name specific files or tests. Done when the listed fugitive flows use the correct file and comparison in place, commands work from fugitive buffers, and moving on from an untouched merge preserves its buffer.
Scritto dal modello di indicizzazione a partire dal testo della issue.
Descrizione
This came out of a question on #1: does the merge view work with fugitive's :Git mergetool? The flow asked about is to load the conflicts into the quickfix list, run :DiffBanditMerge on the current buffer, and move between files with :cnext and :cprev.
It doesn't work today, and other fugitive flows have similar problems.
Problems
Merge views don't follow the quickfix list. :cnext to another file puts that file in the result pane, conflict markers included, while the session keeps tracking the old file. Running :DiffBanditMerge again stacks another tab.
Closing a merge can overwrite the conflicted file with base text. This doesn't need fugitive. :DiffBanditMerge on a file that's already open writes base text into its buffer and never restores it. After closing without edits, the buffer stays modified with its conflict markers gone, so a later :wall replaces the file on disk. Git still reports UU.
Leaving a file can break quickfix entries. A view that loaded a file wipes its buffer on the way out, so the next jump to that file fails with E92: Buffer not found. ]f then :cnext triggers it, and so does the merge walk under nohidden.
Git commands fail from fugitive's buffers. From the status buffer or any fugitive:// buffer, they fail with fatal: cannot change to 'fugitive:///...'.
Diff views don't follow the quickfix list either. After :Git difftool, :cnext leaves the right pane on another file. A jump from the left pane ends the session.
Views ignore the comparison a list describes. After :Git difftool HEAD~1, the view still compares against HEAD, so an entry can land on the wrong change. :Gclog can't move a commit review between commits.
What's wanted
:cnext,:cprevand related commands move merge and diff views in place, from any pane.:Git difftool [range]and:Gcloglists show the comparison or commit each entry describes.- Git commands work from fugitive's buffers, using the file or commit under the cursor in the status buffer.
- An opt-in setting opens DiffBandit from
:Git mergetool,:Git difftoolandddin the status buffer. - Closing or moving on from an untouched merge leaves the file's buffer as it was, and unsaved edits survive moving between files.
- Lingua principale
- Lua
- Stelle
- 298
- Fork
- 4
- Merge medio
- 1g 4h
- PR unite (30g)
- 11
Preparare l'ambiente
Questo progetto non fornisce container di sviluppo, Dockerfile né guida per i contributori, quindi l'ambiente è a tuo carico: parti dal suo README e consulta la nostra guida al primo contributo per i passaggi generali.
Come iniziare
- Leggi tutta la issue e poi la guida ai contributi del progetto.
- Commenta sulla issue per dire che te ne occupi tu — evita che due persone facciano lo stesso lavoro.
- Fai un fork del repository e lavora su un branch.
- Apri una pull request che faccia riferimento al numero della issue.
Altre issue di CoreyKaylor/diffbandit.nvim
-
Difficoltà 2/5 1-3 ore Idoneità per principianti 72/100
CoreyKaylor/diffbandit.nvim#39 · 1 commento ·
I maintainer di solito rispondono entro 1 giorno
Tutte le issue di CoreyKaylor/diffbandit.nvim
Issue simili
-
WaypointApertabug discord triage
Difficoltà 2/5 1-3 ore Idoneità per principianti 68/100
I maintainer di solito rispondono entro 1 giorno
-
Difficoltà 2/5 1-3 ore Idoneità per principianti 67/100
ExpressLRS/Lua#52 ·
-
Bug Forever Module - Options
Difficoltà 2/5 1-3 ore Idoneità per principianti 62/100
I maintainer di solito rispondono entro 1 giorno
-
forever from-game
Difficoltà 2/5 1-3 ore Idoneità per principianti 68/100
openmap-world/openmap#333 ·
I maintainer di solito rispondono entro 1 giorno
-
Difficoltà 1/5 Meno di un'ora Idoneità per principianti 83/100
I maintainer di solito rispondono entro 1 giorno