Skip to content

merge queue: checking #12647 on main (8316c84) - #12683

Closed
mergify[bot] wants to merge 2 commits into
mainfrom
mergify/merge-queue/5424ac8759
Closed

merge queue: checking #12647 on main (8316c84)#12683
mergify[bot] wants to merge 2 commits into
mainfrom
mergify/merge-queue/5424ac8759

Conversation

@mergify

@mergify mergify Bot commented Sep 4, 2026

Copy link
Copy Markdown
Contributor

🎉 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 default for merge:

Required conditions to stay in the queue:

---
checking_base_sha: 8316c84c51cf06c16f6ba64867948119d466d931
previous_check_retries: []
previous_failed_batches: []
pull_requests:
  - number: 12647
    scopes: []
scopes: []
...

jd and others added 2 commits September 3, 2026 18:58
`<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
@mergify
mergify Bot deployed to Mergify Merge Protections September 4, 2026 09:47 Active
@mergify mergify Bot closed this Sep 4, 2026
@mergify
mergify Bot deleted the mergify/merge-queue/5424ac8759 branch September 4, 2026 09:58
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.

1 participant