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

522 Commits

Author SHA1 Message Date
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
Kiril Videlov
2c965e8a47 push head directly 2023-06-30 17:34:24 +02:00
Kiril Videlov
5fb2ef580e update upstream 2023-06-30 17:34:24 +02:00
Kiril Videlov
07c4d53078 persisting upstream branch on vbranch upon push 2023-06-30 17:34:24 +02:00
Scott Chacon
a4114185d2
set a remote flag on commits that have been pushed (#568) 2023-06-30 16:50:15 +02:00
Nikita Galaiko
297e0cddc9 new virtual branch button works 2023-06-30 16:00:54 +02:00
Scott Chacon
f8be69575f
Some Docs (#565) 
* document these structs
 2023-06-30 15:36:40 +02:00
Nikita Galaiko
f2024dc578 bubble up hunks that change size 2023-06-30 15:32:28 +02:00
Nikita Galaiko
183940072d fix tests 2023-06-30 14:30:52 +02:00
Nikita Galaiko
13ef7435b4 bubble new hunks and files up 2023-06-30 14:15:12 +02:00
Nikita Galaiko
b3cc802f1a explicitly move and always update hunks 2023-06-30 14:15:12 +02:00
Scott Chacon
8cc1d7b3f5
Merge status (#554) 
* show merge status of virtual branches
* add merge conflict list and tests and fix uncommitted work
 2023-06-30 11:27:54 +02:00
Kiril Videlov
c090837b17 use default target 2023-06-30 11:23:49 +02:00
Kiril Videlov
e0006dbf43 formatting 2023-06-30 11:23:49 +02:00
Kiril Videlov
4092554bdf Pushing of vBranches 2023-06-30 11:23:49 +02:00
Nikita Galaiko
1df31ec1ee rm move_files 2023-06-30 09:13:22 +02:00
Nikita Galaiko
fd7d2f9d87 remove selected branch id 2023-06-30 08:11:23 +02:00
Nikita Galaiko
ace5b8468f store branch order 2023-06-30 08:11:23 +02:00
Nikita Galaiko
785013d611 create branch with ownership 2023-06-30 08:11:23 +02:00
Nikita Galaiko
b7c9940eb3 rm move_files api 2023-06-30 08:11:23 +02:00
Nikita Galaiko
47fc2924ab fix clippy warnings 2023-06-29 11:47:23 +02:00
Nikita Galaiko
df935248c0 support updating branch ownership 2023-06-29 11:33:20 +02:00
Nikita Galaiko
87476939a8 make branch ownerhip order matter 2023-06-29 11:33:20 +02:00
Scott Chacon
4480f690fe
add placeholder for push, fix checkout (#548) 2023-06-29 08:59:41 +02:00
Scott Chacon
4a0bcb8665
Apply and Unapply Virtual Branches (#544) 
* apply and unapply branches
* show unapplied branches in vbranch list
* pick random branch if selected isnt applied
 2023-06-29 07:48:48 +02:00
Nikita Galaiko
cac92dd027 sort new hunks as they come in 2023-06-28 16:55:04 +02:00
Nikita Galaiko
8cbef59988 rm hunk timestamps 2023-06-28 13:19:50 +02:00
Nikita Galaiko
511c5b6124 more tests for moving hunks 2023-06-28 13:19:50 +02:00
Nikita Galaiko
4dd70ee5b1 refactor ownership types 2023-06-28 13:19:50 +02:00
Nikita Galaiko
201e666fe3 store timstamp in a hunk 2023-06-28 13:19:50 +02:00
Scott Chacon
045ddbf16e
Delete (unapply) branch when it's integrated upstream (#515) 
* delete (unapply branch when the head matches the merge result)
* add debug stuff, create new branch if none applied
* if there are modified files on a vbranch, dont unapply it
* fix args in the wrong order
 2023-06-28 12:40:10 +02:00