rewrite: simplify update_heads()
#3397
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
I don't think we have any transactions that mark commit as abandoned and then later mark it as rewritten or divergent. But if we ever do, I think it should be considered just rewritten/divergent. So let's enforce that invariant by removing the old value from the set of abandoned commits.
We always add abandoned commits as key in `parent_mapping`.
Now that we no longer bother to keep the set of heads to add and remove updated while we rewrite descendants, we can simplify how we find the set of heads to remove - it's simply all commits that have been marked rewritten, divergent, or abandoned, i.e. the keys in `parent_mapping`.
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