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

Add support for options handling in log and stashes views #1661 #1675

Merged
merged 2 commits into from
Jun 19, 2023

Conversation

kamillo
Copy link
Contributor

@kamillo kamillo commented May 7, 2023

This Pull Request fixes/closes #1661.

It changes the following:

  • Adds support for options handling in log and stashes views
  • SharedOptions are now passed to InspectCommitComponent and CompareCommitsComponent and used instead of DiffOptions::default()

I followed the checklist:

  • I added unittests
  • I ran make check without errors
  • I tested the overall application
  • I added an appropriate item to the changelog

Copy link
Owner

@extrawurst extrawurst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Thanks for taking this! One small comment

CHANGELOG.md Outdated Show resolved Hide resolved
…1661

 * Pass SharedOptions to InspectCommitComponent and CompareCommitsComponent
@kamillo kamillo force-pushed the handle-options-in-other-views branch from 5256db6 to 46b4e10 Compare May 10, 2023 05:47
@kamillo kamillo requested a review from extrawurst May 10, 2023 05:53
@extrawurst
Copy link
Owner

@pm100 mind giving this a spin? I am currently on holiday and can’t test it

@pm100
Copy link
Contributor

pm100 commented May 10, 2023

@pm100 mind giving this a spin? I am currently on holiday and can’t test it

sure, I can do a PR to increase min rust version to 1.65 too (since all CI are failing now)

@extrawurst
Copy link
Owner

@pm100 ok let’s do that. Search for all occupancies of 1.64 please especially also in CD for releases so we do not see surprises in a release

@pm100
Copy link
Contributor

pm100 commented May 10, 2023

@extrawurst Not quite sure how this has happened (I am also away but have my macbook and can remote into my home windows dev system) something has pulled crossterm 0.26 into gitui. This has a serious breaking change for windows. I already ran across this for tiu-textarea - see rhysd/tui-textarea#17 because , if you recall, I am working on integrating that into gitui (I have pending PR too, hopefully they get to that)

I supposed that its not this PR but something earlier BUT my initial testing suggests its this change (I pulled gitui master branch and it was fine)

The fix is simple if you know where the keyboard event conversion core is. You now need to explictly test that the crossterm key event is a keydown (ct 0.26 on windows also generates a key release event - grr). Look at the PR i linked above , its tiny

If you tell me where to tweak that I can edit it in and test it (remote debugging / exploring of code I dont know is very hard - only one monitor, small screen, and v slow)

EDIT: Its OK i found how to fix it. I will do a separate PR for that. I suggest you sit on whatever is causing the crossterm upgrade till then (Dont quite understand what is doing that)

BTW. This PR works fine on Mac and Ubuntu (via WSL).

@kamillo
Copy link
Contributor Author

kamillo commented May 17, 2023

Let me know if you need any further changes for this PR.

@pm100
Copy link
Contributor

pm100 commented May 17, 2023

@kamillo I was testing this on windows and hit a blocking issue pulled in from crossterm 0.26, this is now fixed in master and you have synced with that. I will finish testing tomorrow or the next day

@pm100
Copy link
Contributor

pm100 commented May 17, 2023

@extrawurst tested on macos 13.3.1 ubuntu 20.2 (WSL) and windows 11. Works fine

@extrawurst extrawurst merged commit 58e72cd into extrawurst:master Jun 19, 2023
@extrawurst
Copy link
Owner

Thanks @kamillo

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.

Ignore whitespace does not work in Log [2] view
3 participants