Kiril Videlov
5e1766e47d
Rename API update_series_forge_ids to singular
...
This was previously forgotten
2024-10-31 09:52:38 +01:00
Kiril Videlov
0b6bcab859
Updating series name resets forge_id to None
2024-10-31 09:50:28 +01:00
Kiril Videlov
742f5808bf
feat: Add write permission parameter to amend function
2024-10-30 22:28:24 +01:00
Kiril Videlov
b6386bdccf
feat(stack): implement capturing a snapshot before operations
2024-10-30 20:13:25 +01:00
Kiril Videlov
2ee3e2dcef
fix adding a branch on the stack when there is an archived branch
2024-10-30 18:32:34 +01:00
Sebastian Thiel
77a99aa47d
Merge pull request #5366 from Byron/fix-1650
...
fix: do not cutoff traversals by date for branch details (#1650 ).
2024-10-30 16:28:11 +01:00
Mattias Granlund
cd397bca5f
rename all variables gitHost -> forge
2024-10-30 16:23:45 +01:00
Esteban Vega
6ceea63bfe
Merge pull request #5354 from gitbutlerapp/e-branch-2
...
Undo commit: Files stay in the branch that owned the undone commit
2024-10-30 15:54:23 +01:00
Sebastian Thiel
b38d736685
Use version without cutoff as last-resort only.
...
The implementation is a bit more complex to be sure that
the cutoff is still used where possible.
The GitLab repository for instance has such complex
graphs that somehow... the first mergebase often isn't
enough to stop the traversal in time, leading to 100k commits to be traversed.
2024-10-30 15:49:28 +01:00
Sebastian Thiel
14ab092adc
fix: do not cutoff traversals by date for branch details ( #1650 ).
...
We already found the merge-base and know that this will naturally
be the end of the traversal. Thus there is no need to additionally
set a cut-off date, which is the documented default.
With such a cutoff, it's very possible that certain operations on the branches
change the date of the base to lie in the future, which is when no traversal
would be able to happen anymore.
2024-10-30 15:38:41 +01:00
ndom91
291cd0983d
feat: normalize branch name on series creation
2024-10-30 15:20:04 +01:00
ndom91
a99eea1cb0
fix: ensure new series name is normalized on the rust side via gix normalization fn
2024-10-30 15:20:04 +01:00
ndom91
3d8b92c76c
fix: more tauri.conf migrations
2024-10-30 14:23:32 +01:00
Mattias Granlund
2ef866baa6
Tauri v1 -> v2
...
Refactor appSettings to accommodate new Tauri v2 API
- creates AppSettings class and injects it where needed
- avoids `window` undeclared variable during vite build process
2024-10-30 14:23:32 +01:00
Kiril Videlov
bd10692afb
Only show non-archived branches in the UI
2024-10-30 12:52:55 +01:00
Kiril Videlov
94e345aeb0
Change pruning of integrated heads in the stack to just flag them as archived
2024-10-30 12:26:34 +01:00
Kiril Videlov
8f4cb6160f
replace a Vec of Forge Identifers with an Option instead
...
Likely we wont need multiple
2024-10-30 10:32:44 +01:00
Kiril Videlov
1384e90345
Integration test asserting setting and reading forge ids
2024-10-29 23:44:07 +01:00
Kiril Videlov
70f7d82f14
Update create_virtual_branch_from_branch to take forge_id
2024-10-29 23:25:14 +01:00
Kiril Videlov
88729a858c
Add API endpoint for setting the forge ids
...
Plus frontend medthod in branchController for calling it
2024-10-29 22:54:54 +01:00
Kiril Videlov
4bba0dd2b9
expose forge ids on the branches stream api
2024-10-29 21:52:57 +01:00
Kiril Videlov
3844da2ac6
add tests for setting forge ids
2024-10-29 21:49:25 +01:00
Kiril Videlov
ba9ab65918
adds low level api for setting forge ids for a series/branch
2024-10-29 21:39:47 +01:00
Kiril Videlov
22310e018c
introduce a new ForgeIdentifier type to be persisted
2024-10-29 21:21:09 +01:00
Kiril Videlov
e7fd44f259
Emit virtual branches after fetch
...
This is because, in case a branch was integrated, the state is updated
2024-10-29 17:00:40 +01:00
Kiril Videlov
8eff89a621
fix a bug where re-applying a lane causes branch names to be incremented
2024-10-29 16:31:33 +01:00
Mattias Granlund
285f681191
Fix: merge duplicate windows keys in tauri.conf.*.json
2024-10-29 15:23:51 +01:00
estib
9691a603df
Undo commit: Files stay in the branch that owned the undone commit
...
Undoing a commit would move the files to the default branch, instead of keeping them in the source branch.
Now, the files stay in the branch the commit was undone from.
2024-10-29 15:05:44 +01:00
Kiril Videlov
c0c6c8d13b
Merge pull request #5342 from gitbutlerapp/kv-branch-1
...
Test stack reorder shifting last in series to previous
2024-10-28 21:24:42 +01:00
Kiril Videlov
39f5b2e9a8
Test stack reorder shifting last in series to previous
2024-10-28 21:13:48 +01:00
Mattias Granlund
4b77cf4074
Default to experimental locking
...
- changing the name of the field since existing projects would have an explicit false value already
2024-10-28 21:08:59 +01:00
Kiril Videlov
7c61a9a236
Add test for stack pruning
2024-10-28 18:57:04 +01:00
Kiril Videlov
dc07cd1ce3
Prune integrated heads upon inegrating upstream
2024-10-28 17:51:19 +01:00
Kiril Videlov
4e84977516
Stack - handle the case where one of the stack heads can't be found
...
Handled by skipping in this case. What would be better is to not reach this state by updating the stack upon "update workspace"
2024-10-28 17:03:45 +01:00
Mattias Granlund
52d0dba39f
Code cleanup for hunk dependency crate
...
- reformat comments
- fewer derives
- tighter types
2024-10-28 16:58:57 +01:00
Kiril Videlov
3d4f1657d1
Fix - prevent pushing of already integrated branches when in a stack
2024-10-28 16:10:28 +01:00
Kiril Videlov
94e205d6b9
reordering - handle empty series correctlly
2024-10-27 22:50:35 +01:00
Kiril Videlov
38c0453eed
warn on unsafe index access in the stack crate
2024-10-27 22:27:55 +01:00
Kiril Videlov
b639859a65
fix reordering of series heads
2024-10-27 22:17:50 +01:00
Kiril Videlov
52929459e4
fix reordering series heads
2024-10-26 17:21:09 +02:00
Kiril Videlov
c24888e16c
fix test script
2024-10-26 15:11:35 +02:00
Kiril Videlov
a3933bae68
more tests
2024-10-26 14:53:30 +02:00
Kiril Videlov
6ba560aa6b
make reorder tests a bit more succinct
2024-10-26 13:33:58 +02:00
Kiril Videlov
327a570e45
Fix stack reorder implementation
2024-10-26 00:33:22 +02:00
Kiril Videlov
382c6251a0
Integration test setup for reordering
2024-10-25 22:05:45 +02:00
Kiril Videlov
9a61a6d64d
fix reorder list sorting
2024-10-25 22:05:22 +02:00
Kiril Videlov
7e1a5c54f2
Implement new stackign api
2024-10-24 16:27:35 +02:00
Kiril Videlov
16135675bc
Reorder stack API stub
2024-10-21 11:28:57 +02:00
Kiril Videlov
ed84a25334
Merge pull request #5310 from gitbutlerapp/kv-branch-1
...
CLI: add the ability to create series for a stack
2024-10-25 13:35:06 +02:00
Mattias Granlund
8bdecc2f8e
Code cleanup for hunk dependency crate
...
- reformat comments
- fewer derives
- tighter types
2024-10-25 11:02:22 +02:00
