Enable { and } to change diff context size in branches and tags panels in diffing mode#5258
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 preferencesFootnotes
|
|
BTW, I'm a little undecided whether the code complexity is worth it actually. Given that the commands show a toast saying what they did, I could also see us enabling the commands unconditionally everywhere. You could then change the diff context size while looking at the status panel, but why not? It would take effect the next time you view a diff. |
... actually, i stumbled upon a case where it didn't, though i cant recall it right away. do u want me to try to find that again?
i thought it was supposed to be the case already since these keybinds are listed under the "global" heading? |
No, they are listed but don't do anything when a panel is focused that doesn't show diffs. An alternative would be to strike them through in that case, with a tooltip explaining why they aren't available, like we do for many other commands that are only conditionally available. But I don't think it's worth the effort, it's just fine to enable them always. |
…s in diffing mode Actually, we simply enable them in any panel, even those that can never show a diff. Since the commands show a toast, that's enough feedback to understand what happened; the change will take effect the next time you switch to a panel that does show diffs. Same for ( and ) to change the rename threshold.
1faf8c7 to
9dd121d
Compare
what is auto-merge? |
|
It's a GitHub feature that merges the PR as soon as CI is green, so that I don't have to wait for that. |
This MR contains the following updates: | Package | Update | Change | |---|---|---| | [jesseduffield/lazygit](https://github.com/jesseduffield/lazygit) | minor | `v0.59.0` → `v0.60.0` | 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.60.0`](https://github.com/jesseduffield/lazygit/releases/tag/v0.60.0) [Compare Source](jesseduffield/lazygit@v0.59.0...v0.60.0) <!-- Release notes generated using configuration in .github/release.yml at v0.60.0 --> #### What's Changed ##### Enhancements 🔥 - Rename "Copy commit hash to clipboard" to mention it's an abbreviated hash by [@​stefanhaller](https://github.com/stefanhaller) in [#​5331](jesseduffield/lazygit#5331) - Hide the "Fetching..." status of the auto-fetch when bottom line is hidden by [@​stefanhaller](https://github.com/stefanhaller) in [#​5321](jesseduffield/lazygit#5321) - Allow removing lines from patch directly by [@​jesseduffield](https://github.com/jesseduffield) in [#​5277](jesseduffield/lazygit#5277) - Filter file views rather than search by [@​jesseduffield](https://github.com/jesseduffield) in [#​5273](jesseduffield/lazygit#5273) - Show branch name and detached HEAD in worktrees tab by [@​ruudk](https://github.com/ruudk) in [#​5339](jesseduffield/lazygit#5339) - Add backward cycling support for log view (using `<shift>-a` on status page) by [@​zaakiy](https://github.com/zaakiy) in [#​5346](jesseduffield/lazygit#5346) - Show worktree name next to branch in branches list by [@​ruudk](https://github.com/ruudk) in [#​5340](jesseduffield/lazygit#5340) ##### Fixes 🔧 - Fix matching of lazygit-edit URLs without line numbers by [@​danielwe](https://github.com/danielwe) in [#​5311](jesseduffield/lazygit#5311) - Fix [#​5302](jesseduffield/lazygit#5302): Create .git/info directory before writing exclude file by [@​cobyfrombrooklyn-bot](https://github.com/cobyfrombrooklyn-bot) in [#​5325](jesseduffield/lazygit#5325) - Fix off-by-one error when calculating popup panel dimensions by [@​stefanhaller](https://github.com/stefanhaller) in [#​5312](jesseduffield/lazygit#5312) - Properly disable clicks in inactive views behind popups by [@​stefanhaller](https://github.com/stefanhaller) in [#​5313](jesseduffield/lazygit#5313) - Enable `{` and `}` to change diff context size in branches and tags panels in diffing mode by [@​stefanhaller](https://github.com/stefanhaller) in [#​5258](jesseduffield/lazygit#5258) - Fix diff display of custom pagers after screen mode change by [@​stefanhaller](https://github.com/stefanhaller) in [#​5349](jesseduffield/lazygit#5349) ##### Maintenance ⚙️ - Bump github.com/cloudflare/circl from 1.6.1 to 1.6.3 by [@​dependabot](https://github.com/dependabot)\[bot] in [#​5323](jesseduffield/lazygit#5323) ##### Docs 📖 - Fix typo: MacOS to macOS by [@​04cb](https://github.com/04cb) in [#​5335](jesseduffield/lazygit#5335) ##### I18n 🌎 - Update translations from Crowdin by [@​stefanhaller](https://github.com/stefanhaller) in [#​5352](jesseduffield/lazygit#5352) ##### Other Changes - Add Terra as an alternative Fedora install method by [@​Owen-sz](https://github.com/Owen-sz) in [#​5281](jesseduffield/lazygit#5281) #### New Contributors - [@​Owen-sz](https://github.com/Owen-sz) made their first contribution in [#​5281](jesseduffield/lazygit#5281) - [@​danielwe](https://github.com/danielwe) made their first contribution in [#​5311](jesseduffield/lazygit#5311) - [@​cobyfrombrooklyn-bot](https://github.com/cobyfrombrooklyn-bot) made their first contribution in [#​5325](jesseduffield/lazygit#5325) - [@​04cb](https://github.com/04cb) made their first contribution in [#​5335](jesseduffield/lazygit#5335) - [@​zaakiy](https://github.com/zaakiy) made their first contribution in [#​5346](jesseduffield/lazygit#5346) **Full Changelog**: <jesseduffield/lazygit@v0.59.0...v0.60.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:eyJjcmVhdGVkSW5WZXIiOiI0My42MS43IiwidXBkYXRlZEluVmVyIjoiNDMuNjEuNyIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiUmVub3ZhdGUgQm90IiwiYXV0b21hdGlvbjpib3QtYXV0aG9yZWQiLCJkZXBlbmRlbmN5LXR5cGU6Om1pbm9yIl19-->
When looking at a diff in diffing mode in the branches or tags panels (e.g. after pressing
Won a branch and then selecting a different branch to diff it against the first one) it wasn't possible to change the diff context size using{and}, or the rename threshold using(and).Fixes #5254.