integration: Add state model for integration branch - #1165
Open
ed-irl wants to merge 1 commit into
Open
Conversation
Collaborator
Author
This was referenced May 19, 2026
ed-irl
force-pushed
the
integration-state
branch
2 times, most recently
from
June 8, 2026 11:15
2f117ea to
93c644e
Compare
ed-irl
force-pushed
the
integration-state
branch
from
June 12, 2026 20:08
93c644e to
512b215
Compare
This was referenced Jun 12, 2026
ed-irl
force-pushed
the
integration-state
branch
from
June 13, 2026 13:40
512b215 to
8575070
Compare
ed-irl
force-pushed
the
integration-state
branch
from
June 15, 2026 09:53
8575070 to
b0c48d9
Compare
ed-irl
force-pushed
the
integration-state
branch
from
June 19, 2026 01:06
b0c48d9 to
e3c8701
Compare
Introduce repo-scoped integrationInfo carrying a singleton integration branch name, the upstream branch, the last pushed hash for --force-with-lease leasing, and an ordered list of tips with the hashes recorded at the last rebuild. Adds Store.Integration / Store.SetIntegration as the public API and bumps the state storage layout to VersionThree. The version is upgraded only when an integration is configured, so existing repos that never opt in keep V1 or V2. SetRemote preserves integration through remote changes; clearing the integration drops the version back to its prior level. Extends the spice.Service Store interface with Integration and SetIntegration so the service layer can read and write the configuration. spice.Service.RenameBranch now rewrites any integration tip that references the renamed branch; rename failures of the integration update are surfaced as warnings rather than aborting the primary rename. Also adds Store.PendingIntegrationRebuild, Store.SetPendingIntegrationRebuild, and Store.ClearPendingIntegrationRebuild for persisting a rebuild that was paused mid-flight (typically by a merge conflict). The handler uses this to support resuming after the user resolves conflicts in the worktree.
ed-irl
force-pushed
the
integration-state
branch
from
June 24, 2026 01:32
e3c8701 to
dbeafc0
Compare
|
I love the idea |
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
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.
Introduce repo-scoped integrationInfo carrying a singleton integration
branch name, the upstream branch, the last pushed hash for
--force-with-lease leasing, and an ordered list of tips with the hashes
recorded at the last rebuild.
Adds Store.Integration / Store.SetIntegration as the public API and
bumps the state storage layout to VersionThree. The version is upgraded
only when an integration is configured, so existing repos that never opt
in keep V1 or V2.
SetRemote preserves integration through remote changes; clearing the
integration drops the version back to its prior level.
Extends the spice.Service Store interface with Integration and
SetIntegration so the service layer can read and write the
configuration. spice.Service.RenameBranch now rewrites any integration
tip that references the renamed branch; rename failures of the
integration update are surfaced as warnings rather than aborting the
primary rename.
Also adds Store.PendingIntegrationRebuild,
Store.SetPendingIntegrationRebuild, and
Store.ClearPendingIntegrationRebuild for persisting a rebuild that was
paused mid-flight (typically by a merge conflict). The handler uses
this to support resuming after the user resolves conflicts in the
worktree.