Commit Graph

1491 Commits

Author SHA1 Message Date
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
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
Kiril Videlov
30b5a88c63 CLI: add the ability to create series for a stack 2024-10-25 11:01:28 +02:00
Sebastian Thiel
42f632aaf4
avoid allocations for comparisons
Also avoid having an untyped comparison which is easy to get wrong.
2024-10-24 19:17:36 +02:00
Sebastian Thiel
7d12e0bcc7
avoid building doctests
This takes time, and typically there are none.
2024-10-24 19:03:29 +02:00
ndom91
670c7ca44b fix: use custom wix template to avoid update removing shortcuts 2024-10-24 17:39:54 +02:00
Mattias Granlund
8d3aabae1d Fix bug in hunk dependency calculations
- stacks need their own line shifts when combining them
2024-10-24 15:15:39 +02:00
Esteban Vega
a70de62f2e
Merge pull request #5295 from gitbutlerapp/e-branch-2
fix: Compare branches to the remote target branch
2024-10-24 15:15:23 +02:00
estib
4178fdd973 fix: Compare branches to the remote target branch
When getting the branch listings, compare the branches to the remote target branch.
This is necessary because of two reasons:
- GitButler doesn't really care about what your local target branch (e.g. main) does, and also doesn't update it as we merge upstream (e.g. origin/main).
- In some cases, a repository might not have a local branch pusgin to the remote target branch (especially in the cases in which branches are merged through a forge)
2024-10-24 14:32:19 +02:00
Mattias Granlund
5dfa719f51 Fix environment dependent test failure
- fixes `non_bare_without_worktree` test on mac with bash 3.2.57
2024-10-24 14:00:56 +02:00
estib
d2df87f1b2 Refname: Add custom comparator for BStr
Add a neat, nice little implementation for comparing Refnames to BStrs
2024-10-24 13:51:27 +02:00
estib
8a2943a11c list branches: Update tests 2024-10-24 12:06:37 +02:00
estib
bb72296a00 fix: Don't list the target branch
Don't list the target branch in the sidebar
2024-10-24 10:47:33 +02:00
Mattias Granlund
d9156fc00b Integrate new hunk dependency algorithm
- behind a project level feature flag
2024-10-23 22:42:46 +02:00
Mattias Granlund
c8a591505a Make context optional when getting commit diffs 2024-10-23 22:42:46 +02:00
Mattias Granlund
1fa97d4468 Fix clippy warnings after toolchain date bump 2024-10-23 22:42:46 +02:00
Mattias Granlund
b772146acc New crate for calculating hunk dependencies 2024-10-23 22:42:46 +02:00