Add tests for file-level application

Also refactor the apply tests to use a common type now that there are three variants that do almost the same thing for each test.
2026-06-08 13:18:30 +00:00 · 2020-01-27 22:35:13 -08:00
parent 19ec1a24b4
commit 9fc14fddb0
10 changed files with 547 additions and 66 deletions
@@ -0,0 +1,13 @@
+diff --git a/gitdiff/testdata/apply/bin_file_modify.src b/gitdiff/testdata/apply/bin_file_modify.src
+GIT binary patch
+delta 172
+zcmV;d08{^f2)qc8AP{I3VQ>J`s>wb0HU+h#6w8q?tUO~cHmDjZi2<8yZ9XmKhhMdo
+zWu(4bg|8QwzZ|1e*rL4P#)`Fen<n~ik=E?$qG6?hzJ6$u{l5W#?uwHb0q6w)00000
+zlLZ3%0RfW%1N%UMJ{~Z~0@X${&1Kk#98tb3==a{J7A;`O`v&<T@514_mvMTz72b#n
+atf$#NLoPbNe?RPFJVt1aCFGoQbiKD!OHgJ2
+
+delta 112
+zcmV-$0FVE?2!IHXAP~DY<7&llQfwqYA%tL<sR@xVtUMD;+4ZG>XTQ5=J2y;^BfB}4
+zWkisH791|vOVl5e-@^VLX0s~Ky_UyN!3;CgPr>Edj0j+0gOSwSsFsr$0q6zUJph<q
+SlLZ3%0XmZb1N#I__7UCuR5Dxu
+
@@ -0,0 +1,2 @@
+#!/bin/bash
+echo "this file is executable"
@@ -0,0 +1,3 @@
+diff --git a/gitdiff/testdata/apply/file_mode_change.src b/gitdiff/testdata/apply/file_mode_change.src
+old mode 100644
+new mode 100755
@@ -0,0 +1,2 @@
+#!/bin/bash
+echo "this file is executable"
@@ -0,0 +1,195 @@
+the first line is different
+this is line 2
+this is line 3
+this is line 4
+this is line 5
+this is line 6
+this is line 7
+this is line 8
+this is line 9
+this is line 10
+this is line 11
+this is line 12
+this is line 13
+this is line 14
+this is line 15
+this is line 16
+this is line 17
+this is line 18
+this is line 19
+this line offsets all the line numbers!
+this is line 20
+this is line 21
+until here, now we're back on track!
+this is line 24
+this is line 25
+this is line 26
+this is line 27
+this is line 28
+this is line 29
+this is line 30
+this is line 31
+this is line 32
+this is line 33
+this is line 34
+this is line 35
+this is line 36
+this is line 37
+this is line 38
+this is line 39
+this is line 40
+this is line 41
+this is line 42
+this is line 43
+this is line 44
+this is line 45
+this is line 46
+this is line 47
+this is line 48
+this is line 49
+this is line 50
+this is line 51
+this is line 52
+this is line 53
+this is line 54
+this is line 55
+once upon a time, a line
+  in a text
+    file
+  changed
+this is line 60
+this is line 61
+this is line 62
+this is line 63
+this is line 64
+this is line 65
+this is line 66
+this is line 67
+this is line 68
+this is line 69
+this is line 70
+this is line 71
+this is line 72
+this is line 73
+this is line 74
+this is line 75
+this is line 76
+this is line 77
+this is line 78
+this is line 79
+this is line 80
+this is line 81
+this is line 82
+this is line 83
+this is line 84
+this is line 85
+this is line 86
+this is line 87
+this is line 88
+this is line 89
+this is line 90
+this is line 91
+this is line 92
+this is line 93
+this is line 94
+this is line 95
+this is line 96
+this is line 97
+this is line 98
+this is line 99
+this is line 100
+this is line 101
+this is line 102
+this is line 103
+this is line 104
+this is line 105
+this is line 106
+this is line 107
+this is line 108
+this is line 109
+this is line 110
+this is line 111
+this is line 112
+this is line 113
+this is line 114
+this is line 115
+this is line 116
+this is line 117
+this is line 118
+this is line 119
+this is line 120
+this is line 121
+this is line 122
+this is line 123
+this is line 124
+this is line 125
+this is line 126
+this is line 127
+this is line 128
+this is line 129
+this is line 130
+this is line 131
+this is line 132
+this line was bad and has been removed
+this line was REDACTED and has been REDACTED
+this is line 135
+this is line 136
+this is line 137
+this is line 138
+this is line 139
+this is line 140
+this is line 141
+this is line 142
+this is line 143
+this is line 144
+this is line 145
+this is line 146
+this is line 147
+this is line 148
+this is line 149
+this is line 150
+this is line 151
+this is line 152
+this is line 153
+this is line 154
+this is line 155
+this is line 156
+this is line 157
+this is line 158
+this is line 159
+this is line 160
+this is line 161
+this is line 162
+this is line 163
+the number on the remaining lines is 5 ahead of their actual position in the file
+this is line 170
+this is line 171
+this is line 172
+this is line 173
+this is line 174
+this is line 175
+this is line 176
+this is line 177
+this is line 178
+this is line 179
+this is line 180
+this is line 181
+this is line 182
+this is line 183
+this is line 184
+this is line 185
+this is line 186
+this is line 187
+this is line 188
+this is line 189
+this is line 190
+this is line 191
+this is line 192
+this is line 193
+this is line 194
+this is line 195
+this is line 196
+this is line 197
+this is line 198
+this is line 199
+this is line 200
@@ -0,0 +1,62 @@
+diff --git a/gitdiff/testdata/apply/text_file_modify.src b/gitdiff/testdata/apply/text_file_modify.src
+--- a/gitdiff/testdata/apply/text_file_modify.src
+++ b/gitdiff/testdata/apply/text_file_modify.src
+@@ -1,4 +1,4 @@
+-this is line 1
+the first line is different
+ this is line 2
+ this is line 3
+ this is line 4
+@@ -17,10 +17,10 @@ this is line 16
+ this is line 17
+ this is line 18
+ this is line 19
+this line offsets all the line numbers!
+ this is line 20
+ this is line 21
+-this is line 22
+-this is line 23
+until here, now we're back on track!
+ this is line 24
+ this is line 25
+ this is line 26
+@@ -53,10 +53,10 @@ this is line 52
+ this is line 53
+ this is line 54
+ this is line 55
+-this is line 56
+-this is line 57
+-this is line 58
+-this is line 59
+once upon a time, a line
+  in a text
+    file
+  changed
+ this is line 60
+ this is line 61
+ this is line 62
+@@ -130,8 +130,8 @@ this is line 129
+ this is line 130
+ this is line 131
+ this is line 132
+-this is line 133
+-this is line 134
+this line was bad and has been removed
+this line was REDACTED and has been REDACTED
+ this is line 135
+ this is line 136
+ this is line 137
+@@ -161,12 +161,7 @@ this is line 160
+ this is line 161
+ this is line 162
+ this is line 163
+-this is line 164
+-this is line 165
+-this is line 166
+-this is line 167
+-this is line 168
+-this is line 169
+the number on the remaining lines is 5 ahead of their actual position in the file
+ this is line 170
+ this is line 171
+ this is line 172
@@ -0,0 +1,200 @@
+this is line 1
+this is line 2
+this is line 3
+this is line 4
+this is line 5
+this is line 6
+this is line 7
+this is line 8
+this is line 9
+this is line 10
+this is line 11
+this is line 12
+this is line 13
+this is line 14
+this is line 15
+this is line 16
+this is line 17
+this is line 18
+this is line 19
+this is line 20
+this is line 21
+this is line 22
+this is line 23
+this is line 24
+this is line 25
+this is line 26
+this is line 27
+this is line 28
+this is line 29
+this is line 30
+this is line 31
+this is line 32
+this is line 33
+this is line 34
+this is line 35
+this is line 36
+this is line 37
+this is line 38
+this is line 39
+this is line 40
+this is line 41
+this is line 42
+this is line 43
+this is line 44
+this is line 45
+this is line 46
+this is line 47
+this is line 48
+this is line 49
+this is line 50
+this is line 51
+this is line 52
+this is line 53
+this is line 54
+this is line 55
+this is line 56
+this is line 57
+this is line 58
+this is line 59
+this is line 60
+this is line 61
+this is line 62
+this is line 63
+this is line 64
+this is line 65
+this is line 66
+this is line 67
+this is line 68
+this is line 69
+this is line 70
+this is line 71
+this is line 72
+this is line 73
+this is line 74
+this is line 75
+this is line 76
+this is line 77
+this is line 78
+this is line 79
+this is line 80
+this is line 81
+this is line 82
+this is line 83
+this is line 84
+this is line 85
+this is line 86
+this is line 87
+this is line 88
+this is line 89
+this is line 90
+this is line 91
+this is line 92
+this is line 93
+this is line 94
+this is line 95
+this is line 96
+this is line 97
+this is line 98
+this is line 99
+this is line 100
+this is line 101
+this is line 102
+this is line 103
+this is line 104
+this is line 105
+this is line 106
+this is line 107
+this is line 108
+this is line 109
+this is line 110
+this is line 111
+this is line 112
+this is line 113
+this is line 114
+this is line 115
+this is line 116
+this is line 117
+this is line 118
+this is line 119
+this is line 120
+this is line 121
+this is line 122
+this is line 123
+this is line 124
+this is line 125
+this is line 126
+this is line 127
+this is line 128
+this is line 129
+this is line 130
+this is line 131
+this is line 132
+this is line 133
+this is line 134
+this is line 135
+this is line 136
+this is line 137
+this is line 138
+this is line 139
+this is line 140
+this is line 141
+this is line 142
+this is line 143
+this is line 144
+this is line 145
+this is line 146
+this is line 147
+this is line 148
+this is line 149
+this is line 150
+this is line 151
+this is line 152
+this is line 153
+this is line 154
+this is line 155
+this is line 156
+this is line 157
+this is line 158
+this is line 159
+this is line 160
+this is line 161
+this is line 162
+this is line 163
+this is line 164
+this is line 165
+this is line 166
+this is line 167
+this is line 168
+this is line 169
+this is line 170
+this is line 171
+this is line 172
+this is line 173
+this is line 174
+this is line 175
+this is line 176
+this is line 177
+this is line 178
+this is line 179
+this is line 180
+this is line 181
+this is line 182
+this is line 183
+this is line 184
+this is line 185
+this is line 186
+this is line 187
+this is line 188
+this is line 189
+this is line 190
+this is line 191
+this is line 192
+this is line 193
+this is line 194
+this is line 195
+this is line 196
+this is line 197
+this is line 198
+this is line 199
+this is line 200