Commit graph

101 commits

Author SHA1 Message Date
Stephan Dilly
d50e17b353 give blame a more apropriate place in command list 2021-04-24 15:40:16 +02:00
Stephan Dilly
f0a367c3f5
more linting (#647) 2021-04-17 23:17:19 +02:00
brunohgouveia
79a38a70b9 Add pop stash command on Staches tab 2021-04-11 13:17:26 +02:00
Benedikt Terhechte
656561e3eb
Add g to toggle between staging and workdir (workarea) (#595)
closes #594
2021-03-21 18:37:53 +01:00
Stephan Dilly
37415259b1 cleanup commands in status/diff (closes #572) 2021-03-14 12:33:55 +01:00
Stephan Dilly
b5ef9b10f1
Stage/unstage lines (#575) 2021-03-10 22:27:02 +01:00
Stephan Dilly
c79b3d74fa
Fix 576 stash apply conflicts (#578)
* unittest that applying with conflicts errors out and prepare for stash apply to allow creating conflicts for later
* mark conflicting items
2021-03-09 14:14:16 +01:00
Stephan Dilly
f1fcd341c6
add support for pushing tags (#569) 2021-03-05 17:49:40 +01:00
Stephan Dilly
36c124f9e3
refresh compare state at the right time (#564) 2021-03-03 18:40:00 +01:00
Stephan Dilly
67f3a13716
only show non-clean repo states (#553)
* only show repo state if not clean
2021-03-01 00:12:09 +01:00
Stephan Dilly
97f88a2f2f rename 2021-02-28 19:34:45 +01:00
Stephan Dilly
bd54b47d19 rename fetch to pull 2021-02-28 19:25:16 +01:00
Stephan Dilly
39fb65b396
Async fetch (#552)
* async fetch
* reuse remote progress for fetch
* prvent push/fetch popup from closing too soon
2021-02-28 19:24:05 +01:00
Stephan Dilly
c96feb0fe6
branch merge from upstream (#384)
* better structure of all branch functions
* support and unittest fast forward merge
2021-02-28 01:55:35 +01:00
Stephan Dilly
5244751e9e
check if we can_push before trying (#533)
closes #531
2021-02-23 12:32:32 +01:00
Richard Menzies
6c974ee1d3
Support force push (#421) 2021-02-23 11:02:16 +01:00
Stephan Dilly
2b7d7f467b
Set tracking branch on push (#452)
set upstream on each push (if not already defined). closes #275
2020-12-20 16:48:47 +01:00
Stephan Dilly
44ba5a83c9
show branch ahead/behind only if upstream is set (#451)
closes #385
2020-12-20 16:01:04 +01:00
Antonio Yang
eb3d6c9b0f update command list of revlog 2020-12-19 16:27:26 +01:00
Antonio Yang
3101f7b104 copy commit hash 2020-12-19 16:27:26 +01:00
remique
35f3a25cba
Add branch name in Status and ChangesComponent cleanup (#375) 2020-10-26 16:21:26 +01:00
Stephan Dilly
4ee4432f16
visualize outgoing/incoming changes (#364) 2020-10-25 17:35:54 +01:00
Arnaud
9297915ddd
feat: add branch selection popup in the log view (#349) 2020-10-16 18:21:24 +02:00
Stephan Dilly
aae3d2c611 better place for push cmd 2020-10-11 01:00:31 +02:00
Stephan Dilly
23ccee002b do not show push cmd in wrong tabs 2020-10-11 00:56:31 +02:00
Richard Menzies
1cc1884162 Move open_select_branch_popup location 2020-10-11 00:52:09 +02:00
Richard Menzies
94bbf3c9fb
Branch popup (#303)
closes #91
2020-10-10 01:27:13 +02:00
Richard Menzies
93168639fe
Bump tui: 0.9 -> 0.12 (#289) 2020-10-08 09:56:36 +02:00
Stephan Dilly
26565e9021 test fetch 2020-09-07 21:44:42 +02:00
Stephan Dilly
17de5a900c
Test push progress (#272) 2020-09-04 09:08:29 +02:00
Stephan Dilly
7d1e3643b1
support push to origin (#266)
* use  vendored ssl
2020-09-02 02:08:41 +02:00
Stephan Dilly
4907e8b727
new 'create branch' popup (#254)
closes #253
2020-08-29 14:15:06 +02:00
Stephan Dilly
19177ec9bb simplify key bindings further 2020-08-29 00:24:34 +02:00
Stephan Dilly
2401293b66
Rust1.46 and nightly ci (#246) 2020-08-28 10:52:24 +02:00
Antonio Yang
a95ffd7bcc
Customize key binds (#234)
* customizable key config
* provide example vim key config
* automatically show correct key binding in bottom cmd-bar
2020-08-26 18:23:53 +02:00
Christoph Rüßler
bc23270951
Add multiple selection in diff view (#231)
* Add multiple selection in diff view
* Copy selection to clipboard in diff view
* Show error message if copy to clipboard fails
- Draw `msg` after `inspect_commit_popup` to make sure the error message
  is visible
- Move `try_or_popup!` to `utils`
2020-08-19 21:02:19 +02:00
Jon Grythe Stødle
1c3295affc Switch focus when working directory or stage becomes empty
If the focus is on the working directory and it becomes empty (no files are listed) by either staging the last file or using the _Stage all_ command, the focus will be moved to the stage automatically. It works the same for when the stage becomes empty, by moving the focus to the working directory.

If the focus is on the diff area, the focus will not be moved when either the working directory or the stage becomes empty.

Fixes #215
2020-07-29 21:16:50 +02:00
Stephan Dilly
a54fbf7f63 visualize pending load of a diff (#160) 2020-07-18 12:21:18 +02:00
Stephan Dilly
0dd50b402e upgrade to rust 1.45 and fix new clippy warnings 2020-07-17 11:54:12 +02:00
Christoph Rüßler
70423c5b83 Add command for tagging commit 2020-07-15 23:22:03 +02:00
Stephan Dilly
1afa91b144 show tags in commit details popup (closes #193) 2020-07-12 14:38:38 +02:00
Stephan Dilly
f4e2b7c6c0 update changes title right away 2020-07-12 14:38:18 +02:00
Stephan Dilly
315cf615e0
Async tag fetching (#195) 2020-07-12 13:21:34 +02:00
Stephan Dilly
540997c177 error if file to be opened in external editor will not be found (#184) 2020-07-08 19:47:25 +02:00
Stephan Dilly
083e06c57c fix: in revlog dont allow arrow-right when commit-details not open 2020-07-07 13:26:08 +02:00
Jon Grythe Stødle
52f31adb98 Add command to edit selected file in editor
Pressing `e` while looking at a file in the _Status_ view will launch an external editor with the current file opened. The editor chosen is determined by the default logic introduced in #114.

An improvement to this in the future could be launching at the specific line at which the _Diff_ view is focused, but that seems to require a change in `FileDiff` which is a change bigger than this PR.

Fixes #166
2020-07-07 12:42:01 +02:00
Stephan Dilly
a33db8d3de cache branchname lookup (closes #159) 2020-07-04 18:12:54 +02:00
Stephan
4a442f3829 cleanup use 2020-06-29 12:30:10 +02:00
Stephan Dilly
0d84abd1c6 make draw take shared ref again 2020-06-23 11:03:02 +02:00
Stephan Dilly
afa6aad973 cleanup 2020-06-22 16:36:54 +02:00