merge queue: embarking main (ec40cc0), #1443 and #1444 together#1478
Closed
mergify[bot] wants to merge 5 commits into
Closed
merge queue: embarking main (ec40cc0), #1443 and #1444 together#1478mergify[bot] wants to merge 5 commits into
mergify[bot] wants to merge 5 commits into
Conversation
…odule `with_ci_env` (clear every CI-provider env var before applying test overrides) lived in two copies — one inside the `tests` sub-module of `detector.rs`, one inside `scopes_send.rs` (which also had a `with_ci_env_async` counterpart). Both spelled the same 10-var list inline; both were drifting candidates. Extract to a new `crate::testing` (`#[cfg(test)] mod testing`) with the env-var list named as a const, sync + async variants behind one helper that builds the override list. Each test module now does a plain `use crate::testing::with_ci_env;`. Net `-71 / +51`. No behavior change; the existing 49 `mergify-ci` tests still pass. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> Change-Id: Icd8c84417ad51b242cc8d9664d1cd40fff744497
Two unrelated polish items grouped because each is too small for
its own commit:
1. Module docs across `mergify-core`, `mergify-config`,
`mergify-queue`, `mergify-cli`, and `mergify-py-shim` were
pinned to the phase numbering the port plan used during
bootstrapping ("Phase 1.2 populates…", "Phase 1.7 ports…",
"Phase 6 deletes…"). Those references no longer aid the reader
and contradict the project rule about not embedding phase
numbers in long-lived artifacts — rewrite each docstring to
describe the module's *current* shape and let `git log`
reconstruct the trajectory if anyone needs it.
2. `freeze/list.rs::write_row` still had an `if theme.enabled { …
theme.fg(c) } else { Style::new() }` branch around the Status
cell — the same redundant indirection the earlier dedup pass
removed elsewhere. `Theme::fg` already collapses to
`Style::new()` when colors are disabled, so the outer branch
is pure noise. Drop it.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Change-Id: I477e098578452de9e955119241ce7b92c0641b22
`queue show` and `queue status` both map an enum-ish state code to
an "(icon, ANSI style)" pair, but spelled the pairing two different
ways: `show.rs::check_state_glyph` returned `(&'static str, Style)`,
while `status.rs` split it into separate `status_icon` /
`batch_status_style` functions. Same shape, different names, drifting
naturally as new states land.
Add a small `StyledGlyph` struct to `mergify-tui` and route both
callers through it. `status.rs::status_icon` + `batch_status_style`
collapse into a single `batch_glyph(theme, code) -> StyledGlyph`;
the early-return for the disabled-theme case is preserved (the
`merged → green.dimmed()` composition would otherwise emit a dim
escape when colors are off).
The third candidate — `freeze/list.rs`'s active/scheduled coloring
— stays inline: it has no icon, just a two-arm color pick, and
forcing a `StyledGlyph::new("", color)` would add more noise than
it removes.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Change-Id: I8ed9bb5fffd46ecf75ff833df85b2ddf9812a4d8
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.
🎉 This pull request has been checked successfully and will be merged soon. 🎉
Branch main (ec40cc0), #1443 and #1444 are embarked together for merge.
This pull request has been created by Mergify to speculatively check the mergeability of #1444.
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:depends-on = Mergifyio/mergify-cli#1443[⛓️ refactor: drop stale Phase X.Y doc markers and one inline color branch #1443]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 = 0check-success=ci-gateRequired conditions to stay in the queue:
base=maindepends-on = Mergifyio/mergify-cli#1443[⛓️ refactor: drop stale Phase X.Y doc markers and one inline color branch #1443]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