Replace Pygit2 by Dulwich #3221
Merged
Conversation
This file contains hidden or 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
Only a merge is done by git cli, since Dulwich does not have a way to create a merge conflict.
danyeaw
approved these changes
Mar 30, 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.
PR Type
What kind of change does this PR introduce?
What is the current behavior?
PyGit2 relies on libgit, which is a C library. Dulwich is (almost) all Python.
Issue Number: fixes #2864
What is the new behavior?
Dulwich is used to handle merge conflicts.
This simplifies everything, since we can now always assume git support is available.
Other information
Dulwich can't create merge conflicts by itself, so we use the git cli for that bit.
NB. Does merge conflict resolution work from Flatpak? We only have access to the actual file, and not to the .git folder. Maybe we should change the permissions back to
--filesystem=home?