gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-22 17:11:43 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,824 Commits 155 Branches 1,065 Tags 61 MiB
1d59ea805e
Commit Graph

552 Commits

Author SHA1 Message Date
Mattias Granlund
48256ec795 Remove test data from tauri conf 2023-07-12 11:50:10 +02:00
Nikita Galaiko
194f1646cf separate project repo revwalks 2023-07-12 11:25:19 +02:00
Nikita Galaiko
9ba26fc5b0 store target upstream name separately 2023-07-11 15:35:20 +02:00
Nikita Galaiko
b03ed2690c remove printlns 2023-07-11 10:14:43 +02:00
Nikita Galaiko
3971484faf fix attempts overflow 2023-07-10 16:46:50 +02:00
Nikita Galaiko
3fe2f24cc5 fix creation virtual branch with ownership 2023-07-07 21:03:03 +02:00
Nikita Galaiko
00bad6d799 add app target 2023-07-07 16:33:33 +02:00
Mattias Granlund
2b19031a36 Replace svelte-dnd-action with native drag & drop 
This commit is a bit of a relief, we now have less than 1/10th the
amount of code powering drag & drop.

Future work includes:
- extracting commonalities into a Svelte action
- applying css to new drop zone without using sibling selector
- styling
 2023-07-07 15:58:12 +03:00
Scott Chacon
983d58061a
also apply a remote branch when we create a vbranch from it (#649) 2023-07-07 13:54:53 +02:00
Scott Chacon
d9632cea61
add modifiedAt to virtual branch file (#648) 2023-07-07 12:49:43 +02:00
Nikita Galaiko
0cc1b7ce79 in case of duplicates, prefer remote branches 2023-07-07 12:42:20 +02:00
Scott Chacon
360c7db73a
Fix behind branch vbranch creation (#616) 
* clear command
* merge behind branches to upstream target before vbranch creation
 2023-07-07 12:02:48 +02:00
Nikita Galaiko
32fcc9ea43 specify order on create request 2023-07-07 11:08:17 +02:00
Nikita Galaiko
46d8c203ea try assuming target branch 2023-07-06 15:49:03 +02:00
Nikita Galaiko
dd94583186 propagate error message for unsupported push credentials 2023-07-06 10:11:59 +02:00
Nikita Galaiko
84ea0e1e17 disallow pushing to user/pass remotes 2023-07-05 16:10:19 +02:00
Nikita Galaiko
d89784a7e1 move repository lock from session writer to a higher level 2023-07-05 14:15:32 +02:00
Nikita Galaiko
c78ab6bc4a lock get_current_session 2023-07-05 12:20:09 +02:00
Nikita Galaiko
d82781631e remove println 2023-07-05 12:20:09 +02:00
Nikita Galaiko
ed9247f74c handle errors 2023-07-05 12:20:09 +02:00
Nikita Galaiko
e89bd9bdf6 share storage lock to ensure consistancy 2023-07-05 11:00:49 +02:00
Nikita Galaiko
968c1e2840 fix new hunk ids 2023-07-05 10:10:02 +02:00
Nikita Galaiko
6563f9c9bf fetch --prune 2023-07-05 08:41:06 +02:00
Kiril Videlov
0bd0b3628a fix open path allowlist 2023-07-04 16:44:35 +02:00
Nikita Galaiko
bef0e44aa2 delete fully merged branches 2023-07-04 12:37:00 +02:00
Nikita Galaiko
ee35a3f46a fix moving hunks 2023-07-04 10:22:32 +02:00
Nikita Galaiko
06b760d998 add emit event for the watcher 2023-07-04 09:32:21 +02:00
Nikita Galaiko
6473751a60 exponential backoff for failed fetches 2023-07-04 08:52:18 +02:00
Scott Chacon
0a3f9b6adc
Fetch button (#610) 
* when not behind, it fetches

* hitting refresh fetches from remote
 2023-07-04 07:15:44 +02:00
Scott Chacon
282d95af67
fix the fetching issue (#605) 2023-07-04 06:28:35 +02:00
Scott Chacon
e8e41f4b11
Can commit un/re-applied branches (#601) 
* if a branch has no merge base, leave it out
* change write_tree to use treeUpdater rather than the index
 2023-07-03 16:52:32 +02:00
Nikita Galaiko
24988db78a handle errors 2023-07-03 16:34:05 +02:00
Nikita Galaiko
68fadb1209 fix clippy warnings 2023-07-03 16:34:05 +02:00
Nikita Galaiko
f83df47b77 emit git fetch event 2023-07-03 16:09:57 +02:00
Nikita Galaiko
1e3d0244db fetch project in background 2023-07-03 16:09:57 +02:00
Nikita Galaiko
21ec8d9f14 move fetch and push to project 2023-07-03 16:09:57 +02:00
Nikita Galaiko
8878c89f06 track diff timestamps 2023-07-03 14:39:25 +02:00
Scott Chacon
6e73147257
Fix unapply hunks (#598) 
* fix hunk ordering
* get unapply with hunked branches working
 2023-07-03 14:14:26 +02:00
Nikita Galaiko
ac2003efca track diff ownership 2023-07-03 09:51:51 +02:00
Kiril Videlov
e99c939d60 get branch directly 2023-07-03 09:38:58 +03:00
Mattias Granlund
2c590c5e9e Stop double logging to webview 2023-07-02 20:16:57 +03:00
Mattias Granlund
adcf91d165 Right click menu for hunk 
- allows you to open file in vs code
 2023-07-02 18:45:13 +03:00
Scott Chacon
3392ca0b97
tree writing fixes (#586) 
Tree writing (for commits and unapply vbranch stashing) now is tested and works properly for new and removed files as well as hunk level modifications per branch.
 2023-07-02 15:48:44 +02:00
Scott Chacon
0806e94e6f
Fix some vbranch things (#584) 
* add partial test, return branch id
* tests pass now. dont assign hunks if the branch isnt active
 2023-07-02 12:35:50 +02:00
Scott Chacon
e6937368a7
Fix remote listing (#573) 
* fix remote listing
* dont show commit stuff unless there is something to commit
* filter remote branches
* can create a virtual branch from a remote branch
* show remote/local a little differently
 2023-07-01 14:17:32 +02:00
Kiril Videlov
4bdaaacf3e add support for deleting vbrahcnes 2023-07-01 12:10:56 +02:00
Scott Chacon
a2a30d05a8
Sc fix remote listing2 (#574) 
* fix remote listing
* dont show commit stuff unless there is something to commit
 2023-07-01 08:54:17 +02:00
Kiril Videlov
d95cbdb738 fetch after push 2023-06-30 17:34:24 +02:00
Kiril Videlov
488f7862f5 remove unused parameter 2023-06-30 17:34:24 +02:00
Kiril Videlov
f9bc13685a remove target extraction from vbranch, use origin 2023-06-30 17:34:24 +02:00