utils-code/jesseduffield.lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2026-09-11 16:16:28 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
8231 commits 56 branches 247 tags 240 MiB
Commit graph

5245 commits

Author SHA1 Message Date
Jesse Duffield a9559a5c87 move working tree state function into git.go 2020-03-28 13:19:35 +11:00
Jesse Duffield 814ee24c8d better error handling 2020-03-28 11:59:45 +11:00
Jesse Duffield 7876cddf4a remove dead code 2020-03-28 11:59:45 +11:00
Jesse Duffield e9051355a1 fix test 2020-03-28 11:59:45 +11:00
Jesse Duffield 29316a528a better documentation 2020-03-28 11:59:45 +11:00
Jesse Duffield 036b53acf8 in fact we don't need any of these options 2020-03-28 11:59:45 +11:00
Jesse Duffield 919463ff02 actually don't even bother limiting 2020-03-28 11:59:45 +11:00
Jesse Duffield 3f7ec3f3b8 load reflog commits in two stages to speed up startup time 2020-03-28 11:59:45 +11:00
Jesse Duffield 19604214d7 discard old reflog commits when in new context 2020-03-28 11:59:45 +11:00
Jesse Duffield f7add8d788 smarter refreshing for tags and remotes 2020-03-28 11:59:45 +11:00
Jesse Duffield d97c230747 stop switching focus to commit files view while staging line by line 2020-03-28 11:59:45 +11:00
Jesse Duffield 906a49049e smart refreshing files 2020-03-28 11:59:45 +11:00
Jesse Duffield c1a4bd0482 more smart refreshing 
WIP

WIP

WIP

WIP

WIP

fix how diff entries are handled

WIP

WIP

WIP

WIP

WIP

WIP
 2020-03-28 11:59:45 +11:00
Jesse Duffield d0336fe16f better presentation of remotes 2020-03-28 11:59:45 +11:00
Jesse Duffield 61b4bbf74e clean up signature 2020-03-28 11:59:45 +11:00
Jesse Duffield 384c2e13d7 better refreshing for stash 2020-03-28 11:59:45 +11:00
Jesse Duffield 198d237679 more centralised handling of refreshing 2020-03-28 11:59:45 +11:00
Jesse Duffield 39315ca1e2 use wait groups when refreshing 2020-03-28 11:59:45 +11:00
Jesse Duffield efb51eee96 more efficient refreshing 2020-03-28 11:59:45 +11:00
Jesse Duffield fbbd16bd82 use reflogs from state to work out branch recencies 2020-03-28 11:59:45 +11:00
Jesse Duffield bd2c1eef53 remove redundant fetch of reflog 2020-03-28 11:59:45 +11:00
Jesse Duffield d1395b15bb use GIT_EDITOR 2020-03-27 19:26:14 +11:00
Máximo Cuadros 2d8ed5e274 *: update go-git import 2020-03-27 19:06:21 +11:00
Jesse Duffield 95b147079f allow applying patch directly 2020-03-26 21:44:45 +11:00
Jesse Duffield 83757f1065 limit size of menu panel 2020-03-26 21:44:33 +11:00
Jesse Duffield f2036b42e5 only load new reflog entries 2020-03-26 21:44:33 +11:00
Jesse Duffield 21b7d41845 relax limit on commit list and reset on branch change 2020-03-26 21:44:33 +11:00
Jesse Duffield 91a404d033 separate commits from cherry pick state 2020-03-26 21:44:33 +11:00
Jesse Duffield d027cf969c better handling of current branch name 2020-03-26 20:37:06 +11:00
Jesse Duffield 37acc17cf3 more lenient getting of short shas 2020-03-26 18:30:02 +11:00
Dawid Dziurla c831ad39c9 pkg: use upstream pty package 2020-03-25 21:26:15 +11:00
Jesse Duffield bbcc4b7b70 just disallow undo/redo while rebasing because you need more info than just the reflog 2020-03-25 09:39:04 +11:00
Jesse Duffield 45bba0a3c5 ignore redundant actions when undoing and redoing 2020-03-25 09:39:04 +11:00
Jesse Duffield d105e2690a vastly improve the logic for undo and redo 2020-03-25 09:39:04 +11:00
Jesse Duffield 32d3e497c3 fix tests 2020-03-25 09:39:04 +11:00
Jesse Duffield 30a5d1b486 move into undoing file 2020-03-25 09:39:04 +11:00
Jesse Duffield 6b3ea56add refactor undo and redo 2020-03-25 09:39:04 +11:00
Jesse Duffield c3aefdb98e stateless undos and redos 2020-03-25 09:39:04 +11:00
Jesse Duffield 094939451d more explicit env vars 2020-03-25 09:39:04 +11:00
Jesse Duffield 0e23f44b84 support reflog action prefix 2020-03-25 09:39:04 +11:00
Jesse Duffield daecdd7c2b redoing 2020-03-25 09:39:04 +11:00
Jesse Duffield 7c8df28d01 add waiting status to checkout ref handler 2020-03-25 09:39:04 +11:00
Jesse Duffield 65917272a2 undoing status 2020-03-25 09:39:04 +11:00
Jesse Duffield 137fd80fdb note that undo functionality is experimental 2020-03-25 09:39:04 +11:00
Jesse Duffield 98fbc61221 better formatted reflog list 2020-03-25 09:39:04 +11:00
Jesse Duffield f80d15062b use reflog undo history pointer 2020-03-25 09:39:04 +11:00
Jesse Duffield b1b0219f04 autostash changes when hard resetting 2020-03-25 09:39:04 +11:00
Jesse Duffield b1941c33f7 undo via rebase 2020-03-25 09:39:04 +11:00
Jesse Duffield 5d460e1e5e add tab keybindings 2020-03-23 23:25:00 +11:00
Jesse Duffield 3d3e0be7bd more compatible commands 2020-03-23 22:33:17 +11:00
Jesse Duffield 3aab37611a show status of selected cherry picked commits 2020-03-19 21:42:21 +11:00
Jesse Duffield 8fbcc36331 allow resetting cherry picked commits selection 2020-03-19 21:42:21 +11:00
Jesse Duffield dadb646252 fix branch building 2020-03-19 12:04:17 +11:00
Jesse Duffield 0227b93409 fix branch parser 2020-03-18 23:26:02 +11:00
Jesse Duffield b0ec0821d5 fix docs 2020-03-18 22:50:35 +11:00
hitsuji_no_shippo 13a7806cac add opne menu keybindings in docs 2020-03-18 22:50:35 +11:00
hitsuji_no_shippo 41c76fb748 add close menu keybindings in docs 2020-03-18 22:50:35 +11:00
hitsuji_no_shippo ac0c3b9f92 fix search keybindings in docs 2020-03-18 22:50:35 +11:00
Jesse Duffield 1be0ff8da7 better upstream tracking and allow renaming a branch 2020-03-18 21:29:06 +11:00
hitsuji_no_shippo 2169b5109f add search keybings in docs 2020-03-11 19:43:22 +11:00
Jesse Duffield 7df4b736cf be a bit more lenient 2020-03-09 12:41:41 +11:00
Jesse Duffield e47ad846c4 big golangci-lint cleanup 2020-03-09 12:23:13 +11:00
Jesse Duffield 19146d61b1 use selected branch as base when creating a new branch 2020-03-08 18:44:15 +11:00
skwerlman e541b809ce update tests to match changed command 2020-03-06 09:25:31 +11:00
skwerlman 6ca08c6519 make branches and files non-ambiguous for git-log 
fixes #694
 2020-03-06 09:25:31 +11:00
Jesse Duffield 31e201ca52 allow configuring side panel width 2020-03-04 00:12:23 +11:00
Jesse Duffield b3522c48d9 refactor 2020-03-04 00:12:23 +11:00
Jesse Duffield 0fc58a7986 fix test 2020-03-04 00:12:23 +11:00
Jesse Duffield 54241d8ab9 more generic way of supporting custom pagers 2020-03-04 00:12:23 +11:00
Jesse Duffield 355f1615ab supporing custom pagers step 1 2020-03-04 00:12:23 +11:00
William Wagner Moraes Artero 3ce2b9b79a chore: keeping coverage up :D 2020-03-01 10:57:12 +11:00
William Wagner Moraes Artero a79182e50d fix: accidentally escaped %s 2020-03-01 10:57:12 +11:00
William Wagner Moraes Artero 0eb3090ad6 fix: owner groups (GitLab) 2020-03-01 10:57:12 +11:00
William Wagner Moraes Artero 6ea25bd259 feat: flexible service configuration 2020-03-01 10:57:12 +11:00
William Wagner Moraes Artero fe5f087f9c feat: configurable services 2020-03-01 10:57:12 +11:00
Jesse Duffield 79299be3b2 better keybindings for patch building mode 2020-02-29 18:48:10 +11:00
Jesse Duffield 4c9b620bd0 better keybindings for staging by line 2020-02-29 18:48:10 +11:00
Jesse Duffield a7508a5dfd fix cheatsheet script to support different contexts 2020-02-29 17:46:00 +11:00
David Chen a9fe0b8000 set --abbrev-commit to return 8-digit hash strings 2020-02-27 18:05:41 +11:00
David Chen 5af7b0235e fix #680: unpushed commits still appear to be green instead of red 2020-02-27 18:05:41 +11:00
Corentin Rossignon bf946200e9 Fix OutOfBound array access when looking for ReflogCommits 
refs #679
 2020-02-27 09:34:40 +11:00
Jesse Duffield 890cc87724 fix bug where commits appeared as green despite not being pushed 2020-02-27 09:33:09 +11:00
Jesse Duffield 8eb0b0f4ca do not close over variables in a function 2020-02-25 22:09:43 +11:00
Jesse Duffield e6a8dc0bcf better logic for checking if we're rebasing 2020-02-25 22:09:43 +11:00
Jesse Duffield 02c497fad6 show file list when diffing commits 2020-02-25 21:38:38 +11:00
Jesse Duffield d0ab747479 color active frames green by default 2020-02-25 21:27:50 +11:00
Jesse Duffield f94d0be2c9 refactor the way we render lists 2020-02-25 21:21:07 +11:00
Jesse Duffield 9fd9fd6816 better commit lines in fullscreen mode 2020-02-25 21:21:07 +11:00
Jesse Duffield 8ad01fe32f refresh commits when adding a tag 2020-02-25 09:10:23 +11:00
Jesse Duffield fdb543fa7d add half and fullscreen modes 2020-02-25 08:45:30 +11:00
Jesse Duffield 52b5a6410c show item counts in frames 2020-02-25 07:19:46 +11:00
Jesse Duffield 0034cfef5c show tags in commits panel 2020-02-24 23:13:54 +11:00
Jesse Duffield 78b62be96f better handling of clearing the search 2020-02-24 22:18:04 +11:00
Jesse Duffield 1f5ccab1ce eagerload commits when searching 2020-02-24 22:18:04 +11:00
Jesse Duffield 46be280c92 support searching in side panels 
For now we're just doing side panels, because it will take more work
to support this in the various main panel contexts
 2020-02-24 22:18:04 +11:00
Jesse Duffield 2a5763a771 switch custom command keybinding to ':' 2020-02-24 22:04:39 +11:00
Jesse Duffield 370cec098b show diff stat 2020-02-24 09:20:50 +11:00
Dawid Dziurla 49a2f0191f tasks: don't use a function that requires Go 1.12 2020-02-24 09:09:27 +11:00
Jesse Duffield fabdda0492 allow customizing background color in staging mode 2020-02-23 18:37:19 +11:00
Glenn Vriesman 6fc3290a05 Reflog: Use 20 sha digits instead of 7 
Signed-off-by: Glenn Vriesman <glenn.vriesman@gmail.com>
 2020-02-20 08:34:01 +11:00
Jesse Duffield 66e6369c28 allow fastforwarding the current branch 2020-02-18 23:07:38 +11:00
Jesse Duffield 0f0da9c32a fix wording 2020-02-16 09:57:49 +11:00
Jesse Duffield 0a69c1a02d add reset to reflog commit menu 2020-02-16 09:57:49 +11:00
Jesse Duffield feaf98bd01 add reset to upstream option on files panel 2020-02-16 09:57:49 +11:00
Jesse Duffield 0fe9c15ce8 add mixed option to HEAD resetting, remove @{upstream} 2020-02-16 09:57:49 +11:00
Jesse Duffield f528e12c83 allow resetting to tag 2020-02-16 09:57:49 +11:00
Jesse Duffield 8ca9f93ccf allow resetting to remote branch 2020-02-16 09:57:49 +11:00
Jesse Duffield 73d8064837 allow resetting to branch 2020-02-16 09:57:49 +11:00
Jesse Duffield 5b1f60b7eb refactor create reset menu logic 2020-02-16 09:57:49 +11:00
Jesse Duffield 2e1344f611 fix specs 2020-02-15 08:47:36 +11:00
Jesse Duffield 5b9996b16f remove old createMenu function 2020-02-15 08:47:36 +11:00
Jesse Duffield 6fdc1791e4 refactor stash options menu 2020-02-15 08:47:36 +11:00
Jesse Duffield fd4f37b5c3 refactor git flow menu 2020-02-15 08:47:36 +11:00
Jesse Duffield d76e8887e5 refactor patch options menu panel 2020-02-15 08:47:36 +11:00
Jesse Duffield eb9134685a refactor rebase menu panel 2020-02-15 08:47:36 +11:00
Jesse Duffield d929b84786 refactor recent repos menu panel 2020-02-15 08:47:36 +11:00
Jesse Duffield 8ef3297b11 refactor reflog reset options panel 2020-02-15 08:47:36 +11:00
Jesse Duffield 27c7aeb117 refactor workspace reset options panel 2020-02-15 08:47:36 +11:00
Jesse Duffield c9714600e8 refactor commit reset menu 2020-02-15 08:47:36 +11:00
Jesse Duffield 665fdded14 continue refactor of menu panel 2020-02-15 08:47:36 +11:00
Jesse Duffield 814a0ea36f begin refactor of menu panel 2020-02-15 08:47:36 +11:00
Jesse Duffield 71e018a3dd get whole commit SHA from rebase commits 2020-02-13 18:10:14 +11:00
Jesse Duffield efb26f8b60 refresh current branch graph when side panels refresh 2020-02-10 19:05:55 +11:00
Glenn Vriesman d9eb6e2682 Fixed tests 
Signed-off-by: Glenn Vriesman <glenn.vriesman@gmail.com>
 2020-02-09 23:47:22 +11:00
Glenn Vriesman b74107f2ba Use 8 instead of 7 digit long sha 
Signed-off-by: Glenn Vriesman <glenn.vriesman@gmail.com>
 2020-02-09 23:47:22 +11:00
Glenn Vriesman 0cd91a10c6 Increase internal sha size 
This does not change the sha size that is displayed to the user

Signed-off-by: Glenn Vriesman <glenn.vriesman@gmail.com>
 2020-02-09 23:47:22 +11:00
Jesse Duffield f062e1dcda ignore carriage returns 2020-02-09 16:43:02 +11:00
Glenn Vriesman 9f5397a2d4 Moved function to git.go 
Signed-off-by: Glenn Vriesman <glenn.vriesman@gmail.com>
 2020-02-06 23:19:29 +11:00
Glenn Vriesman 0164abbd4a Added feature to ignore tracked files 
Signed-off-by: Glenn Vriesman <glenn.vriesman@gmail.com>
 2020-02-06 23:19:29 +11:00
Glenn Vriesman 047c3cf880 Added more keybinds 
* Commit with editor
 * Commit without hook

Signed-off-by: Glenn Vriesman <glenn.vriesman@gmail.com>
 2020-02-04 23:21:51 +11:00
Glenn Vriesman 47d7d87c82 Added commit keybinding to staging views 2020-02-04 23:21:51 +11:00
Glenn Vriesman 5f53d50492 Check cached when showing new file diffs 
Signed-off-by: Glenn Vriesman <glenn.vriesman@gmail.com>
 2020-02-04 08:41:41 +11:00
Jesse Duffield 5f71f87496 correctly compare new main height to previous 2020-02-03 21:50:31 +11:00
Chris Taylor c6cb90e8ca verify that VISUAL,EDITOR,LGCC envvars are set for non-interactive commands 2020-02-02 11:29:22 +11:00
Chris Taylor fb156bcaac add a helper to search a list for a pattern 2020-02-02 11:29:22 +11:00
Chris Taylor 75ba2196ba perpetuate this style of dependency injection 2020-02-02 11:29:22 +11:00
Chris Taylor 4cb50b15e4 make amend more non-interactive 2020-02-02 11:29:22 +11:00
Jesse Duffield df050472a1 more ticker improvements 2020-02-02 11:26:24 +11:00
Jesse Duffield 434582b5f5 explicitly tell gocui when to start animating the loader 2020-02-01 00:23:22 +11:00
Jesse Duffield cf6be928a3 only rerender app status when we need to 2020-02-01 00:23:22 +11:00
Jesse Duffield c907c55144 close more things when switching repos or to a subprocess 2020-01-31 20:53:08 +11:00
Jesse Duffield 64782a433e fix segfault on line by line panel 
The state object is sometimes undefined in the onclick method of the
line by line panel. Because we set it to nil in a bunch of places,
I've decided to just change the main context to 'normal' before setting
it to nil anywhere. That way the keybindings for the line by line panel
won't get executed and we won't get a segfault.
 2020-01-31 08:27:49 +11:00
Jesse Duffield 44edb49a6e handle files that were deleted downstream but modified upstream 2020-01-29 19:07:47 +11:00
Jesse Duffield 1a6d269063 split main view vertically 
When staging lines (or doing anything that requires the main view to split into two)
we want to split vertically if there's not much width available in the window.
If there is enough width we will split horizontally. The aim here is to allow for
sufficient room in the side panel. We might need to tweak this or make it configurable
but I think it's set to a pretty reasonable default i.e. switching to split vertically
when the window width falls under 220
 2020-01-29 18:44:50 +11:00
Jesse Duffield b64953ebdb safely unstage lines 2020-01-29 18:19:11 +11:00
Jesse Duffield deaa2bcb15 remove rollbar 2020-01-29 17:29:36 +11:00
Jesse Duffield c166c57c5d make use of branch config when pushing/pulling 2020-01-29 15:19:19 +11:00
Jesse Duffield 6b77e4ee4a fix comment 2020-01-28 22:18:55 +11:00
Jesse Duffield e5534f060d use reflog timestamps rather than commit timestamps to show commit recency 2020-01-28 22:12:48 +11:00
Jamie Brynes 810adab957 handle case where file watcher is disabled 2020-01-16 00:30:53 +00:00
Jesse Duffield 83a3c9fc8d handle when fsnotify doesn't work 2020-01-12 14:46:23 +11:00
Jesse Duffield 5e95019b3f Missed a spot with this new string task thing 
The issue here was that we were using a string task
but expecting to be able to set the origin straight after
to point at the conflict, but because it's async it was
actually resetting the origin to 0 after a little bit.

The proper solution here is maybe to add a flag to that thing
asking whether you want to reset main's origin. But I'm
too lazy to do that right now so instead I'm just using
setViewContent. That will probably cause issues in the future.
 2020-01-12 14:43:17 +11:00
Jesse Duffield 83a895a463 reset origin when clicking on list item 2020-01-12 13:55:14 +11:00
Jesse Duffield 77a82e9d51 use view line height to see if you should stop scrolling 2020-01-12 13:55:14 +11:00
Jesse Duffield bd79c2e8dc keep track of current view when pushing 2020-01-12 11:17:20 +11:00
Jesse Duffield 23bcc19180 allow fast flicking through any list panel 
Up till now our approach to rendering things like file diffs, branch logs, and
commit patches, has been to run a command on the command line, wait for it to
complete, take its output as a string, and then write that string to the main
view (or secondary view e.g. when showing both staged and unstaged changes of a
file).

This has caused various issues. For once, if you are flicking through a list of
files and an untracked file is particularly large, not only will this require
lazygit to load that whole file into memory (or more accurately it's equally
large diff), it also will slow down the UI thread while loading that file, and
if the user continued down the list, the original command might eventually
resolve and replace whatever the diff is for the newly selected file.

Following what we've done in lazydocker, I've added a tasks package for when you
need something done but you want it to cancel as soon as something newer comes
up. Given this typically involves running a command to display to a view, I've
added a viewBufferManagerMap struct to the Gui struct which allows you to define
these tasks on a per-view basis.

viewBufferManagers can run files and directly write the output to their view,
meaning we no longer need to use so much memory.

In the tasks package there is a helper method called NewCmdTask which takes a
command, an initial amount of lines to read, and then runs that command, reads
that number of lines, and allows for a readLines channel to tell it to read more
lines. We read more lines when we scroll or resize the window.

There is an adapter for the tasks package in a file called tasks_adapter which
wraps the functions from the tasks package in gui-specific stuff like clearing
the main view before starting the next task that wants to write to the main
view.

I've removed some small features as part of this work, namely the little headers
that were at the top of the main view for some situations. For example, we no
longer show the upstream of a selected branch. I want to re-introduce this in
the future, but I didn't want to make this tasks system too complicated, and in
order to facilitate a header section in the main view we'd need to have a task
that gets the upstream for the current branch, writes it to the header, then
tells another task to write the branch log to the main view, but without
clearing inbetween. So it would get messy. I'm thinking instead of having a
separate 'header' view atop the main view to render that kind of thing (which
can happen in another PR)

I've also simplified the 'git show' to just call 'git show' and not do anything
fancy when it comes to merge commits.

I considered using this tasks approach whenever we write to a view. The only
thing is that the renderString method currently resets the origin of a view and
I don't want to lose that. So I've left some in there that I consider harmless,
but we should probably be just using tasks now for all rendering, even if it's
just strings we can instantly make.
 2020-01-12 11:17:20 +11:00
Jesse Duffield 282f08df36 lazyload commits 2020-01-12 10:10:56 +11:00
Jesse Duffield d647a96ed5 add reflog reset options 2020-01-09 22:36:07 +11:00
Jesse Duffield 1b64ea3210 add checkout reflog commit keybinding 2020-01-09 22:36:07 +11:00
Jesse Duffield 9b32e99eb8 add reflog tab in commits panel 2020-01-09 22:36:07 +11:00
Jesse Duffield 79e696d8a7 switch to 'i' for toggling diff commits 2020-01-08 22:59:12 +11:00
Jesse Duffield e0015a52e5 refresh side panels when resetting to upstream 2020-01-08 22:30:54 +11:00
Jamie Brynes aea4661be5 escape editor path 2020-01-08 22:24:36 +11:00
Jesse Duffield 80377e4716 add git flow support 2020-01-08 22:03:15 +11:00
Jesse Duffield c3d54f3c2e don't watch deleted files 2020-01-08 21:57:39 +11:00
Jesse Duffield c7d367a791 minor fixup 2020-01-08 21:55:52 +11:00
Jesse Duffield ba4253668d reduce to 50 2020-01-08 21:41:39 +11:00
Jesse Duffield 1ce5c69cd2 improve file watching 
By default, macs have 256 open files allowed by a given process.
This sucks when you end up with over 256 files modified in a repo
because after you've watched all of them, lots of other calls to
the command line will fail due to violating the limit.

Given there's no easy platform agnostic way to see what you've got
configured for how many files a process can have open, I'm going to
arbitrarily set the max to 200 and when we hit the limit we start
unwatching older files to make way for new ones.

WIP
 2020-01-08 21:34:02 +11:00
David Chen 205d731d7b added a seperate keybinding option for checking out commits 2020-01-07 19:14:54 -08:00
David Chen 3e875cc593 fix display of menu option keybindings 2020-01-07 13:26:29 -08:00
David Chen de2cfc7e17 cleanup 2020-01-07 12:48:11 -08:00
David Chen e72cab81c1 customizable keybinding for toggleDiffCommit 2020-01-07 10:03:13 -08:00
David Chen 844a2db83a
Merge branch 'master' into custom-keybindings 2020-01-07 09:57:06 -08:00
David Chen 529ba45cc7 fixed keybinding display in merge_panel.go 2020-01-07 09:50:25 -08:00
Jesse Duffield 09aabce3cd allow commits to be checked out 2020-01-07 20:43:01 +11:00
Jesse Duffield eb2bfd3848 allow hard resetting to upstream branch 2020-01-07 20:26:01 +11:00
Yasuhiro Matsumoto d914d40b2e
Use ASCII on Windows with east asian locale 2020-01-07 11:32:11 +09:00
David Chen 66c7672a0c updated keybinding config docs 2020-01-07 08:38:07 +08:00
David Chen 983379d334
Merge branch 'master' into custom-keybindings 2020-01-07 00:03:49 +08:00
David Chen fd72a09d1e if statements to map 2020-01-06 23:37:33 +08:00
David Chen 0ddf7c05c8 PickBothHunks -> pickBothHunks 2020-01-06 23:37:21 +08:00
Jamie Brynes 5e45ae1584 fix applying patch on Windows machine 
This bug was caused how the timestamp was formatted for the patch file.

On Windows machines, ":" is an invalid character for a filename, but the
`stampNano` format for time contains ":".

This fix adjusts the time format to be the `stampNano` format with "."
subsituted for ":".
 2020-01-05 20:01:20 +00:00
David Chen 86b101c410
Merge branch 'master' into custom-keybindings 2020-01-04 08:12:36 +00:00
matejcik 0a31edecb6
make Ctrl+P visible 2020-01-03 15:09:59 +01:00
David Chen 029de4ac86 re-position key names so that the menu will show 'enter' instead of 'ctrl-m', or 'esc' instead of 'ctrl-[' 2019-12-08 14:57:29 -08:00
David Chen 5f21f190b9
Merge branch 'master' into custom-keybindings 2019-12-08 14:40:11 -08:00
Jesse Duffield dab78c8a63 stop the files panel from stealing focus whenever files are refreshed 2019-12-08 21:27:28 +11:00
David Chen 0d1230a959 added keybinding for fetchRemote 2019-12-07 09:26:17 -08:00
David Chen c507e5f562
Merge branch 'master' into custom-keybindings 2019-12-07 09:19:43 -08:00
David Chen 7194dfa43c better error messages 2019-12-06 22:39:41 -08:00
David Chen e425f1df87 suggested keybinding improvements 2019-12-06 22:36:52 -08:00
Jesse Duffield 3f4613feb0 allow fetching remotes with 'f' 2019-12-07 16:23:04 +11:00
Jesse Duffield 033c21754b fix commit message char count 2019-12-07 16:21:26 +11:00
David Chen c89c35c6b3 bug fix: ctrl+combinations was not showing up in help menu 2019-12-06 10:26:39 -08:00
David Chen 1dbfea54bc better error handling 2019-12-04 19:16:47 -08:00
David Chen 0a26050b47 fix 2019-12-04 18:33:00 -08:00
David Chen fa6893fda9 feature: custom keybindings 2019-12-04 18:01:06 -08:00
Dawid Dziurla 1c38db1fc7
keybindings: alias V -> v 2019-11-27 20:37:07 +01:00
Jesse Duffield 339e1b5dcf lenient sorting of tags on startup 2019-11-26 21:39:40 +11:00
Jesse Duffield 7113ed73d4 support older versions of git when getting remote branches 2019-11-26 21:36:07 +11:00
Jesse Duffield 3dd1daacdc unescape another string 2019-11-21 22:17:18 +11:00
Jesse Duffield bad06bb634 fix typo 2019-11-21 22:09:02 +11:00
Jesse Duffield e18e81f5eb don't pass single commands directly to RunCommand (or equivalent function) 
when it contains percentages.

This is a really strange one. It's a linting warning in my editor
and it doesn't stop me from compiling, but it breaks `go test`.

A basic file to reproduce what I'm talking about:

package main

import "fmt"

func main() {
	notSprintf("test %s") // compiler complains here thinking %s needs a corresponding argument
}

func notSprintf(formatStr string, formatArgs ...interface{}) string {
	if formatArgs != nil {
		return formatStr
	}
	return fmt.Sprintf(formatStr, formatArgs...)
}
 2019-11-21 22:07:14 +11:00
Jesse Duffield 67a446234c fix specs 2019-11-21 22:07:14 +11:00
Jesse Duffield f905b27b00 couple of things to clean up after rebasing onto master 2019-11-21 22:07:14 +11:00
Jesse Duffield e36ee0b4f1 give RunCommand the same input signature as fmt.Sprintf 2019-11-21 22:07:14 +11:00
Jesse Duffield 3c13229145 add tags panel 2019-11-21 22:07:14 +11:00
Jesse Duffield cea24c2cf9 allow editing remotes 2019-11-21 22:07:14 +11:00
Jesse Duffield 64017cf874 require double clicking menu items so you know what you're clicking 2019-11-21 22:07:14 +11:00
Jesse Duffield b3bce8a1ba refactor confirmation prompt code 2019-11-21 22:07:14 +11:00
Jesse Duffield 3b0cef2ec8 better handling of click events in list views 2019-11-21 22:07:14 +11:00
Jesse Duffield 07cbae4019 support setting upstream 2019-11-21 22:07:14 +11:00
Jesse Duffield b42202ea1c better fast forward 2019-11-21 22:07:14 +11:00
Jesse Duffield 8347dcd671 make upstream branch display more lenient on git errors 2019-11-21 22:07:14 +11:00
Jesse Duffield dcb5285797 support rebasing onto remote branch 2019-11-21 22:07:14 +11:00
Jesse Duffield a9cd647075 support deleting remote branches 2019-11-21 22:07:14 +11:00
Jesse Duffield f0cd730fbb ensure we switch tabs when switching context 2019-11-21 22:07:14 +11:00
Jesse Duffield 2afbd7ba7f support merging remote branches into checked out branch 2019-11-21 22:07:14 +11:00
Jesse Duffield 55ff0c0dee support detached heads when showing the selected branch 2019-11-21 22:07:14 +11:00
Jesse Duffield 6b7aaeca45 support adding/removing remotes 2019-11-21 22:07:14 +11:00
Jesse Duffield 1f3e1720a3 split RemoteBranch out from Branch 2019-11-21 22:07:14 +11:00
Jesse Duffield b7f2d0366b get branches with git for-each-ref 2019-11-21 22:07:14 +11:00
Jesse Duffield 6bd0979b4a only refresh branches panel on focus lost when in the local-branches context 2019-11-21 22:07:14 +11:00
Jesse Duffield 986abc1e45 support viewing a remote branch 2019-11-21 22:07:14 +11:00
Jesse Duffield 61dac10bb9 support navigating remotes view 2019-11-21 22:07:14 +11:00
Jesse Duffield b5385f2560 remove redundant logging 2019-11-21 22:07:14 +11:00
Jesse Duffield 92e43d9e77 allow changing tabs with [ and ] 2019-11-21 22:07:14 +11:00
Jesse Duffield 325408d0e3 get remote branches when getting remotes 2019-11-21 22:07:14 +11:00
Jesse Duffield eeb667954f trying to use gogit with branches from remotes 2019-11-21 22:07:14 +11:00
Jesse Duffield 8aa1062e06 extract out some logic for list views 2019-11-21 22:07:14 +11:00
Jesse Duffield 7e0a8f235e add contexts to views 2019-11-21 22:07:14 +11:00
Jesse Duffield e6be849eb2 add remotes context to branches view 2019-11-21 22:07:14 +11:00
Jesse Duffield 092f27495a add remote model 2019-11-21 22:07:14 +11:00
Jesse Duffield 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
Jesse Duffield 7995d56a85 allow editing or opening a file while resolving merge conflicts 2019-11-14 22:22:47 +11:00
Jesse Duffield 3b1d705473 show upstream branch for branch 2019-11-13 22:25:42 +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 b907c74386 remove go-getter 2019-11-12 22:58:01 +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 cbc82cd3c1 allow for changing the current directory on exit 
For this to work you'll need to put this in your ~/.zshrc (or equivalent rc file):

lg()
{
    export LAZYGIT_NEW_DIR_FILE=/Users/jesseduffieldduffield/Library/Application\ Support/jesseduffield/lazygit/.lastd

    lazygit "$@"

    if [ -f $LAZYGIT_NEW_DIR_FILE ]; then
            cd "$(cat $LAZYGIT_NEW_DIR_FILE)"
            rm -f $LAZYGIT_NEW_DIR_FILE > /dev/null
    fi
}
 2019-11-11 21:45:31 +11:00
Jesse Duffield e174e5254d support clicking through to commit files panel 2019-11-10 22:32:13 +11:00
Jesse Duffield de5bcb8b9c add some shameless self promotion 2019-11-10 22:32:13 +11:00
Jesse Duffield 98666186ee add '?' keybinding for opening options menu 2019-11-10 22:32:13 +11:00
Jesse Duffield 941d3c6648 allow secondary view to be scrolled 2019-11-10 22:32:13 +11:00
Jesse Duffield df72eee201 don't try to give a logrus entry object to gocui 2019-11-10 22:32:13 +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 cd17b46b55 reset patch builder when we've escaped from the building phase and nothing has been added 2019-11-10 16:18:25 +11:00
Jesse Duffield d0d92c7697 remove old add patch keybinding 2019-11-10 15:01:40 +11:00
Jesse Duffield 194c554357 support ours/theirs merge conflict headers 2019-11-08 09:31:27 +11:00
Jesse Duffield 2f37c0caaf fix tests 2019-11-05 19:22:01 +11:00
Jesse Duffield 86a39e3aea only test with non-original header 2019-11-05 19:22:01 +11:00
Jesse Duffield 326b1ca8c9 better titles 2019-11-05 19:22:01 +11:00
Jesse Duffield 72fe770974 better interface for ApplyPatch function 2019-11-05 19:22:01 +11:00
Jesse Duffield db8c398fa3 strip whitespace when there is nothing else 2019-11-05 19:22:01 +11:00
Jesse Duffield 861bcc38be fix ambiguous condition 2019-11-05 19:22:01 +11:00
Jesse Duffield cd3874ffb7 don't let patch manager ever be nil 2019-11-05 19:22:01 +11:00
Jesse Duffield 10fe88a2cf more work on managing focus when applying patch command 2019-11-05 19:22:01 +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 beaebb7dc7 handling when to show the split panel 2019-11-05 19:22:01 +11:00
Jesse Duffield 6d5d054c30 support line by line additions in staging and patch building contexts 2019-11-05 19:22:01 +11:00
Jesse Duffield 2344155379 handle empty commit in rebase 2019-11-05 19:22:01 +11:00
Jesse Duffield 48347d4d86 use fallback approach for applying patch 2019-11-05 19:22:01 +11:00
Jesse Duffield 61deaaddb7 reorder patch command options 2019-11-05 19:22:01 +11:00
Jesse Duffield 0046e9c469 create backups of patch files in case something goes wrong 2019-11-05 19:22:01 +11:00
Jesse Duffield 733145d132 clear patch after successful patch operation 2019-11-05 19:22:01 +11:00
Jesse Duffield f285d80d0e move PatchManager to GitCommand 2019-11-05 19:22:01 +11:00
Jesse Duffield 0ffccbd3ee checks for if we're in a normal working tree state 2019-11-05 19:22:01 +11:00
Jesse Duffield 1fc120de2d better rebase args 2019-11-05 19:22:01 +11:00
Jesse Duffield d5e443e8e3 Support building and moving patches 
WIP
 2019-11-05 19:22:01 +11:00
Jesse Duffield a3c84296bf use array of ints instead of range 2019-11-05 19:22:01 +11:00
Jesse Duffield cc039d1f9b don't unsplit main panel unconditionally on focus lost 2019-11-05 19:22:01 +11:00
Dawid Dziurla 2484ec9c11 fix headerRegexp 2019-11-05 19:22:01 +11:00
Dawid Dziurla 5f9de1f034 please golang-ci 2019-11-05 19:22:01 +11:00
Jesse Duffield 11e57edbb3 use v keybindings instead of c 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 081598d989 rewrite staging to support line ranges and reversing 
Now we can stage lines by range and we can also stage reversals
meaning we can delete lines or move lines from the working tree
to the index and vice versa.

I looked at how a few different git guis achieved this to iron out
some edge cases, notably ungit and git cola. The end result is
disstinct  from both those repos, but I know people care about
licensing and stuff so I'm happy to revisit this if somebody
considers it derivative.
 2019-11-05 19:22:01 +11:00
Giorgio Previtera a1c6619401 \#480 Close popup panels before switching to a side view 
Reusing the `onNewPopupPanel` function to close existing popup panels
(if any) before switching to a new side view. Alse closing any
confirmation prompt.
 2019-10-27 12:39:08 +11:00
Giorgio Previtera 3524f6baa9 480 - remove duplication by using a decorator 
Also use a for loop to append the new keybindings
 2019-10-27 12:39:08 +11:00
Giorgio Previtera ac5cbc1d2c #480 Allow cycling side panels with number keys 2019-10-27 12:39:08 +11:00
mjarkk a045313e08 Removed the pkg/gui/theme.go file 
Moved most functions to the new theme/theme.go
 2019-10-20 12:32:57 +11:00
