refactor(entity): promote RequestLandStrategy to shared entity/mergestrategy#243
Open
behinddwalls wants to merge 1 commit into
Open
refactor(entity): promote RequestLandStrategy to shared entity/mergestrategy#243behinddwalls wants to merge 1 commit into
behinddwalls wants to merge 1 commit into
Conversation
This was referenced Jun 15, 2026
…trategy ## Summary ### Why? The land-merge strategy enum lived in `submitqueue/entity` as `RequestLandStrategy`, but the upcoming runway merge-conflict contract needs the same type, and runway must not import `submitqueue/entity`. Mirroring the `Change` promotion in #240, the strategy belongs in the shared top-level `entity/` so both domains reference one type with no per-domain enum or mapping. ### What? Moves `RequestLandStrategy` and its constants out of `submitqueue/entity/request.go` into a new top-level `entity/mergestrategy` package as `MergeStrategy` (`MergeStrategyUnknown/Rebase/SquashRebase/Merge`). `Request.LandStrategy` now has type `mergestrategy.MergeStrategy`. All references across the gateway and orchestrator controllers, entities, and tests are updated to the shared type. Pure mechanical refactor — no behavior change. ## Test Plan ✅ `bazel build //...` ✅ `bazel test //... --test_tag_filters=-integration,-e2e` (51 tests pass) ✅ `make gazelle` clean
behinddwalls
force-pushed
the
preetam/mergestrategy-promote
branch
from
20db3b8 to
bf357a5
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
Why?
The land-merge strategy enum lived in
submitqueue/entityasRequestLandStrategy, but the upcoming runway merge-conflict contract needs the same type, and runway must not importsubmitqueue/entity. Mirroring theChangepromotion in #240, the strategy belongs in the shared top-levelentity/so both domains reference one type with no per-domain enum or mapping.What?
Moves
RequestLandStrategyand its constants out ofsubmitqueue/entity/request.gointo a new top-levelentity/mergestrategypackage asMergeStrategy(MergeStrategyUnknown/Rebase/SquashRebase/Merge).Request.LandStrategynow has typemergestrategy.MergeStrategy. All references across the gateway and orchestrator controllers, entities, and tests are updated to the shared type. Pure mechanical refactor — no behavior change.Test Plan
✅
bazel build //...✅
bazel test //... --test_tag_filters=-integration,-e2e(51 tests pass)✅
make gazellecleanStack