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.

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

More refactoring of index #1196

Merged
merged 4 commits into from
Jul 21, 2023
Merged

More refactoring of index #1196

merged 4 commits into from
Jul 21, 2023

Conversation

jelmer
Copy link
Owner

@jelmer jelmer commented Jul 20, 2023

More refactoring of index

  • Split out SerializedIndexEntry
  • Add a ConflictedIndexEntry class that holds references to {ancestor, this, other} entries

@jelmer jelmer enabled auto-merge July 20, 2023 23:50
@jelmer jelmer force-pushed the index-refactor branch 2 times, most recently from 4da6b25 to b11d9db Compare July 20, 2023 23:55
jelmer added 4 commits July 21, 2023 01:38
This should make the changes transparent to existing API users (so long
as they don't work in trees with conflicts). It also prevents repeated
dictionary access.
@jelmer jelmer merged commit 3c84bc4 into master Jul 21, 2023
@jelmer jelmer deleted the index-refactor branch October 6, 2024 11:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant