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
6c1d2d45ef
some i18n and restricting rewording during interactive rebase
2019-02-24 09:42:35 +11:00
f6b3a9b184
rearranging todo items while interactively rebasing
2019-02-24 09:42:34 +11:00
9661ea04f3
wrap amend command in a confirmation
2019-02-20 19:46:27 +11:00
0228e25084
work towards more interactive rebase options
2019-02-19 23:36:36 +11:00
dcc7855fd0
pull commit list builder functions into their own builder struct
2019-02-19 09:18:30 +11:00
d44638130c
add various interactive rebase commands
2019-02-18 23:27:54 +11:00
76a27f417f
rename any commit
2019-02-18 21:29:43 +11:00
adc2529019
dealing better with errors at the top level
2019-02-18 19:42:23 +11:00
43ab7318d3
remove HasMergeConflicts struct instance variables
2019-02-18 19:28:02 +11:00
cb372d469f
fix golangci errors
2019-02-16 21:30:29 +11:00
88ba6efdd5
remove outdated TODO
2019-02-16 21:20:10 +11:00
e011e9bc42
more work on rebasing feature
2019-02-16 21:01:17 +11:00
ad93b4c863
consider whether the view has focus when rendering the contents of a view
2019-02-16 15:17:44 +11:00
198cbee498
introduce panel contexts and more work on rebasing
2019-02-16 12:07:27 +11:00
daca07eaca
add loading panel
2019-02-16 12:03:22 +11:00
c101993405
post-merge cleanup
2019-02-11 22:47:14 +11:00
6430ab6ac9
Merge branch 'master' into feature/rebasing
2019-02-11 22:46:27 +11:00
cfe3605e6b
use go-errors package to display stacktrace of errors that cause panics
2019-02-11 22:39:17 +11:00
75ab8ec4d9
catch rebase errors and show in error panels
2019-02-11 21:29:47 +11:00
77faf85cfc
post-merge cleanup
2019-02-11 21:07:12 +11:00
3d343e9b57
Merge branch 'master' into feature/rebasing
2019-02-11 21:02:53 +11:00
3a607061a2
Only reset origin in main view when handling the selection of a new file
2019-01-18 09:32:15 +11:00
695b092c41
Directly send wrap argument rather than the view
2019-01-17 10:29:52 +11:00
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
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
b6f8ebc0ca
delete KeyReadable field from Binding struct
...
also rewrite GetKey function
2019-01-17 10:11:17 +11:00
6c5e409ffa
send direct error message
2018-12-19 20:12:35 +11:00
800b40ecc4
Translated credentials error with git push/pull/fetch
2018-12-19 10:06:58 +01:00
160af3bb99
fix typo
2018-12-18 22:29:07 +11:00
328b57e2cf
no longer checking for 'exit status 128' because we're directly returning stderr
2018-12-18 22:27:50 +11:00
20a94447d7
explicitly return newlines to our live command stdin
2018-12-18 22:23:17 +11:00
865c7c2332
minor refactor of credentials panel into its own file
2018-12-18 22:19:32 +11:00
276ac3a92e
decrease frequency of refreshing files because it's causing index lock errors
2018-12-18 21:28:09 +11:00
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
5d038dfd33
Removed the wired error handling
2018-12-12 22:11:31 +01:00
a26c15dafa
some fixes for issues around the credentials panel
2018-12-12 22:34:20 +11:00
c71bcc64ed
move fetch keybinding to files view to make way for branch-specific fetched
2018-12-12 22:33:42 +11:00
a365615490
only use subprocess for merging, not rebasing
2018-12-11 22:16:48 +11:00
9489a94473
Make merge panel its own panel
2018-12-11 22:02:12 +11:00
e0ff46fe53
more work on rebasing including visual indicators
2018-12-11 09:39:54 +11:00
cce6f405a5
Making ci happier
2018-12-11 09:39:54 +11:00
e39d2ed44b
Added check to invoke continue/refresh
2018-12-11 09:39:54 +11:00
34fd18a395
Error handling
2018-12-11 09:39:54 +11:00
a1ee11e54e
Added error check to satisfy ci
2018-12-11 09:39:54 +11:00
88c01c1ded
Added rebase keybinding
2018-12-11 09:39:54 +11:00
27994f7de8
Added rebase handler
2018-12-11 09:39:54 +11:00
e20d8366e1
Made gobot happy
2018-12-10 14:21:00 +01:00
76e9582739
Not always git fetch
2018-12-10 13:45:03 +01:00
50f20de8f3
Removed a lot of duplicated code
2018-12-10 08:22:52 +01:00
