Commit Graph

97 Commits

Author SHA1 Message Date
Abdelilah El Aissaoui
250ca295b9 Added option to pull/push from specific branch 2022-02-24 14:25:15 +01:00
Abdelilah El Aissaoui
b8e76aa7a8 Added push including tags option 2022-02-23 02:19:11 +01:00
Abdelilah El Aissaoui
b6c4fa0ed7 Reduced number of operations that have to be executed to update the status 2022-02-21 15:14:31 +01:00
Abdelilah El Aissaoui
4ed10c0682 Reformated project's code 2022-02-21 01:49:14 +01:00
Abdelilah El Aissaoui
a2d687caa8 Fixed flow warning 2022-02-20 23:02:12 +01:00
Abdelilah El Aissaoui
902626f04b Added exception when pull has failed 2022-02-17 23:18:51 +01:00
Abdelilah El Aissaoui
9dc5296a61 Return header if no branches match current ref (or null if empty repo) 2022-02-17 23:18:51 +01:00
Abdelilah El Aissaoui
afce2a2aa7 Added basic remotes management 2022-02-17 19:24:36 +01:00
Abdelilah El Aissaoui
df3f47f073 Untracked files are now staged before stash 2022-02-15 20:05:49 +01:00
Abdelilah El Aissaoui
93a1ef3240 Replaced hardcoded separator by OS dependant appropach 2022-02-08 19:29:20 +01:00
Abdelilah El Aissaoui
02313fe632 Implemented context menu for stash operations
Moved selected item to TabState, so every ViewModel can update the current selected tab state without having to use callbacks to the RepoOpened component. This allows to set currently selected item to "None" when droping a stash that has been selected
2022-02-06 22:57:46 +01:00
Abdelilah El Aissaoui
fff18b7fef Added uncommited files count to "uncommited changes" line in the log
Also improved log performance when a file has changed to only update the header and not the whole list
2022-02-06 20:49:54 +01:00
Abdelilah El Aissaoui
72e77f41fd Implemented cherry-pick 2022-02-05 19:19:49 +01:00
Abdelilah El Aissaoui
cb609c44cc Removed unused annotation 2022-02-05 03:12:20 +01:00
Abdelilah El Aissaoui
ac21b59f6c Implemented amend previous commit 2022-02-05 03:01:03 +01:00
Abdelilah El Aissaoui
e473d29167 Reformated project's code 2022-02-05 02:55:26 +01:00
Abdelilah El Aissaoui
df48b40ce5 Refactored safeProcessing to be able to refresh data even after a crash 2022-02-05 02:06:55 +01:00
Abdelilah El Aissaoui
9105940e00 Push deletion is done before doing it locally to prevent deleting the local branch in case of error 2022-02-05 01:35:44 +01:00
Abdelilah El Aissaoui
07703a66be Added remote branch deletion 2022-02-04 18:53:21 +01:00
Abdelilah El Aissaoui
fc4d52b57a Temporary files are now deleted when exiting the app 2022-02-04 01:34:22 +01:00
Abdelilah El Aissaoui
1dca2dfd51 Added fetch all & after pull all the repository is reloaded 2022-02-02 10:33:08 +01:00
Abdelilah El Aissaoui
a3ff073b54 Fixed project's formatting 2022-02-02 00:26:46 +01:00
Abdelilah El Aissaoui
2efaf654c7 Added webp support 2022-02-01 19:46:17 +01:00
Abdelilah El Aissaoui
171e9dc0be Added force push 2022-02-01 14:31:56 +01:00
Abdelilah El Aissaoui
de9e982ff3 Added pull with rebase 2022-02-01 14:18:59 +01:00
Abdelilah El Aissaoui
edbb095246 Added try catch to dir opening to avoid crash if the dir has been removed 2022-02-01 12:52:56 +01:00
Abdelilah El Aissaoui
fe718fdfec Fixed errors not being displayed 2022-01-31 14:17:54 +01:00
Abdelilah El Aissaoui
42fec7c591 Implemented merge & rebase 2022-01-31 01:30:25 +01:00
Abdelilah El Aissaoui
ef5bd9a254 Completed images & binaries diff 2022-01-30 02:27:41 +01:00
Abdelilah El Aissaoui
27f216aa5d Added basic images diff 2022-01-29 20:33:08 +01:00
Abdelilah El Aissaoui
1508e27b13 Fixed warnings and removed unused code 2022-01-05 03:19:52 +01:00
Abdelilah El Aissaoui
1ed6572170 Added lines numbers in diff view 2022-01-05 02:52:32 +01:00
Abdelilah El Aissaoui
97a082bc47 Completed arch refactor 2022-01-04 19:54:56 +01:00
Abdelilah El Aissaoui
620fd1022b Commit message is now preserved even after disposing the composable (stored in he VM) 2022-01-03 23:04:04 +01:00
Abdelilah El Aissaoui
e6619cbd4b Diff scroll is now preserved when changing the diff entry
The scroll is stored in the view model and only resetted when changing to a different file or state (staged/unstaged version of the same file).
2022-01-03 22:59:35 +01:00
Abdelilah El Aissaoui
9c53ce726e Creation of multiple viewmodels that hold data state 2022-01-03 21:39:53 +01:00
Abdelilah El Aissaoui
997a651faf Fixed status not being updated when merging 2022-01-02 01:47:45 +01:00
Abdelilah El Aissaoui
c0c07ef5b1 Added conflict indicator during merge in uncommited changes 2022-01-02 01:46:23 +01:00
Abdelilah El Aissaoui
ad55f41f58 Fixed unstage hunk not working properly when having context lines inbetween changes 2021-12-28 02:01:08 +01:00
Abdelilah El Aissaoui
2e157aa773 Added try catch that unlocks the dir cache in case of error in hunk unstage 2021-12-28 01:37:21 +01:00
Abdelilah El Aissaoui
a8ed01784d Implemented stage/unstage by hunks 2021-12-28 01:19:29 +01:00
Abdelilah El Aissaoui
86fd61d0d7 Extracted RawFile generation to its own class 2021-12-27 22:55:31 +01:00
Abdelilah El Aissaoui
bd719be963 Refactored diff by replacing text diff patch with a custom Hunk class 2021-12-27 05:13:55 +01:00
Abdelilah El Aissaoui
908696735b Added error display when a push has failed 2021-12-21 02:26:52 +01:00
Abdelilah El Aissaoui
3ed5f0cc1e Uncommited changes line now show if merging/rebasing
This commit starts not only the rebase support but also manage merges when conflicts appear [WIP]
2021-12-18 04:18:48 +01:00
Abdelilah El Aissaoui
d81c81de87 Fixed log not updating when new uncommited changes appear 2021-12-18 02:33:13 +01:00
Abdelilah El Aissaoui
1943bd6906 Fixed crashes when opening an empty repository 2021-12-18 02:23:39 +01:00
Abdelilah El Aissaoui
7f6cc7c32a Fixed flickering when (un)staging many files due to file watcher updating
Commiting show progress bar
2021-12-14 20:06:18 +01:00
Abdelilah El Aissaoui
23a6b741b8 Fixed FileWatcher triggering status update while an operation is running 2021-12-14 13:40:01 +01:00
Abdelilah El Aissaoui
cd19a62ae9 Fixed checking out remote branch doesn't preserve the starting point 2021-12-14 13:33:25 +01:00