Add ability to discard

[benogle]

I want to be able to discard files / hunks / lines. Maybe lines is a little extreme, but definitely allowing the discard of files and hunks would be nice.

• From the keyboard, I want to use backspace. We could pop a confirmation.
• From the UI, not sure. @simurai, have any ideas?

[simurai]

Diff

The initial idea was to have those ✅ icons, to show if something is staged/unstaged. We would still have to implement them, but when you hover them, an ❎ is shown to discard the change. Can be used for both, lines and hunks.

Panel

Then you probably want to discard entire files or all changes. In the panel, there could be ❎ buttons, but only when you hover the title or a file.

Discard all changes	Discard a single file

An alternative is to use a right-click context menu. Maybe if "show on hover" feels too noisy. Also, less risk of accidental clicks.

Status Bar

Discard all files directly from the status-bar with a right-click context menu:

Could also be enabled for the per file diff.

[benogle]

I am into the hover actions. Overall 👍

[kuychaco]

I'm thinking we may want to move this to a later milestone. 💭 @iolsen

[iolsen]

I'm fine with that. I really like this feature but agree we can definitely live without it for staff ship.

[nathansobo]

@kuychaco @iolsen I'm finding the inability to discard driving me back to GitX. I think we should reconsider because it wouldn't be that hard to implement.

[kuychaco]

@nathansobo Yeah that sounds reasonable. Was just thinking about how I really wanted to be able to discard lines when I forget to delete a console.log. Would be a really awesome and handy feature to have

@simurai can we get your thoughts on what this should look like given the current state of things (which is a bit different than your mock-ups above)

Something to consider - if the user tries to delete an unsaved file, or a hunk or line in an unsaved file, how should we handle that? Just have a system dialog that says they must save before discarding?

[iolsen]

I'm OK with moving this up to staff ship. At our next sync we should go through all the open M1 issues and see if there's anything we can push back.

[simurai]

How about initially use the context menu (right click)? Then it could be used consistently in the status-bar, StagingView lists and for hunks and lines. And have no confirmation because it already needs two clicks.

And delete/backspace with the keyboard. Not sure if that needs a confirmation dialog.

[nathansobo]

Just for context, GitX allows hunks to be discarded but not lines. If I need to do a partial discard I just stage some of the lines and discard the remaining hunk. They only show the discard button in the unstaged diff view.

[ungb]

+1, I'd like to see this enhancement as well!

[nathansobo]

YES!