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
|
# 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.
import pygit2
from pygit2.enums import ApplyLocation, CheckoutStrategy, FileStatus
import pytest
import os
from pathlib import Path
def read_content(testrepo):
with (Path(testrepo.workdir) / 'hello.txt').open('rb') as f:
return f.read().decode('utf-8')
@pytest.fixture
def new_content():
content = ['bye world', 'adiós', 'au revoir monde']
content = ''.join(x + os.linesep for x in content)
return content
@pytest.fixture
def old_content(testrepo):
with (Path(testrepo.workdir) / 'hello.txt').open('rb') as f:
return f.read().decode('utf-8')
@pytest.fixture
def patch_diff(testrepo, new_content):
# Create the patch
with (Path(testrepo.workdir) / 'hello.txt').open('wb') as f:
f.write(new_content.encode('utf-8'))
patch = testrepo.diff().patch
# Rollback all changes
testrepo.checkout('HEAD', strategy=CheckoutStrategy.FORCE)
# Return the diff
return pygit2.Diff.parse_diff(patch)
@pytest.fixture
def foreign_patch_diff():
patch_contents = """diff --git a/this_file_does_not_exist b/this_file_does_not_exist
index 7f129fd..af431f2 100644
--- a/this_file_does_not_exist
+++ b/this_file_does_not_exist
@@ -1 +1 @@
-a contents 2
+a contents
"""
return pygit2.Diff.parse_diff(patch_contents)
def test_apply_type_error(testrepo):
# Check apply type error
with pytest.raises(TypeError):
testrepo.apply('HEAD')
def test_apply_diff_to_workdir(testrepo, new_content, patch_diff):
# Apply the patch and compare
testrepo.apply(patch_diff, ApplyLocation.WORKDIR)
assert read_content(testrepo) == new_content
assert testrepo.status_file('hello.txt') == FileStatus.WT_MODIFIED
def test_apply_diff_to_index(testrepo, old_content, patch_diff):
# Apply the patch and compare
testrepo.apply(patch_diff, ApplyLocation.INDEX)
assert read_content(testrepo) == old_content
assert testrepo.status_file('hello.txt') & FileStatus.INDEX_MODIFIED
def test_apply_diff_to_both(testrepo, new_content, patch_diff):
# Apply the patch and compare
testrepo.apply(patch_diff, ApplyLocation.BOTH)
assert read_content(testrepo) == new_content
assert testrepo.status_file('hello.txt') & FileStatus.INDEX_MODIFIED
def test_diff_applies_to_workdir(testrepo, old_content, patch_diff):
# See if patch applies
assert testrepo.applies(patch_diff, ApplyLocation.WORKDIR)
# Ensure it was a dry run
assert read_content(testrepo) == old_content
# Apply patch for real, then ensure it can't be applied again
testrepo.apply(patch_diff, ApplyLocation.WORKDIR)
assert not testrepo.applies(patch_diff, ApplyLocation.WORKDIR)
# It can still be applied to the index, though
assert testrepo.applies(patch_diff, ApplyLocation.INDEX)
def test_diff_applies_to_index(testrepo, old_content, patch_diff):
# See if patch applies
assert testrepo.applies(patch_diff, ApplyLocation.INDEX)
# Ensure it was a dry run
assert read_content(testrepo) == old_content
# Apply patch for real, then ensure it can't be applied again
testrepo.apply(patch_diff, ApplyLocation.INDEX)
assert not testrepo.applies(patch_diff, ApplyLocation.INDEX)
# It can still be applied to the workdir, though
assert testrepo.applies(patch_diff, ApplyLocation.WORKDIR)
def test_diff_applies_to_both(testrepo, old_content, patch_diff):
# See if patch applies
assert testrepo.applies(patch_diff, ApplyLocation.BOTH)
# Ensure it was a dry run
assert read_content(testrepo) == old_content
# Apply patch for real, then ensure it can't be applied again
testrepo.apply(patch_diff, ApplyLocation.BOTH)
assert not testrepo.applies(patch_diff, ApplyLocation.BOTH)
assert not testrepo.applies(patch_diff, ApplyLocation.WORKDIR)
assert not testrepo.applies(patch_diff, ApplyLocation.INDEX)
def test_applies_error(testrepo, old_content, patch_diff, foreign_patch_diff):
# Try to apply a "foreign" patch that affects files that aren't in the repo;
# ensure we get OSError about the missing file (due to raise_error)
with pytest.raises(OSError):
testrepo.applies(foreign_patch_diff, ApplyLocation.BOTH, raise_error=True)
# Apply a valid patch
testrepo.apply(patch_diff, ApplyLocation.BOTH)
# Ensure it can't be applied again and we get an exception about it (due to raise_error)
with pytest.raises(pygit2.GitError):
testrepo.applies(patch_diff, ApplyLocation.BOTH, raise_error=True)
|
