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
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
|
# test_cli_merge.py -- Tests for dulwich merge CLI command
# Copyright (C) 2024 Jelmer Vernooij <jelmer@jelmer.uk>
#
# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
# Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
# General Public License as published by the Free Software Foundation; version 2.0
# or (at your option) any later version. You can redistribute it and/or
# modify it under the terms of either of these two licenses.
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# You should have received a copy of the licenses; if not, see
# <http://www.gnu.org/licenses/> for a copy of the GNU General Public License
# and <http://www.apache.org/licenses/LICENSE-2.0> for a copy of the Apache
# License, Version 2.0.
#
"""Tests for dulwich merge CLI command."""
import importlib.util
import os
import tempfile
import unittest
from dulwich import porcelain
from dulwich.cli import main
from .. import DependencyMissing, TestCase
class CLIMergeTests(TestCase):
"""Tests for the dulwich merge CLI command."""
def test_merge_fast_forward(self):
"""Test CLI merge with fast-forward."""
with tempfile.TemporaryDirectory() as tmpdir:
# Initialize repo
porcelain.init(tmpdir)
# Create initial commit
with open(os.path.join(tmpdir, "file1.txt"), "w") as f:
f.write("Initial content\n")
porcelain.add(tmpdir, paths=["file1.txt"])
porcelain.commit(tmpdir, message=b"Initial commit")
# Create a branch
porcelain.branch_create(tmpdir, "feature")
porcelain.checkout(tmpdir, "feature")
# Add a file on feature branch
with open(os.path.join(tmpdir, "file2.txt"), "w") as f:
f.write("Feature content\n")
porcelain.add(tmpdir, paths=["file2.txt"])
porcelain.commit(tmpdir, message=b"Add feature")
# Go back to master
porcelain.checkout(tmpdir, "master")
# Test merge via CLI
old_cwd = os.getcwd()
try:
os.chdir(tmpdir)
with self.assertLogs("dulwich.cli", level="INFO") as cm:
ret = main(["merge", "feature"])
log_output = "\n".join(cm.output)
self.assertEqual(ret, 0) # Success
self.assertIn("Merge successful", log_output)
# Check that file2.txt exists
self.assertTrue(os.path.exists(os.path.join(tmpdir, "file2.txt")))
finally:
os.chdir(old_cwd)
def test_merge_with_conflicts(self):
"""Test CLI merge with conflicts."""
# Check if merge3 module is available
if importlib.util.find_spec("merge3") is None:
raise DependencyMissing("merge3")
with tempfile.TemporaryDirectory() as tmpdir:
# Initialize repo
porcelain.init(tmpdir)
# Create initial commit
with open(os.path.join(tmpdir, "file1.txt"), "w") as f:
f.write("Initial content\n")
porcelain.add(tmpdir, paths=["file1.txt"])
porcelain.commit(tmpdir, message=b"Initial commit")
# Create a branch and modify file1
porcelain.branch_create(tmpdir, "feature")
porcelain.checkout(tmpdir, "feature")
with open(os.path.join(tmpdir, "file1.txt"), "w") as f:
f.write("Feature content\n")
porcelain.add(tmpdir, paths=["file1.txt"])
porcelain.commit(tmpdir, message=b"Modify file1 in feature")
# Go back to master and modify file1 differently
porcelain.checkout(tmpdir, "master")
with open(os.path.join(tmpdir, "file1.txt"), "w") as f:
f.write("Master content\n")
porcelain.add(tmpdir, paths=["file1.txt"])
porcelain.commit(tmpdir, message=b"Modify file1 in master")
# Test merge via CLI - should exit with error
old_cwd = os.getcwd()
try:
os.chdir(tmpdir)
with self.assertLogs("dulwich.cli", level="WARNING") as cm:
retcode = main(["merge", "feature"])
self.assertEqual(retcode, 1)
log_output = "\n".join(cm.output)
self.assertIn("Merge conflicts", log_output)
self.assertIn("file1.txt", log_output)
finally:
os.chdir(old_cwd)
def test_merge_already_up_to_date(self):
"""Test CLI merge when already up to date."""
with tempfile.TemporaryDirectory() as tmpdir:
# Initialize repo
porcelain.init(tmpdir)
# Create initial commit
with open(os.path.join(tmpdir, "file1.txt"), "w") as f:
f.write("Initial content\n")
porcelain.add(tmpdir, paths=["file1.txt"])
porcelain.commit(tmpdir, message=b"Initial commit")
# Test merge via CLI
old_cwd = os.getcwd()
try:
os.chdir(tmpdir)
with self.assertLogs("dulwich.cli", level="INFO") as cm:
ret = main(["merge", "HEAD"])
log_output = "\n".join(cm.output)
self.assertEqual(ret, 0) # Success
self.assertIn("Already up to date", log_output)
finally:
os.chdir(old_cwd)
def test_merge_no_commit(self):
"""Test CLI merge with --no-commit."""
with tempfile.TemporaryDirectory() as tmpdir:
# Initialize repo
porcelain.init(tmpdir)
# Create initial commit
with open(os.path.join(tmpdir, "file1.txt"), "w") as f:
f.write("Initial content\n")
porcelain.add(tmpdir, paths=["file1.txt"])
porcelain.commit(tmpdir, message=b"Initial commit")
# Create a branch
porcelain.branch_create(tmpdir, "feature")
porcelain.checkout(tmpdir, "feature")
# Add a file on feature branch
with open(os.path.join(tmpdir, "file2.txt"), "w") as f:
f.write("Feature content\n")
porcelain.add(tmpdir, paths=["file2.txt"])
porcelain.commit(tmpdir, message=b"Add feature")
# Go back to master and add another file
porcelain.checkout(tmpdir, "master")
with open(os.path.join(tmpdir, "file3.txt"), "w") as f:
f.write("Master content\n")
porcelain.add(tmpdir, paths=["file3.txt"])
porcelain.commit(tmpdir, message=b"Add file3")
# Test merge via CLI with --no-commit
old_cwd = os.getcwd()
try:
os.chdir(tmpdir)
with self.assertLogs("dulwich.cli", level="INFO") as cm:
ret = main(["merge", "--no-commit", "feature"])
log_output = "\n".join(cm.output)
self.assertEqual(ret, 0) # Success
self.assertIn("not committing", log_output)
# Check that files are merged
self.assertTrue(os.path.exists(os.path.join(tmpdir, "file2.txt")))
self.assertTrue(os.path.exists(os.path.join(tmpdir, "file3.txt")))
finally:
os.chdir(old_cwd)
def test_merge_no_ff(self):
"""Test CLI merge with --no-ff."""
with tempfile.TemporaryDirectory() as tmpdir:
# Initialize repo
porcelain.init(tmpdir)
# Create initial commit
with open(os.path.join(tmpdir, "file1.txt"), "w") as f:
f.write("Initial content\n")
porcelain.add(tmpdir, paths=["file1.txt"])
porcelain.commit(tmpdir, message=b"Initial commit")
# Create a branch
porcelain.branch_create(tmpdir, "feature")
porcelain.checkout(tmpdir, "feature")
# Add a file on feature branch
with open(os.path.join(tmpdir, "file2.txt"), "w") as f:
f.write("Feature content\n")
porcelain.add(tmpdir, paths=["file2.txt"])
porcelain.commit(tmpdir, message=b"Add feature")
# Go back to master
porcelain.checkout(tmpdir, "master")
# Test merge via CLI with --no-ff
old_cwd = os.getcwd()
try:
os.chdir(tmpdir)
with self.assertLogs("dulwich.cli", level="INFO") as cm:
ret = main(["merge", "--no-ff", "feature"])
log_output = "\n".join(cm.output)
self.assertEqual(ret, 0) # Success
self.assertIn("Merge successful", log_output)
self.assertIn("Created merge commit", log_output)
finally:
os.chdir(old_cwd)
def test_merge_with_message(self):
"""Test CLI merge with custom message."""
with tempfile.TemporaryDirectory() as tmpdir:
# Initialize repo
porcelain.init(tmpdir)
# Create initial commit
with open(os.path.join(tmpdir, "file1.txt"), "w") as f:
f.write("Initial content\n")
porcelain.add(tmpdir, paths=["file1.txt"])
porcelain.commit(tmpdir, message=b"Initial commit")
# Create a branch
porcelain.branch_create(tmpdir, "feature")
porcelain.checkout(tmpdir, "feature")
# Add a file on feature branch
with open(os.path.join(tmpdir, "file2.txt"), "w") as f:
f.write("Feature content\n")
porcelain.add(tmpdir, paths=["file2.txt"])
porcelain.commit(tmpdir, message=b"Add feature")
# Go back to master and add another file
porcelain.checkout(tmpdir, "master")
with open(os.path.join(tmpdir, "file3.txt"), "w") as f:
f.write("Master content\n")
porcelain.add(tmpdir, paths=["file3.txt"])
porcelain.commit(tmpdir, message=b"Add file3")
# Test merge via CLI with custom message
old_cwd = os.getcwd()
try:
os.chdir(tmpdir)
with self.assertLogs("dulwich.cli", level="INFO") as cm:
ret = main(["merge", "-m", "Custom merge message", "feature"])
log_output = "\n".join(cm.output)
self.assertEqual(ret, 0) # Success
self.assertIn("Merge successful", log_output)
finally:
os.chdir(old_cwd)
def test_octopus_merge_three_branches(self):
"""Test CLI octopus merge with three branches."""
with tempfile.TemporaryDirectory() as tmpdir:
# Initialize repo
porcelain.init(tmpdir)
# Create initial commit with three files
with open(os.path.join(tmpdir, "file1.txt"), "w") as f:
f.write("File 1 content\n")
with open(os.path.join(tmpdir, "file2.txt"), "w") as f:
f.write("File 2 content\n")
with open(os.path.join(tmpdir, "file3.txt"), "w") as f:
f.write("File 3 content\n")
porcelain.add(tmpdir, paths=["file1.txt", "file2.txt", "file3.txt"])
porcelain.commit(tmpdir, message=b"Initial commit")
# Create branch1 and modify file1
porcelain.branch_create(tmpdir, "branch1")
porcelain.checkout(tmpdir, "branch1")
with open(os.path.join(tmpdir, "file1.txt"), "w") as f:
f.write("Branch1 modified file1\n")
porcelain.add(tmpdir, paths=["file1.txt"])
porcelain.commit(tmpdir, message=b"Branch1 modifies file1")
# Create branch2 and modify file2
porcelain.checkout(tmpdir, "master")
porcelain.branch_create(tmpdir, "branch2")
porcelain.checkout(tmpdir, "branch2")
with open(os.path.join(tmpdir, "file2.txt"), "w") as f:
f.write("Branch2 modified file2\n")
porcelain.add(tmpdir, paths=["file2.txt"])
porcelain.commit(tmpdir, message=b"Branch2 modifies file2")
# Create branch3 and modify file3
porcelain.checkout(tmpdir, "master")
porcelain.branch_create(tmpdir, "branch3")
porcelain.checkout(tmpdir, "branch3")
with open(os.path.join(tmpdir, "file3.txt"), "w") as f:
f.write("Branch3 modified file3\n")
porcelain.add(tmpdir, paths=["file3.txt"])
porcelain.commit(tmpdir, message=b"Branch3 modifies file3")
# Go back to master and octopus merge all three branches via CLI
porcelain.checkout(tmpdir, "master")
old_cwd = os.getcwd()
try:
os.chdir(tmpdir)
with self.assertLogs("dulwich.cli", level="INFO") as cm:
ret = main(["merge", "branch1", "branch2", "branch3"])
log_output = "\n".join(cm.output)
self.assertEqual(ret, 0) # Success
self.assertIn("Octopus merge successful", log_output)
# Check that all modifications are present
with open(os.path.join(tmpdir, "file1.txt")) as f:
self.assertEqual(f.read(), "Branch1 modified file1\n")
with open(os.path.join(tmpdir, "file2.txt")) as f:
self.assertEqual(f.read(), "Branch2 modified file2\n")
with open(os.path.join(tmpdir, "file3.txt")) as f:
self.assertEqual(f.read(), "Branch3 modified file3\n")
finally:
os.chdir(old_cwd)
def test_octopus_merge_with_conflicts(self):
"""Test CLI octopus merge with conflicts."""
# Check if merge3 module is available
if importlib.util.find_spec("merge3") is None:
raise DependencyMissing("merge3")
with tempfile.TemporaryDirectory() as tmpdir:
# Initialize repo
porcelain.init(tmpdir)
# Create initial commit
with open(os.path.join(tmpdir, "file1.txt"), "w") as f:
f.write("Initial content\n")
porcelain.add(tmpdir, paths=["file1.txt"])
porcelain.commit(tmpdir, message=b"Initial commit")
# Create branch1 and modify file1
porcelain.branch_create(tmpdir, "branch1")
porcelain.checkout(tmpdir, "branch1")
with open(os.path.join(tmpdir, "file1.txt"), "w") as f:
f.write("Branch1 content\n")
porcelain.add(tmpdir, paths=["file1.txt"])
porcelain.commit(tmpdir, message=b"Branch1 modifies file1")
# Create branch2 and modify file1 differently
porcelain.checkout(tmpdir, "master")
porcelain.branch_create(tmpdir, "branch2")
porcelain.checkout(tmpdir, "branch2")
with open(os.path.join(tmpdir, "file1.txt"), "w") as f:
f.write("Branch2 content\n")
porcelain.add(tmpdir, paths=["file1.txt"])
porcelain.commit(tmpdir, message=b"Branch2 modifies file1")
# Go back to master and try octopus merge via CLI - should fail
porcelain.checkout(tmpdir, "master")
old_cwd = os.getcwd()
try:
os.chdir(tmpdir)
with self.assertLogs("dulwich.cli", level="WARNING") as cm:
ret = main(["merge", "branch1", "branch2"])
log_output = "\n".join(cm.output)
self.assertEqual(ret, 1) # Error
self.assertIn("Octopus merge failed", log_output)
self.assertIn("refusing to merge with conflicts", log_output)
finally:
os.chdir(old_cwd)
def test_octopus_merge_no_commit(self):
"""Test CLI octopus merge with --no-commit."""
with tempfile.TemporaryDirectory() as tmpdir:
# Initialize repo
porcelain.init(tmpdir)
# Create initial commit
with open(os.path.join(tmpdir, "file1.txt"), "w") as f:
f.write("File 1 content\n")
with open(os.path.join(tmpdir, "file2.txt"), "w") as f:
f.write("File 2 content\n")
porcelain.add(tmpdir, paths=["file1.txt", "file2.txt"])
porcelain.commit(tmpdir, message=b"Initial commit")
# Create branch1 and modify file1
porcelain.branch_create(tmpdir, "branch1")
porcelain.checkout(tmpdir, "branch1")
with open(os.path.join(tmpdir, "file1.txt"), "w") as f:
f.write("Branch1 modified file1\n")
porcelain.add(tmpdir, paths=["file1.txt"])
porcelain.commit(tmpdir, message=b"Branch1 modifies file1")
# Create branch2 and modify file2
porcelain.checkout(tmpdir, "master")
porcelain.branch_create(tmpdir, "branch2")
porcelain.checkout(tmpdir, "branch2")
with open(os.path.join(tmpdir, "file2.txt"), "w") as f:
f.write("Branch2 modified file2\n")
porcelain.add(tmpdir, paths=["file2.txt"])
porcelain.commit(tmpdir, message=b"Branch2 modifies file2")
# Go back to master and octopus merge with --no-commit
porcelain.checkout(tmpdir, "master")
old_cwd = os.getcwd()
try:
os.chdir(tmpdir)
with self.assertLogs("dulwich.cli", level="INFO") as cm:
ret = main(["merge", "--no-commit", "branch1", "branch2"])
log_output = "\n".join(cm.output)
self.assertEqual(ret, 0) # Success
self.assertIn("not committing", log_output)
# Check that files are merged
with open(os.path.join(tmpdir, "file1.txt")) as f:
self.assertEqual(f.read(), "Branch1 modified file1\n")
with open(os.path.join(tmpdir, "file2.txt")) as f:
self.assertEqual(f.read(), "Branch2 modified file2\n")
finally:
os.chdir(old_cwd)
if __name__ == "__main__":
unittest.main()
|
