feat(rust): port stack push end-to-end + delete Python push.py by jd · Pull Request #1553 · Mergifyio/mergify-cli

jd · 2026-06-05T07:00:59Z

End-to-end native port of mergify stack push: wires every
leaf module, the orchestrator, and the binary dispatch in one
self-consistent change so mergify stack push works on the
Rust binary and the Python implementation gets deleted in the
same commit.

New mergify-stack modules (each is a faithful port from
mergify_cli/stack/):

change_type — patch-id-based rebase-vs-content
classification + refs/pull/<n>/head fetch helper.
stack_comment — the "this PR is part of a stack" sticky
comment renderer + header recogniser. JSON marker stays
byte-for-byte compatible with historic comments.
replay — git merge-tree + git diff-tree + the HTTP
upload (POST /git/trees + POST /git/commits) that
materialise the rebase-aware revision-history compare URL.
revision_history — the "Revision history" sticky comment
with parse + append + render round-tripping byte-for-byte
against the Python implementation.
approvals — the rebase/no-rebase decision: skip the
rebase when PRs are already approved (so reviews aren't
dismissed) unless the bottom of the stack has a real merge
conflict with trunk.
notes_push — git fetch/git push plumbing for
refs/notes/mergify/stack + the per-PR refspecs that
stack push lands atomically with --force-with-lease.
rebase_log — pure formatters for the three rebase
narration log lines.
push_helpers — format_pull_description (strip
Change-Id + stale Depends-On, append fresh Depends-On) +
build_change_tasks (the per-PR dependency graph).
pr_upsert — per-PR Create (POST /pulls) and Update
(PATCH /pulls/) + orphan branch teardown.
comment_upsert — per-PR sticky-comment upserters: stack
comment (skip-when-single-PR) + revision history (parse +
append + recover-from-corrupt).
plan — the layer above classify that applies the
--next-only / --only-update-existing-pulls overrides
and resolves dest_branch / base_branch.
changes::Action extended with SkipCreate /
SkipNextOnly so the planner can surface
would-be-created PRs without opening any.
commands::push — the end-to-end orchestrator wiring
every leaf above. Runs per-PR upserts sequentially
(typical 2-5 PR stacks make the latency difference
negligible vs. the GitHub round-trip cost, and the
simpler code avoids a tokio::sync::Notify graph).

Binary wiring (crates/mergify-cli/src/main.rs):

NativeCommand::StackPush(StackPushOpts) variant +
StackPushCli clap struct mirroring the Python click
option surface 1:1 (--skip-rebase, --force-rebase,
--next-only, --dry-run, --draft, --keep-pull- request-title-and-body, --author, --trunk,
--branch-prefix, --only-update-existing-pulls,
--no-revision-history, --no-verify).
dispatch_stack "push" arm routing through to
commands::push::run.
("stack", "push") added to NATIVE_COMMANDS.

Python deletion:

mergify_cli/stack/push.py (the orchestrator, 1394 LOC).
mergify_cli/stack/{sync,approvals,replay,changes}.py —
helpers only imported by push.py and its tests.
mergify_cli/tests/stack/test_{push,replay,approvals}.py.
mergify_cli/stack/cli.py — the push command + the
stack_push_mod import. The click group itself stays
so python -m mergify_cli stack keeps printing help
until the package is removed wholesale in the follow-up.

Adds chrono (with clock feature) and tokio (with
time feature) + url to mergify-stack's prod deps to
support the revision-history timestamps, the
mergeable-retry sleep, and the wiremock test base-URL
parse.

End-to-end verified against the Python implementation on
real fixtures (stack-comment + revision-history bodies
match byte-for-byte; planner action overrides match the
Python get_changes semantics including the
--next-only × --only-update-existing-pulls interaction
at idx 0).

Co-Authored-By: Claude Opus 4.7 noreply@anthropic.com

Depends-On: #1527

jd · 2026-06-05T07:01:03Z

This pull request is part of a Mergify stack:

