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

Show files filter status #4230

Merged
merged 3 commits into from
Feb 7, 2025
Merged

Show files filter status #4230

merged 3 commits into from
Feb 7, 2025

Conversation

stefanhaller
Copy link
Collaborator

  • PR Description

This PR contains three improvements to the Files panel filtering:

  • it allows the user to switch to a different filter type (or reset the filter) when we are auto-showing only conflicting files
  • it shows the filter menu as radio buttons
  • it displays the current filter in the top-right corner of the Files panel's frame

See the individual commits for details.

  • Please check if the PR fulfills these requirements
  • Cheatsheets are up-to-date (run go generate ./...)
  • Code has been formatted (see here)
  • Tests have been added/updated (see here for the integration test guide)
  • Text is internationalised (see here)
  • If a new UserConfig entry was added, make sure it can be hot-reloaded (see here)
  • Docs have been updated if necessary
  • You've read through your own file changes for silly mistakes etc

Copy link

codacy-production bot commented Feb 1, 2025

Coverage summary from Codacy

See diff coverage on Codacy

Coverage variation Diff coverage
Report missing for a1838d31 75.86%
Coverage variation details
Coverable lines Covered lines Coverage
Common ancestor commit (a1838d3) Report Missing Report Missing Report Missing
Head commit (aad2622) 52556 45513 86.60%

Coverage variation is the difference between the coverage for the head and common ancestor commits of the pull request branch: <coverage of head commit> - <coverage of common ancestor commit>

Diff coverage details
Coverable lines Covered lines Diff coverage
Pull request (#4230) 29 22 75.86%

Diff coverage is the percentage of lines that are covered by tests out of the coverable lines that the pull request added or modified: <covered lines added or modified>/<coverable lines added or modified> * 100%

See your quality gate settings    Change summary preferences

Codacy stopped sending the deprecated coverage status on June 5th, 2024. Learn more

Footnotes

  1. Codacy didn't receive coverage data for the commit, or there was an error processing the received data. Check your integration for errors and validate that your coverage setup is correct.

Copy link
Owner

@jesseduffield jesseduffield left a 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

@stefanhaller
Copy link
Collaborator Author

@jesseduffield Thanks. I can only merge this after #4226 is merged though, because it depends on it (and sits on top of it).

Base automatically changed from show-untracked-files to master February 6, 2025 22:08
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.
@stefanhaller stefanhaller force-pushed the show-files-filter-status branch from 86e6a99 to aad2622 Compare February 7, 2025 08:24
@stefanhaller stefanhaller merged commit fcf30ca into master Feb 7, 2025
15 checks passed
@stefanhaller stefanhaller deleted the show-files-filter-status branch February 7, 2025 08:27
tmeijn pushed a commit to tmeijn/dotfiles that referenced this pull request Feb 25, 2025
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 [@&#8203;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 [@&#8203;AzraelSec](https://github.com/AzraelSec) in jesseduffield/lazygit#4191
-   Swap position of checkout-commit and checkout-branch menu items by [@&#8203;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 [@&#8203;jesseduffield](https://github.com/jesseduffield) in jesseduffield/lazygit#4226
-   Expose {{.SelectedCommitRange}} to custom commands by [@&#8203;stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4204
-   Show background fetch status in bottom line by [@&#8203;stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4215
-   Support copying tags to clipboard by [@&#8203;brunofjesus](https://github.com/brunofjesus) in jesseduffield/lazygit#4218
-   Add option to delete local and remote tag by [@&#8203;AnvarU](https://github.com/AnvarU) in jesseduffield/lazygit#4217
-   Show confirmation menu when trying to amend changes while there are conflicts by [@&#8203;stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4222
-   Improve error reporting on config migration by [@&#8203;kas2020-commits](https://github.com/kas2020-commits) in jesseduffield/lazygit#4210
-   Show files filter status by [@&#8203;stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4230
-   Improve contrast of highlighted search results by [@&#8203;stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4242

##### Fixes 🔧

-   Don't try killing processes if we already know the command finished by [@&#8203;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 [@&#8203;efussi](https://github.com/efussi) in jesseduffield/lazygit#4185
-   Fix adding blank line at end of commit message by [@&#8203;stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4182
-   Fix checking out a different branch while pushing a branch for the first time by [@&#8203;stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4214
-   Fix tag being truncated when copying to clipboard by [@&#8203;brunofjesus](https://github.com/brunofjesus) in jesseduffield/lazygit#4232
-   Disable staging and unstaging lines or hunks when the diff context size is 0 by [@&#8203;stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4235
-   Fix incorrect stash diff after rename by [@&#8203;brandondong](https://github.com/brandondong) in jesseduffield/lazygit#4213
-   Fix possible crash when deleting a branch while filtering is active by [@&#8203;stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4195
-   Fix pasting multi-line text into commit message panel by [@&#8203;stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4234
-   fix: properly detect icon for BAZEL and WORKSPACE files by [@&#8203;PeterCardenas](https://github.com/PeterCardenas) in jesseduffield/lazygit#4252
-   Fix json schema for context of CustomCommand by [@&#8203;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 [@&#8203;ChrisMcD1](https://github.com/ChrisMcD1) in jesseduffield/lazygit#4248
-   Fix auto-release workflow by [@&#8203;jesseduffield](https://github.com/jesseduffield) in jesseduffield/lazygit#4265

##### I18n 🌎

-   Update translations; includes a new Portuguese translation by [@&#8203;stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4250

#### New Contributors

-   [@&#8203;efussi](https://github.com/efussi) made their first contribution in jesseduffield/lazygit#4185
-   [@&#8203;brunofjesus](https://github.com/brunofjesus) made their first contribution in jesseduffield/lazygit#4218
-   [@&#8203;AnvarU](https://github.com/AnvarU) made their first contribution in jesseduffield/lazygit#4217
-   [@&#8203;kas2020-commits](https://github.com/kas2020-commits) made their first contribution in jesseduffield/lazygit#4210
-   [@&#8203;ChrisMcD1](https://github.com/ChrisMcD1) made their first contribution in jesseduffield/lazygit#4248
-   [@&#8203;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=-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants