Follow vim-fugitive's quickfix flows in diff and merge views
Les mainteneurs répondent en général sous 1 jour
Évaluation
- Difficulté
- 5/5
- Temps estimé
- Plus d'une semaine
- Accessibilité débutants
- 35/100
Piste de recherche
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.
Rédigé par le modèle d'indexation à partir du texte de l'issue.
Description
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.
- Langage dominant
- Lua
- Étoiles
- 298
- Forks
- 4
- Merge moyen
- 1 j 4 h
- PR mergées (30 j)
- 11
Préparer son environnement
Ce projet ne fournit ni conteneur de développement, ni Dockerfile, ni guide de contribution : l'installation est à votre charge. Commencez par son README, et consultez notre guide de la première contribution pour les étapes générales.
Par où commencer
- Lisez l'issue en entier, puis le guide de contribution du projet.
- Signalez en commentaire que vous la prenez — cela évite que deux personnes fassent le même travail.
- Forkez le dépôt et travaillez sur une branche.
- Ouvrez une pull request qui référence le numéro de l'issue.
Autres issues de CoreyKaylor/diffbandit.nvim
-
Difficulté 2/5 1-3 heures Accessibilité débutants 72/100
CoreyKaylor/diffbandit.nvim#39 · 1 commentaire ·
Les mainteneurs répondent en général sous 1 jour
Toutes les issues de CoreyKaylor/diffbandit.nvim
Issues similaires
-
bug
Difficulté 2/5 1-3 heures Accessibilité débutants 67/100
-
WaypointOuvertebug discord triage
Difficulté 2/5 1-3 heures Accessibilité débutants 68/100
Les mainteneurs répondent en général sous 1 jour
-
Difficulté 2/5 1-3 heures Accessibilité débutants 67/100
ExpressLRS/Lua#52 ·
-
Bug Forever Module - Options
Difficulté 2/5 1-3 heures Accessibilité débutants 62/100
Les mainteneurs répondent en général sous 1 jour
-
forever from-game
Difficulté 2/5 1-3 heures Accessibilité débutants 68/100
openmap-world/openmap#333 ·
Les mainteneurs répondent en général sous 1 jour