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
Abdelilah El Aissaoui
e12a5ee2e2
Doing a commit now refreshes the whole repo info, not just the log
2021-12-12 20:11:33 +01:00
Abdelilah El Aissaoui
31b692e581
Reformated project's code
2021-12-12 19:49:46 +01:00
Abdelilah El Aissaoui
912397b257
Clicking on a ref now selects the log's commit
2021-12-12 19:38:11 +01:00
Abdelilah El Aissaoui
c7954af9ad
Added remotes to side panel
2021-12-08 18:30:41 +01:00
Abdelilah El Aissaoui
a141b0676e
Fixed remote branch checkout
...
Also removed remote branches from "Branches" list in left menu (will add a future "remotes" list)
2021-12-07 19:17:18 +01:00
Abdelilah El Aissaoui
26edec3de3
Added stash detail viewing & selected item state management
2021-12-07 01:08:45 +01:00
Abdelilah El Aissaoui
efab5b0bfa
Added remove tag functionality
2021-12-06 23:15:31 +01:00
Abdelilah El Aissaoui
2a43cdeca8
Disabled allowing empty git commits
2021-12-06 23:05:06 +01:00
Abdelilah El Aissaoui
6c1dc32928
Log full cleanup
...
- Refactored log function into multiple sub functions
- Removed use of DialogManager from Log
- Merge branch now shows current branch instead of hardcoded "HEAD"
2021-12-04 07:02:40 +01:00
Abdelilah El Aissaoui
8a7e8c470e
Fixed clone not asking http credentials
2021-12-02 22:45:26 +01:00
Abdelilah El Aissaoui
f5ab2b0881
Added basic clone implementation
...
Also fixed crash when selecting non-existant file to diff
2021-11-29 18:50:39 +01:00
Abdelilah El Aissaoui
849aeb17cc
Now whole repository tab refreshes when deleting a branch
2021-11-28 06:09:49 +01:00
Abdelilah El Aissaoui
26682daa96
Added comments & improved logs
2021-11-28 03:35:28 +01:00
Abdelilah El Aissaoui
239d004b84
Added git manager scope cancellation on disposal of the tab
2021-11-28 03:30:30 +01:00
Abdelilah El Aissaoui
5ab88ecce0
Made safeGit private
2021-11-28 03:15:49 +01:00
Abdelilah El Aissaoui
ca3a55ce21
Added status update when file system changes (excluding ignored dirs)
2021-11-28 03:15:18 +01:00
Abdelilah El Aissaoui
4abd9e331d
Added support for local branch deletion
2021-11-27 20:22:05 +01:00
Abdelilah El Aissaoui
03201972e7
Checking out a remote branch create now a local branch with the same name
2021-11-19 03:36:23 +01:00
Abdelilah El Aissaoui
713fba6ab9
Started side menu desgin change and added tags support
2021-11-18 02:01:17 +01:00
Abdelilah El Aissaoui
da3f3c8935
Added password for ssh keys
2021-11-05 04:27:35 +01:00
Abdelilah El Aissaoui
b63614d68d
Fixed uncommited changes parent node lane position
2021-10-30 19:38:11 +02:00
Abdelilah El Aissaoui
4a6542abcd
Fixed previous commits of uncommited changes not showing in the same column
2021-10-28 17:03:06 +02:00
Abdelilah El Aissaoui
67f1135b85
Added reset branch feature
2021-10-28 04:28:37 +02:00
Abdelilah El Aissaoui
71bf75ceca
Added merge feature
2021-10-27 20:41:05 +02:00
Abdelilah El Aissaoui
d60b1a14a2
Added revert commit feature
2021-10-27 03:57:15 +02:00
Abdelilah El Aissaoui
d4d057c291
Added context menu to branches/tags & moved code to their correct managers
2021-10-27 03:45:22 +02:00
Abdelilah El Aissaoui
414bce560f
Added context menu to log and added tag creation
2021-10-27 03:23:06 +02:00
Abdelilah El Aissaoui
40fe4c694f
Added basic implementation of error manager
2021-10-26 18:59:52 +02:00
Abdelilah El Aissaoui
469fe530ee
Log updates after creating a new branch
2021-10-26 03:25:48 +02:00
Abdelilah El Aissaoui
c465b89b61
Added field focus when opening branch and credentials dialogs
2021-10-26 03:25:27 +02:00
