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
