refactor: drop stale Phase X.Y doc markers and one inline color branch#1443
Merged
mergify[bot] merged 2 commits intoMay 28, 2026
Conversation
This was referenced May 19, 2026
Member
Author
|
This pull request is part of a Mergify stack:
|
This was referenced May 19, 2026
This was referenced May 19, 2026
Contributor
Merge ProtectionsYour pull request matches the following merge protections and will not be merged until they are valid. 🟢 ⛓️ Depends-On RequirementsWonderful, this rule succeeded.Requirement based on the presence of
🟢 🤖 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/drop-stale-phase-x-y-doc-markers-one-inline-color--477e0985
branch
from
329d5d9 to
2ee7f8e
Compare
jd
force-pushed
the
devs/jd/worktree-rust-port/consolidate-ci-env-scrubber-shared-testing-module--cd8c8441
branch
from
9484593 to
3e6ba1c
Compare
Member
Author
Revision history
|
jd
force-pushed
the
devs/jd/worktree-rust-port/drop-stale-phase-x-y-doc-markers-one-inline-color--477e0985
branch
from
2ee7f8e to
e195107
Compare
This was referenced May 19, 2026
jd
force-pushed
the
devs/jd/worktree-rust-port/drop-stale-phase-x-y-doc-markers-one-inline-color--477e0985
branch
from
04dba1b to
8078162
Compare
jd
force-pushed
the
devs/jd/worktree-rust-port/drop-stale-phase-x-y-doc-markers-one-inline-color--477e0985
branch
from
8078162 to
b33d286
Compare
…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
jd
force-pushed
the
devs/jd/worktree-rust-port/consolidate-ci-env-scrubber-shared-testing-module--cd8c8441
branch
from
5b8ad61 to
ac2002a
Compare
jd
force-pushed
the
devs/jd/worktree-rust-port/drop-stale-phase-x-y-doc-markers-one-inline-color--477e0985
branch
from
b33d286 to
27c303b
Compare
JulianMaurin
approved these changes
May 28, 2026
Base automatically changed from
devs/jd/worktree-rust-port/consolidate-ci-env-scrubber-shared-testing-module--cd8c8441
to
main
May 28, 2026 08:27
kozlek
approved these changes
May 28, 2026
Contributor
Merge Queue Status
This pull request spent 15 minutes 28 seconds in the queue, including 14 minutes 55 seconds running CI. Required conditions to merge
|
38 tasks
remyduthu
approved these changes
May 28, 2026
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
5 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.
Two unrelated polish items grouped because each is too small for
its own commit:
Module docs across
mergify-core,mergify-config,mergify-queue,mergify-cli, andmergify-py-shimwerepinned 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 logreconstruct the trajectory if anyone needs it.
freeze/list.rs::write_rowstill had anif theme.enabled { … theme.fg(c) } else { Style::new() }branch around the Statuscell — the same redundant indirection the earlier dedup pass
removed elsewhere.
Theme::fgalready collapses toStyle::new()when colors are disabled, so the outer branchis pure noise. Drop it.
Co-Authored-By: Claude Opus 4.7 noreply@anthropic.com
Depends-On: #1442