Kiril Videlov
7be3e7a6e7
Merge pull request #5362 from gitbutlerapp/kv-branch-1
...
Retain fully integrated braches on the stack but flag them as archived
2024-10-30 13:51:19 +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
ad0a0a20d0
Merge pull request #5357 from gitbutlerapp/persist-forge-ids-on-series
...
Persist ForgeIdentifier on series (branches)
2024-10-30 10:41:54 +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
6d0f9fe141
When creating a vbranch from PR pass the forge id
2024-10-29 23:25:58 +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
0721250234
Merge pull request #5356 from gitbutlerapp/kv-branch-1
...
Emit virtual branches after fetch
2024-10-29 19:04:57 +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
1dfd2ee146
Merge pull request #5355 from gitbutlerapp/kv-branch-1
...
fix a bug where re-applying a lane causes branch names to be incremented
2024-10-29 16:42:20 +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
Esteban Vega
a216ccedaf
Merge pull request #5349 from gitbutlerapp/e-branch-4
...
fix: Open files on editor in Windows
2024-10-29 11:39:03 +01:00
Pavel Laptev
fedd3187f9
Update StackingSeriesHeader.svelte ( #5350 )
2024-10-29 11:24:52 +01:00
estib
ad345a7770
fix: Open files on editor in Windows
...
In order to open the files using the editor url, we need to use forward slashes for the path, even on Windows.
2024-10-29 10:39:23 +01:00
Esteban Vega
6f901cd367
Merge pull request #5348 from gitbutlerapp/e-branch-3
...
cleanup: Type the file-list menu correctly
2024-10-29 10:35:46 +01:00
Esteban Vega
a3be371940
Merge pull request #5347 from gitbutlerapp/e-branch-2
...
style: Dropzones on the stacking headers
2024-10-29 10:35:38 +01:00
estib
120d372463
cleanup: Type the file-list menu correctly
2024-10-29 09:09:12 +01:00
estib
2efa82a988
style: Dropzones on the stacking headers
...
Display dropzones in the headers of the stacked branches, when dragging a commit.
Also:
Don't display the dropzones on the files-list when dragging a commit.
2024-10-29 08:42:32 +01:00
Mattias Granlund
c6c26c0e0e
Show correct remote name in branch header
...
User might have a push remote set where we create branches on a different remote than the target branch.
2024-10-28 22:07:43 +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
6759d3e4dc
Merge pull request #5340 from gitbutlerapp/kv-branch-1
...
Prune integrated heads upon inegrating upstream
2024-10-28 19:06:05 +01:00
Kiril Videlov
7c61a9a236
Add test for stack pruning
2024-10-28 18:57:04 +01:00
Caleb Owens
d172bd5121
Merge pull request #5329 from gitbutlerapp/Rename-patchstacks
...
Rename away from patch stacks
2024-10-28 16:58:44 +00:00
Caleb Owens
f3b8ff60fe
stuff
2024-10-28 16:57:08 +00:00
Kiril Videlov
dc07cd1ce3
Prune integrated heads upon inegrating upstream
2024-10-28 17:51:19 +01:00
ndom91
50ed7667b7
fix: StackingPullRequestCard reactivity
2024-10-28 17:27:03 +01:00
Kiril Videlov
d8328de56b
Merge pull request #5334 from gitbutlerapp/dependabot/github_actions/actions/cache-4
...
chore(deps): bump actions/cache from 3 to 4
2024-10-28 17:23:51 +01:00
Pavel Laptev
4ac22d5d5e
Update StackingSeriesHeader.svelte ( #5333 )
2024-10-28 17:21:33 +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
9e5496e3da
Merge pull request #5335 from gitbutlerapp/kv-branch-1
...
Fix - prevent pushing of already integrated branches when in a stack
2024-10-28 16:39:23 +01:00
dependabot[bot]
a255340a7b
chore(deps): bump actions/cache from 3 to 4
...
Bumps [actions/cache](https://github.com/actions/cache ) from 3 to 4.
- [Release notes](https://github.com/actions/cache/releases )
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md )
- [Commits](https://github.com/actions/cache/compare/v3...v4 )
---
updated-dependencies:
- dependency-name: actions/cache
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-10-28 15:27:44 +00:00
Kiril Videlov
3d4f1657d1
Fix - prevent pushing of already integrated branches when in a stack
2024-10-28 16:10:28 +01:00
Esteban Vega
3b8a96ca47
Merge pull request #5330 from gitbutlerapp/e-branch-2
...
fix: Modal closes on mouse down outside
2024-10-28 14:52:03 +01:00
estib
42270f1c9f
fix: Modal closes on mouse down outside
...
Avoid closing the modals when releasing the mouse outside the modal.
Only close them on clicking down outside the modal
2024-10-28 14:44:50 +01:00
Pavel Laptev
7a03e89d28
fix typo
2024-10-28 13:34:17 +01:00
Pavel Laptev
60ccac2b63
reloadPR added
2024-10-28 13:34:17 +01:00
Pavel Laptev
f58a29fa1c
added context menu to the whole hard
2024-10-28 13:34:17 +01:00
ndom91
655db0ffee
fix: close contextMenus upon selection
2024-10-28 13:34:17 +01:00
ndom91
ffce14296a
feat: add contextMenu to checks and pr btns in StackingPullRequestCard
2024-10-28 13:34:17 +01:00
Kiril Videlov
97c344404f
Merge pull request #5316 from gitbutlerapp/fix-dashed-lines
...
Fix dashed lines
2024-10-28 13:25:52 +01:00
