6103 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jesse Duffield	54d0ebeff0	Update README.md	2025-02-22 08:34:35 +11:00
Jesse Duffield	af9699e59a	Add --include-untracked flag to stash show command (#3932) ... - **PR Description** This PR fixes #3931 by adding `--include-untracked` to `git stash show` command. Untracked stashed file diff is now shown in the main view.  *Before: the untracked stashed file is not shown in lazygit*.  *After: the untracked stashed file diff is shown in lazygit*. ## One Issue This PR does not fix the fact that untracked stashed files are not shown in the list of files in the "Stash" panel when entering a stash entry, I could not find an easy way to make them appear there. * [x] Cheatsheets are up-to-date (run `go generate ./...`) * [x] Code has been formatted (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#code-formatting)) * [x] Tests have been added/updated (see [here](https://github.com/jesseduffield/lazygit/blob/master/pkg/integration/README.md) for the integration test guide) * [x] Text is internationalised (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#internationalisation)) * [ ] If a new UserConfig entry was added, make sure it can be hot-reloaded (see [here](https://github.com/jesseduffield/lazygit/blob/master/docs/dev/Codebase_Guide.md#using-userconfig)) * [ ] Docs have been updated if necessary * [x] You've read through your own file changes for silly mistakes etc	2025-02-22 08:26:54 +11:00
Matteo Golinelli	d92c6d116b	Replace --include-untracked with -u in stash show command for compatibility and update failing tests	2025-02-22 08:17:38 +11:00
Matteo Golinelli	343a3e466a	Add --include-untracked flag to stash show command	2025-02-22 08:17:38 +11:00
Stefan Haller	16f5348790	Validate user config keybindings (#4275) ... - **PR Description** This improves the user experience when users try to use an invalid key name in their config, either for one of our standard keybindings or for the key of a custom command. Fixes half of #4256 (only the keybindings aspect of it, not the context names).	2025-02-21 13:24:41 +01:00
Stefan Haller	5979b40546	Validate keys of custom commands	2025-02-21 13:20:53 +01:00
Stefan Haller	a5f78d3222	Validate that Universal.JumpToBlock array has 5 elements ... The code that uses this panics if it has fewer.	2025-02-21 13:20:53 +01:00
Stefan Haller	f3791e6ab6	Validate keybindings	2025-02-21 13:20:53 +01:00
Stefan Haller	130801dbf6	Add a few missing keybindings to docs/keybindings/Custom_Keybindings.md	2025-02-21 13:20:33 +01:00
Stefan Haller	67bb7f62c5	Move labelByKey to config package	2025-02-21 13:20:33 +01:00
Stefan Haller	52b1c42d38	Add gui.tabWidth config (#4291) ... - **PR Description** This adds a config `gui.tabWidth` that can be used to change the tab width from the default of 4 to a different number. It affects everything that's shown in the main view, but is probably mostly relevant for diffs. When using a pager, the pager needs to be configured separately for the same tab width. This may often be different for different repos, so it may make sense to put it in a repo-local config file. In some cases this may still not be flexible enough, e.g. in multi-language projects that use different tab widths for the different file types; but it's better than before and was easy to do... Addresses #4290.	2025-02-20 09:17:05 +01:00
Stefan Haller	11616190ee	Add a gui.tabWidth config ... Affects everything that is shown in the main view, but probably mostly relevant for diffs.	2025-02-20 09:13:56 +01:00
Stefan Haller	e5137b86cf	Add a tabWidth parameter to WrapViewLinesToWidth to match gocui	2025-02-20 09:13:56 +01:00
Stefan Haller	ac3824bd7c	Bump gocui	2025-02-20 09:13:54 +01:00
Stefan Haller	56c9d5abeb	Add a "Copy to clipboard" menu to the Commit Files panel (#4271) ... - **PR Description** Add a "Copy to clipboard" menu to the Commit Files panel This is very similar to the same menu in the Files panel, except that it works on whatever diff is currently shown in the main view, including range diffs either in diffing mode (shift-W), or from a range selection of commits. The menu has some code duplication with the existing menu in the Files panel, but actually not so much. The first two menu items could be unified once we have generalized the filetrees, but these are pretty trivial; the other two menu items are sufficiently different that unifying them is not practical, I think. Fixes #4254.	2025-02-19 18:52:34 +01:00
Stefan Haller	c9196812a2	Add a "Copy to clipboard" menu to the Commit Files panel ... This is very similar to the same menu in the Files panel, except that it works on whatever diff is currently shown in the main view, including range diffs either in diffing mode (shift-W), or from a range selection of commits.	2025-02-19 18:50:12 +01:00
Stefan Haller	caca62b89e	Cleanup: simplify and tighten test expectations related to clipboard ... Change our fake clipboard command to not append a linefeed; that's closer to what the production code does. This allows us to use Equals instead of Contains for checking the clipboard contents. Finally, use FileSystem().FileContent() to assert the clipboard contents, instead of selecting the clipboard file and then checking the diff view.	2025-02-19 18:50:12 +01:00
Stefan Haller	e15e4951ab	Fix documentation of gui.showFileTree config (#4282) ... Change `~` to `` ` `` as it's the correct key.	2025-02-17 20:19:10 +01:00
Adrian Gielniewski	e3944c1707	Fix description of showFileTree ... Change '~' to '`' as it's the correct key. Signed-off-by: Adrian Gielniewski <adrian.gielniewski@gmail.com>	2025-02-17 20:14:11 +01:00
Stefan Haller	0d155e1478	feat: Support multiple commit prefixes (#4261) ... - **PR Description** This implementation, unlike that proposed in https://github.com/jesseduffield/lazygit/pull/4253 keeps the yaml schema easy, and does a migration from the single elements to a sequence of elements. Addresses https://github.com/jesseduffield/lazygit/issues/4194	2025-02-17 20:02:12 +01:00
Chris McDonnell	2fa4ee2cac	feat: Support multiple commit prefixes ... This implementation, unlike that proposed in https://github.com/jesseduffield/lazygit/pull/4253 keeps the yaml schema easy, and does a migration from the single elements to a sequence of elements.	2025-02-17 19:58:31 +01:00
Stefan Haller	a7bfeca9c0	Add option to copy commit body (#4274) ... I based this off of the existing `CommitMessage` option in the copy commit attributes menu.	2025-02-17 18:56:44 +01:00
Chris McDonnell	ab23539c0c	Add option to copy commit message body	2025-02-17 18:43:39 +01:00
Jesse Duffield	01eece3737	Use personal access token to push tag (#4266) ... Github actions refuses to trigger a workflow from another workflow, but if you use your own personal access token (in this case, GITHUB_API_TOKEN), it should work. - **PR Description** - **Please check if the PR fulfills these requirements** * [ ] Cheatsheets are up-to-date (run `go generate ./...`) * [ ] Code has been formatted (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#code-formatting)) * [ ] Tests have been added/updated (see [here](https://github.com/jesseduffield/lazygit/blob/master/pkg/integration/README.md) for the integration test guide) * [ ] Text is internationalised (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#internationalisation)) * [ ] If a new UserConfig entry was added, make sure it can be hot-reloaded (see [here](https://github.com/jesseduffield/lazygit/blob/master/docs/dev/Codebase_Guide.md#using-userconfig)) * [ ] Docs have been updated if necessary * [ ] You've read through your own file changes for silly mistakes etc <!-- Be sure to name your PR with an imperative e.g. 'Add worktrees view' see https://github.com/jesseduffield/lazygit/releases/tag/v0.40.0 for examples -->	2025-02-15 15:55:20 +11:00
Jesse Duffield	57220ba478	Use personal access token to push tag ... Github actions refuses to trigger a workflow from another workflow, but if you use your own personal access token (in this case, GITHUB_API_TOKEN), it should work.	2025-02-15 15:54:47 +11:00
Jesse Duffield	6636d0c15a	Fix auto-release workflow (#4265) ... The latest_tag env var wasn't defined when it was used. - **PR Description** - **Please check if the PR fulfills these requirements** * [ ] Cheatsheets are up-to-date (run `go generate ./...`) * [ ] Code has been formatted (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#code-formatting)) * [ ] Tests have been added/updated (see [here](https://github.com/jesseduffield/lazygit/blob/master/pkg/integration/README.md) for the integration test guide) * [ ] Text is internationalised (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#internationalisation)) * [ ] If a new UserConfig entry was added, make sure it can be hot-reloaded (see [here](https://github.com/jesseduffield/lazygit/blob/master/docs/dev/Codebase_Guide.md#using-userconfig)) * [ ] Docs have been updated if necessary * [ ] You've read through your own file changes for silly mistakes etc <!-- Be sure to name your PR with an imperative e.g. 'Add worktrees view' see https://github.com/jesseduffield/lazygit/releases/tag/v0.40.0 for examples -->	2025-02-15 15:37:50 +11:00
Jesse Duffield	269d89ea51	Fix issue where latest tag wasn't obtained early enough in auto-release script	2025-02-15 15:36:54 +11:00
Jesse Duffield	dcf264b182	README.md: Update Sponsors (#4177) ... Automated changes by [create-pull-request](https://github.com/peter-evans/create-pull-request) GitHub action	2025-02-15 15:24:27 +11:00
github-actions[bot]	e37d7d5ad2	README.md: Update Sponsors	2025-02-15 04:23:38 +00:00
Jesse Duffield	988162848a	Don't try killing processes if we already know the command finished + reduce error logging noise on Windows (#4231) ... - **PR Description** I was tinkering around with the code and then checking associated logs but even with LOG_LEVEL=error, I found there was a lot of noise on Windows. This PR fixes two such sources: 1. Navigating through files in the Files panel 1. Navigating through branches in the Branches panel when there are a lot of commits (e.g. this repo) More details in the comments below. - **Please check if the PR fulfills these requirements** * [ ] Cheatsheets are up-to-date (run `go generate ./...`) * [x] Code has been formatted (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#code-formatting)) * [ ] Tests have been added/updated (see [here](https://github.com/jesseduffield/lazygit/blob/master/pkg/integration/README.md) for the integration test guide) * [ ] Text is internationalised (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#internationalisation)) * [ ] If a new UserConfig entry was added, make sure it can be hot-reloaded (see [here](https://github.com/jesseduffield/lazygit/blob/master/docs/dev/Codebase_Guide.md#using-userconfig)) * [ ] Docs have been updated if necessary * [x] You've read through your own file changes for silly mistakes etc <!-- Be sure to name your PR with an imperative e.g. 'Add worktrees view' see https://github.com/jesseduffield/lazygit/releases/tag/v0.40.0 for examples -->	2025-02-15 15:23:26 +11:00
Brandon	ed9519a241	Suppress error logs when killing process on Windows ... There is a string check here to suppress the failure logs due to this reason but on Windows, the string is different ("exit status 1").	2025-02-15 14:51:35 +11:00
Brandon	7731311674	Don't try killing processes if we already know the command finished ... This may lead to unrelated processes being killed on Windows (https://github.com/jesseduffield/lazygit/issues/3008). Imagine: 1. lazygit is started and runs git diff in process X which completes immediately and exits. 2. lazygit is left in the background for several hours by which process X pid is reused by an unrelated process. 3. lazygit is focused back on and runs another git diff. It first runs this stop logic which will kill process X and its children.	2025-02-15 14:51:35 +11:00
Stefan Haller	853a04dfd0	Update translations; includes a new Portuguese translation (#4250) ... - **PR Description** Update translations from Crowdin.	2025-02-12 08:23:56 +01:00
Stefan Haller	c02709698c	Update translations from Crowdin ... This adds a new Portuguese translation.	2025-02-12 08:21:47 +01:00
Stefan Haller	555ab8735a	Change update_language_files.sh script to rename pt-PT to pt	2025-02-12 08:21:47 +01:00
Stefan Haller	20fe43f972	Add some more information to pkg/i18n/translations/README.md	2025-02-12 08:21:47 +01:00
Stefan Haller	0fd7b9baa4	Fix json schema for context of CustomCommand (#4255) ... - **PR Description** Fix ugly error squiggles in VS Code when using a custom command with a context of e.g. "commits, subCommits". Previously the schema only allowed a single value for the context field; however, it is now possible to specify multiple values separated by comma (see #3784). The only solution that I can see is to get rid of the "enum" specification, and mention the valid values only in the description. Add examples too so that you get at least auto-completion.	2025-02-12 08:21:06 +01:00
Stefan Haller	19921b7c42	Fix json schema for context of CustomCommand ... Previously the schema only allowed a single value; however, it is now possible to specify multiple values separated by comma, and you would get very ugly red error squiggles in VS Code when you did that. The only solution that I can see is to get rid of the "enum" specification, and mention the valid values only in the description. Add examples too so that you get at least auto-completion.	2025-02-12 08:18:26 +01:00
Stefan Haller	c37376af74	fix: properly detect icon for BAZEL and WORKSPACE files (#4252) ... - **PR Description** We were using lowercase for checking the `BUILD` and `WORKSPACE` file names when they are always uppercase. Fix these.	2025-02-11 21:46:38 +01:00
Peter Cardenas	9dbde94952	fix: properly detect icon for BAZEL and WORKSPACE files	2025-02-11 11:26:18 -08:00
Stefan Haller	3915cb6e71	Fix pasting multi-line text into commit message panel (#4234) ... - **PR Description** When pasting a multi-line commit message into the subject field of the commit editor, we would interpret the first newline as the confirmation for closing the editor, and then all remaining characters as whatever command they are bound to, resulting in executing all sorts of arbitrary commands. Now we recognize this being a paste, and interpret the first newline as moving to the description. Also, prevent tabs in the pasted content from switching to the respective other panel; simply insert four spaces instead, which should be good enough for the leading indentation in pasted code snippets, for example. Finally, disable pasting text into non-editable views; my assumption is that this is always a mistake, as it would execute arbitrary commands depending on what's in the clipboard. This depends on the terminal emulator supporting bracketed paste; I didn't find one on Mac that doesn't (I tested with Terminal.app, iTerm2, Ghostty, kitty, Alacritty, WezTerm, and VSCode's builtin terminal. It works well in all of them). I couldn't get it to work in Windows Terminal though, and I don't understand why, as it does seem to support bracketed paste (it works in bash). Fixes #3151 Fixes #4066 Fixes #4216	2025-02-10 13:44:05 +01:00
Stefan Haller	ba6cfc1f85	Handle pasting multi-line commit messages ... When pasting a multi-line commit message into the subject field of the commit editor, we would interpret the first newline as the confirmation for closing the editor, and then all remaining characters as whatever command they are bound to, resulting in executing all sorts of arbitrary commands. Now we recognize this being a paste, and interpret the first newline as moving to the description. Also, prevent tabs in the pasted content from switching to the respective other panel; simply insert four spaces instead, which should be good enough for the leading indentation in pasted code snippets, for example.	2025-02-10 13:40:25 +01:00
Stefan Haller	46ebfbbe87	Bump gocui	2025-02-10 13:40:22 +01:00
Stefan Haller	3012306ac3	Swap position of checkout-commit and checkout-branch menu items (#4238) ... - **PR Description** Fixes #4237.	2025-02-10 13:37:34 +01:00
Stefan Haller	e987d4b519	Swap position of checkout-commit and checkout-branch menu items ... Jesse's comment from https://github.com/jesseduffield/lazygit/issues/4237: We recently added a new option to check out a commit's branch from within the commits, reflog, and sub-commits panels: https://github.com/user-attachments/assets/0a5cf3f2-6803-4709-ae5a-e4addc061012 After using it for some time, I find it annoying that the default option has changed. I rarely find myself wanting to check out a branch from the commits panel, and it's rarer still to want to check out a branch from the reflog and sub-commits panel. Although there may be use cases for this, it is jarring that something you can always do (checkout the commit) is harder to do than something that you can sometimes do (checkout the branch). We've also had a user complain (see https://github.com/jesseduffield/lazygit/pull/4117) about their muscle-memory being broken by the recent change, and I have also fallen victim to this. I don't think that the new branch checkout option is sufficiently useful to dislodge the existing keybinding, so let's swap them.	2025-02-10 13:35:01 +01:00
Stefan Haller	190954568e	Bump go-deadlock version to fix crash with go 1.23 in debug mode (#4248) ... - **PR Description** This PR solves https://github.com/jesseduffield/lazygit/issues/4002, and perhaps https://github.com/jesseduffield/lazygit/issues/3880 (if they are indeed duplicates), and the error message preventing debugging in https://github.com/jesseduffield/lazygit/issues/3973. The problem is that our version of `go-deadlock` transitively depends on a version of `goid` that predates their changes to support go `1.23`, which results in every goid being the number `2` for some reason. Bumping the version of `go-deadlock` to include the updated transitive dependency means that the goids are now correct, and `go-deadlock` does not confused why goroutine 2 is trying to lock so many things. I know very little about go vendored dependencies, so all I have done is edit the `go.mod` entry for `go-deadlock` to be v0.3.5, and then run a `go mod tidy` and `go mod vendor`. If there is a more correct way to bump a vendored dependency, feel free to close this PR and just do that!	2025-02-10 13:23:54 +01:00
Chris McDonnell	f117eed614	go-deadlock version bump to fix crash with go 1.23	2025-02-10 01:43:35 -05:00
Stefan Haller	a5698b86fa	Improve contrast of highlighted search results (#4242) ... - **PR Description** Bump gocui to include https://github.com/jesseduffield/gocui/pull/73. Fixes #4162.	2025-02-07 14:27:45 +01:00
Stefan Haller	050a91b7d1	Bump gocui ... This improves the contrast of highlighted search results by setting the foreground color to black.	2025-02-07 14:20:49 +01:00
Stefan Haller	0b524293e1	Fix possible crash when deleting a branch while filtering is active (#4195) ... - **PR Description** Fix #4179.	2025-02-07 09:37:55 +01:00