git_ui: Close branch selector as soon as branch is selected #39725
Conversation
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
|
We require contributors to sign our Contributor License Agreement, and we don't have @mattermoran 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'. |
Contributor
Author
|
@cla-bot check |
cla-bot
bot
added
the
cla-signed
|
The cla-bot has been summoned, and re-checked this pull request! |
maxdeviant
changed the title
cole-miller
requested changes
Oct 20, 2025
Member
cole-miller
left a comment
cole-miller
left a comment
There was a problem hiding this comment.
Thanks, I like this change! Just one point of feedback (and I think it's fine to merge this without adding a test).
…closed before operation is done
cole-miller
approved these changes
Oct 20, 2025
auto-merge was automatically disabled
October 20, 2025 19:25
Head branch was pushed to by a user without write access
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
I noticed that branch picker doesn't close until the checkout operation is completed.
While normally it's not an issue, it becomes obvious if there are longer running post checkout hooks. In that case selecting a branch makes it feel like nothing has happened (there's a small indicator in the footer) so it's possible to click it multiple times. Closing the modal before the operation completes leads to the error modal saying
Failed to change branch. entity released. Please try again.even though the checkout was successful.The new behavior is to close the branch picker as soon as the branch is selected. This also aligns with the existing behavior in
create_branchwherecx.emit(DismissEvent);is called without waiting forrepo.update.And as I mentioned before there an indicator in the footer saying
git switch <branch_name>with a spinner thingy.I also added a check in the picker's
openfunction where it first checks if there's currently an active job and does not show the picker in that case.If this generally makes sense I can add the tests as well if needed.
P.S I checked how it works in VSCode and yes it also closes the branch picker as soon as the branch is selected. The only difference is that they show the loading indicator right next to the branch name (with a new branch) but in our case the current branch and activity indicator are located in different places.
Before
Screen.Recording.2025-10-08.at.12.59.27.AM.mp4
After
Screen.Recording.2025-10-08.at.1.07.49.AM.mp4
Release Notes: