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

Merge + Help Popups in {Commit, Log, Reflog} Views #980

Merged
merged 4 commits into from
Nov 29, 2023

Conversation

gollth
Copy link
Contributor

@gollth gollth commented Nov 29, 2023

Found another couple of missing keybinds =)

@CKolkey
Copy link
Member

CKolkey commented Nov 29, 2023

Merge popup is an easy ✅

Help popup I think is a little weird. It's pretty tightly coupled to the status buffer (the stage/unstage commands are all baked in) and it doesn't have the ability to get the current commit under the cursor so will behave differently when opening a popup from the help menu vs directly.

My plan for that is to do some/all of the following:

  • Make the help popup more composable so callers can modify what gets shown
  • Pass commits into help popup constructor so they can be passed into any popups that are opened up from the help menu
  • Create different help popups for each view

@gollth
Copy link
Contributor Author

gollth commented Nov 29, 2023

Ah okay, didn't look that closely to the help popup (was just wondering why trying to open it brought up a vim search :D)

I will revert the keybind commit for now, than until the preps for the customizable help are ready. All points sound very resonable to me

@CKolkey CKolkey merged commit bb538f1 into NeogitOrg:master Nov 29, 2023
3 checks passed
@CKolkey
Copy link
Member

CKolkey commented Nov 29, 2023

Cool! Thanks as always :)

@gollth
Copy link
Contributor Author

gollth commented Nov 30, 2023

Thank you for this plugin =)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants