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