git: More performance improvements when toggling between diff views (#49400) (cherry-pick to preview)#49412
Merged
zed-zippy[bot] merged 1 commit intov0.224.xfrom Feb 17, 2026
Merged
Conversation
…49400) - Defer syncing block maps from `set_companion`, eliminating some redundant recomputations - Emit one large multibuffer edit from `set_show_deleted_hunks` instead of many small edits, to avoid bad case for block map This cuts hangs roughly in half when toggling between views in a large diff (1000 commits from the chromium repository). <!-- Before you mark this PR as ready for review, make sure that you have: - [ ] Added a solid test coverage and/or screenshots from doing manual testing - [ ] Done a self-review taking into account security and performance aspects - [ ] Aligned any UI changes with the [UI checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) --> Release Notes: - Improved performance with large diffs when toggling between diff views. --------- Co-authored-by: Jakub Konka <kubkon@jakubkonka.com> Co-authored-by: Lukas Wirth <lukas@zed.dev>
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.
Cherry-pick of #49400 to preview
set_companion, eliminating someredundant recomputations
set_show_deleted_hunksinsteadof many small edits, to avoid bad case for block map
This cuts hangs roughly in half when toggling between views in a large
diff (1000 commits from the chromium repository).
Release Notes:
views.
Co-authored-by: Jakub Konka kubkon@jakubkonka.com
Co-authored-by: Lukas Wirth lukas@zed.dev