repo: add a workaround for merging repo views with Google's index #3669
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
We do a 3-way merge of repo views in a few different scenarios. Perhaps the most obvious one is when merging concurrent operations. Another case is when undoing an operation. One step of the 3-way repo view merge is to find which added commits are rewrites of which removed commits (by comparing change IDs). With the high commit rate in the Google repo (combined with storing the commits on a server), this step can get extremely slow. This patch adds a hack to disable the slow step when using a non-standard `Index` implementation. The Google index is the only non-standard implementation I'm aware of, so I don't think this will affect anyone else. The patch is also small enough that I don't think it will cause much maintenance overhead for the project.
yuja
approved these changes
May 12, 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