mjarkk 02fef3136f Added light theme option to the settings 2019-10-20 12:32:57 +11:00
Dawid Dziurla 379dcf0972 UserConfigPath -> UserConfigDir 2019-09-24 19:01:40 +10:00
Dawid Dziurla 0d25d113c9 download updated binary to config dir rather than /tmp 2019-09-24 19:01:40 +10:00
matejcik 600112780c use git.autoFetch config option 2019-09-08 11:20:15 +10:00
matejcik 4c73c8889f move git config options to top-level in default config 2019-09-08 11:20:15 +10:00
matejcik 68d5c2bc10 use gui.g directly 2019-09-08 11:20:15 +10:00
matejcik 7db1fee877 startBackgroundFetch does not return errors 2019-09-08 11:20:15 +10:00
matejcik 8f786e3fd9 configurable auto-fetch 2019-09-08 11:20:15 +10:00
Dawid Dziurla e0dd1cb29d switch to Go modules 2019-09-01 21:24:03 +10:00
Giorgio Previtera 827837b0b9 477 Remove unnecessary variable check 
hasInlineMergeConflicts is always true with hasMergeConflicts is true
 2019-07-27 11:05:23 +10:00
Giorgio Previtera e83ef9858b #477 Remove NeedMerge boolean 
Instead of storing the status in a new variable, derive it from
the existing three fields
 2019-07-27 11:05:23 +10:00
Giorgio Previtera 504d506575 477 Add new NeedReset property to File and update tests 
Use a boolean to determin if a file needs to be reset. We want to reset
the file when discrading changes if there is a conflict.
 2019-07-27 11:05:23 +10:00
Giorgio Previtera 823b436b53 477 Remove duplicate checkout 
We already checout the file calling `c.DiscardUnstagedFileChanges`
 2019-07-27 11:05:23 +10:00
Giorgio Previtera 212327d746 #477 Discard changes when there are merge conflicts 
If there are merge conflicts, reset the file and discard all changes
 2019-07-27 11:05:23 +10:00
Christian Muehlhaeuser cc138fc70e Simplified boolean comparison 2019-07-27 10:55:21 +10:00
Christian Muehlhaeuser d953712377 err was assigned but never checked 2019-07-27 10:55:01 +10:00
Christian Muehlhaeuser 69ac0036e6 Swallow errors entirely, instead of assigning and ignoring them 2019-07-27 10:53:19 +10:00
Christian Muehlhaeuser 975a5315b0 Simplified code a bit 2019-07-27 10:52:06 +10:00
Christian Muehlhaeuser 8f734b11e3 Removed unnecessary string conversion 2019-07-27 10:51:17 +10:00
Jesse Duffield 75db4faf69 show actual error when trying to check out a branch that doesn't exist 2019-07-14 14:31:48 +10:00
haowei e1f5601d4b fix typo 2019-07-14 14:24:59 +10:00
Giorgio Previtera b60ecdaa24 472 - Update error message 2019-07-14 14:24:18 +10:00
Giorgio Previtera 9fb9962ce7 472 - Don't panic if not in a repository 
Display a friendly message and exit with an error if not
in a Git repository. Using the same approach used in this PR:
https://github.com/jesseduffield/lazydocker/pull/14/files
 2019-07-14 14:24:18 +10:00
Jesse Duffield b8baef7b8f use fork of roll that doesn't care about errors 2019-06-29 20:56:46 +10:00
Jesse Duffield 235a47bb80 Revert "emergency situation: we're not logging to rollrus while we're past the request quota" 
This reverts commit c107eed890.
 2019-06-29 20:56:46 +10:00
Jesse Duffield c107eed890 emergency situation: we're not logging to rollrus while we're past the request quota 2019-06-24 12:29:44 +10:00
Jesse Duffield abddea060e revert menu panel error panel usage 2019-06-08 20:29:25 +10:00
Jesse Duffield 3e40369fd2 add GIT_OPTIONAL_LOCKS=0 env var to all commands 2019-06-06 20:53:35 +10: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 bd2170a99c request explicit return from subprocess 
Previously we were recording output from subprocesses using a multiwriter
and hooking that up to the cmd's stdout to write to both os.Stdout and
a buffer. We would then display the output after the program finished.

This worked well for commands like 'ls' but not for commands like 'vi'
which expect you to be in a tty, and when you've got the cmd's stdout
pointing at a multiwriter, the subprogram thinks we're not in a tty
and then things like terminal corruption can happen. This was the case
with neovim, and even in vim a warning was given with a pause before
starting the program.

Now we're chucking out the multiwriter and instead making it that you
need to press enter after the program has finished to return to lazygit.
This allows you to view the output of the program (e.g. if it's ls) and
then decide that you want to return. It's one level of unnecessary
redirection for editors like vim, but even they could potentially have
output to stderr/stdout that you want to look at before returning.

 Please enter the commit message for your changes. Lines starting
 2019-05-26 21:19:54 +10:00
Jesse Duffield c039e5bed0 support going to start/end of line and deleting lines in simple editor 2019-05-26 12:42:17 +10:00
Jesse Duffield 527c025a0c use shift+j/k to scroll main, ctrl+j/k to move commits 2019-05-25 16:48:17 +10:00
Jesse Duffield 53cded77f1 fix padding with coloures strings 2019-05-19 15:25:33 +10:00
Jesse Duffield 4a4dc676fc simplify code for logging output of subprocess 2019-05-18 11:30:10 +10:00
Jesse Duffield c61bfbdd4c Support opening lazygit in a submodule 2019-05-12 17:59:49 +10:00
Suhas Karanth e38d9d5f22 Add alternatives for scroll actions to context map 2019-05-12 16:20:42 +10:00
Suhas Karanth 97f060d38d Add field Alternative to gui.Binding 
Document and use alternative keybinding for generating cheatsheet. Add
alt keybinding fn+up/down for scroll up/down actions.

Also run `go run scripts/generate_cheatsheet.go`.
 2019-05-12 16:20:42 +10:00
mjarkk 8754d766e2 Made not enough space pannel looks better on 1 height 2019-05-07 08:47:41 +02:00
mjarkk 2388c3ee9a Fixed some sugestions from jesseduffield 2019-05-06 20:04:54 +02:00
Mark Kopenga 61890cb9de
Merge branch 'master' into smaller-ui 2019-05-06 15:24:36 +02:00
Jesse Duffield 5a0d0bb299 support resetting to a commit in either soft, hard, or mixed mode 2019-05-06 22:44:38 +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
Suhas Karanth e09aac6450 Improve directory check for .git 
Return error if the .git exists but is not a directory. This provides a
slightly better failure message for git repo with submodules in case
the '.git' is a file which provides the reference to the parent's .git
folder with the submodule inside.
 2019-05-06 21:37:42 +10:00
mjarkk 19a6368377 Changed the way how the view height are set 2019-05-05 15:57:35 +02:00
mjarkk 492614ebc7 Made the ui even smaller 2019-04-26 08:24:14 +02:00
Mark Kopenga d31f0ed39b
Merge branch 'master' into smaller-ui 2019-04-26 07:46:45 +02:00
mjarkk b505c295d2 Fixed another view things 2019-04-26 13:44:37 +10:00
mjarkk 0b9d7edd47 Fixed sugestions 2019-04-26 13:44:37 +10:00
mjarkk e9fbb608a8 Translated missing sentences 2019-04-26 13:44:37 +10:00
mjarkk 6ba05c94ea Added another resizing step 2019-04-25 21:37:19 +02:00
mjarkk 07fec6d00e Made the go bot happy 2019-04-20 16:51:50 +02:00
mjarkk a69b985086 Better UI on small screens 2019-04-20 15:56:23 +02:00
Jesse Duffield 471733fe03 add english translations to dutch/polish i18n files for translation later 2019-04-13 14:39:46 +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 ab9fa291a8 Add skipHookPrefix to config 
allows a user to specify a commit message prefix that will tell lazygit to skip
the pre-commit hook. This defaults to WIP. Setting it to the empty string will
disable the feature.

So if my message goes 'WIP: do the thing' then the pre-commit hook will not run
 2019-04-13 14:38:17 +10:00
Peter Lundberg fc3a57b5e2 Change expected sha for DiscardOldFileChanges 2019-04-10 17:17:31 +10:00
Peter Lundberg 7ff07e1454 Always include atleast 2 commits when doing squash and fixup 2019-04-10 17:17:31 +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 60e33f5d8c Allow for creating fixup! commits 2019-04-07 13:13:40 +10:00
skanehira f34be1896a fixed some #397 2019-04-06 13:02:20 +11:00
skanehira c350cdba43 add feature of display diff between specific commits #397 2019-04-06 13:02:20 +11:00
Jesse Duffield 1a933eaa73 pass length of options to createMenu 2019-03-23 13:26:17 +11:00
Jesse Duffield bd46e9c5b0 delete menu keybinding before setting new one 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 e68dbeb7eb organise keybindings better 2019-03-22 20:20:06 +11:00
skanehira 32ddf0c296 generate commit files keybind 2019-03-18 09:49:23 +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 e583cc2519 allow autostashing changes when checking out a branch 2019-03-16 12:51:48 +11:00
Kristijan Husak 0d208b7957 Update bitbucket pull request url. 2019-03-16 11:58:26 +11:00
Jesse Duffield 43e5c042a2 prompt user to git init when outside a repo 2019-03-16 11:38:16 +11:00
Jesse Duffield 39844ffef9 allow a LOG_LEVEL env var to be set 2019-03-16 10:52:30 +11:00
Jesse Duffield f5c8aac97d add two more tests 2019-03-16 10:20:27 +11:00
Jesse Duffield b6447ebdbb allow adding a file viewed from the commit files panel 2019-03-16 10:20:27 +11:00
Jesse Duffield 466fc4227e fix tests 2019-03-16 10:20:27 +11:00
Jesse Duffield c034c88be4 display test name when running tests 2019-03-16 10:20:27 +11:00
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
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
Glenn Vriesman 88c01c1ded Added rebase keybinding 2018-12-11 09:39:54 +11:00
Glenn Vriesman 27994f7de8 Added rebase handler 2018-12-11 09:39:54 +11:00
Glenn Vriesman 670f0e37c7 Added rebase functions 2018-12-11 09:39:54 +11:00
Glenn Vriesman 822dc5dada Moved push-pullables status to the end 2018-12-11 09:38:33 +11:00
mjarkk e20d8366e1 Made gobot happy 2018-12-10 14:21:00 +01:00
mjarkk 76e9582739 Not always git fetch 2018-12-10 13:45:03 +01:00
mjarkk 50f20de8f3 Removed a lot of duplicated code 2018-12-10 08:22:52 +01:00
mjarkk 8e3f5e19e0 Changed some other names 2018-12-10 08:04:22 +01:00
mjarkk 61c2778de1 Changed pushPassUname name to credentials 2018-12-10 07:51:06 +01:00
mjarkk 3c17bf761a Better name for this function 2018-12-10 07:46:26 +01:00
mjarkk 696d6dc20c Fixed loop before error check 2018-12-10 07:43:32 +01:00
mjarkk f14effe5f5 Worked and fixed a view comments 2018-12-09 13:04:19 +01:00
mjarkk efb82a58ae Tried to fix circleci error 2018-12-08 16:54:00 +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
mjarkk cf5a85b80f Intro message stays on screen now 2018-12-07 19:22:22 +01:00
mjarkk 2f7bd2896c Fixed error when there is no state.yml 2018-12-07 15:46:49 +01:00
mjarkk 8f904ffd72 Working popup 2018-12-07 14:56:29 +01:00
mjarkk ced81e11f0 Only show private repo popup when opening repo for first time 2018-12-06 22:05:16 +01:00
mjarkk 6d0fa8bc29 Made some small inprovements 2018-12-06 09:05:51 +01:00
mjarkk 21a808a52b Renamed branch to branches 2018-12-06 08:39:49 +01:00
mjarkk 89c272eed5 Removed the tabs for spaces 2018-12-06 08:33:04 +01:00
Mark Kopenga 1b6d34e76a
Merge branch 'master' into https-ask-for-username-password 2018-12-06 08:31:12 +01:00
mjarkk 6711543634 Made the gobot happy again 2018-12-06 08:28:56 +01:00
mjarkk f6e83cdbdf Started working on the popup 2018-12-06 08:26:05 +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 66512ca253 use porcelain git rather than go-git for reset --hard HEAD because go-git takes over 5 seconds 2018-12-05 19:49:07 +11:00
Jesse Duffield 933874fb25 dutch and polish translations to be updated 2018-12-05 19:33:54 +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
Jesse Duffield 99824c8a7b add patch modifier struct 2018-12-04 22:11:48 +11:00
mjarkk c269ad1370 Made the bot happy 2018-12-02 15:06:51 +01:00
mjarkk 2edd2b74ff Removed a lot of useless code 2018-12-02 14:58:18 +01:00
BlakeMScurr 181f91d2ef Add full stops to new comments. 2018-11-30 13:47:14 +13:00
BlakeMScurr 643cdd3461 Add simple comments to uncommented functions. 2018-11-30 11:04:08 +13:00
BlakeMScurr 5c70d2724b Fix function comments with CodeLingo. 2018-11-28 15:31:22 +13:00
mjarkk d91493b587 Forgot to set the git fetch timeout back to 60s 2018-11-25 13:23:32 +01:00
mjarkk 9da1382e09 Added credentials popup 2018-11-25 13:15:36 +01:00
mjarkk adfc00bcdc Changed the waitForGroup to a channel 2018-11-23 13:58:30 +01:00
Mark Kopenga b0eaf507a5
Merge branch 'master' into https-ask-for-username-password 2018-11-14 13:40:17 +01:00
mjarkk 448d9caf1b Fixed typo 2018-11-14 11:40:32 +01:00
Mark Kopenga 6d2bf0b0b5
Merge branch 'master' into https-ask-for-username-password 2018-11-14 11:34:39 +01:00
Jesse Duffield 5160668efd
Merge branch 'master' into feature/detached-heads 2018-11-14 21:23:44 +11:00
Jesse Duffield 0eb1e4a86b change how we build our list of branches to support detached heads 2018-11-14 21:19:12 +11:00
mjarkk 0c4c00c1bf Removed useless channel read 2018-11-14 11:14:31 +01:00
Jesse Duffield b8d5adcb84
Merge branch 'master' into feature/translations 2018-11-14 19:35:51 +11:00
Jesse Duffield a5f483fae9 refactor obtaining current branch name 2018-11-14 19:08:42 +11:00
mjarkk 18a1070c2c Trying to fix circleci 2018-11-10 18:24:37 +01:00
mjarkk 9fafd7ebc1 Fixed case that a commit message will break git push 2018-11-10 18:10:53 +01:00
mjarkk 80c6e0a8c4 Fixed pushing forever 2018-11-10 17:02:39 +01:00
mjarkk 8742c4c110 Removed some variables and placed them inside the gui struct 2018-11-10 09:27:03 +01:00
mjarkk 32ecc6d745 Removed getPushPassUnameView function 2018-11-10 09:09:18 +01:00
mjarkk 834e42897d Switched back to github.com/mgutz/str instaid of a copy of ToArgv 2018-11-10 08:57:02 +01:00
mjarkk 500267417b Removed some duplicated code 2018-11-10 08:46:42 +01:00
mjarkk 18bcc0df4d Fixed no error text on windows 
when executing a command live on windows it detects errors but did just show a empty string
 2018-11-10 08:43:02 +01:00
mjarkk 5ae0e75e5e Switched to channels instaid of a mutex 2018-11-10 08:39:09 +01:00
mjarkk 1fd8cadd9e Replaced regex with trim 2018-11-10 08:14:35 +01:00
KOREAN139 9d79d32c94 add scroll-past-bottom configuration option 
with gui.scrollPastBottom option true, lazygit let user scroll past the
bottom - which is default
if option is false, user cannot scroll further when bottom of file has
appeared in mainView
 2018-11-08 19:35:05 +09:00
Mark Kopenga 17b4b4cb33
Merge branch 'master' into https-ask-for-username-password 2018-11-08 10:31:10 +01:00
Jesse Duffield 79ef98739d
Merge branch 'master' into feature/translations 2018-11-08 17:57:01 +11:00
Jesse Duffield 32d1289af7
Merge branch 'master' into feature/fix-keybind-crash 2018-11-08 17:49:21 +11:00
Jesse Duffield ea55643cb2
Merge branch 'master' into feature/translations 2018-11-08 17:47:00 +11:00
mjarkk 9c8b241292 Removed some useless comments 2018-11-06 20:37:59 +01:00
mjarkk 7c4d360645 Better error for code 128 2018-11-06 20:25:11 +01:00
mjarkk ad77ac639e Working new lines in live pty output 2018-11-06 20:24:10 +01:00
mjarkk cf1e9f79b1 hopefully fixed the test now 2018-11-03 09:36:38 +01:00
mjarkk 8f0741a458 Changed the youtube link to a youtu.be short link 2018-11-03 09:19:47 +01:00
mjarkk 8469239d84 Fixed test 2018-11-03 09:12:45 +01: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 0e53a26d6f Maybe fixed the test this time 2018-11-01 07:06:34 +01:00
mjarkk 3938138ebc Hopefully fixed circleci 2018-10-31 19:25:52 +01:00
mjarkk 05f0e5120a Fixed one text 2018-10-31 17:55:02 +01:00
mjarkk 5532289086 Fixed some tests 2018-10-31 17:36:20 +01:00
mjarkk 78b2bc4f60 Made a better way of test pushing 2018-10-31 16:23:58 +01:00
mjarkk 9585f49490 Made error handling better 2018-10-29 08:23:56 +01:00
Glenn Vriesman 9a0f094f58 Changed some things after marks feedback 2018-10-28 20:33:42 +01:00
Glenn Vriesman ee89ad6ae7 Fixed test 2018-10-28 20:13:55 +01:00
Glenn Vriesman 22e5aafd59 Fixed and added some dutch translations 2018-10-28 19:58:20 +01:00
Glenn Vriesman abd0803ef4 Set current view to limit view 2018-10-28 19:15:34 +01:00
mjarkk 372b333662 Added copy note at top of string-to-args.go 2018-10-27 17:08:25 +02:00
mjarkk 18f09a14e6 Removed package github.com/mgutz/str for better code coverage 2018-10-27 17:06:33 +02:00
mjarkk ed564adb4a Removed github.com/ionrock/procs for better code coverage 2018-10-27 16:57:34 +02:00
mjarkk 9a99748d3b Fixed bug where username input didn't go away 2018-10-27 16:29:16 +02:00
mjarkk 9163110640 Removed error check for regex 
Regexp only returns an error when regex string is in-corret
 2018-10-27 15:52:12 +02:00
mjarkk 6c1c110ce0 Made tests pass 
Git constandly exits with error code 1 for some reason it might be because of the wrong username and password but i don't think error 1 is for wrong credentials
 2018-10-27 15:32:12 +02:00
Mark Kopenga 45c249acca
Merge branch 'master' into https-ask-for-username-password 2018-10-27 15:06:51 +02:00
mjarkk 1df1053947 Fixed test 2018-10-27 15:01:16 +02:00
mjarkk 87d1b9a547 Fixed circleci build 2018-10-27 14:56:15 +02:00
mjarkk 959d6fa2ca Made it possible to build for windows again 2018-10-27 14:37:31 +02:00
mjarkk e47c597b3a Made it possible to build again for windows 2018-10-27 14:35:07 +02:00
Mark Kopenga 1fedda6a75
Merge branch 'master' into https-ask-for-username-password 2018-10-23 13:52:50 +02:00
Jesse Duffield 467775fc1c
Merge branch 'master' into master 2018-10-23 09:43:25 +11:00
Naveen Vardhi 3a23cb87b7 Remove force delete keybinding 
And force delete messages gives feedback about merge status
 2018-10-21 21:13:24 +05:30
mjarkk ac03665df3 Handled some errors 2018-10-20 19:44:56 +02:00
mjarkk 1be44eae84 Fixed surgestion from golangcibot 2018-10-20 19:03:51 +02:00
mjarkk b72841ca0c Fixed golangcibot surgestions 2018-10-20 18:58:37 +02:00
mjarkk 12425f0aa7 First good success 2018-10-20 17:37:55 +02:00
mjarkk 727ba9f42e test 2018-10-20 17:21:17 +02:00
mjarkk 73a0a65ee1 test 2018-10-20 17:20:52 +02:00
mjarkk ac5696574c added some translations 2018-10-20 17:18:42 +02:00
mjarkk 1a43d64de3 Added extra translations 2018-10-20 16:25:48 +02:00
Kristijan Husak 990dc8c4ea Add separate open command for links and check if branch exists on remote before opening pull request link. 2018-10-20 11:58:08 +02:00
Jesse Duffield 59cdd7d46e
Merge branch 'master' into master 2018-10-20 10:53:02 +11:00
mjarkk 4451cbc50b handled golangcibot 2018-10-17 21:14:24 +02:00
mjarkk 01fa106de3 Added files to commit pannelsidjfjlisdjfilisldjfiljisldjilfjisdjilfjlsidMoved some code around 2018-10-17 21:12:33 +02:00
mjarkk 9fc4262887 small code addition 2018-10-17 20:41:22 +02:00
mjarkk cecd5733a8 Basic file for getting the fix working 2018-10-17 20:38:13 +02:00
Kristijan Husak c69fce2e9d Remove unnecessary nil error in NewPullRequest. 2018-10-15 11:00:19 +02:00
Kristijan Husak df0e3e52fe Add option to create pull request form branches panel. 2018-10-13 22:54:51 +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
Jesse Duffield ac65586bd5
Merge branch 'master' into feature/commit-amend 2018-10-07 21:08:46 +11:00
Naveen Vardhi af8d362caa Initial version of delete named branch added 2018-10-06 17:04:33 +05:30
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
Jesse Duffield 2be613679e more test coverage 2018-10-05 09:11:19 +10:00
Kristijan Husak 28fe3d6cf9 Use confirmation popup for amending last commit. 2018-09-25 22:11:51 +02:00
Kristijan Husak b6b21bc98e Merge branch 'master' of git://github.com/jesseduffield/lazygit into feature/commit-amend 2018-09-25 21:17:53 +02:00
Jesse Duffield eb69d98f99 add test for CurrentBranchName 2018-09-25 20:31:19 +10:00
Jesse Duffield fb9596a3ff add test for getMergeBase 2018-09-25 20:25:04 +10:00
Jesse Duffield 0d33a746ba Merge branch 'feature/informative-commit-colors' of https://github.com/jesseduffield/lazygit into feature/informative-commit-colors 2018-09-25 20:11:36 +10:00
Jesse Duffield f3fc98a3d0 support git flow when colouring commits 2018-09-25 20:11:33 +10:00
Jesse Duffield 17d7bcdeaf
Merge branch 'master' into feature/informative-commit-colors 2018-09-25 20:10:12 +10:00
Jesse Duffield 7164f37266
Merge branch 'master' into feature/commit-amend 2018-09-25 19:05:24 +10:00
Jesse Duffield e9245cd53b
Merge branch 'master' into add-tests-part-7 2018-09-25 19:03:29 +10:00
Jesse Duffield 80d6bbef86 Merge branch 'master' of https://github.com/jesseduffield/lazygit 2018-09-23 14:13:14 +10:00
Jesse Duffield 3d751c03fe add donation link to status panel 2018-09-23 14:13:10 +10:00
Jesse Duffield 7947668e18 Merge branch 'hotfix/273-cursor-scrolling' of https://github.com/jesseduffield/lazygit into hotfix/273-cursor-scrolling 2018-09-22 13:50:01 +10:00
Jesse Duffield 619c28ce56 use lineheight rather than buffer length 2018-09-22 13:49:58 +10:00
Jesse Duffield 2229a6e133
Merge branch 'master' into hotfix/commit-message-panel-focus 2018-09-21 16:43:37 +10:00
Jesse Duffield 70ee4faf15 add removeAll to git 2018-09-21 09:23:00 +10:00
Anthony HAMON 360b7c1def commands/git : refactor test to Diff, refactor function 2018-09-20 09:11:47 +02:00
Anthony HAMON bdeb78c9a0 commands/git : returns an error instead of panicing 2018-09-20 09:09:37 +02:00
Anthony HAMON 9481920101 commands/git : add test to GetLog 2018-09-20 09:09:37 +02:00
Jesse Duffield a2b3cd0823 add removeAll to git 2018-09-20 09:48:56 +10:00
Jesse Duffield 8fac19c175 Merge branch 'master' into feature/informative-commit-colors 2018-09-20 09:41:29 +10:00
Jesse Duffield b9708c9f88 fix issues with commit message panel losing focus 2018-09-19 20:36:40 +10:00
Jesse Duffield 4ea446205c Merge branch 'hotfix/cursor-positioning' into feature/recent-repos 2018-09-19 19:32:11 +10:00
Jesse Duffield 5a76b57952 one more spec to increase coverage 2018-09-19 19:31:29 +10:00
Jesse Duffield 6de291ff44 Merge branch 'hotfix/cursor-positioning' into feature/recent-repos 2018-09-19 19:23:42 +10:00
Jesse Duffield 64f0eeb42e fix specs 2018-09-19 19:23:31 +10:00
Jesse Duffield baa9eff318 Merge branch 'hotfix/cursor-positioning' into feature/recent-repos 2018-09-19 19:17:05 +10:00
Jesse Duffield fcaf4e339c fix specs 2018-09-19 19:16:55 +10:00
Jesse Duffield e91fb21233 add recent repos menu option 2018-09-19 19:15:29 +10:00
Jesse Duffield 99a6439641
Merge branch 'master' into hotfix/cursor-positioning 2018-09-19 18:42:25 +10:00
Jesse Duffield 768b9453f8 Merge branch 'hotfix/cursor-positioning' into feature/recent-repos 2018-09-19 18:40:41 +10:00
Jesse Duffield e95b2e5f0b update specs 2018-09-19 18:31:54 +10:00
Jesse Duffield 950cfeff6f add specs for menu utils 2018-09-19 18:19:26 +10:00
Jesse Duffield c789bba673 color merged and unmerged commits differently 2018-09-18 21:45:35 +10:00
Jesse Duffield b384fcf6af generalise popup menu panel 2018-09-18 21:07:25 +10:00
Anthony HAMON 60cf549a32 commands/git : reverse the logic 2018-09-18 09:23:41 +02:00
Anthony HAMON 6f0b32f95e commands/git : add GetCommits tests refactor 
* switch GetCommitsToPush scope to private
* return a map instead of slice for look up
* remove useless includesString function
 2018-09-17 21:19:17 +02:00
Jesse Duffield f89bc10af1 appease golangci 2018-09-17 21:32:19 +10:00
Jesse Duffield a66ac8092e minor refactor 2018-09-17 21:27:53 +10:00
Jesse Duffield bd04ecff69 Merge branch 'master' into hotfix/cursor-positioning 2018-09-17 21:03:29 +10:00
Jesse Duffield c00c834b35 standardise rendering of lists in panels 2018-09-17 21:02:30 +10:00
Anthony HAMON 9713a15167 commands/git : add test to GetBranchGraph, refactor 2018-09-16 22:12:03 +02:00
Anthony HAMON b641d6bd96 commands/git : add test to Checkout, refactor 2018-09-16 22:08:23 +02:00
Anthony HAMON 67a42f49b4 commands/git : add test to RemoveFile, refactor 2018-09-16 22:03:56 +02:00
Anthony HAMON bbc88071e9 gui : remove unreachable code 2018-09-16 20:46:25 +02:00
Anthony HAMON c1b7a21631 commands/git : move tests 2018-09-16 11:11:09 +02:00
Anthony HAMON 91832f2c5e commands/git : add tests, refactor a bit 2018-09-16 11:11:09 +02:00
Kristijan Husak 61f0801bd3 Add ammend commit action. 2018-09-13 12:44:32 +02:00
Anthony HAMON c92510ceba commands/git : add tests on SquashFixupCommit and refactor 2018-09-12 22:45:52 +02:00
Anthony HAMON 65a24d70c3 commands/git : add tests on SquashPreviousTwoCommits 2018-09-12 20:43:03 +02:00
Jesse Duffield 3b765e5417 add test for min method 2018-09-12 19:39:36 +10:00
Jesse Duffield 57f6a552d2 Merge branch 'hotfix/cursor-positioning' of https://github.com/jesseduffield/lazygit into hotfix/cursor-positioning 2018-09-12 18:49:14 +10:00
Jesse Duffield 35cae80de9 more efficient building of branch displaystrings 2018-09-12 18:49:09 +10:00
Jesse Duffield b4b4cd83dd
Merge branch 'master' into hotfix/cursor-positioning 2018-09-12 18:47:57 +10:00
Jesse Duffield 31c33dfdcb remove redundant comments 2018-09-12 18:47:37 +10:00
Jesse Duffield 2ce8ac5850 restore old file sorting algorithm 2018-09-12 18:24:03 +10:00
Jesse Duffield f8b484f638 don't use newlines at the end of panel buffers 2018-09-12 18:23:25 +10:00
Anthony HAMON 97e0a6dc45 commands/git : remove extra space 2018-09-12 07:51:14 +02:00
Anthony HAMON 9bad0337fe commands/git : swap global/local get config 2018-09-12 07:50:49 +02:00
Anthony HAMON f03544f392 commands/git : fix test 2018-09-11 22:20:59 +02:00
Anthony HAMON 0aba49af2b commands/git : fix typo 2018-09-11 21:56:17 +02:00
Anthony HAMON ccbc5e569c commands/git : add test to Push func, refactor 2018-09-11 21:56:17 +02:00
Anthony HAMON 415aad600c commands/git : add test to Commit func, refactor 2018-09-11 21:56:17 +02:00
Anthony HAMON d23577168f commands/git : remove dependency on gocui 2018-09-11 21:56:17 +02:00
Anthony HAMON 5c204b2813 commands/git: rewrite UsingGpg, add tests 2018-09-11 21:56:17 +02:00
Sascha Andres 985196f5aa docs: add comments for new test code 2018-09-10 17:36:59 +02:00
Jesse Duffield 52b132fe01 better handling of cursor and origin positionings 2018-09-10 20:17:39 +10:00
Sascha Andres 9ec5a04cf5 merge: remote-tracking branch 'upstream/master' 2018-09-10 10:33:20 +02:00
Sascha Andres bb9698810d refactor: move fallback to platform struct 
Co-authored-by: Jesse Duffield <jessedduffield@gmail.com>
 2018-09-10 10:31:15 +02:00
Sascha Andres 74144e3892 fix: remove call to fmt.Println 2018-09-10 10:10:10 +02:00
mjarkk 07f87eb7cf Added missing dutch translations 2018-09-10 08:08:53 +02:00
Sascha Andres ba0cc20e22 feat: add test cases 2018-09-10 06:51:19 +02:00
Sascha Andres 717913e64c fix: escape quote character on Linux 
Co-authored-by: Dawid Dziurla <dawidd0811@gmail.com>

Closes #269
 2018-09-10 06:36:15 +02:00
Jesse Duffield 557461c016
Merge branch 'master' into add-tests-part-2 2018-09-10 09:47:14 +10:00
Anthony HAMON 24f15742d0 commands/git : rename variable 2018-09-09 20:08:46 +02:00
Anthony HAMON 6076a75643 commands/git : fix function call 2018-09-09 10:52:34 +02:00
Anthony HAMON b46e4b4976 commands/git : add several tests, do some cleanup 2018-09-09 10:52:34 +02:00
Anthony HAMON 99eca7b000 commands/git : replace make function 2018-09-09 10:52:34 +02:00
Anthony HAMON a0faaf6893 commands/git : remove includes function 2018-09-09 10:52:34 +02:00
Anthony HAMON 56ad07ebab commands/git : rename functions 2018-09-09 10:52:34 +02:00
Anthony HAMON 1ecd74c357 commands/git : add tests for GetCommitsToPush 2018-09-09 10:52:34 +02:00
Anthony HAMON ceab9706cb commands/git : add tests for UpstreamDifferentCount 2018-09-09 10:52:34 +02:00
Anthony HAMON 1cc7e9c02a rewrite to use subtests 2018-09-09 10:52:34 +02:00
Dawid Dziurla 63e400647a
shorter english string 2018-09-09 10:47:13 +02:00
Dawid Dziurla 6f7de83bce
Merge branch 'master' into feature/help 
conflicts resolved
 2018-09-09 10:41:01 +02:00
Dawid Dziurla e80371fc6f
satisfy golangci 2018-09-07 14:41:01 +02:00
Dawid Dziurla 9cef98f779
ladies and gentlemen... 
this is fmt number x+1
 2018-09-07 14:23:08 +02:00
Dawid Dziurla ba6dedfb22
rewrite some of menu panel logic 
panel keybindings are now on top and
global keybindings are below separated with empty newline
 2018-09-07 14:19:16 +02:00
Jesse Duffield ca715c5b23 support switching to recent repo 2018-09-07 09:41:15 +10:00
Dawid Dziurla e9268d1828
add confirmOnQuit config option 2018-09-05 19:56:11 +02:00
Dawid Dziurla db2e2160a9
change menu keybinding from ? to x 2018-09-05 15:55:24 +02:00
Dawid Dziurla 4188786749
update pl translation 2018-09-05 15:20:34 +02:00
Jesse Duffield a2d40cfbf1 allow users to configure whether the commit length is shown 2018-09-05 23:02:13 +10:00
Dawid Dziurla 34d1648bd3
fmt strikes again 2018-09-05 13:23:06 +02:00
Dawid Dziurla 906f8e252e
include global keybindings in menu 2018-09-05 13:16:40 +02: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 557009e660
help -> menu 2018-09-05 11:12:11 +02:00
Jesse Duffield 422b263df4 fix popup panel resizing 2018-09-05 19:10:46 +10: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 cbafadd48e
move keys slice to guiState struct 2018-09-04 15:29:43 +02:00
Dawid Dziurla 7b84c162f4
set help panel fgcolor to white 2018-09-04 15:25:54 +02:00
Dawid Dziurla f29c81fb5c
add getMaxKeyLength 2018-09-04 15:25:02 +02:00
Jesse Duffield 33ea093d88
Merge branch 'master' into hotfix/238-xdg-open-2 2018-09-04 20:37:35 +10:00
Jesse Duffield 3f68fe42cb update xdg-open command 2018-09-04 19:18:18 +10:00
Anthony HAMON 172cd7c687 fix tests locally 2018-09-04 08:32:43 +02:00
Anthony HAMON df3e7abd68 use RunCommand 2018-09-04 08:32:40 +02:00
Anthony HAMON 8c67578063 replace fmt with errors 2018-09-04 06:21:58 +02:00
Anthony HAMON 06846ef3ae rename NewApp to Setup 2018-09-04 06:21:58 +02:00
Anthony HAMON 43ad9a81c2 merge setup in function that create a new git command 2018-09-04 06:21:58 +02:00
Anthony HAMON 9f7775df26 pkg/git : remove unused Map function 2018-09-04 06:21:58 +02:00
Anthony HAMON c1984528c8 pkg/git : add tests for SetupGit 2018-09-04 06:21:58 +02:00
Anthony HAMON 624d63d2fa pkg/git : remove panic in SetupGit method 2018-09-04 06:21:58 +02:00
Dawid Dziurla 67d99a24ea
get selected branch from correct panel 2018-09-03 18:45:52 +02:00
Dawid Dziurla bf8514f5e2
helperize spaces 2018-09-03 18:44:56 +02:00
Dawid Dziurla 93e88ea8fe
add missing translated polish strings 2018-09-03 18:34:04 +02:00
Dawid Dziurla a2073528f4
add missing untranslated dutch strings 
@mjarkk
 2018-09-03 18:33:38 +02:00
Dawid Dziurla 230a5afa4c
remove capitalization of keybindings descriptions 2018-09-03 18:16:54 +02:00
Dawid Dziurla c49e4dc287
get item position from correct panel 2018-09-03 18:07:38 +02:00
Dawid Dziurla 59f50010b6
apply fmt again 2018-09-03 18:01:07 +02:00
Dawid Dziurla b5827b7d80
merge conflict effect fix 2018-09-03 17:57:03 +02:00
Dawid Dziurla 83b7c60246
add untranslated dutch strings 
@mjarkk
 2018-09-03 17:54:06 +02:00
Dawid Dziurla 323016aa01
polish translation 2018-09-03 17:54:06 +02:00
Dawid Dziurla b403b6e46d
better english string 2018-09-03 17:54:06 +02:00
Dawid Dziurla 359636c1aa
add generate_cheatsheet script 
script is generating markdown document with small cheatsheet
in selected language
 2018-09-03 17:54:06 +02:00
Dawid Dziurla 1fa55875e2
remove testing content 2018-09-03 17:54:06 +02:00
Dawid Dziurla 5177e458ef
use Fprint instead of renderString 
renderString is wrapping content
because of that lines are being select wrong
 2018-09-03 17:54:06 +02:00
Dawid Dziurla 314c8c279a
apply fmt on keybindings 2018-09-03 17:54:06 +02:00
Dawid Dziurla 20073d0293
don't panic 
"panic: runtime error: index out of range"

when executing stash pop 'g' from help menu
 2018-09-03 17:54:06 +02:00
Dawid Dziurla 90a4cada82
add missing descriptions 2018-09-03 17:54:06 +02:00
Dawid Dziurla e376de6d1a
explicitly delete 'help' view 2018-09-03 17:54:06 +02:00
Dawid Dziurla 265d7e121a
use Key if it's a rune, otherwise KeyReadable 2018-09-03 17:54:06 +02:00
Dawid Dziurla 7ec5b6cc30
indent keybindings 2018-09-03 17:54:06 +02:00
Dawid Dziurla 9ceaf5b9a9
move descriptions to i18n 2018-09-03 17:52:05 +02:00
Dawid Dziurla cc3fa4b79d
make '?' key visible on every panel 2018-09-03 17:52:05 +02:00
Dawid Dziurla 653d590157
help panel size from getConfirmationPanelDimensions 2018-09-03 17:52:05 +02:00
Dawid Dziurla 8a01d11202
more error checks 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
Dawid Dziurla 741e28d01a
move bindings to getKeybindings() 2018-09-03 17:52:05 +02:00
Jesse Duffield 796f17eef4
Merge branch 'master' into fix/tests 2018-09-03 21:20:17 +10:00
Jesse Duffield 6fc4cb1b96
Merge branch 'master' into rename-commits-in-user-editor 2018-09-03 19:53:16 +10:00
Jesse Duffield dfb87d34dc
Merge branch 'master' into hotfix/238-xdg-open 2018-09-03 19:42:06 +10:00
Jesse Duffield 4ab1a1f72b Merge branch 'master' into hotfix/238-xdg-open 2018-09-03 19:33:37 +10:00
Jesse Duffield a9cd277070 add test for ResolvePlaceholderString 2018-09-03 19:31:27 +10:00
Dawid Dziurla 5c1463313d
respect localized output of rmdir 2018-09-01 17:22:49 +02:00
Daniele D'Orazio 39f065207e add simple test for PrepareCommitAmendSubProcess 2018-09-01 12:29:43 +02:00
Daniele D'Orazio 9e6a4a529a add keybinding to open user editor when renaming last commit 2018-09-01 12:14:42 +02:00
Jesse Duffield 87de803a6c update default config header 2018-09-01 14:38:30 +10:00
Jesse Duffield d31520261f introduce platform specific defaults 2018-09-01 14:33:01 +10:00
Jesse Duffield ad880e2d56 wrap windows start command in shell 2018-09-01 13:28:10 +10:00
Jesse Duffield 865809e625 better error handling for commands 2018-09-01 13:27:58 +10:00
Jesse Duffield 04d5a473d7 use start instead of cygstart to open files on windows 2018-09-01 12:53:51 +10:00
Jesse Duffield f127ae62bb update config 2018-09-01 12:18:16 +10:00
Jesse Duffield 3f14b764d5 update tests 2018-09-01 12:13:41 +10:00
Jesse Duffield ae0d88f855 WIP using runDirectCommand with xdg-open 2018-09-01 11:38:32 +10:00
Jesse Duffield 42500817e0 better error for nonbackwards compatible changes 2018-09-01 10:36:55 +10:00
antham 1b8836e92d fix fmt issue 2018-08-29 13:46:51 +02:00
Anthony HAMON 54326907c3 fix linting issues 2018-08-29 13:46:51 +02:00
Anthony HAMON cda7b374e2 fix linting issues 2018-08-29 13:46:51 +02:00
Anthony HAMON e889a40caf fix golint issue 2018-08-29 13:46:51 +02:00
Anthony HAMON 66e5dacf5e fix git tests 2018-08-29 12:03:32 +02:00
Anthony HAMON e3ed899b20 refactor MergeStatusFiles 2018-08-29 12:03:32 +02:00
Anthony HAMON d6b4d4b063 add tests for MergesStatusFiles 2018-08-29 12:03:32 +02:00
Anthony HAMON 45fa257128 add test for StashSave and refactor StashSave method 2018-08-29 12:03:32 +02:00
Anthony HAMON 99840d8fc4 add test for StashDo and refactor StashDo method 2018-08-29 12:03:32 +02:00
Anthony HAMON 85012dbc8f add tests for GetStatusFiles 2018-08-29 12:03:32 +02:00
Anthony HAMON 13f9073552 add test for GetStashEntryDiff 2018-08-29 12:03:32 +02:00
Anthony HAMON 49b507d2ff replace make 2018-08-29 12:03:32 +02:00
Anthony HAMON 8247fd69c9 add test for GetStashEntries 2018-08-29 12:03:32 +02:00
Anthony HAMON 983d0bd586 replace make 2018-08-29 12:03:32 +02:00
Anthony HAMON ca9ce22693 use assert in tests, rename testing method 2018-08-29 12:03:32 +02:00
Jesse Duffield cff1dee6dc more lenient version comparison 2018-08-29 09:37:47 +10:00
Jesse Duffield 7e1e97d050 dont panic when catting directories 2018-08-28 19:12:35 +10:00
Jesse Duffield 320ccdb22a when panicking due to malformed gitconfig, show a more useful error 2018-08-28 18:01:53 +10:00
Jesse Duffield da2d3f253f better translation 2018-08-27 20:58:17 +10:00
Jesse Duffield b4323c029f Merge branch 'master' into feature/add-all 2018-08-27 20:57:50 +10:00
Jesse Duffield 203ad29349 use logrus entry rather than logger 2018-08-27 20:51:21 +10:00
Jesse Duffield 04735d0601 update call to update user config function 2018-08-27 20:49:47 +10:00
Jesse Duffield bbe603ff5b separate english translation structs 2018-08-27 20:46:06 +10:00
Jesse Duffield 23a9f41d9d Merge branch 'feature/anonymous-reporting' 2018-08-27 20:35:55 +10:00
Jesse Duffield f861175f83 move update quit confirmation function into updates file 2018-08-27 20:26:49 +10:00
Jesse Duffield 25c60b1854 localize update errors 2018-08-27 20:23:47 +10:00
Jesse Duffield 38557f131d record last update check as soon as you begin checking 2018-08-27 20:16:26 +10:00
Jesse Duffield 96eef7838e better auto update logic 2018-08-27 20:08:10 +10:00
Jesse Duffield 2bf536265a disable updating on windows for now 2018-08-27 19:37:01 +10:00
Jesse Duffield 43f612feb1 Merge branch 'master' into feature/auto-updates 2018-08-27 19:20:07 +10:00
Jesse Duffield a1c6adab59 Merge branch 'master' into feature/anonymous-reporting 2018-08-27 18:50:24 +10:00
Anthony HAMON a2a9e0c478 fix format issue 2018-08-27 10:01:05 +02:00
Jesse Duffield d3953a1440
Merge pull request #206 from antham/add-pkg-commands-test 
Add test to pkg/commands, refactor some methods
 2018-08-27 17:58:02 +10:00
Dawid Dziurla b7f6bcb3ca
add config flag 2018-08-26 17:31:28 +02:00
Jesse Duffield 540edc0c35 anonymous reporting data 2018-08-26 16:53:31 +10:00
Jesse Duffield 12261ceb05 update config docs for auto updates 2018-08-26 13:03:37 +10:00
Anthony HAMON f6ab11e4ee run gofmt 2018-08-26 02:20:01 +02:00
Anthony HAMON 23fe0290ad add openFile to gui struct 2018-08-26 01:58:20 +02:00
Anthony HAMON ed2dcd9e46 add tests 2018-08-26 01:58:20 +02:00
Anthony HAMON 75e08993ea extract dependencies 2018-08-26 01:58:20 +02:00
Anthony HAMON 0b07cd19f7 switch GetOpenCommand scope to private 2018-08-26 01:58:20 +02:00
Anthony HAMON 38f11f1f4a move dummy functions, rename functions 2018-08-26 01:58:19 +02:00
Anthony HAMON f91e2b12db add tests to pkg/commands 2018-08-26 01:58:19 +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
Anthony HAMON a891bc90b7 simplify method 2018-08-26 01:58:19 +02:00
Anthony HAMON 7a74bc504b avoid useless allocation 2018-08-26 01:58:19 +02:00
Anthony HAMON 32f4d09e89 move platform specific code to dedicated platform files 2018-08-26 01:58:19 +02:00
Anthony HAMON a5adfaee8a remove useless returned variable 2018-08-26 01:58:19 +02:00
Jesse Duffield 57decdd11d check error from setViewOnBottom 2018-08-25 17:38:03 +10:00
Jesse Duffield 21f6e9ba87 auto-updates 2018-08-25 17:32:34 +10:00
Jesse Duffield f24c95aede Merge branch 'master' into feature/auto-updates 2018-08-25 11:02:46 +10:00
Jesse Duffield 60422912c8 add 'a' keybinding to toggle staged/unstaged for all files 2018-08-25 08:59:51 +10:00
Jesse Duffield 6c389df57d
Merge pull request #200 from remyabel/feature/esc-quits 
Esc will quit when not in popup, fixes #197
 2018-08-24 09:16:56 +10:00
Dawid Dziurla bcbeec1a56
Sirupsen -> sirupsen 2018-08-23 14:22:03 +02:00
Jesse Duffield 5628eae502 WIP 2018-08-23 18:43:16 +10:00
Jesse Duffield 2cdd439286
Merge pull request #204 from remyabel/hotfix/fix-dutch-errors 
Fix typos causing tests to fail
 2018-08-23 10:19:31 +10:00
Tommy Nguyen 110ff38c0d
Remove accidentally checked in code 2018-08-22 11:34:16 -04:00
Tommy Nguyen 3e8ef0d12d
Remove space before punctuation 2018-08-22 11:27:45 -04:00
Jesse Duffield 584d6b241c
Merge pull request #198 from antham/fix-various-errors 
Fix various errors reported by goreportcard
 2018-08-22 09:28:19 +10:00
Anthony HAMON 37681627ab remove useless check 2018-08-21 20:54:48 +02:00
Anthony HAMON 810155ef2f fix documentation and reference issues 2018-08-21 20:54:46 +02:00
Tommy Nguyen 924a9bb2c9
Fix typos causing tests to fail 2018-08-21 10:55:33 -04:00
Jesse Duffield 4d635cd1cd
Merge pull request #151 from alcohol/force-delete-branch 
add option to force delete given branch
 2018-08-21 23:45:27 +10:00
Jesse Duffield 3d49ab6666
Merge pull request #202 from dawidd6/test 
Fix testPath for debian packaging
 2018-08-21 23:33:25 +10:00
Tommy Nguyen cd4063c763
s/escape/quit 2018-08-21 08:54:51 -04:00
Tommy Nguyen 646c205227
s/quit/escape, don't use special handling for views 2018-08-21 07:50:37 -04:00
Tommy Nguyen dc911906b3
Esc will quit when not in popup, fixes #197 2018-08-21 06:36:20 -04:00
Rob Bast 182e475116
correct variable assignment 2018-08-21 12:09:13 +02:00
Rob Bast 5f6b61d28c
adjust translation(s) for forced branch deletion 2018-08-21 12:06:42 +02:00
Rob Bast 810540edfa
add return 2018-08-21 11:32:17 +02:00
Jesse Duffield c6a8899060
Merge pull request #160 from remyabel/157_remove_bom 
#157: clean BOM, allowing CSV files to display correctly
 2018-08-21 17:39:55 +10:00
Jesse Duffield da4c12bf9e
Merge pull request #193 from antham/add-tests 
Add tests to i18n package
 2018-08-21 17:34:13 +10:00
Anthony HAMON 4972a4c218 rewrite addBundles 2018-08-20 21:18:50 +02:00
Anthony HAMON e4070ccb4f rewrite language detection, rewrite tests 2018-08-20 21:12:42 +02:00
Dawid Dziurla 483b4d939d
fix testPath for debian packaging 2018-08-20 15:21:05 +02:00
Tommy Nguyen 45fea83771
Convert \r\n to \n; don't depend on unix2dos 2018-08-20 09:16:35 -04:00
Jesse Duffield 37029f7db3 support empty version string 2018-08-20 20:52:32 +10:00
Jesse Duffield 954dfb12e4 Merge branch 'master' into feature/auto-updates 2018-08-20 19:53:53 +10:00
Jesse Duffield 8364509d1f
Merge pull request #188 from jesseduffield/feature/force-push 
Force push confirmation panel
 2018-08-20 19:52:41 +10:00
Jesse Duffield d938a437a2 WIP auto updates 2018-08-20 19:52:20 +10:00
Anthony HAMON 3c0fb9b324 add tests to i18n package 2018-08-20 09:02:57 +02:00
Rob Bast 8e3df6b981
add option to force delete given branch 2018-08-20 08:37:16 +02:00
Tommy Nguyen 5dd049eb82
Convert test to use new library 2018-08-19 23:39:57 -04:00
Tommy Nguyen 108815c790
Add missing brace 2018-08-19 23:31:26 -04:00
remyabel 5c65066cbb
Merge branch 'master' into 157_remove_bom 2018-08-19 23:29:47 -04:00
Jesse Duffield 5fcbe4ff8a
Merge pull request #191 from jesseduffield/hotfix/174-language-not-found 
174: Use fallback language if language not detected on startup
 2018-08-20 13:23:26 +10:00
Jesse Duffield fa8248bd70 use fallback language if language not detected on startup 2018-08-20 13:20:59 +10:00
Jesse Duffield 65c5a6014b
Merge pull request #185 from antham/add-tests 
Add test to utils package
 2018-08-20 09:24:54 +10:00
Anthony HAMON fc126a1718 remove test 2018-08-19 21:39:23 +02:00
Tommy Nguyen e8b12a086c
Fix ineffectual assignment 2018-08-19 08:52:08 -04:00
Tommy Nguyen 766197de9d
NormalizeLinefeeds removes rather than converts Window/Mac style lf's 2018-08-19 08:48:03 -04:00
Jesse Duffield 1e44001910 Merge branch 'master' into feature/auto-updates 2018-08-19 21:36:40 +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
Tommy Nguyen d2bdac29aa
Merge branch 'master' into 157_remove_bom 2018-08-19 07:22:48 -04:00
Tommy Nguyen cea736e6e9
Factor out into NormalizeLinefeeds; add tests 2018-08-19 07:20:50 -04:00
Jesse Duffield aa4d739577 fix ignore feature 2018-08-19 20:41:04 +10:00
Jesse Duffield 35884f81e9 handle filenames with spaces better 2018-08-19 20:13:29 +10:00
Jesse Duffield c5d4024d58 compare error message rather than error itself on no-commits error 2018-08-19 18:51:42 +10:00
Anthony HAMON f91b4067f4 add test to utils package 2018-08-19 10:37:03 +02:00
Tommy Nguyen b46d174f70
view_helpers.go: don't ignore return value 2018-08-19 02:21:33 -04:00
Tommy Nguyen cdc6d45fa4
view_helpers.go: replace \r with \r\n 2018-08-19 02:19:19 -04:00
Jesse Duffield 81b07daa01 Merge branch 'hotfix/167-ambiguous-name-in-diff' 2018-08-19 15:06:06 +10:00
Jesse Duffield 93266cc2a4 support forked branches when getting project root 2018-08-19 15:05:36 +10:00
Jesse Duffield 60fc24eada
Merge pull request #172 from jesseduffield/hotfix/167-ambiguous-name-in-diff 
167: Support File names that match Branch names
 2018-08-19 14:53:14 +10:00
Jesse Duffield cd9eada0c6 add test for variety of potential git diff situations 2018-08-19 14:48:39 +10:00
Mark Kopenga 29f2bdbba3 removed logrus logger import 2018-08-18 14:03:20 +02:00
Jesse Duffield b104dccab2
Merge pull request #163 from dawidd6/translation/pl 
Add Polish translation
 2018-08-18 21:08:56 +10:00
Jesse Duffield 08666889f4 improve remove file logic 2018-08-18 20:14:44 +10:00
Jesse Duffield 13ac1d151a WIP updater package 2018-08-18 19:54:44 +10:00
Jesse Duffield 1f756d3d0a avoid nil pointer reference on startup 2018-08-18 19:43:58 +10:00
Jesse Duffield f025b289f0 enforce white text color in prompt panels 2018-08-18 16:23:19 +10:00
remyabel 9a923eb300
Merge branch 'master' into 157_remove_bom 2018-08-18 02:11:13 -04:00
Jesse Duffield 29431ddc8e create dashboard 2018-08-18 15:30:56 +10:00
Jesse Duffield a1a828a781 support opening and editing config file 2018-08-18 14:54:05 +10:00
Jesse Duffield 6b150a4be0 bump dependencies 2018-08-18 14:20:19 +10:00
Jesse Duffield 284c534251 user configurable border colors 2018-08-18 13:53:58 +10:00
Jesse Duffield 10fdb5a609 support writing back to user config 2018-08-18 13:22:05 +10:00
Jesse Duffield 4dc6d40b5a merge master 2018-08-18 12:08:21 +10:00
Mark Kopenga 0f145093fe
Here i a fix for the error go complain on your pull 2018-08-17 20:43:51 +02:00
Dawid Dziurla bf5f3bb972
pl translation 3 2018-08-17 14:27:13 +02:00
Jesse Duffield 03a7e32694 support filenames that match branchnames 2018-08-17 22:25:53 +10:00
Dawid Dziurla b0e08491ac
pl translation 2 2018-08-17 14:11:48 +02:00
Jesse Duffield aaa8558de8
Merge pull request #159 from remyabel/158_escape_backticks 
#158: escapes backticks, which is a problem in shells like Bash
 2018-08-17 21:11:20 +10:00
Jesse Duffield dcd3bb6bbd use platform independent command to remove a file or directory 2018-08-17 11:13:21 +10:00
Tommy Nguyen 52033b32f7 Use strings.Replace instead of regexp 2018-08-16 17:04:39 -04:00
Mark Kopenga 5c738fa493
Removed duplicates 2018-08-16 20:59:32 +02:00
Dawid Dziurla 2d80a83d27
pl translation 1 2018-08-16 18:56:16 +02:00
Nicolas Borboën ff15d86ced
Typo path → patch 2018-08-16 14:15:55 +02:00
remyabel 64d8a55dbd
Merge branch 'master' into 157_remove_bom 2018-08-16 07:59:31 -04:00
Mark Kopenga fcf616bd62 Fixed it 2018-08-16 13:35:04 +02:00
Tommy Nguyen 74d81ae080 [rebase] Fix errors; update dependencies 
Argument must be []byte not string

Don't commit bomtest.txt
 2018-08-16 07:17:47 -04:00
Tommy Nguyen a7755ab184 reformat 2018-08-16 07:00:13 -04:00
Mark Kopenga faf218f465 Fixed comments from jesseduffield on issue #137 2018-08-16 11:31:50 +02:00
Mark Kopenga 90746502df Fixed comments from jesseduffield on issue #137 2018-08-16 11:31:03 +02:00
Jesse Duffield 5819e04c53 use shibukawa/configdir package to follow xdg spec config directory structure 2018-08-16 19:17:38 +10:00
Jesse Duffield fd3ce21576 use yaml for config file rather than json 2018-08-16 18:43:46 +10:00
Tommy Nguyen f09515867d #157: clean BOM, allowing CSV files to display correctly 2018-08-16 01:53:53 -04:00
Mark Kopenga 88e1a815fe Fixed comment on issue #137 from @jesseduffield 2018-08-16 07:16:32 +02:00
Tommy Nguyen db94dde114 fix formatting 2018-08-15 23:58:44 -04:00
Tommy Nguyen ee4660af97 #158: escapes backticks, which is a problem in shells like Bash 2018-08-15 23:55:55 -04:00
Mark Kopenga 9abbfe5a43 Fully translated pkg/gui/confirmation_panel.go 2018-08-15 15:12:55 +02:00
Mark Kopenga 9112278ab7
Merge pull request #4 from jesseduffield/master 
Update to latest master
 2018-08-15 15:03:27 +02:00
Mark Kopenga d00c46a712 Added all english translations to a file and fixed some typos 2018-08-15 14:57:20 +02:00
Jesse Duffield 29ed971558 add user configuration in json file 2018-08-15 22:06:37 +10:00
Jesse Duffield 8d99b400fd factor out code for new popup panels 2018-08-15 21:49:38 +10:00
Jesse Duffield 7c33c02930 dont panic if unable to close confirmation prompt 2018-08-15 21:43:31 +10:00
Mark Kopenga 50b41bfccc Translated pkg/gui/view_helpers.go 2018-08-15 11:49:43 +02:00
Mark Kopenga 295093a432 Translated pkg/gui/stash_panel.go 2018-08-15 11:12:46 +02:00
Mark Kopenga 10c53162ca
Merge pull request #3 from jesseduffield/master 
Updated to latest master
 2018-08-15 10:54:43 +02:00
Mark Kopenga 7e926cf41d Added translation for pkg/gui/ confirmation_panel.go gui.go merge_panel.go 2018-08-15 10:53:05 +02:00
Mark Kopenga d12cc5a74e Fully translated pkg/gui/commits_panel.go 2018-08-15 10:30:29 +02:00
Mark Kopenga 8418fa17a5 Fully translated pkg/gui/commit_message_panel.go 2018-08-15 09:15:31 +02:00
Jesse Duffield 0687c07f50 more robust reading of reflog to get branch name 2018-08-15 09:45:24 +10:00
Jesse Duffield 922f4ed5a4 try rev-parse of git symbolic-ref returns nothing 2018-08-15 09:42:02 +10:00
Mark Kopenga 3dba246029 Added translations for files_panel.go and fixed some typos 2018-08-14 22:29:17 +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
Mark Kopenga 8e22d569a0
Merge pull request #2 from jesseduffield/master 
Updated to latest master
 2018-08-14 15:10:59 +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 6e518142b4 added some commands 2018-08-14 12:56:11 +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 5ad97add08 Added the translation to some words again 2018-08-14 11:27:46 +02:00
Jesse Duffield 6a3f8eefa5 send version number through app 2018-08-14 19:22:38 +10:00
Mark Kopenga dfafb98871 tried to update to latest master 2018-08-14 11:05:26 +02:00
Jesse Duffield 574b34930c support files with spaces in name 2018-08-14 18:48:08 +10:00
Jesse Duffield c476dfc1cb fix open command 2018-08-14 18:35:47 +10:00
Jesse Duffield bde6182c94 better git squash logic 2018-08-14 18:30:06 +10:00
Jesse Duffield efb049cd24 better error handling for stashing files 2018-08-14 18:29:25 +10:00
Jesse Duffield 5f30f07ea5 Merge branch 'master' into feature/quoted-messages 2018-08-14 18:10:44 +10:00
Jesse Duffield b32173b0c7 output to development.log in append mode 2018-08-14 18:02:27 +10:00
Jesse Duffield 1c750fdb40 fix reflog command 2018-08-14 18:02:14 +10:00
Jesse Duffield 9ecd7908aa refactor commands to depend less on the shell 2018-08-14 17:47:33 +10:00
Andrei Miulescu 842ceec9b0
Platform should only be present once 2018-08-14 12:24:32 +10:00
Jesse Duffield 95c7df4c61 use platform-specific message quoting 2018-08-14 11:16:52 +10:00
Jesse Duffield 047892962a centralise subprocess code to gui.go 2018-08-14 08:33:40 +10:00
Jesse Duffield d4f4b46a1f check both local and global config for gpgsign 2018-08-14 08:33:27 +10:00
Jesse Duffield f549ad0f37 use git command with message in subprocess if using gpgsign 2018-08-14 07:27:59 +10:00
Jesse Duffield ebfed34145 add PR #135 keybindings to this branch 2018-08-13 23:46:08 +10:00
Jesse Duffield 59e5545f38 discard log output when not in debug mode 2018-08-13 23:35:01 +10:00
Jesse Duffield fb0004481b correct cursor before returning item position 2018-08-13 21:42:56 +10:00
Jesse Duffield 12de0345e4 minor cleanup 2018-08-13 21:35:54 +10:00
Jesse Duffield 9e725ae24e got this bad boy compiling again 2018-08-13 21:16:21 +10:00
Jesse Duffield 97cff65612 progress on refactor 2018-08-13 20:26:02 +10:00
Jesse Duffield e6beb5d50b no more go-git for committing (reflecting the change in master) 2018-08-12 23:29:58 +10:00
Andrei Miulescu e8eb78617c
Mid refactor change some more stuff 2018-08-12 21:04:47 +10:00
Andrei Miulescu e65ddd7b6f
Move some commands around 2018-08-12 20:22:20 +10:00
Jesse Duffield c01bc09442 WIP refactor 2018-08-12 19:50:55 +10:00
Andrei Miulescu dcd461d29f
Restrucure project in a way where it is more modular 2018-08-12 19:31:27 +10:00