Preparations for moving DescendantRebaser state into MutableRepo
#3356
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
When rebasing descendants, we generally move branches, child commits, the working copy to the rewritten commit(s). However, we don't move the working copy to the new rewritten commit (s) if the old commit had been abandoned, and we don't move child commits if the rewriten was divergent. This patch aims to make it clearer that there's only one mapping from old to new parents, and that is in `parent_mapping`. It does so by merging the current `divergent` map into it, and makes the `divergent` just a set instead. When finding the new parents for a child, we leave the existing parent if it's in the set. My longer-term goal is to move `parent_mapping`, `abandoned`, and `divergent` into `MutableRepo` (maybe in a nested struct), so we can do some transformations on descendants as we rebase them. By having the state in a single place (not moving it from `MutableRepo` to `DescendantRebaser` as we currently do), I hope it will be easier to write a `MutableRepo::transform_descendants(callback)`, where the callback gets a `CommitBuilder` and can change parents of the commit, for example.
I plan to remove `record_rewritten_commit()` and instead make repeated rewrites replace the rewrite state.
All callers now pass a single new commit and I would like to keep it that way.
I don't think we have any callers left that call `record_rewritten_commit()` multiple times within a transaction and expect it to result in divergence. I think we should consider it a bug to do that.
yuja
approved these changes
Mar 25, 2024
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.
Checklist
If applicable:
CHANGELOG.md