fix(stack): preserve rebase-conflict recovery guidance and exit code#1616
Merged
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
JulianMaurin
temporarily deployed
to
func-tests-live
GitHub Actions
Inactive
Contributor
Author
|
This pull request is part of a Mergify stack:
|
This was referenced Jun 16, 2026
Contributor
Merge Protections🟢 All 6 merge protections satisfied — ready to merge. |
jd
previously approved these changes
Jun 17, 2026
kozlek
previously approved these changes
Jun 17, 2026
Contributor
|
Queued — the merge queue status continues in this comment ↓. |
Contributor
Merge Queue Status
|
Contributor
Merge Queue Status
This pull request spent 6 minutes 28 seconds in the queue, including 5 minutes 55 seconds running CI. Waiting for
All conditions
ReasonPull request #1616 has been dequeued merge conditions no longer match. Blocked by:
HintYou should look at the reason for the failure and decide if the pull request needs to be fixed or if you want to requeue it. Requeued — the merge queue status continues in this comment ↓. |
38 tasks
Base automatically changed from
devs/JulianMaurin/fix/stack-push-output/strip-raw-rich-markup-push-rebase-narration--3b8c1ed7
to
main
June 17, 2026 07:38
mergify
Bot
dismissed stale reviews from kozlek and jd
The base branch was changed.
36 tasks
remyduthu
approved these changes
Jun 17, 2026
kozlek
approved these changes
Jun 17, 2026
Contributor
Author
|
@Mergifyio queue |
Contributor
Merge Queue Status
This pull request spent 7 minutes 2 seconds in the queue, including 5 minutes 39 seconds running CI. Required conditions to merge
|
38 tasks
38 tasks
mergify Bot
pushed a commit
that referenced
this pull request
Jun 17, 2026
drop/squash/fixup/reword/reorder/move printed only the affected commits, only on --dry-run, and dropped the Change-Id and per-commit action tags; real runs printed ad-hoc per-commit lines with no plan. Python printed the whole stack — numbered, with Change-Id and action tags — unconditionally on both dry-run and real runs. Add a shared plan_display::render_plan mirroring Python's display_plan/display_action_plan, have each command's Outcome carry the full base..HEAD stack as PlanRow values (with Change-Id and the per-commit action), and render it on both paths followed by the existing success/dry-run footer. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Depends-On: #1616
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
4 participants
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.
A failed
git rebase -iin spawn_rebase returned a generic "exited " 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
Depends-On: #1615