Skip to content

Add ConflictCollection.__contains__ #1181

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

Merged
merged 1 commit into from
Nov 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions pygit2/index.py
Original file line number Diff line number Diff line change
Expand Up @@ -427,6 +427,19 @@ def __delitem__(self, path):
def __iter__(self):
return ConflictIterator(self._index)

def __contains__(self, path):
cancestor = ffi.new('git_index_entry **')
cours = ffi.new('git_index_entry **')
ctheirs = ffi.new('git_index_entry **')

err = C.git_index_conflict_get(cancestor, cours, ctheirs,
self._index._index, to_bytes(path))
if err == C.GIT_ENOTFOUND:
return False

check_error(err)
return True


class ConflictIterator:

Expand Down
4 changes: 4 additions & 0 deletions test/test_merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@ def test_merge_no_fastforward_conflicts(mergerepo):
assert mergerepo.index.conflicts is not None
with pytest.raises(KeyError):
mergerepo.index.conflicts.__getitem__('some-file')
assert 'some-file' not in mergerepo.index.conflicts
assert '.gitignore' in mergerepo.index.conflicts

status = pygit2.GIT_STATUS_CONFLICTED
# Asking twice to assure the reference counting is correct
Expand All @@ -126,12 +128,14 @@ def test_merge_remove_conflicts(mergerepo):
idx = mergerepo.index
conflicts = idx.conflicts
assert conflicts is not None
assert '.gitignore' in conflicts
try:
conflicts['.gitignore']
except KeyError:
mergerepo.fail("conflicts['.gitignore'] raised KeyError unexpectedly")
del idx.conflicts['.gitignore']
with pytest.raises(KeyError): conflicts.__getitem__('.gitignore')
assert '.gitignore' not in conflicts
assert idx.conflicts is None


Expand Down