5859 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Stefan Haller	3d56357294	Fix copying commit author to clipboard ... This was a regression introduced with the GitCommandBuilder in 25f8b0337.	2024-09-23 09:47:14 +02:00
Stefan Haller	9b2a0c4538	Add test for copying a commit author to the clipboard ... The test shows that we are including single quotes in strange places.	2024-09-23 09:45:03 +02:00
Jesse Duffield	a04ad24a60	Add performance improvements section to release notes (#3922) ... - **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 -->	2024-09-18 21:26:47 +10:00
Jesse Duffield	0d633896ae	Add performance improvements section to release notes	2024-09-18 21:06:02 +10:00
Stefan Haller	611fabde11	Fix crash when viewing the divergence of a branch which is up to date with its upstream (#3918) ... This was introduced by #3838, specifically by commit e675025411. Fixes #3900 and #3917.	2024-09-18 09:27:11 +02:00
Stefan Haller	f8073c7188	Fix crash when viewing the divergence of a branch which is up to date with its upstream ... This was introduced by #3838, specifically by commit e675025411. Add a regression test that would have crashed without the fix.	2024-09-18 09:24:10 +02:00
Stefan Haller	4dadcd2ace	Improve performance with large numbers of untracked or modified files (#3919) ... - **PR Description** **BuildTreeFromFiles** used a linear complexity lookup to find if the children has already been added. Use maps to get constant time lookup for children. For the test scenario in #3798 (90000 untracked files) this reduces the time of BuildTreeFromFiles from something like 10s down to about 30ms on my machine. Fixes #3798. - **Please check if the PR fulfills these requirements** * [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)) * [ ] 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 -->	2024-09-18 09:23:21 +02:00
partho.kunda	b18f12ca0f	Use map to quickly find children in BuildTreeFromFiles	2024-09-18 09:16:58 +02:00
Stefan Haller	c67979abbb	Add options for disabling switching to the Files panel after popping or applying a stash (#3913) ... - **PR Description** In v0.44.0 we added a small QoL improvement to auto-switch to the Files panel after popping or applying a stash. While this should be an improvement for most people, it turns out to be in the way of some people's workflows, so make it configurable. See [here](https://github.com/jesseduffield/lazygit/pull/3888#issuecomment-2350853602) for more discussion.	2024-09-15 14:19:08 +02:00
Stefan Haller	0e489bb5cc	Add options for disabling switching to the Files panel after popping or applying a stash	2024-09-15 11:59:59 +02:00
Stefan Haller	647f533e71	With stacked branches, create fixup commit at the end of the branch it belongs to (#3892) ... - **PR Description** When working with stacked branches, and creating a fixup commit for a commit in one of the lower branches of the stack, the fixup was created at the top of the stack and the user needed to move it down to the right branch manually. This is unnecessary extra work; create it at the end of the right branch automatically.	2024-09-15 11:21:34 +02:00
Stefan Haller	b22149d832	Create fixup commit at end of its branch when there's a stack of branches	2024-09-15 11:19:39 +02:00
Stefan Haller	396215a5c9	Extract helper function for getting the hash of the last commit made	2024-09-15 11:19:39 +02:00
Stefan Haller	42c157a5e6	Add changeToFixup field to MoveFixupCommitDown	2024-09-15 11:19:39 +02:00
Stefan Haller	a793f709b6	Update language files from Crowdin (#3898) ... - **PR Description** Pull down the latest translations from Crowdin. Unfortunately I forgot to do this in time for the 0.44 release, bummer. I'm not sure how much testing/proof-reading/peer review we want to do on these.	2024-09-15 09:43:15 +02:00
Stefan Haller	f74551e464	Generate keybindings	2024-09-08 15:20:52 +02:00
Stefan Haller	e06b1cef60	Update language files from Crowdin	2024-09-08 15:19:26 +02:00
Stefan Haller	2d0c7cb0fc	Switch to Files panel after popping a stash (#3888) ... #### PR Description I find myself always switching to the Files panel after popping a stash, 100% of the time, so it makes sense that lazygit does this for me. Do it for apply as well, for consistency. #### Please check if the PR fulfills these requirements * [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) * [ ] 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	2024-09-06 13:21:49 +02:00
Stefan Haller	f5b8619ded	Switch to Files panel after popping a stash	2024-09-06 13:15:37 +02:00
Stefan Haller	4c6c915a77	Get rid of a lot of error return values (#3890) ... - **PR Description** Change many functions in the gui package (and some in gocui) to no longer return errors. There might be more that could be changed in this way, but I feel these are the main ones. Fixes #3887.	2024-09-06 08:48:44 +02:00
Stefan Haller	064fae41e7	Remove return value of OpenCommitMessagePanel ... Similar to the previous commit: in 100% of the call sites we now need an extra `return nil`. Nevertheless, I still prefer it this way.	2024-09-06 08:45:48 +02:00
Stefan Haller	d4ef8e53d5	Remove return value of Alert/Confirm/Prompt ... This might seem controversial; in many cases the client code gets longer, because it needs an extra line for an explicit `return nil`. I still prefer this, because it makes it clearer which calls can return errors.	2024-09-06 08:45:48 +02:00
Stefan Haller	b15a1c7ae7	Remove return value of CreatePopupPanel	2024-09-06 08:45:48 +02:00
Stefan Haller	6f0182f11c	Remove return value of RefreshPatchBuildingPanel	2024-09-06 08:45:48 +02:00
Stefan Haller	371998e635	Remove return value of IContextMgr.Push/Pop et. al.	2024-09-06 08:45:48 +02:00
Stefan Haller	072b465fa6	Fix a lock that is held too long ... I can only guess, but I think this was a typo (or a copy-paste-o) when this code was written. It was introduced in 55af07a1bb, and I think the defer was kept by accident; if it had been on purpose, then the statement would have been put right after the Lock call.	2024-09-06 08:45:48 +02:00
Stefan Haller	8302575078	Remove return value of Focus-related functions	2024-09-06 08:45:48 +02:00
Stefan Haller	8edcd71234	Remove return value of IPatchExplorerContext.Render, RenderAndFocus, and NavigateTo	2024-09-06 08:45:48 +02:00
Stefan Haller	5446683881	Remove return value of RenderToMainViews and some related functions	2024-09-06 08:45:48 +02:00
Stefan Haller	b91beb68e1	Remove return value of HandleRender	2024-09-06 08:45:48 +02:00
Stefan Haller	5659f1f3e9	Bump gocui ... And adapt client code.	2024-09-06 08:45:48 +02:00
Stefan Haller	753b16b697	Add Zed editor support to editorPreset (#3886) ... - **PR Description** - **Please check if the PR fulfills these requirements** * [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) * [X] Docs have been updated if necessary * [X] You've read through your own file changes for silly mistakes etc	2024-09-03 19:27:29 +02:00
Dmytro Suvorov	da7a28c117	Add Zed to user_config.go and schema	2024-09-03 19:22:56 +02:00
Dmytro Suvorov	c35743d7ad	Add Zed to docs/Config.md	2024-09-03 19:22:56 +02:00
Dmytro Suvorov	f0eafabd6d	Add Zed support to editor_presets.go	2024-09-03 17:30:56 +03:00
Stefan Haller	fc4cf5d196	Offer autostash option when creating new branch (#3871) ... - **PR Description** Resolves https://github.com/jesseduffield/lazygit/issues/3866 My attempt at creating a shared abstraction felt like it was more indirection than it was worth so I ended up going with the code duplication approach.	2024-09-03 09:08:56 +02:00
Brandon	4e880e56c4	Add integration tests for checkout/new branch with autostash	2024-09-03 09:05:53 +02:00
Brandon	e8e39f5ce2	Offer autostash option when creating new branch	2024-09-03 09:05:53 +02:00
Brandon	370ab2d19c	Simplify CheckoutRef	2024-09-03 09:05:53 +02:00
Stefan Haller	fa8cd47227	Don't allow opening a menu while the search or filter prompt is open (#3878) ... - **PR Description** This solves several problems that arise from opening a menu while the prompt is open. We might try to solve these in a different way, e.g. by dismissing the search prompt before opening a menu, but restricting what you can do while the prompt is open seems like the more robust fix. To achieve this, we - call resetKeyBindings both when opening and when closing the search/filter prompt - change the keybindings to only contain the ones for the search prompt when that context is active. Fixes #3875.	2024-09-02 18:34:28 +02:00
Stefan Haller	9ec77bba91	Don't allow opening a menu while the search or filter prompt is open ... This solves several problems that arise from opening a menu while the prompt is open. We might try to solve these in a different way, e.g. by dismissing the search prompt before opening a menu, but restricting what you can do while the prompt is open seems like the more robust fix. To achieve this, we - call resetKeyBindings both when opening and when closing the search/filter prompt - change the keybindings to only contain the ones for the search prompt when that context is active.	2024-09-02 18:31:30 +02:00
Stefan Haller	4ec9262ff6	Ask to auto-stage unstaged files when continuing a rebase after resolving conflicts (#3879) ... - **PR Description** When lazygit sees that all conflicts were resolved, it auto-stages all previously conflicted files and asks to continue the rebase. (There is [a PR](https://github.com/jesseduffield/lazygit/pull/3870) open to make this optional.) It is a common situation for this popup to be opened in the background, while the user is still busy fixing build errors in their editor. In this case, coming back to lazygit and confirming the continue prompt would result in an error because not all files are staged. Improve this by opening another popup in this case, asking to stage the newly modified files too and continue. See https://github.com/jesseduffield/lazygit/issues/3111#issuecomment-1801751982 and the following discussion further down in that issue.	2024-09-02 18:27:08 +02:00
Stefan Haller	ba21d4e651	Ask to auto-stage unstaged files when continuing a rebase after resolving conflicts	2024-09-02 18:24:36 +02:00
Stefan Haller	3cffed9412	Make auto-staging resolved conflicts optional (#3870) ... - **PR Description** Add user config `git.autoStageResolvedConflicts` (default true). When set to false, users need to stage their conflicted files manually after resolving conflicts, and also continue a merge/rebase manually when all conflicted files are resolved. Fixes #3111.	2024-09-02 18:20:20 +02:00
Stefan Haller	90b8fd242d	Add config git.autoStageResolvedConflicts	2024-09-02 18:12:47 +02:00
Stefan Haller	1191aca60f	Actually look for conflict markers in GetHasInlineMergeConflicts ... So far, lazygit has always auto-staged files as soon as the conflict markers disappeared from them, which means that we could rely on any file that still had a status of "UU" to still contain conflict markers. We are going to make the auto-staging optional in the next commit, and in that case the user will want to manually stage "UU" files; so we must now check whether the file contains conflict markers, and disallow the staging in that case.	2024-09-02 18:12:47 +02:00
Stefan Haller	2f01af49e8	Non-sticky range selection diff (#3869) ... - **PR Description** When selecting a range of commits, show the combined diff for them. Along the way, fix a few minor issues with the current implementation of diffing mode; see the individual commit messages for details. Fixes #3862. - **Please check if the PR fulfills these requirements** * [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	2024-08-31 08:16:32 +02:00
Stefan Haller	32fef9aadb	Add a simple integration test for non-sticky range diff	2024-08-28 19:51:15 +02:00
Stefan Haller	717cb40f05	Cleanup: remove now unused ListControllerTrait from SwitchToDiffFilesController	2024-08-28 19:51:15 +02:00
Stefan Haller	ef7d1a8602	Use non-sticky range diff when entering commit files panel ... We make the name of the GetSelectedRefRangeForDiffFiles very specific on purpose to make it clear that this is only for switching to diff files, so the implementations can make assumptions about that (unlike GetSelectedRef, which is used for different purposes and needs to stay more generic).	2024-08-28 19:51:15 +02:00