merge queue: queuing main (b2529cf), #1615 and #1616 together#1623
Closed
mergify[bot] wants to merge 5 commits into
Closed
merge queue: queuing main (b2529cf), #1615 and #1616 together#1623mergify[bot] wants to merge 5 commits into
mergify[bot] wants to merge 5 commits into
Conversation
`stack push` rendered only `log_lines` and discarded the planned/upserted data, so the "Stacked pull request plan" preview and per-PR `[created] … <url>` summary were missing. Port `get_log_from_local_change` / `get_log_from_orphan_change` as plain-text formatters and emit the plan, created, and orphan-deleted lines into `log_lines` in flow order (dry-run included). `push_branches` ran `git push` with inherited stdio, leaking git's `remote:` ruleset-bypass and branch-creation narration. Capture it and surface stderr only on failure, matching `run_git_silent`. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Change-Id: Ic1a22ea2f054a6a38df6ff5aff569ae9573fce22
The dry-run rebase narration and the revision-history change-type fetch warning carried literal `[orange]…[/]` Rich tags. Python rendered them through a markup-aware console (tags stripped off a TTY, styled on one); the Rust CLI prints log lines verbatim with no markup renderer, so users saw the literal bracket tags. Drop the tags so the lines read as plain text, consistent with the rest of the CLI's output. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Change-Id: I3b8c1ed7b55f6d806f871ad86878fc375d9eade1
A failed `git rebase -i` in spawn_rebase returned a generic "exited <status>" error mapped to exit 1. Every rebase-driving command (drop, squash, fixup, reorder, reword, move, edit, sync) routes through this helper, so all of them lost the conflict recovery instructions and the dedicated Conflict exit code (4) that automation keys on. Return CliError::Conflict with the resolve/continue/abort guidance, matching the Python run_scripted_rebase contract. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Change-Id: I5dff7d8117910398fcd0abc2cc39027744ff1cf7
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.
⏳ The pull request #1616 is queued for merge and currently being checked. ⏳
Branch main (b2529cf), #1615 and #1616 are queued together for merge.
This pull request has been created by Mergify to speculatively check the mergeability of #1616.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.
Required conditions of queue rule
defaultfor merge:check-success=ci-gatedepends-on=Mergifyio/mergify-cli#1615[⛓️ fix(stack): strip raw Rich markup from push rebase narration #1615 [stack]]title ~= ^(fix|feat|docs|style|refactor|perf|test|build|ci|chore|revert|ui)(?:\(.+\))?:#approved-reviews-by>=2author = dependabot[bot]author = mergify-ci-botauthor = renovate[bot]body ~= (?ms:.{48,})#changes-requested-reviews-by = 0#review-requested = 0#review-threads-unresolved = 0Required conditions to stay in the queue:
base=maindepends-on=Mergifyio/mergify-cli#1615[⛓️ fix(stack): strip raw Rich markup from push rebase narration #1615 [stack]]label!=manual mergetitle ~= ^(fix|feat|docs|style|refactor|perf|test|build|ci|chore|revert|ui)(?:\(.+\))?:#approved-reviews-by>=2author = dependabot[bot]author = mergify-ci-botauthor = renovate[bot]body ~= (?ms:.{48,})#changes-requested-reviews-by = 0#review-requested = 0#review-threads-unresolved = 0check-success=ci-gate