Jesse Duffield
72830efc45
add some tests
2019-03-16 10:20:27 +11:00
Jesse Duffield
c98eddc185
appease golangci
2019-03-16 10:20:27 +11:00
Jesse Duffield
3b2353b5ae
remove redundant call to refreshCommitFilesView
...
We already call this function inside the refreshCommitsView function.
We call it there because it's logical that A) one occurs whenever the other does and
B) the commit files only get refreshed after we've updated the commits themselves
2019-03-16 10:20:27 +11:00
Jesse Duffield
3f567c952c
i18n for error message about a feature being disabled for GPG users
2019-03-16 10:20:27 +11:00
Jesse Duffield
4f7f6a073c
allow user to discard old file changes for a given commit
2019-03-16 10:20:27 +11:00
Jesse Duffield
0e008cc15f
allow user to checkout old files
2019-03-16 10:20:27 +11:00
Jesse Duffield
1ad9c6faac
minor cleanup
2019-03-16 10:20:27 +11:00
skanehira
06fe726ee7
Add feature of display committed file list #383
2019-03-16 10:20:27 +11:00
skanehira
1b6e46973e
remove the -o option from Dockerfile
2019-03-08 15:51:23 +11:00
Jesse Duffield
63e2ccfccf
bump go version in CI
2019-03-05 21:56:23 +11:00
Jesse Duffield
6fd4d49db7
update go.sum
2019-03-05 21:56:23 +11:00
Jesse Duffield
2393bc791d
fix cpu drainage issue
2019-03-05 21:56:23 +11:00
Jesse Duffield
398f91decb
Merge branch 'master' of https://github.com/jesseduffield/lazygit
2019-03-04 20:40:51 +11:00
Jesse Duffield
c937a93f79
yet another rebase image for the readme
2019-03-04 20:40:46 +11:00
Jesse Duffield
9402d8b0c0
Update README.md
2019-03-04 20:39:00 +11:00
Jesse Duffield
2a0615da10
get higher res image of rebasing
2019-03-04 20:37:25 +11:00
Jesse Duffield
4be5eaae7b
update readme again
2019-03-04 20:32:17 +11:00
Jesse Duffield
038dcb546e
update readme with new keybindings link
2019-03-03 23:44:50 +11:00
Jesse Duffield
1184990e16
move updated keybindings file
2019-03-03 23:27:19 +11:00
Jesse Duffield
ac5088eee6
allow both enter and space to execute menu item
2019-03-03 23:18:28 +11:00
Jesse Duffield
e36899d5c5
prevent crashes when scrolling up
2019-03-03 23:08:07 +11:00
Jesse Duffield
403526bc50
bump go mod
2019-03-03 16:15:52 +11:00
Jesse Duffield
a5d27764cd
support user configuring mouse events to be enabled
2019-03-03 16:15:20 +11:00
Jesse Duffield
43758cbb5f
i18n for rebase loading states
2019-03-03 16:11:20 +11:00
Jesse Duffield
0079015102
distinguish between inline and non-inline merge conflicts
2019-03-03 15:58:01 +11:00
Jesse Duffield
7a2176f479
acknowledge 'DU' statuses as being merge conflicts
2019-03-03 15:48:16 +11:00
Jesse Duffield
e0bdfad63a
don't crash if we have no lines to stage
2019-03-03 15:48:01 +11:00
Jesse Duffield
f07fc31f8b
fixup layout issue that was causing crashes when the window was too small
2019-03-03 15:34:53 +11:00
Jesse Duffield
4bb577ab7d
show loading status for rebasing events
2019-03-03 15:21:33 +11:00
Jesse Duffield
8305d8e72f
hide donate button if mouse events are disabled
2019-03-03 15:21:20 +11:00
Jesse Duffield
f68166e858
bump gocui to stop polling events after closing the gui when switching to a subprocess
2019-03-03 14:20:25 +11:00
Jesse Duffield
8925b161a7
windows support for skipping the editor
2019-03-03 12:44:10 +11:00
Jesse Duffield
0a1298765c
use sh intead of bash for the sake of testing on the docker image
2019-03-02 21:31:48 +11:00
Jesse Duffield
273678f081
fix issue where you couldn't rearrange commits while rebasing onto a branch
2019-03-02 21:31:48 +11:00
Jesse Duffield
790235f64b
add another match on the error message to tell us we've encountered merge conflicts
2019-03-02 21:31:48 +11:00
Jesse Duffield
abc0f7f0aa
copy lazygit directory into docker container
2019-03-02 21:31:48 +11:00
Jesse Duffield
ab81f27fc7
don't show stack trace if lazygit is started outside of a git repo
2019-03-02 21:31:48 +11:00
Jesse Duffield
dbb01b028d
populate dutch and polish i18n files with new messages
2019-03-02 21:31:48 +11:00
Jesse Duffield
0c886eddfb
Revert "remove old rebase code now that we're only ever interactively rebasing"
...
This reverts commit 1a19b1412d
2019-03-02 20:00:26 +11:00
Jesse Duffield
399346c2ee
disable mouse feature until its ready
2019-03-02 20:00:17 +11:00
Jesse Duffield
7a170bbccf
extend cheatsheet generator to contain context based keybindings
2019-03-02 19:05:21 +11:00
Jesse Duffield Duffield
8c0ea8f45f
mouse support
2019-03-02 17:49:30 +11:00
Jesse Duffield
afbc028ad6
revert to the old keybinding for stash: I don't want anybody accidentally deleting changes they are trying to stash
2019-03-02 17:46:56 +11:00
Jesse Duffield
e331dfcaf8
update i18n
2019-03-02 17:46:56 +11:00
Jesse Duffield
1337f6e76a
appease golangci
2019-03-02 17:45:53 +11:00
Jesse Duffield
4de31da4be
fix up tests
...
This fixes up some git and oscommand tests, and pulls some tests into commit_list_builder_test.go
I've also made the NewDummyBlah functions public so that I didn't need to duplicate them across packages
I've also given OSCommand a SetCommand() method for setting the command on the struct
I've also created a file utils.go in the test package for creating convient 'CommandSwapper's, which
basically enable you to assert a sequence of commands on the command line, and swap each one out for
a different one to actually be executed
2019-03-02 13:39:09 +11:00
Jesse Duffield Duffield
23c51ba708
cleanup
2019-02-24 18:34:18 +11:00
Jesse Duffield Duffield
19a3ac603d
improve script for making a test repo
2019-02-24 17:54:56 +11:00
Jesse Duffield Duffield
f4938deaae
change type of cherryPickedCommits from []string to []*Commit
2019-02-24 17:34:19 +11:00
Jesse Duffield Duffield
639df512f3
decolorise strings before calculating padwidths
2019-02-24 17:05:17 +11:00
