Jesse Duffield
7995d56a85
allow editing or opening a file while resolving merge conflicts
2019-11-14 22:22:47 +11:00
Jesse Duffield
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
Jesse Duffield
12b84307ac
specify upstream when pushing a branch for the first time
2019-11-11 23:30:30 +11:00
Jesse Duffield
131113b065
simplify how the context system works
2019-11-10 22:32:13 +11:00
Jesse Duffield
e85310c0a9
add mouse support
2019-11-10 22:32:13 +11:00
Jesse Duffield
d0d92c7697
remove old add patch keybinding
2019-11-10 15:01:40 +11:00
Jesse Duffield
1a38bfb76d
do not return focus to commitsFiles view after selecting to start a new patch
2019-11-05 19:22:01 +11:00
Jesse Duffield
820f3d5cbb
support split view in staging panel and staging ranges
2019-11-05 19:22:01 +11:00
Jesse Duffield
0f0fda1660
allow stashing staged changes
...
reinstate old stash functionality with the 's' keybinding
2019-06-06 20:50:19 +10:00
Jesse Duffield
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
Jesse Duffield
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
Jesse Duffield
0f1abcb10c
remove subprocess channel stuff
2019-04-07 17:15:01 +10:00
Jesse Duffield
55538a3695
support custom commands
2019-04-07 17:15:01 +10:00
Jesse Duffield
1a933eaa73
pass length of options to createMenu
2019-03-23 13:26:17 +11:00
Jesse Duffield
09b7ae21bc
always attempt to discard changes from current file
2019-03-23 13:26:17 +11:00
Jesse Duffield
acfc961909
move soft reset keybinding into reset options
2019-03-23 13:26:17 +11:00
Jesse Duffield
f502f75e1f
add more options for resetting files in the working tree
2019-03-23 13:26:17 +11:00
Jesse Duffield
ff97ef7b94
support discarding unstaged changes
2019-03-23 13:26:17 +11:00
Jesse Duffield
a2c780b085
retain commit message if precommit hook fails
2019-03-23 13:07:36 +11:00
Jesse Duffield
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
Jesse Duffield
d5f617ec92
show some more errors in the gui rather than panicking
2019-03-16 12:51:48 +11:00
Jesse Duffield
6d104bfa91
show file remove error in gui rather than panic
2019-03-16 12:51:48 +11:00
Jesse Duffield
0079015102
distinguish between inline and non-inline merge conflicts
2019-03-03 15:58:01 +11:00
Jesse Duffield Duffield
8c0ea8f45f
mouse support
2019-03-02 17:49:30 +11:00
Jesse Duffield
1337f6e76a
appease golangci
2019-03-02 17:45:53 +11:00
Jesse Duffield Duffield
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
Jesse Duffield
0228e25084
work towards more interactive rebase options
2019-02-19 23:36:36 +11:00
Jesse Duffield
ad93b4c863
consider whether the view has focus when rendering the contents of a view
2019-02-16 15:17:44 +11:00
Jesse Duffield
198cbee498
introduce panel contexts and more work on rebasing
2019-02-16 12:07:27 +11:00
Jesse Duffield
daca07eaca
add loading panel
2019-02-16 12:03:22 +11:00
Jesse Duffield
77faf85cfc
post-merge cleanup
2019-02-11 21:07:12 +11:00
Jesse Duffield
3d343e9b57
Merge branch 'master' into feature/rebasing
2019-02-11 21:02:53 +11:00
Jesse Duffield
3a607061a2
Only reset origin in main view when handling the selection of a new file
2019-01-18 09:32:15 +11:00
Jesse Duffield
9489a94473
Make merge panel its own panel
2018-12-11 22:02:12 +11:00
Jesse Duffield
e0ff46fe53
more work on rebasing including visual indicators
2018-12-11 09:39:54 +11:00
mjarkk
50f20de8f3
Removed a lot of duplicated code
2018-12-10 08:22:52 +01:00
mjarkk
61c2778de1
Changed pushPassUname name to credentials
2018-12-10 07:51:06 +01:00
mjarkk
f14effe5f5
Worked and fixed a view comments
2018-12-09 13:04:19 +01:00
Mark Kopenga
19a6a32625
Merge branch 'master' into https-ask-for-username-password
2018-12-08 16:41:39 +01:00
mjarkk
270658fc00
Made code ready to merge to master's latest commit
2018-12-08 16:40:22 +01:00
Jesse Duffield
ff856b7630
fetching branches without checking out
2018-12-08 11:51:47 +11:00
Jesse Duffield
ca3afa2a39
standardising how list panels deal with cursor movement
2018-12-08 11:51:47 +11:00
Jesse Duffield
99a8b1ae8b
making a start on unidirectional data binding to fix these UI bugs
2018-12-08 11:51:47 +11:00
Mark Kopenga
1b6d34e76a
Merge branch 'master' into https-ask-for-username-password
2018-12-06 08:31:12 +01:00
Jesse Duffield
3b51d7cd00
clean as well as reset (I'm hoping this is a good design decision)
2018-12-05 20:06:47 +11:00
Jesse Duffield
c0f9795910
staging lines and hunks
2018-12-05 19:33:46 +11:00
Jesse Duffield
658e5a9faf
initial support for staging individual lines
2018-12-04 22:11:48 +11:00
mjarkk
af54d7f015
Fixed view not defined error with git push and pull
2018-11-02 15:07:10 +01:00
mjarkk
cb9ad5bc73
Fixed golangcibot surgestion
2018-11-02 10:06:10 +01:00
mjarkk
5470bb4121
Added username password detect to git pull
2018-11-02 09:54:54 +01:00
mjarkk
9a99748d3b
Fixed bug where username input didn't go away
2018-10-27 16:29:16 +02:00
mjarkk
ac03665df3
Handled some errors
2018-10-20 19:44:56 +02:00
mjarkk
12425f0aa7
First good success
2018-10-20 17:37:55 +02:00
mjarkk
01fa106de3
Added files to commit pannelsidjfjlisdjfilisldjfiljisldjilfjisdjilfjlsidMoved some code around
2018-10-17 21:12:33 +02:00
Kristijan Husak
4287f8ae90
Fix tests and add test scenarios for amend.
2018-10-08 22:19:42 +02:00
Kristijan Husak
190309e5c1
Check if there is any commit to amend and use 'A' instead of 'M' as shortcut.
2018-10-08 21:19:45 +02:00
Kristijan Husak
5f7ac97a39
Refresh side panels and use uppercase HEAD in all git commands that requires it.
2018-10-06 09:53:54 +02:00
Kristijan Husak
28fe3d6cf9
Use confirmation popup for amending last commit.
2018-09-25 22:11:51 +02:00
Jesse Duffield
7164f37266
Merge branch 'master' into feature/commit-amend
2018-09-25 19:05:24 +10:00
Jesse Duffield
f89bc10af1
appease golangci
2018-09-17 21:32:19 +10:00
Jesse Duffield
c00c834b35
standardise rendering of lists in panels
2018-09-17 21:02:30 +10:00
Kristijan Husak
61f0801bd3
Add ammend commit action.
2018-09-13 12:44:32 +02:00
Jesse Duffield
f8b484f638
don't use newlines at the end of panel buffers
2018-09-12 18:23:25 +10:00
Jesse Duffield
52b132fe01
better handling of cursor and origin positionings
2018-09-10 20:17:39 +10:00
Dawid Dziurla
6f7de83bce
Merge branch 'master' into feature/help
...
conflicts resolved
2018-09-09 10:41:01 +02:00
Jesse Duffield
a2d40cfbf1
allow users to configure whether the commit length is shown
2018-09-05 23:02:13 +10:00
Jesse Duffield
986774e5c7
add commit count via gocui subtitle
2018-09-05 20:43:45 +10:00
Dawid Dziurla
98763e98cb
initial commit message counter
2018-09-05 11:26:54 +02:00
Dawid Dziurla
e21f739f4f
add renderGlobalOptions
...
render only global options for all panels
2018-09-04 16:07:31 +02:00
Dawid Dziurla
97ad4a1643
delete options
2018-09-04 15:40:29 +02:00
Dawid Dziurla
cc3fa4b79d
make '?' key visible on every panel
2018-09-03 17:52:05 +02:00
Dawid Dziurla
28a9594ef7
update help panel
...
- delete scrolling ability
- lines are now selectable
- implemented handler execution when space is pressed
- add example descriptions for status panel keybindings
2018-09-03 17:52:05 +02:00
Dawid Dziurla
77623db1d0
apply fmt
2018-09-03 17:52:05 +02:00
Dawid Dziurla
6a99d36ae1
change key from 'H' to '?'
2018-09-03 17:52:05 +02:00
Dawid Dziurla
2416f585ce
initial help panel
2018-09-03 17:52:05 +02:00
Jesse Duffield
ae0d88f855
WIP using runDirectCommand with xdg-open
2018-09-01 11:38:32 +10:00
Jesse Duffield
7e1e97d050
dont panic when catting directories
2018-08-28 19:12:35 +10:00
Jesse Duffield
b4323c029f
Merge branch 'master' into feature/add-all
2018-08-27 20:57:50 +10:00
Anthony HAMON
23fe0290ad
add openFile to gui struct
2018-08-26 01:58:20 +02:00
Anthony HAMON
364c1ac5e7
remove useless returned variable
2018-08-26 01:58:19 +02:00
Anthony HAMON
883fcf1083
remove useless returned variable
2018-08-26 01:58:19 +02:00
Jesse Duffield
60422912c8
add 'a' keybinding to toggle staged/unstaged for all files
2018-08-25 08:59:51 +10:00
Jesse Duffield
317926c808
fix golangci lint
2018-08-19 21:34:24 +10:00
Jesse Duffield
4d2346f80a
popup force push confirmation panel if the local branch has diverged from the upstream branch
2018-08-19 21:28:13 +10:00
Jesse Duffield
aa4d739577
fix ignore feature
2018-08-19 20:41:04 +10:00
Jesse Duffield
08666889f4
improve remove file logic
2018-08-18 20:14:44 +10:00
Jesse Duffield
a1a828a781
support opening and editing config file
2018-08-18 14:54:05 +10:00
Mark Kopenga
90746502df
Fixed comments from jesseduffield on issue #137
2018-08-16 11:31:03 +02:00
Mark Kopenga
88e1a815fe
Fixed comment on issue #137 from @jesseduffield
2018-08-16 07:16:32 +02:00
Mark Kopenga
be3f5846e4
Added more translations
2018-08-14 21:06:50 +02:00
Mark Kopenga
38a1a00cf1
Fixed comment from myself on issue: 137
2018-08-14 16:38:25 +02:00
Mark Kopenga
9c97b75aad
Merge remote-tracking branch 'origin/master'
2018-08-14 16:14:11 +02:00
Mark Kopenga
883f436b0f
can't go any further because of an error
2018-08-14 16:12:21 +02:00
Jesse Duffield
d923796cff
Merge branch 'master' of https://github.com/mjarkk/lazygit
2018-08-14 23:48:18 +10:00
Jesse Duffield
ba2b6fbf1f
pull errors out of package scope and store sentinel errors on the gui struct
2018-08-14 23:47:14 +10:00
Mark Kopenga
73a1682540
fixed package naming and added tr object to file_panel.go
2018-08-14 15:26:25 +02:00
Jesse Duffield
4d0702fba5
Merge branch 'master' of https://github.com/mjarkk/lazygit
2018-08-14 22:12:11 +10:00
Jesse Duffield
5cbacb0c67
make local i18n package confirm to project structure
2018-08-14 22:12:07 +10:00
Mark Kopenga
0568b32f0b
Added more translations
2018-08-14 13:31:23 +02:00
Mark Kopenga
0c39347224
Added auto detection for the system language
2018-08-14 12:52:26 +02:00
Mark Kopenga
dd7e93ac8d
Added all the missing translations from dutch.go
2018-08-14 11:35:39 +02:00
Mark Kopenga
dfafb98871
tried to update to latest master
2018-08-14 11:05:26 +02:00
