merge queue: embarking main (b314393), #1266 and #1268 together#1284
Closed
mergify[bot] wants to merge 4 commits intomainfrom
Closed
merge queue: embarking main (b314393), #1266 and #1268 together#1284mergify[bot] wants to merge 4 commits intomainfrom
mergify[bot] wants to merge 4 commits intomainfrom
Conversation
Add "mergify stack squash SRC... into TARGET [-m MESSAGE]" which reorders SRC commits adjacent to TARGET and folds them in without opening an editor. Without -m, TARGET's message is kept (via the fixup rebase action). With -m, the rebase inserts an `exec git commit --amend -m ...` line right after the last fixup source, which runs while HEAD still points at the combined target — so prepare-commit-msg re-attaches the Change-Id normally. Errors when SRC == TARGET, when a SRC is duplicated, or when a SRC or TARGET prefix is unknown. Supports --dry-run. Click does not allow two positionals when one is variadic, so the CLI takes a single tokens tuple and parses "SRC... into TARGET" manually (_parse_squash_tokens); parser edge cases are covered by unit tests. Also documents the squash command in skills/mergify-stack/SKILL.md. Change-Id: I558e6e6f5e33252ad52f8e4a002dfc0141d693b0
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
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
1 participant
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. 🎉
Branch main (b314393), #1266 and #1268 are embarked together for merge.
This pull request has been created by Mergify to speculatively check the mergeability of #1268.
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:title ~= ^(fix|feat|docs|style|refactor|perf|test|build|ci|chore|revert)(?:\(.+\))?:#approved-reviews-by>=2author = dependabot[bot]author = mergify-ci-botauthor = renovate[bot]body ~= (?ms:.{48,})#changes-requested-reviews-by = 0#review-requested = 0#review-threads-unresolved = 0check-success=ci-gateRequired conditions to stay in the queue:
base=mainlabel!=manual mergetitle ~= ^(fix|feat|docs|style|refactor|perf|test|build|ci|chore|revert)(?:\(.+\))?:#approved-reviews-by>=2author = dependabot[bot]author = mergify-ci-botauthor = renovate[bot]body ~= (?ms:.{48,})#changes-requested-reviews-by = 0#review-requested = 0#review-threads-unresolved = 0check-success=ci-gate