1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
|
# Copyright 2010-2025 The pygit2 contributors
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License, version 2,
# as published by the Free Software Foundation.
#
# In addition to the permissions in the GNU General Public License,
# the authors give you unlimited permission to link the compiled
# version of this file into combinations with other programs,
# and to distribute those combinations without any restriction
# coming from the use of this file. (The General Public License
# restrictions do apply in other respects; for example, they cover
# modification of the file, and distribution when not linked into
# a combined executable.)
#
# This file is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; see the file COPYING. If not, write to
# the Free Software Foundation, 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
"""Tests for merging and information about it."""
from pathlib import Path
import pytest
import pygit2
from pygit2.enums import RepositoryState
def test_cherrypick_none(mergerepo):
with pytest.raises(TypeError):
mergerepo.cherrypick(None)
def test_cherrypick_invalid_hex(mergerepo):
branch_head_hex = '12345678'
with pytest.raises(KeyError):
mergerepo.cherrypick(branch_head_hex)
def test_cherrypick_already_something_in_index(mergerepo):
branch_head_hex = '03490f16b15a09913edb3a067a3dc67fbb8d41f1'
branch_oid = mergerepo.get(branch_head_hex).id
with (Path(mergerepo.workdir) / 'inindex.txt').open('w') as f:
f.write('new content')
mergerepo.index.add('inindex.txt')
with pytest.raises(pygit2.GitError):
mergerepo.cherrypick(branch_oid)
def test_cherrypick_remove_conflicts(mergerepo):
assert mergerepo.state() == RepositoryState.NONE
assert not mergerepo.message
other_branch_tip = '1b2bae55ac95a4be3f8983b86cd579226d0eb247'
mergerepo.cherrypick(other_branch_tip)
assert mergerepo.state() == RepositoryState.CHERRYPICK
assert mergerepo.message.startswith('commit to provoke a conflict')
idx = mergerepo.index
conflicts = idx.conflicts
assert conflicts is not None
conflicts['.gitignore']
del idx.conflicts['.gitignore']
with pytest.raises(KeyError):
conflicts.__getitem__('.gitignore')
assert idx.conflicts is None
mergerepo.state_cleanup()
assert mergerepo.state() == RepositoryState.NONE
assert not mergerepo.message
|
