stgit.el: Fix Index/Work Tree incremental refresh#634
Open
jrajahalme wants to merge 1 commit into
Open
Conversation
Index/Work Tree incremental refresh has been broken in center mode after lexical-binding change made in commit 04559f0. When stgit-show-worktree-mode is center, stgit-run-series-insert-index may be called while parsing stg series output inside with-temp-buffer. Since stgit-index-node and stgit-worktree-node are buffer-local, the current implementation stores them in the temporary buffer, not the real stgit-mode buffer. As a result, after reload in this layout: stgit-index-node ;; nil in the stgit buffer stgit-worktree-node ;; nil in the stgit buffer Then commands like stgit-toggle-index call: (stgit-refresh-worktree) (stgit-refresh-index) but both are no-ops because the node variables are nil. A full stgit-reload still works, which is why pressing g fixes the display. Fix by applying the updated stgit-index-node and stgit-worktree-node to the real stgit-mode buffer instead. Fixes: 04559f0 Fixes: stacked-git#633 Signed-off-by: Jarno Rajahalme <jarno@isovalent.com>
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.
Index/Work Tree incremental refresh has been broken in center mode after lexical-binding change made in commit 04559f0.
When stgit-show-worktree-mode is center, stgit-run-series-insert-index may be called while parsing stg series output inside with-temp-buffer. Since stgit-index-node and stgit-worktree-node are buffer-local, the current implementation stores them in the temporary buffer, not the real stgit-mode buffer.
As a result, after reload in this layout:
stgit-index-node ;; nil in the stgit buffer
stgit-worktree-node ;; nil in the stgit buffer
Then commands like stgit-toggle-index call:
(stgit-refresh-worktree)
(stgit-refresh-index)
but both are no-ops because the node variables are nil. A full stgit-reload still works, which is why pressing g fixes the display.
Fix by applying the updated stgit-index-node and stgit-worktree-node to the real stgit-mode buffer instead.
Fixes: 04559f0
Fixes: #633