Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork966
Expand file tree
/
Copy pathtest_diff.py
More file actions
268 lines (227 loc) · 11.2 KB
/
test_diff.py
File metadata and controls
268 lines (227 loc) · 11.2 KB
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
# coding: utf-8
# test_diff.py
# Copyright (C) 2008, 2009 Michael Trier (mtrier@gmail.com) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
importddt
fromgitimport (
Repo,
GitCommandError,
Diff,
DiffIndex,
NULL_TREE,
)
fromgit.cmdimportGit
fromgit.test.libimport (
TestBase,
StringProcessAdapter,
fixture,
assert_equal,
assert_true,
)
fromgit.test.libimportwith_rw_directory
importos.pathasosp
@ddt.ddt
classTestDiff(TestBase):
deftearDown(self):
importgc
gc.collect()
def_assert_diff_format(self,diffs):
# verify that the format of the diff is sane
fordiffindiffs:
ifdiff.a_mode:
assertisinstance(diff.a_mode,int)
ifdiff.b_mode:
assertisinstance(diff.b_mode,int)
ifdiff.a_blob:
assertnotdiff.a_blob.path.endswith('\n')
ifdiff.b_blob:
assertnotdiff.b_blob.path.endswith('\n')
# END for each diff
returndiffs
@with_rw_directory
deftest_diff_with_staged_file(self,rw_dir):
# SETUP INDEX WITH MULTIPLE STAGES
r=Repo.init(rw_dir)
fp=osp.join(rw_dir,'hello.txt')
withopen(fp,'w')asfs:
fs.write("hello world")
r.git.add(Git.polish_url(fp))
r.git.commit(message="init")
withopen(fp,'w')asfs:
fs.write("Hola Mundo")
r.git.commit(all=True,message="change on master")
r.git.checkout('HEAD~1',b='topic')
withopen(fp,'w')asfs:
fs.write("Hallo Welt")
r.git.commit(all=True,message="change on topic branch")
# there must be a merge-conflict
self.failUnlessRaises(GitCommandError,r.git.cherry_pick,'master')
# Now do the actual testing - this should just work
self.assertEqual(len(r.index.diff(None)),2)
self.assertEqual(len(r.index.diff(None,create_patch=True)),0,
"This should work, but doesn't right now ... it's OK")
deftest_list_from_string_new_mode(self):
output=StringProcessAdapter(fixture('diff_new_mode'))
diffs=Diff._index_from_patch_format(self.rorepo,output)
self._assert_diff_format(diffs)
assert_equal(1,len(diffs))
assert_equal(8,len(diffs[0].diff.splitlines()))
deftest_diff_with_rename(self):
output=StringProcessAdapter(fixture('diff_rename'))
diffs=Diff._index_from_patch_format(self.rorepo,output)
self._assert_diff_format(diffs)
assert_equal(1,len(diffs))
diff=diffs[0]
assert_true(diff.renamed_file)
assert_true(diff.renamed)
assert_equal(diff.rename_from,u'Jérôme')
assert_equal(diff.rename_to,u'müller')
assert_equal(diff.raw_rename_from,b'J\xc3\xa9r\xc3\xb4me')
assert_equal(diff.raw_rename_to,b'm\xc3\xbcller')
assertisinstance(str(diff),str)
output=StringProcessAdapter(fixture('diff_rename_raw'))
diffs=Diff._index_from_raw_format(self.rorepo,output)
self.assertEqual(len(diffs),1)
diff=diffs[0]
self.assertIsNotNone(diff.renamed_file)
self.assertIsNotNone(diff.renamed)
self.assertEqual(diff.rename_from,'this')
self.assertEqual(diff.rename_to,'that')
self.assertEqual(len(list(diffs.iter_change_type('R'))),1)
deftest_diff_of_modified_files_not_added_to_the_index(self):
output=StringProcessAdapter(fixture('diff_abbrev-40_full-index_M_raw_no-color'))
diffs=Diff._index_from_raw_format(self.rorepo,output)
self.assertEqual(len(diffs),1,'one modification')
self.assertEqual(len(list(diffs.iter_change_type('M'))),1,'one modification')
self.assertEqual(diffs[0].change_type,'M')
self.assertIsNone(diffs[0].b_blob,)
@ddt.data(
(Diff._index_from_patch_format,'diff_patch_binary'),
(Diff._index_from_raw_format,'diff_raw_binary')
)
deftest_binary_diff(self,case):
method,file_name=case
res=method(None,StringProcessAdapter(fixture(file_name)))
self.assertEqual(len(res),1)
self.assertEqual(len(list(res.iter_change_type('M'))),1)
ifres[0].diff:
self.assertEqual(res[0].diff,
b"Binary files a/rps and b/rps differ\n",
"in patch mode, we get a diff text")
self.assertIsNotNone(str(res[0]),"This call should just work")
deftest_diff_index(self):
output=StringProcessAdapter(fixture('diff_index_patch'))
res=Diff._index_from_patch_format(None,output)
self.assertEqual(len(res),6)
fordrinres:
self.assertTrue(dr.diff.startswith(b'@@'),dr)
self.assertIsNotNone(str(dr),"Diff to string conversion should be possible")
# end for each diff
dr=res[3]
assertdr.diff.endswith(b"+Binary files a/rps and b/rps differ\n")
deftest_diff_index_raw_format(self):
output=StringProcessAdapter(fixture('diff_index_raw'))
res=Diff._index_from_raw_format(None,output)
self.assertIsNotNone(res[0].deleted_file)
self.assertIsNone(res[0].b_path,)
deftest_diff_initial_commit(self):
initial_commit=self.rorepo.commit('33ebe7acec14b25c5f84f35a664803fcab2f7781')
# Without creating a patch...
diff_index=initial_commit.diff(NULL_TREE)
self.assertEqual(diff_index[0].b_path,'CHANGES')
self.assertIsNotNone(diff_index[0].new_file)
self.assertEqual(diff_index[0].diff,'')
# ...and with creating a patch
diff_index=initial_commit.diff(NULL_TREE,create_patch=True)
self.assertIsNone(diff_index[0].a_path,repr(diff_index[0].a_path))
self.assertEqual(diff_index[0].b_path,'CHANGES',repr(diff_index[0].b_path))
self.assertIsNotNone(diff_index[0].new_file)
self.assertEqual(diff_index[0].diff,fixture('diff_initial'))
deftest_diff_unsafe_paths(self):
output=StringProcessAdapter(fixture('diff_patch_unsafe_paths'))
res=Diff._index_from_patch_format(None,output)
# The "Additions"
self.assertEqual(res[0].b_path,u'path/ starting with a space')
self.assertEqual(res[1].b_path,u'path/"with-quotes"')
self.assertEqual(res[2].b_path,u"path/'with-single-quotes'")
self.assertEqual(res[3].b_path,u'path/ending in a space ')
self.assertEqual(res[4].b_path,u'path/with\ttab')
self.assertEqual(res[5].b_path,u'path/with\nnewline')
self.assertEqual(res[6].b_path,u'path/with spaces')
self.assertEqual(res[7].b_path,u'path/with-question-mark?')
self.assertEqual(res[8].b_path,u'path/¯\\_(ツ)_|¯')
self.assertEqual(res[9].b_path,u'path/💩.txt')
self.assertEqual(res[9].b_rawpath,b'path/\xf0\x9f\x92\xa9.txt')
self.assertEqual(res[10].b_path,u'path/�-invalid-unicode-path.txt')
self.assertEqual(res[10].b_rawpath,b'path/\x80-invalid-unicode-path.txt')
# The "Moves"
# NOTE: The path prefixes a/ and b/ here are legit! We're actually
# verifying that it's not "a/a/" that shows up, see the fixture data.
self.assertEqual(res[11].a_path,u'a/with spaces')# NOTE: path a/ here legit!
self.assertEqual(res[11].b_path,u'b/with some spaces')# NOTE: path b/ here legit!
self.assertEqual(res[12].a_path,u'a/ending in a space ')
self.assertEqual(res[12].b_path,u'b/ending with space ')
self.assertEqual(res[13].a_path,u'a/"with-quotes"')
self.assertEqual(res[13].b_path,u'b/"with even more quotes"')
deftest_diff_patch_format(self):
# test all of the 'old' format diffs for completness - it should at least
# be able to deal with it
fixtures= ("diff_2","diff_2f","diff_f","diff_i","diff_mode_only",
"diff_new_mode","diff_numstat","diff_p","diff_rename",
"diff_tree_numstat_root","diff_patch_unsafe_paths")
forfixture_nameinfixtures:
diff_proc=StringProcessAdapter(fixture(fixture_name))
Diff._index_from_patch_format(self.rorepo,diff_proc)
# END for each fixture
deftest_diff_with_spaces(self):
data=StringProcessAdapter(fixture('diff_file_with_spaces'))
diff_index=Diff._index_from_patch_format(self.rorepo,data)
self.assertIsNone(diff_index[0].a_path,repr(diff_index[0].a_path))
self.assertEqual(diff_index[0].b_path,u'file with spaces',repr(diff_index[0].b_path))
deftest_diff_interface(self):
# test a few variations of the main diff routine
assertion_map=dict()
fori,commitinenumerate(self.rorepo.iter_commits('0.1.6',max_count=2)):
diff_item=commit
ifi%2==0:
diff_item=commit.tree
# END use tree every second item
forotherin (None,NULL_TREE,commit.Index,commit.parents[0]):
forpathsin (None,"CHANGES", ("CHANGES","lib")):
forcreate_patchinrange(2):
diff_index=diff_item.diff(other=other,paths=paths,create_patch=create_patch)
assertisinstance(diff_index,DiffIndex)
ifdiff_index:
self._assert_diff_format(diff_index)
forctinDiffIndex.change_type:
key='ct_%s'%ct
assertion_map.setdefault(key,0)
assertion_map[key]=assertion_map[key]+len(list(diff_index.iter_change_type(ct)))
# END for each changetype
# check entries
diff_set=set()
diff_set.add(diff_index[0])
diff_set.add(diff_index[0])
self.assertEqual(len(diff_set),1)
self.assertEqual(diff_index[0],diff_index[0])
self.assertFalse(diff_index[0]!=diff_index[0])
fordrindiff_index:
self.assertIsNotNone(str(dr),"Diff to string conversion should be possible")
# END diff index checking
# END for each patch option
# END for each path option
# END for each other side
# END for each commit
# assert we could always find at least one instance of the members we
# can iterate in the diff index - if not this indicates its not working correctly
# or our test does not span the whole range of possibilities
forkey,valueinassertion_map.items():
self.assertIsNotNone(value,"Did not find diff for %s"%key)
# END for each iteration type
# test path not existing in the index - should be ignored
c=self.rorepo.head.commit
cp=c.parents[0]
diff_index=c.diff(cp, ["does/not/exist"])
self.assertEqual(len(diff_index),0)