Simplify DescendantRebaser
#3369
Merged
Conversation
This file contains 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
martinvonz
force-pushed
the
push-ywwlvvqvptvp
branch
from
08faf73 to
194dd36
Compare
yuja
approved these changes
Mar 26, 2024
By adding the abandoned commit's parents to `parent_mapping`, we can remove a bit more of the special handling of abandoned commitsin `DescendantRebaser`.
When `rebase_commit_with_options()` decides to abandons a commit, it records the new parents in the `MutableRepo`, but it's currently the caller's responsibility to remember to mark it as abandoned. Let's move that logic into the function to reduce the risk of future bugs.
The function only uses state from `MutableRepo`, so it should be implemented on that type.
Now that we only call `update_references()` in one place, there's no reason to have it also update `heads_to_add` and `heads_to_remove`. By moving it out of the function, we can consolidate the logic in one place.
We only use `new_commits` in `update_heads()`, so let's calculate it there. It should also be more correct in case other commits were created after we initialized `DescendantRebaser`.
Similar to the previous commit.
Similar to the previous two commits.
We currently include the commits in `parent_mapping` and `abandoned` in the set of commits to visit when rebasing descendants. The reason was that we used to update branches and working copies when we visited these commits. Since we started updating refs after rebasing all commits, there's no need to even visit these commits.
martinvonz
force-pushed
the
push-ywwlvvqvptvp
branch
from
194dd36 to
8d14178
Compare
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.
This makes the
rebase_one()step ofDescendantRebasersimpler and safer. References are now updated after all commits have been rebased.Checklist
If applicable:
CHANGELOG.md