Skip to content

refactor: drop stale Phase X.Y doc markers and one inline color branch#1443

Open
jd wants to merge 1 commit into
devs/jd/worktree-rust-port/consolidate-ci-env-scrubber-shared-testing-module--cd8c8441from
devs/jd/worktree-rust-port/drop-stale-phase-x-y-doc-markers-one-inline-color--477e0985
Open

refactor: drop stale Phase X.Y doc markers and one inline color branch#1443
jd wants to merge 1 commit into
devs/jd/worktree-rust-port/consolidate-ci-env-scrubber-shared-testing-module--cd8c8441from
devs/jd/worktree-rust-port/drop-stale-phase-x-y-doc-markers-one-inline-color--477e0985

Conversation

@jd
Copy link
Copy Markdown
Member

@jd jd commented May 19, 2026

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

Depends-On: #1442

@jd
Copy link
Copy Markdown
Member Author

jd commented May 19, 2026

This pull request is part of a Mergify stack:

# Pull Request Link
1 test(freeze): add live smoke test for freeze create/update/delete #1436
2 feat(rust): port freeze create/update/delete to native Rust #1437
3 refactor(rust): dedupe emit-helper boilerplate across command crates #1438
4 refactor(rust): share test scaffolding via mergify-test-support crate #1439
5 refactor(core): introduce CommandContext for the queue+freeze prelude #1441
6 refactor(ci): consolidate the CI-env scrubber into a shared testing module #1442
7 refactor: drop stale Phase X.Y doc markers and one inline color branch #1443 👈
8 refactor(tui): share StyledGlyph across queue show/status renderers #1444
9 refactor(queue): drop indexmap, group_by_scope returns a Vec<(K, V)> #1445
10 refactor(ci): swap uuid for getrandom in the GHA heredoc delimiter #1446
11 refactor(config): standardize the workspace on serde_yaml_ng for YAML parsing #1447

@mergify
Copy link
Copy Markdown
Contributor

mergify Bot commented May 19, 2026

Merge Protections

Your pull request matches the following merge protections and will not be merged until they are valid.

🔴 ⛓️ Depends-On Requirements

Waiting for

This rule is failing.

Requirement based on the presence of Depends-On in the body of the pull request

🔴 👀 Review Requirements

Waiting for

  • #approved-reviews-by>=2
This rule is failing.
  • any of:
    • #approved-reviews-by>=2
    • author = dependabot[bot]
    • author = mergify-ci-bot
    • author = renovate[bot]

🔴 🔎 Reviews

Waiting for

  • #review-requested = 0
This rule is failing.
  • #review-requested = 0
  • #changes-requested-reviews-by = 0
  • #review-threads-unresolved = 0

🟢 🤖 Continuous Integration

Wonderful, this rule succeeded.
  • all of:
    • check-success=ci-gate

🟢 Enforce conventional commit

Wonderful, this rule succeeded.

Make sure that we follow https://www.conventionalcommits.org/en/v1.0.0/

  • title ~= ^(fix|feat|docs|style|refactor|perf|test|build|ci|chore|revert|ui)(?:\(.+\))?:

🟢 📕 PR description

Wonderful, this rule succeeded.
  • body ~= (?ms:.{48,})

@jd 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 May 19, 2026 13:04
@jd jd force-pushed the devs/jd/worktree-rust-port/consolidate-ci-env-scrubber-shared-testing-module--cd8c8441 branch from 9484593 to 3e6ba1c Compare May 19, 2026 13:04
@jd jd temporarily deployed to func-tests-live May 19, 2026 13:04 — with GitHub Actions Inactive
@jd jd temporarily deployed to func-tests-live May 19, 2026 13:04 — with GitHub Actions Inactive
@jd
Copy link
Copy Markdown
Member Author

jd commented May 19, 2026

Revision history

# Type Changes Reason Date
1 initial 329d5d9 2026-05-19 13:04 UTC
2 rebase 329d5d9 → 2ee7f8e (rebase only) 2026-05-19 13:04 UTC
3 rebase 2ee7f8e → e195107 (rebase only) 2026-05-19 14:15 UTC
4 rebase e195107 → 1a26a25 (rebase only) 2026-05-20 08:42 UTC
5 rebase 1a26a25 → 30e29f7 (rebase only) 2026-05-20 09:05 UTC
6 rebase 30e29f7 → 6629220 (rebase only) 2026-05-21 07:25 UTC
7 content 6629220 → 1472a2e 2026-05-21 07:56 UTC
8 rebase 1472a2e → 69759d0 (rebase only) 2026-05-21 12:39 UTC

