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
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
|
# 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.
import unittest
import pygit2
import pytest
BLOB_OLD_SHA = 'a520c24d85fbfc815d385957eed41406ca5a860b'
BLOB_NEW_SHA = '3b18e512dba79e4c8300dd08aeb37f8e728b8dad'
BLOB_OLD_CONTENT = b"""hello world
hola mundo
bonjour le monde
"""
BLOB_NEW_CONTENT = b'foo bar\n'
BLOB_OLD_PATH = 'a/file'
BLOB_NEW_PATH = 'b/file'
BLOB_PATCH2 = """diff --git a/a/file b/b/file
index a520c24..3b18e51 100644
--- a/a/file
+++ b/b/file
@@ -1,3 +1 @@
hello world
-hola mundo
-bonjour le monde
"""
BLOB_PATCH = """diff --git a/a/file b/b/file
index a520c24..d675fa4 100644
--- a/a/file
+++ b/b/file
@@ -1,3 +1 @@
-hello world
-hola mundo
-bonjour le monde
+foo bar
"""
BLOB_PATCH_ADDED = """diff --git a/a/file b/b/file
new file mode 100644
index 0000000..d675fa4
--- /dev/null
+++ b/b/file
@@ -0,0 +1 @@
+foo bar
"""
BLOB_PATCH_DELETED = """diff --git a/a/file b/b/file
deleted file mode 100644
index a520c24..0000000
--- a/a/file
+++ /dev/null
@@ -1,3 +0,0 @@
-hello world
-hola mundo
-bonjour le monde
"""
def test_patch_create_from_buffers():
patch = pygit2.Patch.create_from(
BLOB_OLD_CONTENT,
BLOB_NEW_CONTENT,
old_as_path=BLOB_OLD_PATH,
new_as_path=BLOB_NEW_PATH,
)
assert patch.text == BLOB_PATCH
@unittest.skip("Doesn't work in buildd")
def test_patch_create_from_blobs(testrepo):
old_blob = testrepo[BLOB_OLD_SHA]
new_blob = testrepo[BLOB_NEW_SHA]
patch = pygit2.Patch.create_from(
old_blob,
new_blob,
old_as_path=BLOB_OLD_PATH,
new_as_path=BLOB_NEW_PATH,
)
assert patch.text == BLOB_PATCH2
@unittest.skip("Doesn't work in buildd")
def test_patch_create_from_blob_buffer(testrepo):
old_blob = testrepo[BLOB_OLD_SHA]
patch = pygit2.Patch.create_from(
old_blob,
BLOB_NEW_CONTENT,
old_as_path=BLOB_OLD_PATH,
new_as_path=BLOB_NEW_PATH,
)
assert patch.text == BLOB_PATCH
def test_patch_create_from_blob_buffer_add(testrepo):
patch = pygit2.Patch.create_from(
None,
BLOB_NEW_CONTENT,
old_as_path=BLOB_OLD_PATH,
new_as_path=BLOB_NEW_PATH,
)
assert patch.text == BLOB_PATCH_ADDED
@unittest.skip("Doesn't work in buildd")
def test_patch_create_from_blob_buffer_delete(testrepo):
old_blob = testrepo[BLOB_OLD_SHA]
patch = pygit2.Patch.create_from(
old_blob,
None,
old_as_path=BLOB_OLD_PATH,
new_as_path=BLOB_NEW_PATH,
)
assert patch.text == BLOB_PATCH_DELETED
def test_patch_create_from_bad_old_type_arg(testrepo):
with pytest.raises(TypeError):
pygit2.Patch.create_from(testrepo, BLOB_NEW_CONTENT)
def test_patch_create_from_bad_new_type_arg(testrepo):
with pytest.raises(TypeError):
pygit2.Patch.create_from(None, testrepo)
def test_context_lines(testrepo):
old_blob = testrepo[BLOB_OLD_SHA]
new_blob = testrepo[BLOB_NEW_SHA]
patch = pygit2.Patch.create_from(
old_blob,
new_blob,
old_as_path=BLOB_OLD_PATH,
new_as_path=BLOB_NEW_PATH,
)
context_count = len(
[line for line in patch.text.splitlines() if line.startswith(" ")]
)
assert context_count != 0
@unittest.skip("Doesn't work in buildd")
def test_no_context_lines(testrepo):
old_blob = testrepo[BLOB_OLD_SHA]
new_blob = testrepo[BLOB_NEW_SHA]
patch = pygit2.Patch.create_from(
old_blob,
new_blob,
old_as_path=BLOB_OLD_PATH,
new_as_path=BLOB_NEW_PATH,
context_lines=0,
)
context_count = len(
[line for line in patch.text.splitlines() if line.startswith(" ")]
)
assert context_count == 0
def test_patch_create_blob_blobs(testrepo):
old_blob = testrepo[testrepo.create_blob(BLOB_OLD_CONTENT)]
new_blob = testrepo[testrepo.create_blob(BLOB_NEW_CONTENT)]
patch = pygit2.Patch.create_from(
old_blob,
new_blob,
old_as_path=BLOB_OLD_PATH,
new_as_path=BLOB_NEW_PATH,
)
assert patch.text == BLOB_PATCH
def test_patch_create_blob_buffer(testrepo):
blob = testrepo[testrepo.create_blob(BLOB_OLD_CONTENT)]
patch = pygit2.Patch.create_from(
blob,
BLOB_NEW_CONTENT,
old_as_path=BLOB_OLD_PATH,
new_as_path=BLOB_NEW_PATH,
)
assert patch.text == BLOB_PATCH
def test_patch_create_blob_delete(testrepo):
blob = testrepo[testrepo.create_blob(BLOB_OLD_CONTENT)]
patch = pygit2.Patch.create_from(
blob,
None,
old_as_path=BLOB_OLD_PATH,
new_as_path=BLOB_NEW_PATH,
)
assert patch.text == BLOB_PATCH_DELETED
def test_patch_create_blob_add(testrepo):
blob = testrepo[testrepo.create_blob(BLOB_NEW_CONTENT)]
patch = pygit2.Patch.create_from(
None,
blob,
old_as_path=BLOB_OLD_PATH,
new_as_path=BLOB_NEW_PATH,
)
assert patch.text == BLOB_PATCH_ADDED
def test_patch_delete_blob(testrepo):
blob = testrepo[BLOB_OLD_SHA]
patch = pygit2.Patch.create_from(
blob,
None,
old_as_path=BLOB_OLD_PATH,
new_as_path=BLOB_NEW_PATH,
)
# Make sure that even after deleting the blob the patch still has the
# necessary references to generate its patch
del blob
assert patch.text == BLOB_PATCH_DELETED
def test_patch_multi_blob(testrepo):
blob = testrepo[BLOB_OLD_SHA]
patch = pygit2.Patch.create_from(
blob,
None
)
patch_text = patch.text
blob = testrepo[BLOB_OLD_SHA]
patch2 = pygit2.Patch.create_from(
blob,
None
)
patch_text2 = patch.text
assert patch_text == patch_text2
assert patch_text == patch.text
assert patch_text2 == patch2.text
assert patch.text == patch2.text
|
