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
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
|
# Copyright 2010-2020 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."""
import os
import pytest
from pygit2 import GIT_MERGE_ANALYSIS_UP_TO_DATE
from pygit2 import GIT_MERGE_ANALYSIS_FASTFORWARD
import pygit2
def test_merge_none(mergerepo):
with pytest.raises(TypeError): mergerepo.merge(None)
def test_merge_analysis_uptodate(mergerepo):
branch_head_hex = '5ebeeebb320790caf276b9fc8b24546d63316533'
branch_id = mergerepo.get(branch_head_hex).id
analysis, preference = mergerepo.merge_analysis(branch_id)
assert analysis & GIT_MERGE_ANALYSIS_UP_TO_DATE
assert not analysis & GIT_MERGE_ANALYSIS_FASTFORWARD
assert {} == mergerepo.status()
analysis, preference = mergerepo.merge_analysis(branch_id, 'refs/heads/ff-branch')
assert analysis & GIT_MERGE_ANALYSIS_UP_TO_DATE
assert not analysis & GIT_MERGE_ANALYSIS_FASTFORWARD
assert {} == mergerepo.status()
def test_merge_analysis_fastforward(mergerepo):
branch_head_hex = 'e97b4cfd5db0fb4ebabf4f203979ca4e5d1c7c87'
branch_id = mergerepo.get(branch_head_hex).id
analysis, preference = mergerepo.merge_analysis(branch_id)
assert not analysis & GIT_MERGE_ANALYSIS_UP_TO_DATE
assert analysis & GIT_MERGE_ANALYSIS_FASTFORWARD
assert {} == mergerepo.status()
analysis, preference = mergerepo.merge_analysis(branch_id, 'refs/heads/master')
assert not analysis & GIT_MERGE_ANALYSIS_UP_TO_DATE
assert analysis & GIT_MERGE_ANALYSIS_FASTFORWARD
assert {} == mergerepo.status()
def test_merge_no_fastforward_no_conflicts(mergerepo):
branch_head_hex = '03490f16b15a09913edb3a067a3dc67fbb8d41f1'
branch_id = mergerepo.get(branch_head_hex).id
analysis, preference = mergerepo.merge_analysis(branch_id)
assert not analysis & GIT_MERGE_ANALYSIS_UP_TO_DATE
assert not analysis & GIT_MERGE_ANALYSIS_FASTFORWARD
# Asking twice to assure the reference counting is correct
assert {} == mergerepo.status()
assert {} == mergerepo.status()
def test_merge_invalid_hex(mergerepo):
branch_head_hex = '12345678'
with pytest.raises(KeyError): mergerepo.merge(branch_head_hex)
def test_merge_already_something_in_index(mergerepo):
branch_head_hex = '03490f16b15a09913edb3a067a3dc67fbb8d41f1'
branch_oid = mergerepo.get(branch_head_hex).id
with open(os.path.join(mergerepo.workdir, 'inindex.txt'), 'w') as f:
f.write('new content')
mergerepo.index.add('inindex.txt')
with pytest.raises(pygit2.GitError): mergerepo.merge(branch_oid)
def test_merge_no_fastforward_conflicts(mergerepo):
branch_head_hex = '1b2bae55ac95a4be3f8983b86cd579226d0eb247'
branch_id = mergerepo.get(branch_head_hex).id
analysis, preference = mergerepo.merge_analysis(branch_id)
assert not analysis & GIT_MERGE_ANALYSIS_UP_TO_DATE
assert not analysis & GIT_MERGE_ANALYSIS_FASTFORWARD
mergerepo.merge(branch_id)
assert mergerepo.index.conflicts is not None
with pytest.raises(KeyError):
mergerepo.index.conflicts.__getitem__('some-file')
status = pygit2.GIT_STATUS_CONFLICTED
# Asking twice to assure the reference counting is correct
assert {'.gitignore': status} == mergerepo.status()
assert {'.gitignore': status} == mergerepo.status()
ancestor, ours, theirs = mergerepo.index.conflicts['.gitignore']
assert ancestor is None
assert ours is not None
assert theirs is not None
assert '.gitignore' == ours.path
assert '.gitignore' == theirs.path
assert 1 == len(list(mergerepo.index.conflicts))
# Checking the index works as expected
mergerepo.index.add('.gitignore')
mergerepo.index.write()
assert mergerepo.index.conflicts is None
assert {'.gitignore': pygit2.GIT_STATUS_INDEX_MODIFIED} == mergerepo.status()
def test_merge_remove_conflicts(mergerepo):
other_branch_tip = '1b2bae55ac95a4be3f8983b86cd579226d0eb247'
mergerepo.merge(other_branch_tip)
idx = mergerepo.index
conflicts = idx.conflicts
assert conflicts is not None
try:
conflicts['.gitignore']
except KeyError:
mergerepo.fail("conflicts['.gitignore'] raised KeyError unexpectedly")
del idx.conflicts['.gitignore']
with pytest.raises(KeyError): conflicts.__getitem__('.gitignore')
assert idx.conflicts is None
def test_merge_commits(mergerepo):
branch_head_hex = '03490f16b15a09913edb3a067a3dc67fbb8d41f1'
branch_id = mergerepo.get(branch_head_hex).id
merge_index = mergerepo.merge_commits(mergerepo.head.target, branch_head_hex)
assert merge_index.conflicts is None
merge_commits_tree = merge_index.write_tree(mergerepo)
mergerepo.merge(branch_id)
index = mergerepo.index
assert index.conflicts is None
merge_tree = index.write_tree()
assert merge_tree == merge_commits_tree
def test_merge_commits_favor(mergerepo):
branch_head_hex = '1b2bae55ac95a4be3f8983b86cd579226d0eb247'
merge_index = mergerepo.merge_commits(mergerepo.head.target, branch_head_hex, favor='ours')
assert merge_index.conflicts is None
with pytest.raises(ValueError):
mergerepo.merge_commits(mergerepo.head.target, branch_head_hex, favor='foo')
def test_merge_trees(mergerepo):
branch_head_hex = '03490f16b15a09913edb3a067a3dc67fbb8d41f1'
branch_id = mergerepo.get(branch_head_hex).id
ancestor_id = mergerepo.merge_base(mergerepo.head.target, branch_id)
merge_index = mergerepo.merge_trees(ancestor_id, mergerepo.head.target, branch_head_hex)
assert merge_index.conflicts is None
merge_commits_tree = merge_index.write_tree(mergerepo)
mergerepo.merge(branch_id)
index = mergerepo.index
assert index.conflicts is None
merge_tree = index.write_tree()
assert merge_tree == merge_commits_tree
def test_merge_trees_favor(mergerepo):
branch_head_hex = '1b2bae55ac95a4be3f8983b86cd579226d0eb247'
ancestor_id = mergerepo.merge_base(mergerepo.head.target, branch_head_hex)
merge_index = mergerepo.merge_trees(ancestor_id, mergerepo.head.target, branch_head_hex, favor='ours')
assert merge_index.conflicts is None
with pytest.raises(ValueError):
mergerepo.merge_trees(ancestor_id, mergerepo.head.target, branch_head_hex, favor='foo')
def test_merge_options():
from pygit2.ffi import C
# Default
o = pygit2.Repository._merge_options()
assert o.file_favor == C.GIT_MERGE_FILE_FAVOR_NORMAL
assert o.flags == C.GIT_MERGE_FIND_RENAMES
assert o.file_flags == 0
o = pygit2.Repository._merge_options(
favor='ours', flags={'fail_on_conflict': True}, file_flags={'ignore_whitespace': True}
)
assert o.file_favor == C.GIT_MERGE_FILE_FAVOR_OURS
assert o.flags == C.GIT_MERGE_FIND_RENAMES | C.GIT_MERGE_FAIL_ON_CONFLICT
assert o.file_flags == C.GIT_MERGE_FILE_IGNORE_WHITESPACE
o = pygit2.Repository._merge_options(
favor='theirs', flags={'find_renames': False}, file_flags={'ignore_whitespace': False}
)
assert o.file_favor == C.GIT_MERGE_FILE_FAVOR_THEIRS
assert o.flags == 0
assert o.file_flags == 0
o = pygit2.Repository._merge_options(
favor='union',
flags={'find_renames': True, 'no_recursive': True},
file_flags={'diff3_style': True, 'ignore_whitespace': True, 'patience': True}
)
assert o.file_favor == C.GIT_MERGE_FILE_FAVOR_UNION
assert o.flags == C.GIT_MERGE_FIND_RENAMES | C.GIT_MERGE_NO_RECURSIVE
assert o.file_flags == (
C.GIT_MERGE_FILE_STYLE_DIFF3
| C.GIT_MERGE_FILE_IGNORE_WHITESPACE
| C.GIT_MERGE_FILE_DIFF_PATIENCE
)
|
