Commit Graph

391 Commits

Author SHA1 Message Date
Abdelilah El Aissaoui
9c1133a292 Added line numbers and text selection to blame 2022-05-28 16:28:39 +02:00
Abdelilah El Aissaoui
df03edf396 Removed unused imports 2022-05-28 16:12:49 +02:00
Abdelilah El Aissaoui
cd06819cfd Added error handling when a file can't be blamed 2022-05-28 16:12:09 +02:00
Abdelilah El Aissaoui
60a1ef21d8 Added hand icon on hover where it's intended to be 2022-05-27 20:07:24 +02:00
Abdelilah El Aissaoui
eca68aaf07 Multiple blame improvements
- Clicking on a diff now minimizes the blame
- Clicking on a commit of the blame will select this commit in the log and show the commit changes.
- Unified design of Diff and Blame
2022-05-27 19:50:41 +02:00
Abdelilah El Aissaoui
cb3fe17fee Rebase interactive is aborted when something fails during the process 2022-05-27 15:52:16 +02:00
Abdelilah El Aissaoui
f124d1fb9e Disabled fixup and squash for the first line of the rebase interactive 2022-05-27 13:30:07 +02:00
Abdelilah El Aissaoui
332c3ef73d Added try catch in case platform doesn't support opening URL in the browser 2022-05-26 23:55:54 +02:00
Abdelilah El Aissaoui
40366be75c Limited blame text line to a single line 2022-05-26 23:55:33 +02:00
Abdelilah El Aissaoui
8e366741ac Added basic version of blame 2022-05-26 23:40:15 +02:00
Abdelilah El Aissaoui
543545d93d Changed commited changes load block to avoid changing the state to loading when is not necessary 2022-05-23 19:36:06 +02:00
Abdelilah El Aissaoui
46cb205739 Fixed white screen blink when opening a new tab 2022-05-23 19:14:37 +02:00
Abdelilah El Aissaoui
143f98d07f Changed error dialog animation 2022-05-22 00:54:04 +02:00
Abdelilah El Aissaoui
51d79cff8f Reimplemented rebase interactive as a part of the tab instead of a dialog 2022-05-22 00:47:36 +02:00
Abdelilah El Aissaoui
364fa53558 Added option to stage/unstage file from diff header 2022-05-16 20:16:12 +02:00
Abdelilah El Aissaoui
c9a7f63a1c Changed cursor for log divider 2022-05-14 17:05:23 +02:00
Abdelilah El Aissaoui
3ab0936e44 Changed app font to OpenSans 2022-05-09 23:03:15 +02:00
Abdelilah El Aissaoui
2263785723 Changed item selection design 2022-05-09 22:02:24 +02:00
Abdelilah El Aissaoui
08f814c8d8 Added scroll to rebase interactive dialog 2022-04-16 04:59:03 +02:00
Abdelilah El Aissaoui
f60580750b Implemented reword on rebase interactive 2022-04-16 04:52:53 +02:00
Abdelilah El Aissaoui
cdf7d61045 Diff replaces a tab by 4 characters until compose bug is fixed
https://github.com/JetBrains/compose-jb/issues/615
2022-04-11 04:32:05 +02:00
Abdelilah El Aissaoui
b68135d3a4 Fixed crash when creating the graph if the repo contains tags that point to blobs 2022-04-11 04:27:25 +02:00
Abdelilah El Aissaoui
14eb5f8c9c Added first version of interactive rebase 2022-04-09 23:10:08 +02:00
Abdelilah El Aissaoui
08d0323e48 Improved tab's design 2022-04-09 18:59:10 +02:00
Abdelilah El Aissaoui
9f51893ed2 Hidden file not found exception when trying to fetch the icons from gravatar 2022-04-09 18:58:30 +02:00
Abdelilah El Aissaoui
f03165f70a Added max lines to welcome page text composables 2022-04-09 18:58:16 +02:00
Abdelilah El Aissaoui
d5cac58b87 Removed unused property 2022-04-08 22:26:23 +02:00
Abdelilah El Aissaoui
855b57196d Side menu items expand state is now stored in the viewModels to restore it's value after changing tabs 2022-04-08 22:05:48 +02:00
Abdelilah El Aissaoui
8650b1a43c Moved error state holding to the TabViewModel 2022-04-08 22:05:22 +02:00
Abdelilah El Aissaoui
1f58114404 Added exception throwing when rebase/merge failed due to uncommited changes 2022-04-08 21:43:47 +02:00
Abdelilah El Aissaoui
4f84c38fb4 Started replacement of the old tabs system with the new one 2022-04-08 21:30:13 +02:00
Abdelilah El Aissaoui
fac5cbf16a Increased version for the next release 2022-04-08 20:22:04 +02:00
Abdelilah El Aissaoui
fb8e41dfff Fixed lines in diff being cut when overflowing 2022-04-08 20:22:04 +02:00
Abdelilah El Aissaoui
b7179a5c20 Increased version code 2022-04-07 23:33:21 +02:00
Abdelilah El Aissaoui
c31b1a9d6b Fixed hunk stage on files with a single line without lineDelimiter 2022-04-07 23:06:20 +02:00
Abdelilah El Aissaoui
d055060483 Fixed crash on empty graph 2022-04-07 22:57:32 +02:00
Abdelilah El Aissaoui
7b4ab49a30 Increased refresh time when having multiple consecutive changes to 1s and added refresh when diff missing 2022-04-07 22:50:52 +02:00
Abdelilah El Aissaoui
c20021832f Fixed graph size not being recalculated after changing uncommited changes status 2022-04-07 22:44:34 +02:00
Abdelilah El Aissaoui
c71f7555de Fixed stage/unstage hunks not working on properly on specific line endings 2022-04-07 22:39:33 +02:00
Abdelilah El Aissaoui
5982c65c79 Fixed diff on index files when a repository is empty 2022-04-07 19:19:21 +02:00
Abdelilah El Aissaoui
685769a154 Increased project version to 0.1.1 2022-04-07 18:44:52 +02:00
Abdelilah El Aissaoui
1baab9e3f8 Fixed clone state being lost on error & multiple errros not being reported
Also updated errors strings to better clarify the issue
2022-04-07 18:41:53 +02:00
Abdelilah El Aissaoui
716d04df9a Merge branch 'status_optimizations' into main 2022-04-06 20:19:54 +02:00
Abdelilah El Aissaoui
b53b9b0b79 Now staged and unstaged use the same status to update the data (instead of executing it twice) 2022-04-06 20:19:29 +02:00
Abdelilah El Aissaoui
7f9da646ff Fixed uncommited changes line not appearing on rebase with a single conflict (no other changes) 2022-04-06 20:18:59 +02:00
Abdelilah El Aissaoui
51ea75c033 Removed done TODO tasks and added appScope cancellation on app exit 2022-04-06 20:02:56 +02:00
Abdelilah El Aissaoui
ab9c8ce2df Fixed unstage hunk not restoring lines properly 2022-04-06 19:48:30 +02:00
Abdelilah El Aissaoui
1e0660dca0 Refactored status to improve its performance and removed diff update handling 2022-04-06 19:39:06 +02:00
Abdelilah El Aissaoui
9927a249b9 Fixed invalid directory string on clone 2022-04-06 17:50:31 +02:00
Abdelilah El Aissaoui
4108537825 [WIP] started refactor of status 2022-04-06 17:49:38 +02:00
Abdelilah El Aissaoui
60a6fb1a3e Fixed file name not being completly displayed when it's in the root of the dir for commited changes 2022-04-04 21:00:17 +02:00
Abdelilah El Aissaoui
8d066f15dc Updated description 2022-04-04 19:00:32 +02:00
Abdelilah El Aissaoui
f8c7bd5515 Renamed project from references 2022-04-04 18:43:27 +02:00
Abdelilah El Aissaoui
f1868844a2 Extracted project name as a constant 2022-04-04 18:32:56 +02:00
Abdelilah El Aissaoui
27e8efcaf7 Added additional info dialog 2022-04-04 18:32:06 +02:00
Abdelilah El Aissaoui
6c1790ce24 Added refresh even if stash has failed 2022-04-04 05:12:11 +02:00
Abdelilah El Aissaoui
61d5ee941a Fixed file name not being completly displayed when it's in the root of the dir 2022-04-04 05:05:50 +02:00
Abdelilah El Aissaoui
dac6d597a2 Fixed date being moved if the message is too long 2022-04-04 03:00:51 +02:00
Abdelilah El Aissaoui
b980784b1f Changed secondary color & reorganized welcome/home screen 2022-04-04 02:58:51 +02:00
Abdelilah El Aissaoui
8f92b6d195 Added updates check 2022-04-04 02:48:40 +02:00
Abdelilah El Aissaoui
11ea0986c3 Fixed clone url replacing inbetween ".git" string (should only remove suffixes) 2022-04-04 00:19:03 +02:00
Abdelilah El Aissaoui
c1fdd891c6 Added clone progress and changed clone button to PrimaryButton 2022-04-03 19:43:54 +02:00
Abdelilah El Aissaoui
df638defb8 Removed unnecessary dispose (already using "use" extension) 2022-04-03 19:43:26 +02:00
Abdelilah El Aissaoui
e2449db568 Added padding at the end of the graph to avoid the last line being partially covered by the horizontal scrollbar of the graph 2022-04-03 19:22:45 +02:00
Abdelilah El Aissaoui
154ab89a21 Changed old style buttons to the new one 2022-04-03 01:29:18 +02:00
Abdelilah El Aissaoui
d662edba9d Improved clone dialog features by adding more error management & directory picker 2022-04-03 01:16:55 +02:00
Abdelilah El Aissaoui
59a36fed08 Graph now shows properly the HEAD commits when rebasing & commits referenced by unpeeled tags 2022-04-02 04:03:01 +02:00
Abdelilah El Aissaoui
457d604575 Removed unnecessary parameters from callbacks 2022-04-02 00:36:09 +02:00
Abdelilah El Aissaoui
5ab529e22b Updated repo URLs 2022-04-02 00:35:33 +02:00
Abdelilah El Aissaoui
a9accafafb Replaced direct usage of manager coroutineScope to use an method that handles errors 2022-04-01 20:30:19 +02:00
Abdelilah El Aissaoui
558f02fca4 Implemented basic local git init 2022-04-01 05:42:44 +02:00
Abdelilah El Aissaoui
54a1ab4436 Added loading screen when opening a repository 2022-04-01 05:00:06 +02:00
Abdelilah El Aissaoui
2dd6fb106e Filtered out uninitialized submodules from git diff 2022-03-31 22:09:59 +02:00
Abdelilah El Aissaoui
a32f4d5ccd Fixed text not being cleared after commit 2022-03-31 20:40:25 +02:00
Abdelilah El Aissaoui
054778bdcc Implemented graph search
Fixed bug where deleting text input value too fast (keeping pressed backspace) would not behave properly
2022-03-31 20:39:25 +02:00
Abdelilah El Aissaoui
d544cc4e94 Moved repository opening to repository manager 2022-03-30 00:08:53 +02:00
Abdelilah El Aissaoui
fc821ecb92 Fixed git paths using system dependant separator instead of fixed "/" 2022-03-04 15:43:29 +01:00
Abdelilah El Aissaoui
2466dd7a33 File picker styling is only applied in windows/macOs now 2022-03-04 14:53:49 +01:00
Abdelilah El Aissaoui
3352444371 Disabled the option to stage/unstage hunks when the repository is not in a safe state 2022-03-03 20:27:11 +01:00
Abdelilah El Aissaoui
33eb0f3c8a File watcher now also watched new added directories 2022-03-03 20:00:34 +01:00
Abdelilah El Aissaoui
aae80445f9 Moved delayed refresh to tabViewModel instead of the file watched and added detection of git dir changed to refresh the whole repository information 2022-02-25 16:51:52 +01:00
Abdelilah El Aissaoui
bbea356eb2 Added missing horizontal padding to commited changes files icon 2022-02-25 00:41:03 +01:00
Abdelilah El Aissaoui
afc7d9df8e Improved performance when multiple FS changes occur in a fraction of a second
Between update there is a minimum of 0.5s even if there have been multiple file updates
2022-02-25 00:40:11 +01:00
Abdelilah El Aissaoui
41ff6a57b8 Improved display of branches' names in branch context menu 2022-02-24 23:07:28 +01:00
Abdelilah El Aissaoui
dd56ccf2fc Now uncommited changes shows which diff entry has been clicked
Also refactored selected index from commit changes to use the same logic as uncommited changes
2022-02-24 15:41:10 +01:00
Abdelilah El Aissaoui
970132f1d7 File name is always shown in the changes log to cut the dir path 2022-02-24 14:51:12 +01:00
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
8d00141df2 Improved settings dialog UI 2022-02-21 16:03:36 +01:00
Abdelilah El Aissaoui
84d986587d Reduced status sumary font size + fixed typo 2022-02-21 15:19:45 +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
d8d4147d18 Fixed currently displayed diff entry being updated twice when changes are detected 2022-02-20 22:59:43 +01:00
Abdelilah El Aissaoui
fb377b9554 Changed graph border width and corner shape 2022-02-18 15:30:46 +01:00
Abdelilah El Aissaoui
82d9479e55 Changed multiple elements colors
Button and log border
2022-02-18 15:03:52 +01:00
Abdelilah El Aissaoui
7a86ed8227 Changed abort button colors 2022-02-18 12:30:30 +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
32ef5d50cd Fixed crash when commits list is empty 2022-02-17 23:18:51 +01:00