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

[Feature Request] Confirmation dialog when hitting Esc on Interactive Rebase #255

Closed
fgimian opened this issue May 4, 2019 · 9 comments

Comments

@fgimian
Copy link

commented May 4, 2019

It's currently way too easy to lose your work by accidentally hitting Esc after making many edits on an interactive rebase. This just happened to me and honestly I don't even know how, but I lost a good 15 mins of work.

Kindly consider a confirmation dialog if any changes have been made and a user tries to cancel an interactive rebase.

Thanks heaps and great job on this app!!! 😄
Fotis

@fgimian

This comment has been minimized.

Copy link
Author

commented May 4, 2019

Actually, it turns out I hadn't hit Esc as I reproduced the issue again. After renaming a bunch of commits and scrolling through to check my work, the Interactive Rebase dialog box just disappeared and I lost all my work again 😢

I'm going back to the CLI for now 😄

@DanPristupov

This comment has been minimized.

Copy link
Contributor

commented May 4, 2019

Most probably you hit 5 minute timeout for an active rebase process. I need to improve that.

@fgimian

This comment has been minimized.

Copy link
Author

commented May 4, 2019

Most probably you hit 5 minute timeout for an active rebase process. I need to improve that.

Ooooh, that makes sense. Yes, please remove the timeout completely if you can. On a large rebase, it can easily take longer than that.

Cheers
Fotis

@vadsiraly

This comment has been minimized.

Copy link

commented May 6, 2019

Hah! We are not alone. I second this.

@DanPristupov

This comment has been minimized.

Copy link
Contributor

commented May 6, 2019

Yes, we have this already: #186.

I will think how to fix that.

@fgimian

This comment has been minimized.

Copy link
Author

commented May 6, 2019

Thanks @vadsiraly, looks like you beat me to it with your report 😄

Personally, I think there should never be a timeout on such operations. When the user is finished, they will close the dialog box and the process can die.

I hope there's a way to implement this and remove the timout completely, this is extremely strange behaviour imho.

Huge love and thanks
Fotis

@DanPristupov

This comment has been minimized.

Copy link
Contributor

commented May 6, 2019

Personally, I think there should never be a timeout on such operations.

This is dangerous. IR is performed as a background process. So, if you kill Fork in Task Manager (or it crashes), the repository will be blocked until a reboot.

I hope there's a way to implement this and remove the timeout completely, this is extremely strange behaviour imho.

Any timeout could be considered as a strange behaviour, because usually it handles cases when something went wrong.

@fgimian

This comment has been minimized.

Copy link
Author

commented May 6, 2019

Really appreciate the reply and your commitment to helping solve this!

Ultimately as a user, I simply can't trust Fork for interactive rebases in its current form because I've lost my work twice when the timeout was enforced. The dialog just diassppeared even though I had renamed dozens of commits.

It's way too risky, especially for such tedious operations that I would never want to do more than once (in the case above, I did it 3 times, twice with Fork which timed out both times ... and then finally I just used the CLI and everything was fine). Lucikly I had put my old and new commit messages into a file in Sublime text and was copy / pasting, but even so, it was still very frustrating doing that multiple times.

Hope that a solution can be found to remedy this because Fork otherwise does a wonderful job on interactive rebase 😄

@DanPristupov DanPristupov added this to the 1.34 milestone Jun 6, 2019

@DanPristupov

This comment has been minimized.

Copy link
Contributor

commented Jun 8, 2019

We added the confirmation dialog in 1.34.

P.S. The timeout problem is still there

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.