feat(stack): push notes and surface reasons in revision history#1268
Merged
mergify[bot] merged 1 commit intomainfrom Apr 21, 2026
Conversation
Member
Author
|
This pull request is part of a Mergify stack:
|
Contributor
Merge ProtectionsYour pull request matches the following merge protections and will not be merged until they are valid. 🟢 🤖 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-git-notes/push-notes-surface-reasons-revision-history--59af5360
branch
from
baaa2b2 to
6ab0e33
Compare
Member
Author
Revision history
|
jd
force-pushed
the
devs/jd/worktree-git-notes/add-mergify-stack-note-cmd--33cc921f
branch
from
6932dd2 to
b188fe3
Compare
Base automatically changed from
devs/jd/worktree-git-notes/add-mergify-stack-note-cmd--33cc921f
to
main
April 21, 2026 07:42
JulianMaurin
previously approved these changes
Apr 21, 2026
Contributor
|
@jd this pull request is now in conflict 😩 |
jd
force-pushed
the
devs/jd/worktree-git-notes/push-notes-surface-reasons-revision-history--59af5360
branch
from
6ab0e33 to
59812b1
Compare
mergify
Bot
dismissed
JulianMaurin’s stale review
Pull request has been modified.
There was a problem hiding this comment.
Pull request overview
This PR completes the stack-notes workflow by syncing and pushing a git-notes ref used to store “reasons” for changes, and surfaces those reasons in the revision-history PR comment.
Changes:
- Fetch
refs/notes/mergify/stackbefore planning, read per-commit notes intoLocalChange.reason, and push the notes ref atomically with stack branches using--force-with-lease. - Extend revision-history rendering/parsing to support a new “Reason” column (while accepting legacy 4-column bodies).
- Update test harnesses/mocks and add test coverage for notes fetching/pushing and reason formatting/parsing.
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
mergify_cli/stack/push.py |
Implements notes fetch/push behavior, reads reasons from notes, and adds a “Reason” column to revision-history comments with escaping/truncation. |
mergify_cli/stack/changes.py |
Adds LocalChange.reason (default empty string). |
mergify_cli/tests/utils.py |
Extends GitMock to simulate command errors and registers default notes-related git mocks. |
mergify_cli/tests/stack/test_push.py |
Adds/updates tests for notes ref fetch/push behavior and revision-history reason rendering/parsing. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Complete the stack-notes feature: fetch refs/notes/mergify from the remote before planning, read the note attached to each updated commit into LocalChange.reason, and push the ref atomically alongside the stack branches with --force-with-lease. The revision-history PR comment gains a new "Reason" column: | # | Type | Changes | Reason | Date | The parser accepts both the legacy 4-column format and the new 5-column format, preserving legacy rows verbatim so old comments aren't rewritten. Reason cells escape pipes and newlines for markdown-table safety and truncate at 200 characters. Error catches for the notes fetch and the per-commit notes read are narrowed to the specific "ref/note not found" cases so other failures (auth, network, corruption) still surface. Depends-On: the preceding 'stack note' command PR. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Change-Id: I59af53609d8f0875b000f82cae085368adb5d5ab
jd
force-pushed
the
devs/jd/worktree-git-notes/push-notes-surface-reasons-revision-history--59af5360
branch
from
59812b1 to
73ce4a9
Compare
JulianMaurin
approved these changes
Apr 21, 2026
kozlek
approved these changes
Apr 21, 2026
Contributor
Merge Queue Status
This pull request spent 6 minutes 34 seconds in the queue, including 6 minutes 10 seconds running CI. Required conditions to merge
|
36 tasks
mergify
Bot
deleted the
devs/jd/worktree-git-notes/push-notes-surface-reasons-revision-history--59af5360
branch
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.
Complete the stack-notes feature: fetch refs/notes/mergify from the
remote before planning, read the note attached to each updated commit
into LocalChange.reason, and push the ref atomically alongside the
stack branches with --force-with-lease.
The revision-history PR comment gains a new "Reason" column:
| # | Type | Changes | Reason | Date |
The parser accepts both the legacy 4-column format and the new 5-column
format, preserving legacy rows verbatim so old comments aren't rewritten.
Reason cells escape pipes and newlines for markdown-table safety and
truncate at 200 characters. Error catches for the notes fetch and the
per-commit notes read are narrowed to the specific "ref/note not found"
cases so other failures (auth, network, corruption) still surface.
Depends-On: the preceding 'stack note' command PR.
Co-Authored-By: Claude Opus 4.7 (1M context) noreply@anthropic.com