#	Pull Request	Link
1	feat(rust): port stack reorder + stack move to native Rust	#1520
2	feat(rust): port stack squash to native Rust	#1521
3	feat(rust): port stack checkout to native Rust	#1522
4	feat(rust): port stack sync to native Rust	#1523
5	feat(rust): port stack list + stack open to native Rust	#1524
6	feat(rust): port stack hooks + stack setup to native Rust	#1527
7	feat(rust): port stack push end-to-end + delete Python push.py	#1553	👈
8	chore: delete Python tree + simplify wheel/CI for pure-Rust binary	#1554
9	refactor(stack): extract shared git helpers into crate::git	#1555
10	ci(workflows): align smoke-test-binary on python 3.14	#1557

mergify · 2026-06-05T07:01:13Z

jd · 2026-06-05T08:13:10Z

Revision history

#	Type	Changes	Date
1	initial	`0ed6917`	2026-06-05 08:13 UTC
2	rebase	`0ed6917 → 9767f5b` (rebase only)	2026-06-05 08:13 UTC
3	rebase	`9767f5b → bcaa5fa` (rebase only)	2026-06-05 09:38 UTC
4	rebase	`bcaa5fa → f74c92d` (rebase only)	2026-06-05 12:37 UTC

End-to-end native port of `mergify stack push`: wires every leaf module, the orchestrator, and the binary dispatch in one self-consistent change so `mergify stack push` works on the Rust binary and the Python implementation gets deleted in the same commit. New `mergify-stack` modules (each is a faithful port from `mergify_cli/stack/`): - `change_type` — patch-id-based rebase-vs-content classification + `refs/pull/<n>/head` fetch helper. - `stack_comment` — the "this PR is part of a stack" sticky comment renderer + header recogniser. JSON marker stays byte-for-byte compatible with historic comments. - `replay` — `git merge-tree` + `git diff-tree` + the HTTP upload (`POST /git/trees` + `POST /git/commits`) that materialise the rebase-aware revision-history compare URL. - `revision_history` — the "Revision history" sticky comment with parse + append + render round-tripping byte-for-byte against the Python implementation. - `approvals` — the rebase/no-rebase decision: skip the rebase when PRs are already approved (so reviews aren't dismissed) unless the bottom of the stack has a real merge conflict with trunk. - `notes_push` — `git fetch`/`git push` plumbing for `refs/notes/mergify/stack` + the per-PR refspecs that `stack push` lands atomically with `--force-with-lease`. - `rebase_log` — pure formatters for the three rebase narration log lines. - `push_helpers` — `format_pull_description` (strip Change-Id + stale Depends-On, append fresh Depends-On) + `build_change_tasks` (the per-PR dependency graph). - `pr_upsert` — per-PR Create (POST /pulls) and Update (PATCH /pulls/<n>) + orphan branch teardown. - `comment_upsert` — per-PR sticky-comment upserters: stack comment (skip-when-single-PR) + revision history (parse + append + recover-from-corrupt). - `plan` — the layer above `classify` that applies the `--next-only` / `--only-update-existing-pulls` overrides and resolves `dest_branch` / `base_branch`. - `changes::Action` extended with `SkipCreate` / `SkipNextOnly` so the planner can surface would-be-created PRs without opening any. - `commands::push` — the end-to-end orchestrator wiring every leaf above. Runs per-PR upserts sequentially (typical 2-5 PR stacks make the latency difference negligible vs. the GitHub round-trip cost, and the simpler code avoids a `tokio::sync::Notify` graph). Binary wiring (`crates/mergify-cli/src/main.rs`): - `NativeCommand::StackPush(StackPushOpts)` variant + `StackPushCli` clap struct mirroring the Python click option surface 1:1 (`--skip-rebase`, `--force-rebase`, `--next-only`, `--dry-run`, `--draft`, `--keep-pull- request-title-and-body`, `--author`, `--trunk`, `--branch-prefix`, `--only-update-existing-pulls`, `--no-revision-history`, `--no-verify`). - `dispatch_stack` "push" arm routing through to `commands::push::run`. - `("stack", "push")` added to `NATIVE_COMMANDS`. Python deletion: - `mergify_cli/stack/push.py` (the orchestrator, 1394 LOC). - `mergify_cli/stack/{sync,approvals,replay,changes}.py` — helpers only imported by push.py and its tests. - `mergify_cli/tests/stack/test_{push,replay,approvals}.py`. - `mergify_cli/stack/cli.py` — the `push` command + the `stack_push_mod` import. The click group itself stays so `python -m mergify_cli stack` keeps printing help until the package is removed wholesale in the follow-up. Adds `chrono` (with `clock` feature) and `tokio` (with `time` feature) + `url` to `mergify-stack`'s prod deps to support the revision-history timestamps, the mergeable-retry sleep, and the wiremock test base-URL parse. End-to-end verified against the Python implementation on real fixtures (stack-comment + revision-history bodies match byte-for-byte; planner action overrides match the Python `get_changes` semantics including the `--next-only` × `--only-update-existing-pulls` interaction at idx 0). Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> Change-Id: I1b2c30509153a19071cf495155a03e9a2e616e87

mergify Bot had a problem deploying to Mergify Merge Protections June 5, 2026 07:01 Failure

jd mentioned this pull request Jun 5, 2026

chore: delete Python tree + simplify wheel/CI for pure-Rust binary #1554

Open

jd temporarily deployed to func-tests-live June 5, 2026 07:01 — with GitHub Actions Inactive

jd mentioned this pull request Jun 5, 2026

feat(rust): port stack push end-to-end + delete Python push.py #1551

Closed

mergify Bot requested a review from a team June 5, 2026 07:10

jd marked this pull request as ready for review June 5, 2026 07:41

jd force-pushed the devs/jd/feat/rust-stack-new/port-stack-hooks-stack-setup-native-rust--12f4b4af branch from e5c33cc to d2bd9e8 Compare June 5, 2026 08:13

jd force-pushed the devs/jd/feat/rust-stack-new/port-stack-push-end-end-delete-python-push-py--1b2c3050 branch from 0ed6917 to 9767f5b Compare June 5, 2026 08:13

jd temporarily deployed to func-tests-live June 5, 2026 08:13 — with GitHub Actions Inactive

jd mentioned this pull request Jun 5, 2026

refactor(stack): extract shared git helpers into crate::git #1555

Open

mergify Bot had a problem deploying to Mergify Merge Protections June 5, 2026 08:13 Failure

jd force-pushed the devs/jd/feat/rust-stack-new/port-stack-push-end-end-delete-python-push-py--1b2c3050 branch from 9767f5b to bcaa5fa Compare June 5, 2026 09:38

jd force-pushed the devs/jd/feat/rust-stack-new/port-stack-hooks-stack-setup-native-rust--12f4b4af branch from d2bd9e8 to 291e013 Compare June 5, 2026 09:38

jd temporarily deployed to func-tests-live June 5, 2026 09:38 — with GitHub Actions Inactive

mergify Bot had a problem deploying to Mergify Merge Protections June 5, 2026 09:39 Failure

jd mentioned this pull request Jun 5, 2026

ci(workflows): align smoke-test-binary on python 3.14 #1557

Open

jd force-pushed the devs/jd/feat/rust-stack-new/port-stack-push-end-end-delete-python-push-py--1b2c3050 branch from bcaa5fa to f74c92d Compare June 5, 2026 12:37

jd temporarily deployed to func-tests-live June 5, 2026 12:37 — with GitHub Actions Inactive

mergify Bot had a problem deploying to Mergify Merge Protections June 5, 2026 12:37 Failure

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(rust): port stack push end-to-end + delete Python push.py#1553

feat(rust): port stack push end-to-end + delete Python push.py#1553
jd wants to merge 1 commit into
devs/jd/feat/rust-stack-new/port-stack-hooks-stack-setup-native-rust--12f4b4affrom
devs/jd/feat/rust-stack-new/port-stack-push-end-end-delete-python-push-py--1b2c3050

jd commented Jun 5, 2026

Uh oh!

jd commented Jun 5, 2026 •

edited

Loading

Uh oh!

mergify Bot commented Jun 5, 2026 •

edited

Loading

Uh oh!

jd commented Jun 5, 2026 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

1 participant

Conversation

jd commented Jun 5, 2026

Uh oh!

jd commented Jun 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mergify Bot commented Jun 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Merge Protections

🔴 ⛓️ Depends-On Requirements

🔴 👀 Review Requirements

🔴 🔎 Reviews

🟢 🤖 Continuous Integration

🟢 Enforce conventional commit

🟢 📕 PR description

Uh oh!

jd commented Jun 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Revision history

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

1 participant

jd commented Jun 5, 2026 •

edited

Loading

mergify Bot commented Jun 5, 2026 •

edited

Loading

jd commented Jun 5, 2026 •

edited

Loading