Skip to content

fix(stack): restore push summary and capture git push output#1614

Merged
mergify[bot] merged 1 commit into
mainfrom
devs/JulianMaurin/fix/stack-push-output/restore-push-summary-capture-git-push-output--c1a22ea2
Jun 17, 2026
Merged

fix(stack): restore push summary and capture git push output#1614
mergify[bot] merged 1 commit into
mainfrom
devs/JulianMaurin/fix/stack-push-output/restore-push-summary-capture-git-push-output--c1a22ea2

Conversation

@JulianMaurin

Copy link
Copy Markdown
Contributor

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

Copilot AI review requested due to automatic review settings June 16, 2026 15:39
@mergify mergify Bot had a problem deploying to Mergify Merge Protections June 16, 2026 15:39 Failure
@mergify

mergify Bot commented Jun 16, 2026

Copy link
Copy Markdown
Contributor

Merge Protections

🟢 All 5 merge protections satisfied — ready to merge.

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Restores stack push user-facing output parity by reintroducing the plan preview and per-PR outcome/orphan-deletion summaries, and reduces noisy git push narration by capturing its output and only surfacing stderr on failure.

Changes:

  • Capture git push output in push_branches and include stderr only when the push fails.
  • Add a plan preview (including dry-run) and append per-PR outcome lines after upsert, plus orphan-deletion lines.
  • Introduce plain-text change/orphan log formatters with unit tests.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 11 comments.

File Description
crates/mergify-stack/src/notes_push.rs Capture git push output instead of inheriting stdio; include stderr on failure only.
crates/mergify-stack/src/commands/push.rs Emit plan preview and restore post-upsert per-PR summary + orphan-deletion log lines.
crates/mergify-stack/src/changes.rs Add plain-text log formatters for local/orphan changes and unit tests for expected output.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread crates/mergify-stack/src/changes.rs
Comment thread crates/mergify-stack/src/changes.rs
Comment thread crates/mergify-stack/src/changes.rs
Comment thread crates/mergify-stack/src/changes.rs
Comment thread crates/mergify-stack/src/changes.rs
Comment thread crates/mergify-stack/src/changes.rs
Comment thread crates/mergify-stack/src/commands/push.rs
Comment thread crates/mergify-stack/src/commands/push.rs
Comment thread crates/mergify-stack/src/changes.rs
Comment thread crates/mergify-stack/src/commands/push.rs
@JulianMaurin JulianMaurin force-pushed the devs/JulianMaurin/fix/stack-push-output/restore-push-summary-capture-git-push-output--c1a22ea2 branch from bb98d3f to d67e94f Compare June 16, 2026 17:37
@JulianMaurin

JulianMaurin commented Jun 16, 2026

Copy link
Copy Markdown
Contributor Author

Revision history

# Type Changes Reason Date
1 initial bb98d3f 2026-06-16 17:37 UTC
2 content bb98d3f → d67e94f (raw) Address review: missing html_url now falls back to instead of an empty string (trailing-space/empty-URL). 2026-06-16 17:37 UTC
3 content d67e94f → 6b9797e (raw) cargo fmt: wrap the orphan-formatter title binding (CI fmt gate). 2026-06-16 18:24 UTC

@mergify mergify Bot had a problem deploying to Mergify Merge Protections June 16, 2026 17:37 Failure
`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
@JulianMaurin JulianMaurin force-pushed the devs/JulianMaurin/fix/stack-push-output/restore-push-summary-capture-git-push-output--c1a22ea2 branch from d67e94f to 6b9797e Compare June 16, 2026 18:24
@mergify mergify Bot deployed to Mergify Merge Protections June 16, 2026 18:24 Active
@mergify mergify Bot requested a review from a team June 16, 2026 18:29
@JulianMaurin

Copy link
Copy Markdown
Contributor Author

This pull request is part of a Mergify stack:

# Pull Request Link
1 fix(stack): restore push summary and capture git push output #1614 👈
2 fix(stack): strip raw Rich markup from push rebase narration #1615
3 fix(stack): preserve rebase-conflict recovery guidance and exit code #1616
4 fix(stack): restore full-stack action-plan previews #1617
5 fix(stack): restore prefix-match error detail and not-found exit codes #1618
6 fix(core): surface API error detail and the failing endpoint URL #1619
7 fix(ci,queue,stack): restore minor output details lost in the port #1620

@mergify

mergify Bot commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

Queued — the merge queue status continues in this comment ↓.

@mergify

mergify Bot commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

Merge Queue Status

This pull request spent 6 minutes 12 seconds in the queue, including 5 minutes 44 seconds running CI.

Required conditions to merge

mergify Bot added a commit that referenced this pull request Jun 17, 2026
@mergify mergify Bot added the queued label Jun 17, 2026
@mergify mergify Bot merged commit b2529cf into main Jun 17, 2026
34 checks passed
@mergify mergify Bot deleted the devs/JulianMaurin/fix/stack-push-output/restore-push-summary-capture-git-push-output--c1a22ea2 branch June 17, 2026 07:26
@mergify mergify Bot removed the queued label Jun 17, 2026
mergify Bot pushed a commit that referenced this pull request Jun 17, 2026
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>

Depends-On: #1614
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

4 participants