git: Mark entries as pending when staging a files making the staged highlighting more "optimistic" by van-sprundel · Pull Request #43434 · zed-industries/zed

van-sprundel · 2025-11-24T21:19:15Z

This at least speeds it up, not sure if this would close the issue

On main (342eba6):

Screen.Recording.2025-11-24.at.22.20.41.mov

This branch:

Screen.Recording.2025-11-24.at.22.16.56.mov

Closes #26870

Release Notes:

Added optimistic staged hunk updating

cla-bot · 2025-11-24T21:19:19Z

We require contributors to sign our Contributor License Agreement, and we don't have @van-sprundel on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'.

van-sprundel · 2025-11-24T21:20:19Z

@cla-bot check

cla-bot · 2025-11-24T21:20:21Z

We require contributors to sign our Contributor License Agreement, and we don't have @van-sprundel on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'.

cla-bot · 2025-11-24T21:20:22Z

We require contributors to sign our Contributor License Agreement, and we don't have @van-sprundel on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'.

cla-bot · 2025-11-24T21:20:23Z

The cla-bot has been summoned, and re-checked this pull request!

van-sprundel · 2025-11-24T21:23:45Z

@cla-bot check

cla-bot · 2025-11-24T21:23:49Z

The cla-bot has been summoned, and re-checked this pull request!

cole-miller · 2025-12-16T04:06:35Z

Thanks!

+1 for making this more optimistic, and I think the basic approach is right, but we can streamline the implementation a bit. The goal is to end up with a set of pending_hunks that has the same hunk ranges as the uncommitted diff, and where the new_status for each hunk is DiffHunkSecondaryStatus::SecondaryHunkRemovalPending (staging) or DiffHunkSecondaryStatus::SecondaryHunkAdditionPending (unstaging). We should be able to add a method on BufferDiff that just sets the pending hunks to this state, which should have the same effect as the stage_or_unstage_hunks call and be a bit more efficient. Would you be able to take a crack at implementing that?

van-sprundel · 2025-12-16T08:37:23Z

Will take a look at that later today!

cole-miller · 2025-12-16T21:01:01Z

Hi @van-sprundel, thanks for updating the PR!

