Move the index to cffi and add conflict information #389
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
This commit gives us feature-parity with the version in C.
The method is in Repository, but the merge functionality is separate. We will introduce more tests in this area later.
Add documentation for the conflicts, and add some for IndexEntry and Index which went missing during the conversion to cffi.
|
Instead of having becomes |
| return centry, path | ||
|
|
||
| @classmethod | ||
| def _from_c(cls, centry): |
There was a problem hiding this comment.
Why not from_c like in Index.from_c? Is more consistent this way
There was a problem hiding this comment.
Because it's a special function. I went back and forth on that one, but this is a private function that only makes sense inside pygit2. The consistency should go the other way.
Closed
|
+1 to make |
|
Ok just did that. |
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.
I wanted to add information for conflicts, so I went and put it into python beforehand.