-
-
Notifications
You must be signed in to change notification settings - Fork 2k
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
Show files filter status #4230
Show files filter status #4230
Conversation
Coverage summary from CodacySee diff coverage on Codacy
Coverage variation details
Coverage variation is the difference between the coverage for the head and common ancestor commits of the pull request branch: Diff coverage details
Diff coverage is the percentage of lines that are covered by tests out of the coverable lines that the pull request added or modified: See your quality gate settings Change summary preferencesCodacy stopped sending the deprecated coverage status on June 5th, 2024. Learn more Footnotes
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM: tested and it works well
@jesseduffield Thanks. I can only merge this after #4226 is merged though, because it depends on it (and sits on top of it). |
b5e1269
to
7e85cdd
Compare
We don't need to maintain additional state to allow this; all we need to do is take over the filter only when the number of conflicting files goes from zero to non-zero, rather than every time it is non-zero. The only problem is that we don't allow users to go back to showing only conflicted files, but that's just because we don't have that as an entry in the menu. And I don't think it's a problem.
I renamed the "Reset filter" item to "No filter" to make it look more like a state than an action, so that it fits the radio button concept better. When there are conflicts and we set the filter to show only conflicting files, then none of the radio buttons light up, which is slightly strange. I guess it's ok though.
This includes the "only conflicting" status that the user can't switch to themselves. We display it anyway to give a hint that files are being filtered, and to let them know that they can turn the filter off if they want to.
86e6a99
to
aad2622
Compare
This MR contains the following updates: | Package | Update | Change | |---|---|---| | [jesseduffield/lazygit](https://github.com/jesseduffield/lazygit) | minor | `v0.45.2` -> `v0.47.1` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>jesseduffield/lazygit (jesseduffield/lazygit)</summary> ### [`v0.47.1`](https://github.com/jesseduffield/lazygit/releases/tag/v0.47.1) [Compare Source](jesseduffield/lazygit@v0.46.0...v0.47.1) <!-- Release notes generated using configuration in .github/release.yml at v0.47.1 --> #### What's Changed ##### Maintenance ⚙️ - Fix race condition with reselecting the focused branch and rendering by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4268 **Full Changelog**: jesseduffield/lazygit@v0.47.0...v0.47.1 ### [`v0.46.0`](https://github.com/jesseduffield/lazygit/releases/tag/v0.46.0) [Compare Source](jesseduffield/lazygit@v0.45.2...v0.46.0) It's time for another Lazygit release! Thanks to all who contributed to this release. #### What's Changed ##### Enhancements 🔥 - Preserve pending commit message when closing/re-opening by [@​AzraelSec](https://github.com/AzraelSec) in jesseduffield/lazygit#4191 - Swap position of checkout-commit and checkout-branch menu items by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4238 - In a previous release we had made it so that when you press space on a commit, the first option in the menu was to check out the corresponding branch, rather than the commit itself. We've made it so that now the first option is to check out the commit itself, for the sake of everybody's muscle memory. - Allow user to filter the files view to only show untracked files by [@​jesseduffield](https://github.com/jesseduffield) in jesseduffield/lazygit#4226 - Expose {{.SelectedCommitRange}} to custom commands by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4204 - Show background fetch status in bottom line by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4215 - Support copying tags to clipboard by [@​brunofjesus](https://github.com/brunofjesus) in jesseduffield/lazygit#4218 - Add option to delete local and remote tag by [@​AnvarU](https://github.com/AnvarU) in jesseduffield/lazygit#4217 - Show confirmation menu when trying to amend changes while there are conflicts by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4222 - Improve error reporting on config migration by [@​kas2020-commits](https://github.com/kas2020-commits) in jesseduffield/lazygit#4210 - Show files filter status by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4230 - Improve contrast of highlighted search results by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4242 ##### Fixes 🔧 - Don't try killing processes if we already know the command finished by [@​brandondong](https://github.com/brandondong) in jesseduffield/lazygit#4231 - We believe this was causing all sorts of problems for windows users. - Add '--' to 'git rev-list' to disambiguate branch name from path by [@​efussi](https://github.com/efussi) in jesseduffield/lazygit#4185 - Fix adding blank line at end of commit message by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4182 - Fix checking out a different branch while pushing a branch for the first time by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4214 - Fix tag being truncated when copying to clipboard by [@​brunofjesus](https://github.com/brunofjesus) in jesseduffield/lazygit#4232 - Disable staging and unstaging lines or hunks when the diff context size is 0 by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4235 - Fix incorrect stash diff after rename by [@​brandondong](https://github.com/brandondong) in jesseduffield/lazygit#4213 - Fix possible crash when deleting a branch while filtering is active by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4195 - Fix pasting multi-line text into commit message panel by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4234 - fix: properly detect icon for BAZEL and WORKSPACE files by [@​PeterCardenas](https://github.com/PeterCardenas) in jesseduffield/lazygit#4252 - Fix json schema for context of CustomCommand by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4255 ##### Maintenance ⚙️ - Bump go-deadlock version to fix crash with go 1.23 in debug mode by [@​ChrisMcD1](https://github.com/ChrisMcD1) in jesseduffield/lazygit#4248 - Fix auto-release workflow by [@​jesseduffield](https://github.com/jesseduffield) in jesseduffield/lazygit#4265 ##### I18n 🌎 - Update translations; includes a new Portuguese translation by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4250 #### New Contributors - [@​efussi](https://github.com/efussi) made their first contribution in jesseduffield/lazygit#4185 - [@​brunofjesus](https://github.com/brunofjesus) made their first contribution in jesseduffield/lazygit#4218 - [@​AnvarU](https://github.com/AnvarU) made their first contribution in jesseduffield/lazygit#4217 - [@​kas2020-commits](https://github.com/kas2020-commits) made their first contribution in jesseduffield/lazygit#4210 - [@​ChrisMcD1](https://github.com/ChrisMcD1) made their first contribution in jesseduffield/lazygit#4248 - [@​PeterCardenas](https://github.com/PeterCardenas) made their first contribution in jesseduffield/lazygit#4252 **Full Changelog**: jesseduffield/lazygit@v0.45.2...v0.46.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4xNzAuMSIsInVwZGF0ZWRJblZlciI6IjM5LjE3Ni40IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJSZW5vdmF0ZSBCb3QiXX0=-->
This PR contains three improvements to the Files panel filtering:
See the individual commits for details.
go generate ./...
)