##// END OF EJS Templates
Added some missing tests for copy+chmod, copy+chmod+modify...
marcink -
r4007:3e8f48cc default
parent child Browse files
Show More
@@ -0,0 +1,5 b''
1 diff --git a/file3 b/file4
2 old mode 100644
3 new mode 100755
4 copy from file3
5 copy to file4
@@ -0,0 +1,9 b''
1 diff --git a/file2 b/file3
2 copy from file2
3 copy to file3
4 --- a/file2
5 +++ b/file3
6 @@ -1,2 +1,3 @@
7 line1
8 line2
9 +line3
@@ -0,0 +1,13 b''
1 diff --git a/file4 b/file5
2 old mode 100755
3 new mode 100644
4 copy from file4
5 copy to file5
6 --- a/file4
7 +++ b/file5
8 @@ -1,3 +1,4 @@
9 -line1
10 line2
11 line3
12 +line4
13 +line5
@@ -223,6 +223,31 b' DIFF_FIXTURES = {'
223 'deleted': 0,
223 'deleted': 0,
224 'binary': True,
224 'binary': True,
225 'ops': {COPIED_FILENODE: 'file copied from file1 to file2'}}),
225 'ops': {COPIED_FILENODE: 'file copied from file1 to file2'}}),
226 ],
227 'hg_diff_copy_and_modify_file.diff': [
228 ('file3', 'M',
229 {'added': 1,
230 'deleted': 0,
231 'binary': False,
232 'ops': {COPIED_FILENODE: 'file copied from file2 to file3',
233 MOD_FILENODE: 'modified file'}}),
234 ],
235 'hg_diff_copy_and_chmod_file.diff': [
236 ('file4', 'M',
237 {'added': 0,
238 'deleted': 0,
239 'binary': True,
240 'ops': {COPIED_FILENODE: 'file copied from file3 to file4',
241 CHMOD_FILENODE: 'modified file chmod 100644 => 100755'}}),
242 ],
243 'hg_diff_copy_chmod_and_edit_file.diff': [
244 ('file5', 'M',
245 {'added': 2,
246 'deleted': 1,
247 'binary': False,
248 'ops': {COPIED_FILENODE: 'file copied from file4 to file5',
249 CHMOD_FILENODE: 'modified file chmod 100755 => 100644',
250 MOD_FILENODE: 'modified file'}}),
226 ]
251 ]
227 # 'large_diff.diff': [
252 # 'large_diff.diff': [
228 # ('.hgignore', 'A', {'deleted': 0, 'binary': False, 'added': 3, 'ops': {1: 'new file 100644'}}),
253 # ('.hgignore', 'A', {'deleted': 0, 'binary': False, 'added': 3, 'ops': {1: 'new file 100644'}}),
General Comments 0
You need to be logged in to leave comments. Login now