Commit graph

126 commits

Author SHA1 Message Date
Stephan Dilly
1faba1760c cleanup 2021-08-19 22:28:57 +02:00
Stephan Dilly
bc611bca52 allow inspecting top commit in branchlist 2021-08-19 22:20:54 +02:00
Stephan Dilly
f7ecc0e194 do not fetch filetree on empty repo (closes #859) 2021-08-19 11:05:20 +02:00
Stephan Dilly
7cc19f673a
support options for the way we calculate the status (#849) 2021-08-19 02:19:36 +02:00
Stephan Dilly
2b85b81a3e
drop multiple stashes (#855) 2021-08-18 01:41:33 +02:00
Stephan Dilly
dad8e8d43d cargo fmt: use hardtabs
since it does not support hard-whitespaces its the only way to make whitespaces consisitent and checked
2021-08-17 14:24:25 +02:00
zcorniere
56502ad3fd
ability to delete remote branch (#838)
* added ability to delete remote branch (closes #622)
2021-08-15 17:44:55 +02:00
Stephan Dilly
19f2fd03cf
app has its own async notifications now (#813)
* app has its own async notifications now
2021-07-11 13:24:19 +02:00
Christoph Rüßler
bce652ecca Add filter to AsyncLog
This is a small change that makes it possible to reuse the logic in
`AsyncLog` for the file history view. `AsyncLog` passes the filter to
`FileLogWalker` unchanged.
2021-06-26 13:07:03 +02:00
Stephan Dilly
84488855fe clippy fixes 2021-06-07 23:50:35 +02:00
Stephan Dilly
8032c35902 refactor better name 2021-06-07 23:04:07 +02:00
Stephan Dilly
7058ab14d3 abstract queue into custom type 2021-06-07 22:57:27 +02:00
Emil Jaszczuk
b2b5a0faa0
Add undo_last_commit command (#769)
closes #758
2021-06-07 16:46:45 +02:00
Stephan Dilly
5b07c48234 nightly clippy fixes 2021-06-05 10:28:18 +02:00
Stephan Dilly
3cd218de57
honor showUntrackedFiles config (#753) 2021-06-01 09:56:55 +02:00
Stephan Dilly
739d7e7f84
Fix 730 files tab (#743) 2021-05-28 00:15:02 +02:00
Christoph Rüßler
2ed6f53dcf Add popup for tags
This closes #483.
2021-05-27 21:02:30 +02:00
Stephan Dilly
5ba657cabe
file tree of a commit (#715) 2021-05-18 00:21:05 +02:00
Stephan Dilly
8ddb3cdac5 move focus after last file staged 2021-05-16 22:05:22 +02:00
Stephan Dilly
b5327a65c1 rename 2021-05-12 09:01:08 +02:00
Stephan Dilly
f30ec49886
show merge head ids in merge state (#697) 2021-05-11 18:26:12 +02:00
Stephan Dilly
4f6aceb3ec
merging a branch (#696)
* merging arbitrary branch
* cleanup intermediate in-merge state
2021-05-09 22:53:12 +02:00
Stephan Dilly
9f37835dc4 cleanup some more expects 2021-05-09 20:39:26 +02:00
Stephan Dilly
838258c933 some cleanup 2021-04-26 11:55:40 +02:00
Agung Baptiso Sorlawan
ad8ecd6a1b
introduce EventState enum (#666) 2021-04-26 11:33:45 +02:00
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