Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rebase -s: add support for --insert-after and --insert-before #4640

Merged
merged 6 commits into from
Oct 16, 2024
Merged

rebase -s: add support for --insert-after and --insert-before #4640

merged 6 commits into from
Oct 16, 2024

Conversation

bnjmnt4n
Copy link
Member

Supercedes #3607.

Checklist

If applicable:

  • I have updated CHANGELOG.md
  • I have updated the documentation (README.md, docs/, demos/)
  • I have updated the config schema (cli/src/config-schema.json)
  • I have added tests to cover my changes

@bnjmnt4n bnjmnt4n force-pushed the bnjmnt4n/push-oxyqqvlorlxl branch from d90844b to dbd9635 Compare October 14, 2024 11:30
martinvonz
martinvonz reviewed Oct 14, 2024
View reviewed changes
Copy link
Member

@martinvonz martinvonz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Neat! Looks good to me, but I'll leave approval to Yuya since he reviewed the previous incarnation of this PR.

cli/src/commands/rebase.rs Outdated Show resolved Hide resolved
yuja
yuja approved these changes Oct 15, 2024
View reviewed changes
Copy link
Contributor

@yuja yuja left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

lib/src/rewrite.rs Outdated Show resolved Hide resolved
cli/src/commands/rebase.rs Outdated Show resolved Hide resolved
cli/src/commands/rebase.rs Outdated Show resolved Hide resolved
@bnjmnt4n bnjmnt4n force-pushed the bnjmnt4n/push-oxyqqvlorlxl branch 2 times, most recently from 1402064 to c955e48 Compare October 15, 2024 14:12
yuja
yuja reviewed Oct 16, 2024
View reviewed changes
cli/src/commands/rebase.rs Outdated Show resolved Hide resolved
cli/src/commands/rebase.rs Show resolved Hide resolved
cli/src/commands/rebase.rs Outdated Show resolved Hide resolved
cli/src/commands/rebase.rs Show resolved Hide resolved
@bnjmnt4n
rewrite: move_commits: use rebase_commit_with_options to rebase c…
ce63bf7 
…ommits

This allows for `RebaseOptions` to be respected. This will be used when
migrating `rebase --source`/`rebase --branch` to use `move_commits` to
respect the `--before`/`--after` options.
@bnjmnt4n
rewrite: move_commits: allow specifying the roots of target set man…
73598f3 
…ually

This is required when performing `rebase -s a -s b` where "b" is a
descendant of "a". Both "a" and "b" should be regarded as the roots of
the target set and be rebased onto the new destination.
@bnjmnt4n
rebase: use move_commits to rebase descendants for --source and `…
951799a 
…--branch`
@bnjmnt4n
rebase: add compute_rebase_destination function
e09c276
@bnjmnt4n
rebase -s: add support for --insert-after and --insert-before opt…
1838db6 
…ions
@bnjmnt4n bnjmnt4n force-pushed the bnjmnt4n/push-oxyqqvlorlxl branch from c955e48 to e19f8f7 Compare October 16, 2024 02:51
@bnjmnt4n bnjmnt4n force-pushed the bnjmnt4n/push-oxyqqvlorlxl branch from e19f8f7 to dfed470 Compare October 16, 2024 03:13
@bnjmnt4n bnjmnt4n enabled auto-merge (rebase) October 16, 2024 03:14
@bnjmnt4n bnjmnt4n merged commit 11648ee into main Oct 16, 2024
31 checks passed
@bnjmnt4n bnjmnt4n deleted the bnjmnt4n/push-oxyqqvlorlxl branch October 16, 2024 03:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@martinvonz martinvonz martinvonz left review comments

@yuja yuja yuja approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@bnjmnt4n @yuja @martinvonz