1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-15 00:15:32 +02:00
Commit Graph

303 Commits

Author SHA1 Message Date
f15e47bb67 add file watching for modified files
log createErrorPanel error

swallow error when adding file to watcher
2019-11-14 22:22:47 +11:00
7995d56a85 allow editing or opening a file while resolving merge conflicts 2019-11-14 22:22:47 +11:00
f43ba728e3 prompt to set upstream when pulling on untracked branch
prompt to set upstream when pulling on untracked branch
2019-11-13 21:36:16 +11:00
12b84307ac specify upstream when pushing a branch for the first time 2019-11-11 23:30:30 +11:00
131113b065 simplify how the context system works 2019-11-10 22:32:13 +11:00
e85310c0a9 add mouse support 2019-11-10 22:32:13 +11:00
d0d92c7697 remove old add patch keybinding 2019-11-10 15:01:40 +11:00
1a38bfb76d do not return focus to commitsFiles view after selecting to start a new patch 2019-11-05 19:22:01 +11:00
820f3d5cbb support split view in staging panel and staging ranges 2019-11-05 19:22:01 +11:00
0f0fda1660 allow stashing staged changes
reinstate old stash functionality with the 's' keybinding
2019-06-06 20:50:19 +10:00
2746b1bd38 Prevent crash when opening in small window
We were crashing when opening lazygit in a small window because the limit view
was the only view that got created, and there were two functions that referenced
either the 'current' view or the files view, neither of which existed.

Now those functions just return nil if the view does not exist
2019-05-06 22:39:35 +10:00
0d3a193ab5 Add 'w' keybinding in files panel to commit as a WIP
If your git.skipHookPrefix is set to, say, WIP, in your config, then
hitting 'w' in the files panel will bring up the commit message panel
with 'WIP' pre-filled, so you just need to hit enter to confirm
(or add some more to the message) in order to commit your changes
with the --no-verify flag, meaning the pre-commit hook will be skipped
2019-04-13 14:38:17 +10:00
0f1abcb10c remove subprocess channel stuff 2019-04-07 17:15:01 +10:00
55538a3695 support custom commands 2019-04-07 17:15:01 +10:00
1a933eaa73 pass length of options to createMenu 2019-03-23 13:26:17 +11:00
09b7ae21bc always attempt to discard changes from current file 2019-03-23 13:26:17 +11:00
acfc961909 move soft reset keybinding into reset options 2019-03-23 13:26:17 +11:00
f502f75e1f add more options for resetting files in the working tree 2019-03-23 13:26:17 +11:00
ff97ef7b94 support discarding unstaged changes 2019-03-23 13:26:17 +11:00
a2c780b085 retain commit message if precommit hook fails 2019-03-23 13:07:36 +11:00
d84dfc23e7 Rely on model rather than view to focus a point
Currently when we want to focus a point on a view (i.e. highlight a
line and ensure it's within the bounds of a view's box, we use the
LinesHeight method on the view to work out how many lines in total
there are.

This is bad because for example if we come back from editing a file,
the view will have no contents so LinesHeight == 0, but we might
be trying to select line 10 because there are actual ten things we
expect to be rendered already. This causes a crash when e.g. 10 is
greater than the height of the view.

So we need to pass in to our FocusPoint method the actual number of
items we want to render, rather than having the method rely on the
LinesHeight, so that the method knows to scroll a bit before setting
the cursor's y position.

Unfortunately this makes for some awkward code with our current setup.
We don't have a good interface type on these state objects so we now
need to explicitly obtain the len() of whatever array we're rendering.

In the case of the menu panel this is even more awkward because the items
list is just an interface{} and it's not easy to get the list of that, so
now when we instantiate a menu we need to pass in the count of items
as well.

The better solution would be to define an interface with a getItems
and getLength method and have all these item arrays become structs
implementing the interface, but I am too lazy to do this right now :)
2019-03-23 11:54:25 +11:00
d5f617ec92 show some more errors in the gui rather than panicking 2019-03-16 12:51:48 +11:00
6d104bfa91 show file remove error in gui rather than panic 2019-03-16 12:51:48 +11:00
0079015102 distinguish between inline and non-inline merge conflicts 2019-03-03 15:58:01 +11:00
8c0ea8f45f mouse support 2019-03-02 17:49:30 +11:00
1337f6e76a appease golangci 2019-03-02 17:45:53 +11:00
95d451e59a Make it easier to run sync/async commands, switch to interactive rebase when rebasing on branches 2019-02-24 10:58:15 +11:00
0228e25084 work towards more interactive rebase options 2019-02-19 23:36:36 +11:00
ad93b4c863 consider whether the view has focus when rendering the contents of a view 2019-02-16 15:17:44 +11:00
198cbee498 introduce panel contexts and more work on rebasing 2019-02-16 12:07:27 +11:00
daca07eaca add loading panel 2019-02-16 12:03:22 +11:00
77faf85cfc post-merge cleanup 2019-02-11 21:07:12 +11:00
3d343e9b57 Merge branch 'master' into feature/rebasing 2019-02-11 21:02:53 +11:00
3a607061a2 Only reset origin in main view when handling the selection of a new file 2019-01-18 09:32:15 +11:00
9489a94473 Make merge panel its own panel 2018-12-11 22:02:12 +11:00
e0ff46fe53 more work on rebasing including visual indicators 2018-12-11 09:39:54 +11:00
50f20de8f3 Removed a lot of duplicated code 2018-12-10 08:22:52 +01:00
61c2778de1 Changed pushPassUname name to credentials 2018-12-10 07:51:06 +01:00
f14effe5f5 Worked and fixed a view comments 2018-12-09 13:04:19 +01:00
19a6a32625 Merge branch 'master' into https-ask-for-username-password 2018-12-08 16:41:39 +01:00
270658fc00 Made code ready to merge to master's latest commit 2018-12-08 16:40:22 +01:00
ff856b7630 fetching branches without checking out 2018-12-08 11:51:47 +11:00
ca3afa2a39 standardising how list panels deal with cursor movement 2018-12-08 11:51:47 +11:00
99a8b1ae8b making a start on unidirectional data binding to fix these UI bugs 2018-12-08 11:51:47 +11:00
1b6d34e76a Merge branch 'master' into https-ask-for-username-password 2018-12-06 08:31:12 +01:00
3b51d7cd00 clean as well as reset (I'm hoping this is a good design decision) 2018-12-05 20:06:47 +11:00
c0f9795910 staging lines and hunks 2018-12-05 19:33:46 +11:00
658e5a9faf initial support for staging individual lines 2018-12-04 22:11:48 +11:00
af54d7f015 Fixed view not defined error with git push and pull 2018-11-02 15:07:10 +01:00
cb9ad5bc73 Fixed golangcibot surgestion 2018-11-02 10:06:10 +01:00