fix(cli): surface clap's --help instead of erroring on native subcommands#1380
Merged
mergify[bot] merged 1 commit intoMay 11, 2026
Conversation
Member
Author
|
This pull request is part of a Mergify stack:
|
This was referenced May 6, 2026
Contributor
Merge ProtectionsYour pull request matches the following merge protections and will not be merged until they are valid. 🟢 🤖 Continuous IntegrationWonderful, this rule succeeded.
🟢 👀 Review RequirementsWonderful, this rule succeeded.
🟢 Enforce conventional commitWonderful, this rule succeeded.Make sure that we follow https://www.conventionalcommits.org/en/v1.0.0/
🟢 🔎 ReviewsWonderful, this rule succeeded.
🟢 📕 PR descriptionWonderful, this rule succeeded.
|
jd
force-pushed
the
devs/jd/worktree-rust-port/extract-reusable-terminal-ui-primitives-mergify--bbdbce1e
branch
from
bd4d24c to
3697e5a
Compare
jd
force-pushed
the
devs/jd/worktree-rust-port/surface-clap-s-help-instead-erroring-native--2922aa2d
branch
from
fef89f9 to
aa9b1b2
Compare
Member
Author
Revision history
|
jd
changed the base branch from
devs/jd/worktree-rust-port/extract-reusable-terminal-ui-primitives-mergify--bbdbce1e
to
main
jd
force-pushed
the
devs/jd/worktree-rust-port/surface-clap-s-help-instead-erroring-native--2922aa2d
branch
from
aa9b1b2 to
544e9b2
Compare
…ands Reported by user: ``mergify queue status --help`` rejected the flag with ``error: unexpected argument '--help' found``. Root cause: ``CliRoot`` had ``disable_help_flag = true``, so clap's auto-generated ``--help`` machinery wasn't wired up — and our ``detect_native`` then surfaced the resulting parser error (because ``looks_native`` matched) instead of falling through. Three changes: 1. Drop ``disable_help_flag = true`` from ``CliRoot``. clap now auto-recognizes ``-h`` / ``--help`` at every level and generates its standard help blurb listing flags + subcommands. 2. ``detect_native`` catches the special help-error kinds (``DisplayHelp`` and ``DisplayHelpOnMissingArgumentOrSubcommand``) explicitly and calls ``err.exit()`` regardless of the ``looks_native`` heuristic. ``err.exit()`` prints help to stdout and calls ``process::exit(0)``. The previous flow also called ``err.exit()`` on parser errors when ``looks_native``, but it only fired when the argv contained a (group, subcommand) pair — root-level ``mergify --help`` had no such pair so it would have leaked to the Python shim. 3. Honor ``MERGIFY_CLI_TESTING_UTF8_MODE`` from the Rust binary. ``test_binary_build.py`` runs ``mergify --help`` against the wheel-installed binary to verify UTF-8 emoji output works (particularly on Windows). The marker used to be printed by ``mergify_cli/cli.py::main``, but now that ``--help`` is handled natively the Python path no longer fires. Mirror the marker from the Rust binary: the binary is UTF-8 native on every platform (no ``os.execv`` re-exec needed), so report ``utf8_mode=1`` on Windows (matching the post-re-exec value the test expects) and ``utf8_mode=0`` elsewhere. Verified locally: - ``mergify --help`` lists the three native top-level groups (``config`` / ``ci`` / ``queue``). - ``mergify queue --help`` lists the native queue subcommands (``pause`` / ``unpause`` / ``status``). - ``mergify queue status --help`` shows ``--branch`` / ``--json`` / ``--token`` / ``--api-url`` / ``--repository`` with their doc-strings. - ``MERGIFY_CLI_TESTING_UTF8_MODE=1 mergify --help`` prints ``utf8_mode=0`` and ``✅`` before the help text. Known follow-up: ``mergify queue --help`` doesn't list ``show`` because it's still shimmed (no clap variant). Fixable by registering opaque clap stubs for shimmed commands; deferred to the PR that ports ``queue show``. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Change-Id: I2922aa2d83af6c99cb551f2a95bf5a4959832375
jd
force-pushed
the
devs/jd/worktree-rust-port/surface-clap-s-help-instead-erroring-native--2922aa2d
branch
from
544e9b2 to
cbcac36
Compare
JulianMaurin
approved these changes
May 11, 2026
kozlek
approved these changes
May 11, 2026
Contributor
Merge Queue Status
This pull request spent 14 minutes 37 seconds in the queue, including 14 minutes 14 seconds running CI. Required conditions to merge
|
36 tasks
mergify
Bot
deleted the
devs/jd/worktree-rust-port/surface-clap-s-help-instead-erroring-native--2922aa2d
branch
jd
added a commit
that referenced
this pull request
May 11, 2026
The Rust binary now serves ``mergify queue show <PR_NUMBER>`` natively. The Python implementation (``mergify_cli/queue/cli.py:show`` plus the eight rendering helpers it depended on, plus ``mergify_cli/queue/api.py``) is removed in the same PR — the port-and-delete rule keeps a single live copy of every command. This is the last command in the ``queue`` group, so the whole ``mergify_cli/queue/`` Python package goes away. Closes the gap noted in #1380's commit message: ``mergify queue --help`` now lists ``show`` alongside ``pause`` / ``unpause`` / ``status``. ``mergify queue show <PR_NUMBER> [-v] [--json] [-r REPO] [-t TOKEN] [-u URL]``: 1. Resolves repository / token / API URL via the shared ``mergify_core::auth`` resolver. 2. Fetches ``GET /v1/repos/<repo>/merge-queue/pull/<pr_number>`` through the new ``HttpClient::get_if_exists`` helper. On 404 the command exits with ``MERGIFY_API_ERROR`` and the message ``PR #<n> is not in the merge queue``, matching the Python implementation. Other 4xx/5xx surface as normal API errors. 3. With ``--json``: pretty-prints the raw response. Schema is the Mergify API contract, so unknown fields survive verbatim. 4. Without ``--json``: renders the metadata block (position / priority / queue rule / queued / ETA), then a CI-state line and a checks section, then a conditions section. ``--verbose`` switches the checks summary to a full table and the conditions summary to a tree (``├── └── │ ``) instead of the compact ``N/M met`` summary with bullet-listed failures. New plumbing in ``mergify-core::http``: - ``Client::get_if_exists<T>(&path) -> Result<Option<T>, _>`` — GET that returns ``None`` on 404. Mirrors ``delete_if_exists`` for read-only endpoints where "not found" is a meaningful caller branch rather than a server failure. Reuses the same retry policy, bearer-auth injection, and flavor-aware error mapping as ``get`` / ``post`` / ``put``. Tests: - 7 new unit tests in ``crates/mergify-queue/src/show.rs``: compact metadata + checks summary + failing-conditions block; verbose checks table + conditions tree; JSON passthrough with a synthetic ``future_field`` to verify unknown fields survive; 404 → ``MergifyApi`` error with the right message; missing ``mergeability_check`` falls through to "Waiting for mergeability check..."; condition-group summarization (two labels joined with ``or``; truncation at 3+ labels); aggregator recursion (``any of`` / ``all of`` / ``not`` falls through to the first leaf). Wiring: - ``crates/mergify-cli/src/main.rs``: adds ``Show(ShowCliArgs)`` to ``QueueSubcommand``, dispatch to ``mergify_queue::show::run``. Adds ``("queue", "show")`` to ``NATIVE_COMMANDS``. ``ShowCliArgs`` carries the positional ``pr_number: u64`` plus ``--verbose`` and ``--json`` flags. Python deletions: - ``mergify_cli/queue/__init__.py`` / ``cli.py`` / ``api.py``: removed entirely. The whole package goes away — all four ``queue`` subcommands are now Rust-native. - ``mergify_cli/cli.py``: drops the ``from mergify_cli.queue import cli as queue_cli_mod`` import and the ``cli.add_command(queue_cli_mod.queue)`` call. - ``mergify_cli/tests/queue/test_cli.py``: deleted entirely (it only covered ``_relative_time``, which lives in ``mergify-tui::time`` now). - ``mergify_cli/tests/queue/test_show.py``: deleted entirely. - ``mergify_cli/tests/queue/test_skill.py``: drops the click import; the skill-reference check now consults the binary alone (no parallel click-command list to merge). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Change-Id: I6c265303a37642529dbbcef6f255eb429407a1d2
jd
added a commit
that referenced
this pull request
May 11, 2026
The Rust binary now serves ``mergify queue show <PR_NUMBER>`` natively. The Python implementation (``mergify_cli/queue/cli.py:show`` plus the eight rendering helpers it depended on, plus ``mergify_cli/queue/api.py``) is removed in the same PR — the port-and-delete rule keeps a single live copy of every command. This is the last command in the ``queue`` group, so the whole ``mergify_cli/queue/`` Python package goes away. Closes the gap noted in #1380's commit message: ``mergify queue --help`` now lists ``show`` alongside ``pause`` / ``unpause`` / ``status``. ``mergify queue show <PR_NUMBER> [-v] [--json] [-r REPO] [-t TOKEN] [-u URL]``: 1. Resolves repository / token / API URL via the shared ``mergify_core::auth`` resolver. 2. Fetches ``GET /v1/repos/<repo>/merge-queue/pull/<pr_number>`` through the new ``HttpClient::get_if_exists`` helper. On 404 the command exits with ``MERGIFY_API_ERROR`` and the message ``PR #<n> is not in the merge queue``, matching the Python implementation. Other 4xx/5xx surface as normal API errors. 3. With ``--json``: pretty-prints the raw response. Schema is the Mergify API contract, so unknown fields survive verbatim. 4. Without ``--json``: renders the metadata block (position / priority / queue rule / queued / ETA), then a CI-state line and a checks section, then a conditions section. ``--verbose`` switches the checks summary to a full table and the conditions summary to a tree (``├── └── │ ``) instead of the compact ``N/M met`` summary with bullet-listed failures. New plumbing in ``mergify-core::http``: - ``Client::get_if_exists<T>(&path) -> Result<Option<T>, _>`` — GET that returns ``None`` on 404. Mirrors ``delete_if_exists`` for read-only endpoints where "not found" is a meaningful caller branch rather than a server failure. Reuses the same retry policy, bearer-auth injection, and flavor-aware error mapping as ``get`` / ``post`` / ``put``. Tests: - 7 new unit tests in ``crates/mergify-queue/src/show.rs``: compact metadata + checks summary + failing-conditions block; verbose checks table + conditions tree; JSON passthrough with a synthetic ``future_field`` to verify unknown fields survive; 404 → ``MergifyApi`` error with the right message; missing ``mergeability_check`` falls through to "Waiting for mergeability check..."; condition-group summarization (two labels joined with ``or``; truncation at 3+ labels); aggregator recursion (``any of`` / ``all of`` / ``not`` falls through to the first leaf). Wiring: - ``crates/mergify-cli/src/main.rs``: adds ``Show(ShowCliArgs)`` to ``QueueSubcommand``, dispatch to ``mergify_queue::show::run``. Adds ``("queue", "show")`` to ``NATIVE_COMMANDS``. ``ShowCliArgs`` carries the positional ``pr_number: u64`` plus ``--verbose`` and ``--json`` flags. Python deletions: - ``mergify_cli/queue/__init__.py`` / ``cli.py`` / ``api.py``: removed entirely. The whole package goes away — all four ``queue`` subcommands are now Rust-native. - ``mergify_cli/cli.py``: drops the ``from mergify_cli.queue import cli as queue_cli_mod`` import and the ``cli.add_command(queue_cli_mod.queue)`` call. - ``mergify_cli/tests/queue/test_cli.py``: deleted entirely (it only covered ``_relative_time``, which lives in ``mergify-tui::time`` now). - ``mergify_cli/tests/queue/test_show.py``: deleted entirely. - ``mergify_cli/tests/queue/test_skill.py``: drops the click import; the skill-reference check now consults the binary alone (no parallel click-command list to merge). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Change-Id: I6c265303a37642529dbbcef6f255eb429407a1d2
jd
added a commit
that referenced
this pull request
May 11, 2026
The Rust binary now serves ``mergify queue show <PR_NUMBER>`` natively. The Python implementation (``mergify_cli/queue/cli.py:show`` plus the eight rendering helpers it depended on, plus ``mergify_cli/queue/api.py``) is removed in the same PR — the port-and-delete rule keeps a single live copy of every command. This is the last command in the ``queue`` group, so the whole ``mergify_cli/queue/`` Python package goes away. Closes the gap noted in #1380's commit message: ``mergify queue --help`` now lists ``show`` alongside ``pause`` / ``unpause`` / ``status``. ``mergify queue show <PR_NUMBER> [-v] [--json] [-r REPO] [-t TOKEN] [-u URL]``: 1. Resolves repository / token / API URL via the shared ``mergify_core::auth`` resolver. 2. Fetches ``GET /v1/repos/<repo>/merge-queue/pull/<pr_number>`` through the new ``HttpClient::get_if_exists`` helper. On 404 the command exits with ``MERGIFY_API_ERROR`` and the message ``PR #<n> is not in the merge queue``, matching the Python implementation. Other 4xx/5xx surface as normal API errors. 3. With ``--json``: pretty-prints the raw response. Schema is the Mergify API contract, so unknown fields survive verbatim. 4. Without ``--json``: renders the metadata block (position / priority / queue rule / queued / ETA), then a CI-state line and a checks section, then a conditions section. ``--verbose`` switches the checks summary to a full table and the conditions summary to a tree (``├── └── │ ``) instead of the compact ``N/M met`` summary with bullet-listed failures. New plumbing in ``mergify-core::http``: - ``Client::get_if_exists<T>(&path) -> Result<Option<T>, _>`` — GET that returns ``None`` on 404. Mirrors ``delete_if_exists`` for read-only endpoints where "not found" is a meaningful caller branch rather than a server failure. Reuses the same retry policy, bearer-auth injection, and flavor-aware error mapping as ``get`` / ``post`` / ``put``. Tests: - 7 new unit tests in ``crates/mergify-queue/src/show.rs``: compact metadata + checks summary + failing-conditions block; verbose checks table + conditions tree; JSON passthrough with a synthetic ``future_field`` to verify unknown fields survive; 404 → ``MergifyApi`` error with the right message; missing ``mergeability_check`` falls through to "Waiting for mergeability check..."; condition-group summarization (two labels joined with ``or``; truncation at 3+ labels); aggregator recursion (``any of`` / ``all of`` / ``not`` falls through to the first leaf). Wiring: - ``crates/mergify-cli/src/main.rs``: adds ``Show(ShowCliArgs)`` to ``QueueSubcommand``, dispatch to ``mergify_queue::show::run``. Adds ``("queue", "show")`` to ``NATIVE_COMMANDS``. ``ShowCliArgs`` carries the positional ``pr_number: u64`` plus ``--verbose`` and ``--json`` flags. Python deletions: - ``mergify_cli/queue/__init__.py`` / ``cli.py`` / ``api.py``: removed entirely. The whole package goes away — all four ``queue`` subcommands are now Rust-native. - ``mergify_cli/cli.py``: drops the ``from mergify_cli.queue import cli as queue_cli_mod`` import and the ``cli.add_command(queue_cli_mod.queue)`` call. - ``mergify_cli/tests/queue/test_cli.py``: deleted entirely (it only covered ``_relative_time``, which lives in ``mergify-tui::time`` now). - ``mergify_cli/tests/queue/test_show.py``: deleted entirely. - ``mergify_cli/tests/queue/test_skill.py``: drops the click import; the skill-reference check now consults the binary alone (no parallel click-command list to merge). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Change-Id: I6c265303a37642529dbbcef6f255eb429407a1d2
jd
added a commit
that referenced
this pull request
May 11, 2026
The Rust binary now serves ``mergify queue show <PR_NUMBER>`` natively. The Python implementation (``mergify_cli/queue/cli.py:show`` plus the eight rendering helpers it depended on, plus ``mergify_cli/queue/api.py``) is removed in the same PR — the port-and-delete rule keeps a single live copy of every command. This is the last command in the ``queue`` group, so the whole ``mergify_cli/queue/`` Python package goes away. Closes the gap noted in #1380's commit message: ``mergify queue --help`` now lists ``show`` alongside ``pause`` / ``unpause`` / ``status``. ``mergify queue show <PR_NUMBER> [-v] [--json] [-r REPO] [-t TOKEN] [-u URL]``: 1. Resolves repository / token / API URL via the shared ``mergify_core::auth`` resolver. 2. Fetches ``GET /v1/repos/<repo>/merge-queue/pull/<pr_number>`` through the new ``HttpClient::get_if_exists`` helper. On 404 the command exits with ``MERGIFY_API_ERROR`` and the message ``PR #<n> is not in the merge queue``, matching the Python implementation. Other 4xx/5xx surface as normal API errors. 3. With ``--json``: pretty-prints the raw response. Schema is the Mergify API contract, so unknown fields survive verbatim. 4. Without ``--json``: renders the metadata block (position / priority / queue rule / queued / ETA), then a CI-state line and a checks section, then a conditions section. ``--verbose`` switches the checks summary to a full table and the conditions summary to a tree (``├── └── │ ``) instead of the compact ``N/M met`` summary with bullet-listed failures. New plumbing in ``mergify-core::http``: - ``Client::get_if_exists<T>(&path) -> Result<Option<T>, _>`` — GET that returns ``None`` on 404. Mirrors ``delete_if_exists`` for read-only endpoints where "not found" is a meaningful caller branch rather than a server failure. Reuses the same retry policy, bearer-auth injection, and flavor-aware error mapping as ``get`` / ``post`` / ``put``. Tests: - 7 new unit tests in ``crates/mergify-queue/src/show.rs``: compact metadata + checks summary + failing-conditions block; verbose checks table + conditions tree; JSON passthrough with a synthetic ``future_field`` to verify unknown fields survive; 404 → ``MergifyApi`` error with the right message; missing ``mergeability_check`` falls through to "Waiting for mergeability check..."; condition-group summarization (two labels joined with ``or``; truncation at 3+ labels); aggregator recursion (``any of`` / ``all of`` / ``not`` falls through to the first leaf). Wiring: - ``crates/mergify-cli/src/main.rs``: adds ``Show(ShowCliArgs)`` to ``QueueSubcommand``, dispatch to ``mergify_queue::show::run``. Adds ``("queue", "show")`` to ``NATIVE_COMMANDS``. ``ShowCliArgs`` carries the positional ``pr_number: u64`` plus ``--verbose`` and ``--json`` flags. Python deletions: - ``mergify_cli/queue/__init__.py`` / ``cli.py`` / ``api.py``: removed entirely. The whole package goes away — all four ``queue`` subcommands are now Rust-native. - ``mergify_cli/cli.py``: drops the ``from mergify_cli.queue import cli as queue_cli_mod`` import and the ``cli.add_command(queue_cli_mod.queue)`` call. - ``mergify_cli/tests/queue/test_cli.py``: deleted entirely (it only covered ``_relative_time``, which lives in ``mergify-tui::time`` now). - ``mergify_cli/tests/queue/test_show.py``: deleted entirely. - ``mergify_cli/tests/queue/test_skill.py``: drops the click import; the skill-reference check now consults the binary alone (no parallel click-command list to merge). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Change-Id: I6c265303a37642529dbbcef6f255eb429407a1d2
jd
added a commit
that referenced
this pull request
May 11, 2026
The Rust binary now serves ``mergify queue show <PR_NUMBER>`` natively. The Python implementation (``mergify_cli/queue/cli.py:show`` plus the eight rendering helpers it depended on, plus ``mergify_cli/queue/api.py``) is removed in the same PR — the port-and-delete rule keeps a single live copy of every command. This is the last command in the ``queue`` group, so the whole ``mergify_cli/queue/`` Python package goes away. Closes the gap noted in #1380's commit message: ``mergify queue --help`` now lists ``show`` alongside ``pause`` / ``unpause`` / ``status``. ``mergify queue show <PR_NUMBER> [-v] [--json] [-r REPO] [-t TOKEN] [-u URL]``: 1. Resolves repository / token / API URL via the shared ``mergify_core::auth`` resolver. 2. Fetches ``GET /v1/repos/<repo>/merge-queue/pull/<pr_number>`` through the new ``HttpClient::get_if_exists`` helper. On 404 the command exits with ``MERGIFY_API_ERROR`` and the message ``PR #<n> is not in the merge queue``, matching the Python implementation. Other 4xx/5xx surface as normal API errors. 3. With ``--json``: pretty-prints the raw response. Schema is the Mergify API contract, so unknown fields survive verbatim. 4. Without ``--json``: renders the metadata block (position / priority / queue rule / queued / ETA), then a CI-state line and a checks section, then a conditions section. ``--verbose`` switches the checks summary to a full table and the conditions summary to a tree (``├── └── │ ``) instead of the compact ``N/M met`` summary with bullet-listed failures. New plumbing in ``mergify-core::http``: - ``Client::get_if_exists<T>(&path) -> Result<Option<T>, _>`` — GET that returns ``None`` on 404. Mirrors ``delete_if_exists`` for read-only endpoints where "not found" is a meaningful caller branch rather than a server failure. Reuses the same retry policy, bearer-auth injection, and flavor-aware error mapping as ``get`` / ``post`` / ``put``. Tests: - 7 new unit tests in ``crates/mergify-queue/src/show.rs``: compact metadata + checks summary + failing-conditions block; verbose checks table + conditions tree; JSON passthrough with a synthetic ``future_field`` to verify unknown fields survive; 404 → ``MergifyApi`` error with the right message; missing ``mergeability_check`` falls through to "Waiting for mergeability check..."; condition-group summarization (two labels joined with ``or``; truncation at 3+ labels); aggregator recursion (``any of`` / ``all of`` / ``not`` falls through to the first leaf). Wiring: - ``crates/mergify-cli/src/main.rs``: adds ``Show(ShowCliArgs)`` to ``QueueSubcommand``, dispatch to ``mergify_queue::show::run``. Adds ``("queue", "show")`` to ``NATIVE_COMMANDS``. ``ShowCliArgs`` carries the positional ``pr_number: u64`` plus ``--verbose`` and ``--json`` flags. Python deletions: - ``mergify_cli/queue/__init__.py`` / ``cli.py`` / ``api.py``: removed entirely. The whole package goes away — all four ``queue`` subcommands are now Rust-native. - ``mergify_cli/cli.py``: drops the ``from mergify_cli.queue import cli as queue_cli_mod`` import and the ``cli.add_command(queue_cli_mod.queue)`` call. - ``mergify_cli/tests/queue/test_cli.py``: deleted entirely (it only covered ``_relative_time``, which lives in ``mergify-tui::time`` now). - ``mergify_cli/tests/queue/test_show.py``: deleted entirely. - ``mergify_cli/tests/queue/test_skill.py``: drops the click import; the skill-reference check now consults the binary alone (no parallel click-command list to merge). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Change-Id: I6c265303a37642529dbbcef6f255eb429407a1d2
jd
added a commit
that referenced
this pull request
May 11, 2026
The Rust binary now serves ``mergify queue show <PR_NUMBER>`` natively. The Python implementation (``mergify_cli/queue/cli.py:show`` plus the eight rendering helpers it depended on, plus ``mergify_cli/queue/api.py``) is removed in the same PR — the port-and-delete rule keeps a single live copy of every command. This is the last command in the ``queue`` group, so the whole ``mergify_cli/queue/`` Python package goes away. Closes the gap noted in #1380's commit message: ``mergify queue --help`` now lists ``show`` alongside ``pause`` / ``unpause`` / ``status``. ``mergify queue show <PR_NUMBER> [-v] [--json] [-r REPO] [-t TOKEN] [-u URL]``: 1. Resolves repository / token / API URL via the shared ``mergify_core::auth`` resolver. 2. Fetches ``GET /v1/repos/<repo>/merge-queue/pull/<pr_number>`` through the new ``HttpClient::get_if_exists`` helper. On 404 the command exits with ``MERGIFY_API_ERROR`` and the message ``PR #<n> is not in the merge queue``, matching the Python implementation. Other 4xx/5xx surface as normal API errors. 3. With ``--json``: pretty-prints the raw response. Schema is the Mergify API contract, so unknown fields survive verbatim. 4. Without ``--json``: renders the metadata block (position / priority / queue rule / queued / ETA), then a CI-state line and a checks section, then a conditions section. ``--verbose`` switches the checks summary to a full table and the conditions summary to a tree (``├── └── │ ``) instead of the compact ``N/M met`` summary with bullet-listed failures. New plumbing in ``mergify-core::http``: - ``Client::get_if_exists<T>(&path) -> Result<Option<T>, _>`` — GET that returns ``None`` on 404. Mirrors ``delete_if_exists`` for read-only endpoints where "not found" is a meaningful caller branch rather than a server failure. Reuses the same retry policy, bearer-auth injection, and flavor-aware error mapping as ``get`` / ``post`` / ``put``. Tests: - 7 new unit tests in ``crates/mergify-queue/src/show.rs``: compact metadata + checks summary + failing-conditions block; verbose checks table + conditions tree; JSON passthrough with a synthetic ``future_field`` to verify unknown fields survive; 404 → ``MergifyApi`` error with the right message; missing ``mergeability_check`` falls through to "Waiting for mergeability check..."; condition-group summarization (two labels joined with ``or``; truncation at 3+ labels); aggregator recursion (``any of`` / ``all of`` / ``not`` falls through to the first leaf). Wiring: - ``crates/mergify-cli/src/main.rs``: adds ``Show(ShowCliArgs)`` to ``QueueSubcommand``, dispatch to ``mergify_queue::show::run``. Adds ``("queue", "show")`` to ``NATIVE_COMMANDS``. ``ShowCliArgs`` carries the positional ``pr_number: u64`` plus ``--verbose`` and ``--json`` flags. Python deletions: - ``mergify_cli/queue/__init__.py`` / ``cli.py`` / ``api.py``: removed entirely. The whole package goes away — all four ``queue`` subcommands are now Rust-native. - ``mergify_cli/cli.py``: drops the ``from mergify_cli.queue import cli as queue_cli_mod`` import and the ``cli.add_command(queue_cli_mod.queue)`` call. - ``mergify_cli/tests/queue/test_cli.py``: deleted entirely (it only covered ``_relative_time``, which lives in ``mergify-tui::time`` now). - ``mergify_cli/tests/queue/test_show.py``: deleted entirely. - ``mergify_cli/tests/queue/test_skill.py``: drops the click import; the skill-reference check now consults the binary alone (no parallel click-command list to merge). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Change-Id: I6c265303a37642529dbbcef6f255eb429407a1d2
jd
added a commit
that referenced
this pull request
May 11, 2026
The Rust binary now serves ``mergify queue show <PR_NUMBER>`` natively. The Python implementation (``mergify_cli/queue/cli.py:show`` plus the eight rendering helpers it depended on, plus ``mergify_cli/queue/api.py``) is removed in the same PR — the port-and-delete rule keeps a single live copy of every command. This is the last command in the ``queue`` group, so the whole ``mergify_cli/queue/`` Python package goes away. Closes the gap noted in #1380's commit message: ``mergify queue --help`` now lists ``show`` alongside ``pause`` / ``unpause`` / ``status``. ``mergify queue show <PR_NUMBER> [-v] [--json] [-r REPO] [-t TOKEN] [-u URL]``: 1. Resolves repository / token / API URL via the shared ``mergify_core::auth`` resolver. 2. Fetches ``GET /v1/repos/<repo>/merge-queue/pull/<pr_number>`` through the new ``HttpClient::get_if_exists`` helper. On 404 the command exits with ``MERGIFY_API_ERROR`` and the message ``PR #<n> is not in the merge queue``, matching the Python implementation. Other 4xx/5xx surface as normal API errors. 3. With ``--json``: pretty-prints the raw response. Schema is the Mergify API contract, so unknown fields survive verbatim. 4. Without ``--json``: renders the metadata block (position / priority / queue rule / queued / ETA), then a CI-state line and a checks section, then a conditions section. ``--verbose`` switches the checks summary to a full table and the conditions summary to a tree (``├── └── │ ``) instead of the compact ``N/M met`` summary with bullet-listed failures. New plumbing in ``mergify-core::http``: - ``Client::get_if_exists<T>(&path) -> Result<Option<T>, _>`` — GET that returns ``None`` on 404. Mirrors ``delete_if_exists`` for read-only endpoints where "not found" is a meaningful caller branch rather than a server failure. Reuses the same retry policy, bearer-auth injection, and flavor-aware error mapping as ``get`` / ``post`` / ``put``. Tests: - 7 new unit tests in ``crates/mergify-queue/src/show.rs``: compact metadata + checks summary + failing-conditions block; verbose checks table + conditions tree; JSON passthrough with a synthetic ``future_field`` to verify unknown fields survive; 404 → ``MergifyApi`` error with the right message; missing ``mergeability_check`` falls through to "Waiting for mergeability check..."; condition-group summarization (two labels joined with ``or``; truncation at 3+ labels); aggregator recursion (``any of`` / ``all of`` / ``not`` falls through to the first leaf). Wiring: - ``crates/mergify-cli/src/main.rs``: adds ``Show(ShowCliArgs)`` to ``QueueSubcommand``, dispatch to ``mergify_queue::show::run``. Adds ``("queue", "show")`` to ``NATIVE_COMMANDS``. ``ShowCliArgs`` carries the positional ``pr_number: u64`` plus ``--verbose`` and ``--json`` flags. Python deletions: - ``mergify_cli/queue/__init__.py`` / ``cli.py`` / ``api.py``: removed entirely. The whole package goes away — all four ``queue`` subcommands are now Rust-native. - ``mergify_cli/cli.py``: drops the ``from mergify_cli.queue import cli as queue_cli_mod`` import and the ``cli.add_command(queue_cli_mod.queue)`` call. - ``mergify_cli/tests/queue/test_cli.py``: deleted entirely (it only covered ``_relative_time``, which lives in ``mergify-tui::time`` now). - ``mergify_cli/tests/queue/test_show.py``: deleted entirely. - ``mergify_cli/tests/queue/test_skill.py``: drops the click import; the skill-reference check now consults the binary alone (no parallel click-command list to merge). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Change-Id: I6c265303a37642529dbbcef6f255eb429407a1d2
jd
added a commit
that referenced
this pull request
May 12, 2026
The Rust binary now serves ``mergify queue show <PR_NUMBER>`` natively. The Python implementation (``mergify_cli/queue/cli.py:show`` plus the eight rendering helpers it depended on, plus ``mergify_cli/queue/api.py``) is removed in the same PR — the port-and-delete rule keeps a single live copy of every command. This is the last command in the ``queue`` group, so the whole ``mergify_cli/queue/`` Python package goes away. Closes the gap noted in #1380's commit message: ``mergify queue --help`` now lists ``show`` alongside ``pause`` / ``unpause`` / ``status``. ``mergify queue show <PR_NUMBER> [-v] [--json] [-r REPO] [-t TOKEN] [-u URL]``: 1. Resolves repository / token / API URL via the shared ``mergify_core::auth`` resolver. 2. Fetches ``GET /v1/repos/<repo>/merge-queue/pull/<pr_number>`` through the new ``HttpClient::get_if_exists`` helper. On 404 the command exits with ``MERGIFY_API_ERROR`` and the message ``PR #<n> is not in the merge queue``, matching the Python implementation. Other 4xx/5xx surface as normal API errors. 3. With ``--json``: pretty-prints the raw response. Schema is the Mergify API contract, so unknown fields survive verbatim. 4. Without ``--json``: renders the metadata block (position / priority / queue rule / queued / ETA), then a CI-state line and a checks section, then a conditions section. ``--verbose`` switches the checks summary to a full table and the conditions summary to a tree (``├── └── │ ``) instead of the compact ``N/M met`` summary with bullet-listed failures. New plumbing in ``mergify-core::http``: - ``Client::get_if_exists<T>(&path) -> Result<Option<T>, _>`` — GET that returns ``None`` on 404. Mirrors ``delete_if_exists`` for read-only endpoints where "not found" is a meaningful caller branch rather than a server failure. Reuses the same retry policy, bearer-auth injection, and flavor-aware error mapping as ``get`` / ``post`` / ``put``. Tests: - 7 new unit tests in ``crates/mergify-queue/src/show.rs``: compact metadata + checks summary + failing-conditions block; verbose checks table + conditions tree; JSON passthrough with a synthetic ``future_field`` to verify unknown fields survive; 404 → ``MergifyApi`` error with the right message; missing ``mergeability_check`` falls through to "Waiting for mergeability check..."; condition-group summarization (two labels joined with ``or``; truncation at 3+ labels); aggregator recursion (``any of`` / ``all of`` / ``not`` falls through to the first leaf). Wiring: - ``crates/mergify-cli/src/main.rs``: adds ``Show(ShowCliArgs)`` to ``QueueSubcommand``, dispatch to ``mergify_queue::show::run``. Adds ``("queue", "show")`` to ``NATIVE_COMMANDS``. ``ShowCliArgs`` carries the positional ``pr_number: u64`` plus ``--verbose`` and ``--json`` flags. Python deletions: - ``mergify_cli/queue/__init__.py`` / ``cli.py`` / ``api.py``: removed entirely. The whole package goes away — all four ``queue`` subcommands are now Rust-native. - ``mergify_cli/cli.py``: drops the ``from mergify_cli.queue import cli as queue_cli_mod`` import and the ``cli.add_command(queue_cli_mod.queue)`` call. - ``mergify_cli/tests/queue/test_cli.py``: deleted entirely (it only covered ``_relative_time``, which lives in ``mergify-tui::time`` now). - ``mergify_cli/tests/queue/test_show.py``: deleted entirely. - ``mergify_cli/tests/queue/test_skill.py``: drops the click import; the skill-reference check now consults the binary alone (no parallel click-command list to merge). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Change-Id: I6c265303a37642529dbbcef6f255eb429407a1d2
jd
added a commit
that referenced
this pull request
May 12, 2026
The Rust binary now serves ``mergify queue show <PR_NUMBER>`` natively. The Python implementation (``mergify_cli/queue/cli.py:show`` plus the eight rendering helpers it depended on, plus ``mergify_cli/queue/api.py``) is removed in the same PR — the port-and-delete rule keeps a single live copy of every command. This is the last command in the ``queue`` group, so the whole ``mergify_cli/queue/`` Python package goes away. Closes the gap noted in #1380's commit message: ``mergify queue --help`` now lists ``show`` alongside ``pause`` / ``unpause`` / ``status``. ``mergify queue show <PR_NUMBER> [-v] [--json] [-r REPO] [-t TOKEN] [-u URL]``: 1. Resolves repository / token / API URL via the shared ``mergify_core::auth`` resolver. 2. Fetches ``GET /v1/repos/<repo>/merge-queue/pull/<pr_number>`` through the new ``HttpClient::get_if_exists`` helper. On 404 the command exits with ``MERGIFY_API_ERROR`` and the message ``PR #<n> is not in the merge queue``, matching the Python implementation. Other 4xx/5xx surface as normal API errors. 3. With ``--json``: pretty-prints the raw response. Schema is the Mergify API contract, so unknown fields survive verbatim. 4. Without ``--json``: renders the metadata block (position / priority / queue rule / queued / ETA), then a CI-state line and a checks section, then a conditions section. ``--verbose`` switches the checks summary to a full table and the conditions summary to a tree (``├── └── │ ``) instead of the compact ``N/M met`` summary with bullet-listed failures. New plumbing in ``mergify-core::http``: - ``Client::get_if_exists<T>(&path) -> Result<Option<T>, _>`` — GET that returns ``None`` on 404. Mirrors ``delete_if_exists`` for read-only endpoints where "not found" is a meaningful caller branch rather than a server failure. Reuses the same retry policy, bearer-auth injection, and flavor-aware error mapping as ``get`` / ``post`` / ``put``. Tests: - 7 new unit tests in ``crates/mergify-queue/src/show.rs``: compact metadata + checks summary + failing-conditions block; verbose checks table + conditions tree; JSON passthrough with a synthetic ``future_field`` to verify unknown fields survive; 404 → ``MergifyApi`` error with the right message; missing ``mergeability_check`` falls through to "Waiting for mergeability check..."; condition-group summarization (two labels joined with ``or``; truncation at 3+ labels); aggregator recursion (``any of`` / ``all of`` / ``not`` falls through to the first leaf). Wiring: - ``crates/mergify-cli/src/main.rs``: adds ``Show(ShowCliArgs)`` to ``QueueSubcommand``, dispatch to ``mergify_queue::show::run``. Adds ``("queue", "show")`` to ``NATIVE_COMMANDS``. ``ShowCliArgs`` carries the positional ``pr_number: u64`` plus ``--verbose`` and ``--json`` flags. Python deletions: - ``mergify_cli/queue/__init__.py`` / ``cli.py`` / ``api.py``: removed entirely. The whole package goes away — all four ``queue`` subcommands are now Rust-native. - ``mergify_cli/cli.py``: drops the ``from mergify_cli.queue import cli as queue_cli_mod`` import and the ``cli.add_command(queue_cli_mod.queue)`` call. - ``mergify_cli/tests/queue/test_cli.py``: deleted entirely (it only covered ``_relative_time``, which lives in ``mergify-tui::time`` now). - ``mergify_cli/tests/queue/test_show.py``: deleted entirely. - ``mergify_cli/tests/queue/test_skill.py``: drops the click import; the skill-reference check now consults the binary alone (no parallel click-command list to merge). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Change-Id: I6c265303a37642529dbbcef6f255eb429407a1d2
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
3 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.
Reported by user:
mergify queue status --helprejected theflag with
error: unexpected argument '--help' found. Rootcause:
CliRoothaddisable_help_flag = true, so clap'sauto-generated
--helpmachinery wasn't wired up — and ourdetect_nativethen surfaced the resulting parser error(because
looks_nativematched) instead of falling through.Three changes:
Drop
disable_help_flag = truefromCliRoot. clap nowauto-recognizes
-h/--helpat every level andgenerates its standard help blurb listing flags + subcommands.
detect_nativecatches the special help-error kinds(
DisplayHelpandDisplayHelpOnMissingArgumentOrSubcommand) explicitly andcalls
err.exit()regardless of thelooks_nativeheuristic.
err.exit()prints help to stdout and callsprocess::exit(0). The previous flow also callederr.exit()on parser errors whenlooks_native, but itonly fired when the argv contained a (group, subcommand) pair
— root-level
mergify --helphad no such pair so it wouldhave leaked to the Python shim.
Honor
MERGIFY_CLI_TESTING_UTF8_MODEfrom the Rust binary.test_binary_build.pyrunsmergify --helpagainst thewheel-installed binary to verify UTF-8 emoji output works
(particularly on Windows). The marker used to be printed by
mergify_cli/cli.py::main, but now that--helpishandled natively the Python path no longer fires. Mirror the
marker from the Rust binary: the binary is UTF-8 native on
every platform (no
os.execvre-exec needed), so reportutf8_mode=1on Windows (matching the post-re-exec valuethe test expects) and
utf8_mode=0elsewhere.Verified locally:
mergify --helplists the three native top-level groups(
config/ci/queue).mergify queue --helplists the native queue subcommands(
pause/unpause/status).mergify queue status --helpshows--branch/--json/
--token/--api-url/--repositorywith theirdoc-strings.
MERGIFY_CLI_TESTING_UTF8_MODE=1 mergify --helpprintsutf8_mode=0and✅before the help text.Known follow-up:
mergify queue --helpdoesn't listshowbecause it's still shimmed (no clap variant). Fixable by
registering opaque clap stubs for shimmed commands; deferred to
the PR that ports
queue show.Co-Authored-By: Claude Opus 4.7 (1M context) noreply@anthropic.com