Wire up workspace_integrate_upstream API for stack rebase and upstream integration#13678
Draft
mtsgrd wants to merge 1 commit into
Draft
Wire up workspace_integrate_upstream API for stack rebase and upstream integration#13678mtsgrd wants to merge 1 commit into
mtsgrd wants to merge 1 commit into
Conversation
mtsgrd
force-pushed
the
add-rebase-stack-modal
branch
from
36effc6 to
7c228ad
Compare
mtsgrd
changed the title
mtsgrd
force-pushed
the
add-rebase-stack-modal
branch
from
7c228ad to
93001e3
Compare
mtsgrd
force-pushed
the
add-rebase-stack-modal
branch
2 times, most recently
from
90da8d5 to
576b1a6
Compare
Contributor
Author
|
@Caleb-T-Owens is the new API ready for the svelte app to migrate? |
mtsgrd
force-pushed
the
add-rebase-stack-modal
branch
7 times, most recently
from
94ff5eb to
0915fca
Compare
mtsgrd
force-pushed
the
add-rebase-stack-modal
branch
3 times, most recently
from
f21d42c to
2fe9438
Compare
Move upstream integration status computation and types out of gitbutler-branch-actions into but-api::workspace, using the but-graph workspace projection instead of the legacy stack_details_v3 path. Backend: - Add upstream_integration module with SDK-registered types (StackStatuses, BranchStatus, StackStatus, ResolutionApproach, etc.) - Add upstream_statuses module that computes per-stack statuses via but-graph projections, trial rebases, and forge review checks - Extract upstream_integration_statuses_inner for Context-free testing - Remove legacy upstream_integration module and integrate_upstream from gitbutler-branch-actions, tauri bindings, and but-server - Update CLI pull/status commands to use new API Frontend: - Migrate IntegrateUpstreamModal from Resolution API to BottomUpdate[] - Imperative status fetch → reactive useQuery subscription - Merge UpstreamIntegrationService into stackService - Remove StackStatusesWithBranchesV3 and dead upstream types Tests: - Add fixture-based tests using but-workspace pattern (no legacy APIs) - Two fixture scripts for upstream integration scenarios - Cover status computation and integrate_upstream with integrated branch E2E: - Add Playwright test for single-stack rebase via context menu
mtsgrd
force-pushed
the
add-rebase-stack-modal
branch
from
2fe9438 to
359a895
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
workspace_integrate_upstreamAPI for upstream integration in the desktop appIntegrateUpstreamModalfrom imperative fetching to reactive query subscriptions withReduxResultbottom_selectoronStackStatusso the frontend can constructBottomUpdateselectorsTest plan
🤖 Generated with Claude Code