utils-code/jesseduffield.lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2026-09-15 01:56:24 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
1255 commits 64 branches 248 tags 205 MiB
Commit graph

627 commits

Author SHA1 Message Date
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
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 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 8925b161a7 windows support for skipping the editor 2019-03-03 12:44:10 +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 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 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
Jesse Duffield Duffield a8858cbd12 support cherry picking commits 2019-02-24 13:51:52 +11:00
Jesse Duffield Duffield 1a19b1412d remove old rebase code now that we're only ever interactively rebasing 2019-02-24 11:03:14 +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 6c1d2d45ef some i18n and restricting rewording during interactive rebase 2019-02-24 09:42:35 +11:00
Jesse Duffield f6b3a9b184 rearranging todo items while interactively rebasing 2019-02-24 09:42:34 +11:00
Jesse Duffield cdc50e8557 more support for files with spaces 2019-02-24 09:42:34 +11:00
Jesse Duffield 0173fdb9df support file renames 2019-02-24 09:42:32 +11:00
Jesse Duffield 9661ea04f3 wrap amend command in a confirmation 2019-02-20 19:46:27 +11:00
Jesse Duffield 0228e25084 work towards more interactive rebase options 2019-02-19 23:36:36 +11:00
Jesse Duffield 935f774834 don't autostash when editing 2019-02-19 09:34:24 +11:00
Jesse Duffield dcc7855fd0 pull commit list builder functions into their own builder struct 2019-02-19 09:18:30 +11:00
Jesse Duffield a8e22ed82f show interactive rebase commits that are yet to go 2019-02-19 09:03:29 +11:00
Jesse Duffield d44638130c add various interactive rebase commands 2019-02-18 23:27:54 +11:00
Jesse Duffield 76a27f417f rename any commit 2019-02-18 21:29:43 +11:00
Jesse Duffield adc2529019 dealing better with errors at the top level 2019-02-18 19:42:23 +11:00
Jesse Duffield 43ab7318d3 remove HasMergeConflicts struct instance variables 2019-02-18 19:28:02 +11:00
Jesse Duffield cb372d469f fix golangci errors 2019-02-16 21:30:29 +11:00
Jesse Duffield 88ba6efdd5
remove outdated TODO 2019-02-16 21:20:10 +11:00
Jesse Duffield e011e9bc42 more work on rebasing feature 2019-02-16 21:01:17 +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 d967f65329 fix git tests 2019-02-16 11:24:47 +11:00
Jesse Duffield c101993405 post-merge cleanup 2019-02-11 22:47:14 +11:00
Jesse Duffield 6430ab6ac9 Merge branch 'master' into feature/rebasing 2019-02-11 22:46:27 +11:00
Jesse Duffield cfe3605e6b use go-errors package to display stacktrace of errors that cause panics 2019-02-11 22:39:17 +11:00
Jesse Duffield 75ab8ec4d9 catch rebase errors and show in error panels 2019-02-11 21:29:47 +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 695b092c41 Directly send wrap argument rather than the view 2019-01-17 10:29:52 +11:00
Jesse Duffield a38d1a3b68 Explicitly refer confirmation panel view 
as @jesseduffield pointed in #358, need to refer
confirmation panel view explicitly in case something
else has focus

Co-Authored-By: KOREAN139 <korean139@gmail.com>
 2019-01-17 10:29:52 +11:00
KOREAN139 2dc5e6d503 Fix recent repo view size issue 
getMessageHeight() calculates height under assumption that given view's
wrap option (view.Wrap) is true, and createMenu() does not set wrap
option as true. this causes gocui set improper view's height when lines
in view needs to be wrapped.
add *gocui.View as parameter in getMessageHeight(), and calculates
view's height depend on its wrap option.

resolve issue #354
 2019-01-17 10:29:52 +11:00
Dawid Dziurla b6f8ebc0ca delete KeyReadable field from Binding struct 
also rewrite GetKey function
 2019-01-17 10:11:17 +11:00