I realized that the refactoring I suggested introduces a bug, where the staged status of the hunks flickers if you click the checkbox multiple times in quick succession (this is due to losing the cx.emit(BufferDiffEvent::HunksStagedOrUnstaged { .. } in fn stage_or_unstage_hunks. I think we should go back to your original approach, sorry for the confusion! Other than that I think this is good to merge.

van-sprundel · 2025-12-17T09:08:48Z

I did notice that when you spam it, the visualization lags behind sometimes. Wondering why this makes such a difference because I wouldn't expect it to be slower

van-sprundel · 2025-12-17T14:20:49Z

Reverted the commit :)

cole-miller · 2025-12-17T16:32:47Z

Thanks!

…ighlighting more "optimistic" (#43434) This at least speeds it up, not sure if this would close the issue On main (342eba6): https://github.com/user-attachments/assets/55d10187-b4e6-410d-9002-06509e8015c9 This branch: https://github.com/user-attachments/assets/e9a5c14f-9694-4321-a81c-88d6f62fb342 Closes #26870 Release Notes: - Added optimistic staged hunk updating

…staged highlighting more "optimistic" (#43434)" This reverts commit 74b4013.

…staged highlighting more "optimistic"" (#45175) Reverts #43434 This caused a regression because the additional pending hunks don't get cleared.

Relanding #43434 with an improved approach. Release Notes: - N/A --------- Co-authored-by: Ramon <55579979+van-sprundel@users.noreply.github.com>

…ighlighting more "optimistic" (#43434) This at least speeds it up, not sure if this would close the issue On main (342eba6): https://github.com/user-attachments/assets/55d10187-b4e6-410d-9002-06509e8015c9 This branch: https://github.com/user-attachments/assets/e9a5c14f-9694-4321-a81c-88d6f62fb342 Closes #26870 Release Notes: - Added optimistic staged hunk updating

…staged highlighting more "optimistic"" (#45175) Reverts #43434 This caused a regression because the additional pending hunks don't get cleared.

Relanding #43434 with an improved approach. Release Notes: - N/A --------- Co-authored-by: Ramon <55579979+van-sprundel@users.noreply.github.com>

…ighlighting more "optimistic" (zed-industries#43434) This at least speeds it up, not sure if this would close the issue On main (342eba6): https://github.com/user-attachments/assets/55d10187-b4e6-410d-9002-06509e8015c9 This branch: https://github.com/user-attachments/assets/e9a5c14f-9694-4321-a81c-88d6f62fb342 Closes zed-industries#26870 Release Notes: - Added optimistic staged hunk updating

…staged highlighting more "optimistic"" (zed-industries#45175) Reverts zed-industries#43434 This caused a regression because the additional pending hunks don't get cleared.

…stries#45278) Relanding zed-industries#43434 with an improved approach. Release Notes: - N/A --------- Co-authored-by: Ramon <55579979+van-sprundel@users.noreply.github.com>

…ighlighting more "optimistic" (zed-industries#43434) This at least speeds it up, not sure if this would close the issue On main (342eba6): https://github.com/user-attachments/assets/55d10187-b4e6-410d-9002-06509e8015c9 This branch: https://github.com/user-attachments/assets/e9a5c14f-9694-4321-a81c-88d6f62fb342 Closes zed-industries#26870 Release Notes: - Added optimistic staged hunk updating

…staged highlighting more "optimistic"" (zed-industries#45175) Reverts zed-industries#43434 This caused a regression because the additional pending hunks don't get cleared.

…stries#45278) Relanding zed-industries#43434 with an improved approach. Release Notes: - N/A --------- Co-authored-by: Ramon <55579979+van-sprundel@users.noreply.github.com>

…ighlighting more "optimistic" (zed-industries#43434) This at least speeds it up, not sure if this would close the issue On main (342eba6): https://github.com/user-attachments/assets/55d10187-b4e6-410d-9002-06509e8015c9 This branch: https://github.com/user-attachments/assets/e9a5c14f-9694-4321-a81c-88d6f62fb342 Closes zed-industries#26870 Release Notes: - Added optimistic staged hunk updating

…staged highlighting more "optimistic"" (zed-industries#45175) Reverts zed-industries#43434 This caused a regression because the additional pending hunks don't get cleared.

…stries#45278) Relanding zed-industries#43434 with an improved approach. Release Notes: - N/A --------- Co-authored-by: Ramon <55579979+van-sprundel@users.noreply.github.com>

van-sprundel changed the title ~~git: mark entries as pending when staging a files making the staged highlighting more optimistic"~~ git: mark entries as pending when staging a files making the staged highlighting more "optimistic" Nov 24, 2025

van-sprundel force-pushed the mark-entries-as-pending-when-staging branch from 85a56ae to 0486829 Compare November 24, 2025 21:20

maxdeviant changed the title ~~git: mark entries as pending when staging a files making the staged highlighting more "optimistic"~~ git: Mark entries as pending when staging a files making the staged highlighting more "optimistic" Nov 24, 2025

cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Nov 24, 2025

van-sprundel force-pushed the mark-entries-as-pending-when-staging branch from 0486829 to ec007c3 Compare November 24, 2025 21:24

git: Mark entries as pending when staging a files

933413f

van-sprundel force-pushed the mark-entries-as-pending-when-staging branch from ec007c3 to 933413f Compare November 24, 2025 21:25

van-sprundel marked this pull request as ready for review November 24, 2025 21:31

SomeoneToIgnore assigned cole-miller Nov 24, 2025

zelenenka added this to Quality Week – December 2025 Nov 27, 2025

github-project-automation bot moved this to Community PRs in Quality Week – December 2025 Nov 27, 2025

cole-miller moved this from Community PRs to In progress in Quality Week – December 2025 Dec 16, 2025

van-sprundel force-pushed the mark-entries-as-pending-when-staging branch from b540c18 to 933413f Compare December 17, 2025 14:20

cole-miller merged commit 74b4013 into zed-industries:main Dec 17, 2025
45 checks passed

github-project-automation bot moved this from In progress to Done in Quality Week – December 2025 Dec 17, 2025

cole-miller added a commit that referenced this pull request Dec 18, 2025

Revert "git: Mark entries as pending when staging a files making the …

151926a

…staged highlighting more "optimistic" (#43434)" This reverts commit 74b4013.

cole-miller mentioned this pull request Dec 18, 2025

Revert "git: Mark entries as pending when staging a files making the staged highlighting more "optimistic"" #45175

Merged

cole-miller mentioned this pull request Dec 18, 2025

git: Optimistically stage hunks when staging a file, take 2 #45278

Merged

esthertrapadoux added this to Git board Jan 20, 2026

esthertrapadoux moved this to 🚢 Shipped by Community in Git board Jan 20, 2026

Uh oh!

Conversation

van-sprundel commented Nov 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cla-bot bot commented Nov 24, 2025

Uh oh!

van-sprundel commented Nov 24, 2025

Uh oh!

cla-bot bot commented Nov 24, 2025

Uh oh!

cla-bot bot commented Nov 24, 2025

Uh oh!

cla-bot bot commented Nov 24, 2025

Uh oh!

van-sprundel commented Nov 24, 2025

Uh oh!

cla-bot bot commented Nov 24, 2025

Uh oh!

cole-miller commented Dec 16, 2025

Uh oh!

van-sprundel commented Dec 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cole-miller commented Dec 16, 2025

Uh oh!

van-sprundel commented Dec 17, 2025

Uh oh!

van-sprundel commented Dec 17, 2025

Uh oh!

cole-miller commented Dec 17, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

van-sprundel commented Nov 24, 2025 •

edited

Loading

van-sprundel commented Dec 16, 2025 •

edited

Loading