@mergify mergify Bot had a problem deploying to Mergify Merge Protections May 19, 2026 13:04 Failure
@mergify mergify Bot requested a review from a team May 19, 2026 13:19
@jd 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 May 19, 2026 14:14
@jd jd temporarily deployed to func-tests-live May 19, 2026 14:15 — with GitHub Actions Inactive
@mergify mergify Bot had a problem deploying to Mergify Merge Protections May 19, 2026 14:15 Failure
@jd jd marked this pull request as ready for review May 19, 2026 14:56
sileht
sileht previously approved these changes May 20, 2026
@mergify mergify Bot requested a review from a team May 20, 2026 07:43
@jd jd force-pushed the devs/jd/worktree-rust-port/consolidate-ci-env-scrubber-shared-testing-module--cd8c8441 branch from 6d57a9c to a946696 Compare May 20, 2026 08:42
@jd jd force-pushed the devs/jd/worktree-rust-port/drop-stale-phase-x-y-doc-markers-one-inline-color--477e0985 branch from e195107 to 1a26a25 Compare May 20, 2026 08:42
@jd jd temporarily deployed to func-tests-live May 20, 2026 08:42 — with GitHub Actions Inactive
@mergify mergify Bot dismissed sileht’s stale review May 20, 2026 08:43

Pull request has been modified.

@mergify mergify Bot had a problem deploying to Mergify Merge Protections May 20, 2026 08:43 Failure
@jd jd force-pushed the devs/jd/worktree-rust-port/consolidate-ci-env-scrubber-shared-testing-module--cd8c8441 branch from a946696 to fcfd504 Compare May 20, 2026 09:05
@jd jd force-pushed the devs/jd/worktree-rust-port/drop-stale-phase-x-y-doc-markers-one-inline-color--477e0985 branch from 1a26a25 to 30e29f7 Compare May 20, 2026 09:05
@jd jd temporarily deployed to func-tests-live May 20, 2026 09:05 — with GitHub Actions Inactive
@mergify mergify Bot had a problem deploying to Mergify Merge Protections May 20, 2026 09:06 Failure
@jd jd force-pushed the devs/jd/worktree-rust-port/drop-stale-phase-x-y-doc-markers-one-inline-color--477e0985 branch from 30e29f7 to 6629220 Compare May 21, 2026 07:24
@jd jd force-pushed the devs/jd/worktree-rust-port/consolidate-ci-env-scrubber-shared-testing-module--cd8c8441 branch from fcfd504 to 2b55249 Compare May 21, 2026 07:24
@jd jd temporarily deployed to func-tests-live May 21, 2026 07:25 — with GitHub Actions Inactive
@jd jd temporarily deployed to func-tests-live May 21, 2026 07:25 — with GitHub Actions Inactive
@mergify mergify Bot had a problem deploying to Mergify Merge Protections May 21, 2026 07:25 Failure
@jd jd force-pushed the devs/jd/worktree-rust-port/consolidate-ci-env-scrubber-shared-testing-module--cd8c8441 branch from 2b55249 to b12bb5c Compare May 21, 2026 07:55
@jd jd force-pushed the devs/jd/worktree-rust-port/drop-stale-phase-x-y-doc-markers-one-inline-color--477e0985 branch from 6629220 to 1472a2e Compare May 21, 2026 07:56
@jd jd temporarily deployed to func-tests-live May 21, 2026 07:56 — with GitHub Actions Inactive
@jd jd temporarily deployed to func-tests-live May 21, 2026 07:56 — with GitHub Actions Inactive
@mergify mergify Bot had a problem deploying to Mergify Merge Protections May 21, 2026 07:56 Failure
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 jd force-pushed the devs/jd/worktree-rust-port/consolidate-ci-env-scrubber-shared-testing-module--cd8c8441 branch from b12bb5c to 8b64b4d Compare May 21, 2026 12:39
@jd jd force-pushed the devs/jd/worktree-rust-port/drop-stale-phase-x-y-doc-markers-one-inline-color--477e0985 branch from 1472a2e to 69759d0 Compare May 21, 2026 12:39
@jd jd temporarily deployed to func-tests-live May 21, 2026 12:39 — with GitHub Actions Inactive
@jd jd temporarily deployed to func-tests-live May 21, 2026 12:39 — with GitHub Actions Inactive
@mergify mergify Bot had a problem deploying to Mergify Merge Protections May 21, 2026 12:40 Failure
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.

2 participants