Conversation
|
This pull request is part of a stack:
|
Merge ProtectionsYour pull request matches the following merge protections and will not be merged until they are valid. 🔴 👀 Review RequirementsWaiting for:
or
or
or
This rule is failing.
🔴 🔎 ReviewsWaiting for:
This rule is failing.
🟢 🤖 Continuous IntegrationWonderful, this rule succeeded.
🟢 Enforce conventional commitWonderful, this rule succeeded.Make sure that we follow https://www.conventionalcommits.org/en/v1.0.0/
🟢 📕 PR descriptionWonderful, this rule succeeded.
|
7220a93 to
be67877
Compare
There was a problem hiding this comment.
Pull request overview
Adds a new mergify stack move command to reposition a single commit within the current stack, building on the existing non-interactive rebase helpers introduced for stack reordering.
Changes:
- Introduce
mergify_cli.stack.move.stack_move()to compute a new commit order and execute (or preview) the rebase. - Wire the new
movesubcommand into the stack CLI and document usage in the stack skill guide. - Add end-to-end style tests for move scenarios (before/after/first/last, dry-run, and validation cases).
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
mergify_cli/stack/move.py |
New implementation of commit movement using existing reorder/rebase helpers. |
mergify_cli/stack/cli.py |
Registers the mergify stack move command and its arguments/options. |
mergify_cli/stack/skill.md |
Documents the new move syntax alongside reorder guidance and examples. |
mergify_cli/tests/stack/test_move.py |
Adds functional tests covering move behavior and error cases. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
|
@jd this pull request is now in conflict 😩 |
be67877 to
689a87d
Compare
JulianMaurin
left a comment
There was a problem hiding this comment.
not sure about this one 🤔
|
@jd this pull request is now in conflict 😩 |
Add `mergify stack move` to move a single commit within the stack. Supports natural positional syntax: mergify stack move <commit> before <target> mergify stack move <commit> after <target> mergify stack move <commit> first mergify stack move <commit> last Reuses the shared rebase helpers from the reorder module. Supports --dry-run and both SHA and Change-Id prefix identification. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Change-Id: Id3e08ba58709c88ac9eaf8fcf4137f630ba2f383 Claude-Session-Id: cdc0d010-0b6d-4808-a13c-d8e205472a4b
689a87d to
af55a58
Compare
Pull request has been modified.
Add
mergify stack moveto move a single commit within the stack.Supports natural positional syntax:
mergify stack move before
mergify stack move after
mergify stack move first
mergify stack move last
Reuses the shared rebase helpers from the reorder module.
Supports --dry-run and both SHA and Change-Id prefix identification.
Co-Authored-By: Claude Opus 4.6 (1M context) noreply@anthropic.com
Claude-Session-Id: cdc0d010-0b6d-4808-a13c-d8e205472a4b