Draft: feat: implement rebasing#534
Open
jakubbortlik wants to merge 10 commits intoharrisoncramer:developfrom
Open
Draft: feat: implement rebasing#534jakubbortlik wants to merge 10 commits intoharrisoncramer:developfrom
jakubbortlik wants to merge 10 commits intoharrisoncramer:developfrom
Conversation
jakubbortlik
commented
Mar 4, 2026
lua/gitlab/reviewer/init.lua
Outdated
| end | ||
|
|
||
| vim.api.nvim_command(string.format("%s %s..%s", diffview_open_command, diff_refs.base_sha, diff_refs.head_sha)) | ||
| local full_command = string.format("%s %s..%s", diffview_open_command, remote_target_branch, state.INFO.source_branch) |
Collaborator
Author
There was a problem hiding this comment.
By using branch names to open the Diffview the view automatically updates after fetching the remote target branch and pulling the source branch which has been rebased on the server.
I still need to find out if this doesn't break anything or if the diff_refs should not be replaced in other parts of the codebase as well.
Collaborator
Author
There was a problem hiding this comment.
After some testing, I think it will be more appropriate if the base SHA is taken from the diff_refs (vim.api.nvim_command(string.format("%s %s..%s", diffview_open_command, diff_refs.base_sha, state.INFO.source_branch)), as it was originally otherwise the diffview shows too many "changed" files when the MR needs to be rebased.
jakubbortlik
force-pushed
the
feat/implement-rebasing
branch
from
27e544a to
6fc6475
Compare
jakubbortlik
force-pushed
the
feat/implement-rebasing
branch
from
6fc6475 to
3384ee1
Compare
jakubbortlik
force-pushed
the
feat/implement-rebasing
branch
from
3384ee1 to
d528de8
Compare
This was referenced Apr 7, 2026
jakubbortlik
changed the title
jakubbortlik
changed the title
jakubbortlik
force-pushed
the
feat/implement-rebasing
branch
from
dff2d2a to
49d2495
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #497.
This is still in draft because I would like to test it thoroughly, but the main functionality works. The maintained Diffview fork supports updating a diffview, and programmatically modifying selections which enables us to update the reviewer in place without closing and reopening after a rebase.
There will be a trivial conflict with #530 because both PR's add keybindings in the same place in settings.
AI use: The Go code is mostly generated by Claude Opus 4.5. The same model has been used for reviewing the lua code.