KimMachineGune 3e24069722 pkg: Fix typo 2019-01-16 18:06:11 +11:00
Jesse Duffield c722ea5afc log in config directory rather than wherever you opened lazygit 2019-01-16 08:54:12 +11:00
KimMachineGune 7ff022f1e7 pkg/updates: Refactoring 2019-01-14 21:52:03 +11:00
Mark Kopenga 1db8801771 Update dutch.go 2018-12-20 09:17:10 +11:00
Mark Kopenga 666ea3a4a0 Fixed suggestion from glvr182 2018-12-20 09:17:10 +11:00
mjarkk 47d50989c4 Added dutch translations 2018-12-20 09:17:10 +11:00
Dawid Dziurla e4f70278dd i18n: pl translation 2018-12-20 09:13:41 +11:00
Jesse Duffield 0afffd03ca remove comment 2018-12-19 21:46:48 +11:00
Jesse Duffield 6c5e409ffa send direct error message 2018-12-19 20:12:35 +11:00
mjarkk 800b40ecc4 Translated credentials error with git push/pull/fetch 2018-12-19 10:06:58 +01:00
Jesse Duffield 7835fce708 fix tests 2018-12-18 22:40:36 +11:00
Jesse Duffield 160af3bb99 fix typo 2018-12-18 22:29:07 +11:00
Jesse Duffield 328b57e2cf no longer checking for 'exit status 128' because we're directly returning stderr 2018-12-18 22:27:50 +11:00
Jesse Duffield 20a94447d7 explicitly return newlines to our live command stdin 2018-12-18 22:23:17 +11:00
Jesse Duffield 865c7c2332 minor refactor of credentials panel into its own file 2018-12-18 22:19:32 +11:00
Jesse Duffield 276ac3a92e decrease frequency of refreshing files because it's causing index lock errors 2018-12-18 21:28:09 +11:00
Jesse Duffield c35255b7a9 set stderr ourselves so that we only read the error output if there is any 2018-12-18 21:25:49 +11:00
mjarkk f5f726e9c4 A try to hide the password from the error output 2018-12-17 08:58:09 +01:00
Jesse Duffield 4886b8350e always hide rather than delete the credentials view, and don't log on error in case there is a user password in the error 2018-12-16 17:28:04 +11:00
mjarkk af26b5f3e0 Tried to fix circleci 2018-12-14 13:45:43 +01:00
mjarkk 70cd6700e7 Tried to fix circleci 2018-12-14 13:43:13 +01:00
mjarkk d11f8989d9 Merge branch 'https-ask-for-username-password' of https://github.com/mjarkk/lazygit into https-ask-for-username-password 2018-12-14 13:40:40 +01:00
mjarkk 0fca27d022 Tried to fix circleci 2018-12-14 13:40:29 +01:00
Mark Kopenga 255319e597
Merge branch 'master' into https-ask-for-username-password 2018-12-14 11:13:29 +01:00
mjarkk 5d038dfd33 Removed the wired error handling 2018-12-12 22:11:31 +01:00
mjarkk 0577d3b97f Removed the username / password savety check 
This check is not realy needed because the change that it will show up a second time is so low that this is more work to check than the change it actualy might happen
 2018-12-12 21:08:53 +01:00
Jesse Duffield a26c15dafa some fixes for issues around the credentials panel 2018-12-12 22:34:20 +11:00
Jesse Duffield c71bcc64ed move fetch keybinding to files view to make way for branch-specific fetched 2018-12-12 22:33:42 +11:00
Jesse Duffield a365615490 only use subprocess for merging, not rebasing 2018-12-11 22:16:48 +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
Glenn Vriesman cce6f405a5 Making ci happier 2018-12-11 09:39:54 +11:00
Glenn Vriesman e39d2ed44b Added check to invoke continue/refresh 2018-12-11 09:39:54 +11:00
Glenn Vriesman 7a7e885773 Added rebase support commands 2018-12-11 09:39:54 +11:00
Glenn Vriesman 34fd18a395 Error handling 2018-12-11 09:39:54 +11:00
Glenn Vriesman a1ee11e54e Added error check to satisfy ci 2018-12-11 09:39:54 +11:00
Glenn Vriesman 7b850c56c4 Added some translations 2018-12-11 09:39:54 +11:00