Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Missing UI feedback when rebasing onto another branch #1488

Closed
grossjohann opened this issue Sep 24, 2021 · 6 comments
Closed

Missing UI feedback when rebasing onto another branch #1488

grossjohann opened this issue Sep 24, 2021 · 6 comments
Labels
bug Something isn't working good first issue Good for newcomers

Comments

@grossjohann
Copy link

Describe the bug
When hitting r in the "Local Branches" panel to rebase the currently checked-out branch onto the selected branch, there is no user feedback while the operation is ongoing. Lazygit usually responds really fast, so if it appears to hang for a couple of seconds, I start suspecting that something went wrong.

To Reproduce
Start a branch and work on it for a while. Let's say that other people push to master while you are working on your branch. After some commits on master have happened, while you are still in your branch:

  • Start lazygit
  • Navigate to the "Local Branches" panel
  • Navigate to the master branch in the "Local Branches" panel
  • Hit f to fetch the commits that have happened on the master branch
  • Hit r to rebase your branch on top of master

Expected behavior
After hitting r, the UI updates soon. If the rebase operation is fast, it makes sense to display the result. If the rebase operation is slow, perhaps a spinner would be nice, like the ones from push and pull.

Screenshots
I think screenshots are not required.

Desktop (please complete the following information):

  • OS: macOS Big Sur version 11.6
  • Lazygit Version: 0.29 (installed via the jesseduffield/lazygit tap for HomeBrew)

Additional context
Add any other context about the problem here.

@grossjohann grossjohann added the bug Something isn't working label Sep 24, 2021
@rickyelopez
Copy link

rickyelopez commented May 9, 2023

This is still a problem. I'm working on a pretty massive repo, and the rebase operation makes everything hang for sometimes up to a full minute. Worse than it hanging, there's no feedback that lazygit as registered me hitting enter on the "are you sure you want to rebase" prompt, and subsequent enter presses while it is frozen will be applied to the next dialog that appears (i.e. the "conflicts! press enter to continue" prompt).

Would it be possible to make rebasing work like some other operations (edit: like checking out a branch) where while waiting there's a spinner in the bottom left that tells you there's something happening? Or maybe there's another solution?

@jesseduffield jesseduffield added the good first issue Good for newcomers label May 9, 2023
@jesseduffield
Copy link
Owner

This should be a really simple fix: In the rebase() method in pkg/gui/controllers/branches_controller.go we just need to wrap the action in a WithLoaderPanel call (you can see an example of that happening elsewhere in the file)

I've chucked a good-first-issue label on this. Do you feel up to the task @rickyelopez or @grossjohann ?

@rickyelopez
Copy link

yep sounds like fun, I can give it a shot in the next few weeks.

@topher200
Copy link

This issue can be closed; it's resolved by #2851

@grossjohann
Copy link
Author

Thank you @topher200 for the reminder. Yes, with the new behavior there is very nice feedback. Let me close this issue.

@rickyelopez
Copy link

thanks guys! sorry I never got to it myself

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working good first issue Good for newcomers
Projects
None yet
Development

No branches or pull requests

4 participants