merge queue: checking #12647 on main (8316c84) - #12683
Closed
mergify[bot] wants to merge 2 commits into
Closed
Conversation
`<GitGraph>` was a second Graphviz pipeline running beside the `dot` fences, with its own `COLORS` map, its own `EDGE_COLOR`, and its own string-replace for dark mode. `<StackMapping>` was a third, with five more hex literals. Three surfaces, three private palettes, all drifting apart — which is how a page like merge-queue/stacks ends up rendering a themed diagram and a baked one side by side. All three now name roles. `src/util/diagramSvg.ts` holds the post-processing both Graphviz surfaces share — drop the canvas, strip the inline paint, mark a borderless shape as a caption — so there is one place to change and no second list of hex strings to fall out of date. The hand-placed SVG in GitGraph's linear mode and in StackMapping emits the same `node` / `edge` groups and the same role classes, so `.dg` paints all four kinds of diagram from one stylesheet. `--theme-diagram-edge` is deleted: it was the old surfaces' single diagram token and `--dg-a-chrome` now says the same thing. This also fixes the bug that made the case for it. GitGraph marks every node `style=filled`, which reaches a `shape=plaintext` node too, so the `main` branch label sat on an opaque pale box — barely noticeable in light mode and glaring in dark, on seven pages. It is a caption, so it now carries `plain` and the box is gone. Two things changed while I was in there: - `<StackMapping>` sizes its columns to their content. They were fixed at 160px and the generated branch names did not fit; the overflow was invisible while the label was white on a solid fill, and would have been plainly visible once the label became dark text on a tint. - Graph-mode commit graphs are typeset at the same sizes as the fences (13/10 rather than Graphviz's default 14 and a hand-set 9), so the two kinds of diagram on one page no longer disagree about how big a label is. A call site names a role rather than a color: `color: "green"` becomes `role: "queued"`, `commitColor="green"` becomes `commitRole="queued"`. The prop is typed as `DiagramRole`, so a color name no longer compiles. Change-Id: I6bdb5b9fbd6574a37172fa067e81b0103282725f
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
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. 🎉
#12647 is queued for merge on branch main (8316c84).
This pull request has been created by Mergify to check the mergeability of #12647.
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:github-review-approved[🛡 GitHub repository ruleset ruleRequire pull request for default branch]schedule=Mon-Fri 09:00-17:30[Europe/Paris]Enforce conventional commit]:title ~= ^(fix|feat|internal|docs|style|refactor|perf|test|build|ci|chore|revert|ui)(?:\(.+\))?!?:👀 Review Requirements]:#approved-reviews-by >= 2author = dependabot[bot]author = renovate[bot]author = mergify-ci-bot-head ~= ^docs-agent/📕 PR description]:body ~= (?ms:.{48,})🔎 Reviews]:#changes-requested-reviews-by = 0#review-requested = 0#review-threads-unresolved = 0🤖 Continuous Integration]:check-success = buildcheck-success = lintcheck-success = testcheck-success = test-broken-linkslabel = ignore-broken-linkscheck-success=Cloudflare Pages-head-repo-full-name~=^Mergifyio/Required conditions to stay in the queue:
github-review-approved[🛡 GitHub repository ruleset ruleRequire pull request for default branch]Enforce conventional commit]:title ~= ^(fix|feat|internal|docs|style|refactor|perf|test|build|ci|chore|revert|ui)(?:\(.+\))?!?:👀 Review Requirements]:#approved-reviews-by >= 2author = dependabot[bot]author = renovate[bot]author = mergify-ci-bot-head ~= ^docs-agent/📕 PR description]:body ~= (?ms:.{48,})🔎 Reviews]:#changes-requested-reviews-by = 0#review-requested = 0#review-threads-unresolved = 0🤖 Continuous Integration]:check-success = buildcheck-success = lintcheck-success = testcheck-success = test-broken-linkslabel = ignore-broken-linkscheck-success=Cloudflare Pages-head-repo-full-name~=^Mergifyio/author != dependabot[bot]author != mergify-ci-botauthor != renovate[bot]head ~= ^docs-agent/