thodg/libgit2/tests/apply/fromdiff.c
Tag
-
Show log
Commit
-
Hash : 585fbd74
Author :
Date : 2019-08-28T23:18:31
apply: Test for EOFNL mishandling when several hunks are processed Introduce an unit test to validate that git_apply__patch() properly handles EOFNL changes in case of patches with several hunks.
-
tests/apply/fromdiff.c
-
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
#include "clar_libgit2.h" #include "git2/sys/repository.h" #include "apply.h" #include "repository.h" #include "buf_text.h" #include "../patch/patch_common.h" static git_repository *repo = NULL; static git_diff_options binary_opts = GIT_DIFF_OPTIONS_INIT; void test_apply_fromdiff__initialize(void) { repo = cl_git_sandbox_init("renames"); binary_opts.flags |= GIT_DIFF_SHOW_BINARY; } void test_apply_fromdiff__cleanup(void) { cl_git_sandbox_cleanup(); } static int apply_gitbuf( const git_buf *old, const char *oldname, const git_buf *new, const char *newname, const char *patch_expected, const git_diff_options *diff_opts) { git_patch *patch; git_buf result = GIT_BUF_INIT; git_buf patchbuf = GIT_BUF_INIT; char *filename; unsigned int mode; int error; cl_git_pass(git_patch_from_buffers(&patch, old ? old->ptr : NULL, old ? old->size : 0, oldname, new ? new->ptr : NULL, new ? new->size : 0, newname, diff_opts)); if (patch_expected) { cl_git_pass(git_patch_to_buf(&patchbuf, patch)); cl_assert_equal_s(patch_expected, patchbuf.ptr); } error = git_apply__patch(&result, &filename, &mode, old ? old->ptr : NULL, old ? old->size : 0, patch, NULL); if (error == 0 && new == NULL) { cl_assert_equal_i(0, result.size); cl_assert_equal_p(NULL, filename); cl_assert_equal_i(0, mode); } else if (error == 0) { cl_assert_equal_s(new->ptr, result.ptr); cl_assert_equal_s(newname ? newname : oldname, filename); cl_assert_equal_i(0100644, mode); } git__free(filename); git_buf_dispose(&result); git_buf_dispose(&patchbuf); git_patch_free(patch); return error; } static int apply_buf( const char *old, const char *oldname, const char *new, const char *newname, const char *patch_expected, const git_diff_options *diff_opts) { git_buf o = GIT_BUF_INIT, n = GIT_BUF_INIT, *optr = NULL, *nptr = NULL; if (old) { o.ptr = (char *)old; o.size = strlen(old); optr = &o; } if (new) { n.ptr = (char *)new; n.size = strlen(new); nptr = &n; } return apply_gitbuf(optr, oldname, nptr, newname, patch_expected, diff_opts); } void test_apply_fromdiff__change_middle(void) { cl_git_pass(apply_buf( FILE_ORIGINAL, "file.txt", FILE_CHANGE_MIDDLE, "file.txt", PATCH_ORIGINAL_TO_CHANGE_MIDDLE, NULL)); } void test_apply_fromdiff__change_middle_nocontext(void) { git_diff_options diff_opts = GIT_DIFF_OPTIONS_INIT; diff_opts.context_lines = 0; cl_git_pass(apply_buf( FILE_ORIGINAL, "file.txt", FILE_CHANGE_MIDDLE, "file.txt", PATCH_ORIGINAL_TO_CHANGE_MIDDLE_NOCONTEXT, &diff_opts)); } void test_apply_fromdiff__change_firstline(void) { cl_git_pass(apply_buf( FILE_ORIGINAL, "file.txt", FILE_CHANGE_FIRSTLINE, "file.txt", PATCH_ORIGINAL_TO_CHANGE_FIRSTLINE, NULL)); } void test_apply_fromdiff__lastline(void) { cl_git_pass(apply_buf( FILE_ORIGINAL, "file.txt", FILE_CHANGE_LASTLINE, "file.txt", PATCH_ORIGINAL_TO_CHANGE_LASTLINE, NULL)); } void test_apply_fromdiff__change_middle_and_lastline_nocontext(void) { git_diff_options diff_opts = GIT_DIFF_OPTIONS_INIT; diff_opts.context_lines = 0; cl_git_pass(apply_buf( FILE_ORIGINAL, "file.txt", FILE_CHANGE_MIDDLE_AND_LASTLINE, "file.txt", PATCH_ORIGINAL_TO_CHANGE_MIDDLE_AND_LASTLINE_NOCONTEXT, &diff_opts)); } void test_apply_fromdiff__prepend(void) { cl_git_pass(apply_buf( FILE_ORIGINAL, "file.txt", FILE_PREPEND, "file.txt", PATCH_ORIGINAL_TO_PREPEND, NULL)); } void test_apply_fromdiff__prepend_nocontext(void) { git_diff_options diff_opts = GIT_DIFF_OPTIONS_INIT; diff_opts.context_lines = 0; cl_git_pass(apply_buf( FILE_ORIGINAL, "file.txt", FILE_PREPEND, "file.txt", PATCH_ORIGINAL_TO_PREPEND_NOCONTEXT, &diff_opts)); } void test_apply_fromdiff__prepend_and_change(void) { cl_git_pass(apply_buf( FILE_ORIGINAL, "file.txt", FILE_PREPEND_AND_CHANGE, "file.txt", PATCH_ORIGINAL_TO_PREPEND_AND_CHANGE, NULL)); } void test_apply_fromdiff__prepend_and_change_nocontext(void) { git_diff_options diff_opts = GIT_DIFF_OPTIONS_INIT; diff_opts.context_lines = 0; cl_git_pass(apply_buf( FILE_ORIGINAL, "file.txt", FILE_PREPEND_AND_CHANGE, "file.txt", PATCH_ORIGINAL_TO_PREPEND_AND_CHANGE_NOCONTEXT, &diff_opts)); } void test_apply_fromdiff__delete_and_change(void) { cl_git_pass(apply_buf( FILE_ORIGINAL, "file.txt", FILE_DELETE_AND_CHANGE, "file.txt", PATCH_ORIGINAL_TO_DELETE_AND_CHANGE, NULL)); } void test_apply_fromdiff__delete_and_change_nocontext(void) { git_diff_options diff_opts = GIT_DIFF_OPTIONS_INIT; diff_opts.context_lines = 0; cl_git_pass(apply_buf( FILE_ORIGINAL, "file.txt", FILE_DELETE_AND_CHANGE, "file.txt", PATCH_ORIGINAL_TO_DELETE_AND_CHANGE_NOCONTEXT, &diff_opts)); } void test_apply_fromdiff__delete_firstline(void) { cl_git_pass(apply_buf( FILE_ORIGINAL, "file.txt", FILE_DELETE_FIRSTLINE, "file.txt", PATCH_ORIGINAL_TO_DELETE_FIRSTLINE, NULL)); } void test_apply_fromdiff__append(void) { cl_git_pass(apply_buf( FILE_ORIGINAL, "file.txt", FILE_APPEND, "file.txt", PATCH_ORIGINAL_TO_APPEND, NULL)); } void test_apply_fromdiff__append_nocontext(void) { git_diff_options diff_opts = GIT_DIFF_OPTIONS_INIT; diff_opts.context_lines = 0; cl_git_pass(apply_buf( FILE_ORIGINAL, "file.txt", FILE_APPEND, "file.txt", PATCH_ORIGINAL_TO_APPEND_NOCONTEXT, &diff_opts)); } void test_apply_fromdiff__prepend_and_append(void) { cl_git_pass(apply_buf( FILE_ORIGINAL, "file.txt", FILE_PREPEND_AND_APPEND, "file.txt", PATCH_ORIGINAL_TO_PREPEND_AND_APPEND, NULL)); } void test_apply_fromdiff__to_empty_file(void) { cl_git_pass(apply_buf( FILE_ORIGINAL, "file.txt", "", NULL, PATCH_ORIGINAL_TO_EMPTY_FILE, NULL)); } void test_apply_fromdiff__from_empty_file(void) { cl_git_pass(apply_buf( "", NULL, FILE_ORIGINAL, "file.txt", PATCH_EMPTY_FILE_TO_ORIGINAL, NULL)); } void test_apply_fromdiff__add(void) { cl_git_pass(apply_buf( NULL, NULL, FILE_ORIGINAL, "file.txt", PATCH_ADD_ORIGINAL, NULL)); } void test_apply_fromdiff__delete(void) { cl_git_pass(apply_buf( FILE_ORIGINAL, "file.txt", NULL, NULL, PATCH_DELETE_ORIGINAL, NULL)); } void test_apply_fromdiff__no_change(void) { cl_git_pass(apply_buf( FILE_ORIGINAL, "file.txt", FILE_ORIGINAL, "file.txt", "", NULL)); } void test_apply_fromdiff__binary_add(void) { git_buf newfile = GIT_BUF_INIT; newfile.ptr = FILE_BINARY_DELTA_MODIFIED; newfile.size = FILE_BINARY_DELTA_MODIFIED_LEN; cl_git_pass(apply_gitbuf( NULL, NULL, &newfile, "binary.bin", NULL, &binary_opts)); } void test_apply_fromdiff__binary_no_change(void) { git_buf original = GIT_BUF_INIT; original.ptr = FILE_BINARY_DELTA_ORIGINAL; original.size = FILE_BINARY_DELTA_ORIGINAL_LEN; cl_git_pass(apply_gitbuf( &original, "binary.bin", &original, "binary.bin", "", &binary_opts)); } void test_apply_fromdiff__binary_change_delta(void) { git_buf original = GIT_BUF_INIT, modified = GIT_BUF_INIT; original.ptr = FILE_BINARY_DELTA_ORIGINAL; original.size = FILE_BINARY_DELTA_ORIGINAL_LEN; modified.ptr = FILE_BINARY_DELTA_MODIFIED; modified.size = FILE_BINARY_DELTA_MODIFIED_LEN; cl_git_pass(apply_gitbuf( &original, "binary.bin", &modified, "binary.bin", NULL, &binary_opts)); } void test_apply_fromdiff__binary_change_literal(void) { git_buf original = GIT_BUF_INIT, modified = GIT_BUF_INIT; original.ptr = FILE_BINARY_LITERAL_ORIGINAL; original.size = FILE_BINARY_LITERAL_ORIGINAL_LEN; modified.ptr = FILE_BINARY_LITERAL_MODIFIED; modified.size = FILE_BINARY_LITERAL_MODIFIED_LEN; cl_git_pass(apply_gitbuf( &original, "binary.bin", &modified, "binary.bin", NULL, &binary_opts)); } void test_apply_fromdiff__binary_delete(void) { git_buf original = GIT_BUF_INIT; original.ptr = FILE_BINARY_DELTA_MODIFIED; original.size = FILE_BINARY_DELTA_MODIFIED_LEN; cl_git_pass(apply_gitbuf( &original, "binary.bin", NULL, NULL, NULL, &binary_opts)); } void test_apply_fromdiff__patching_correctly_truncates_source(void) { git_buf original = GIT_BUF_INIT, patched = GIT_BUF_INIT; git_patch *patch; unsigned int mode; char *path; cl_git_pass(git_patch_from_buffers(&patch, "foo\nbar", 7, "file.txt", "foo\nfoo", 7, "file.txt", NULL)); /* * Previously, we would fail to correctly truncate the source buffer if * the source has more than one line and ends with a non-newline * character. In the following call, we thus truncate the source string * in the middle of the second line. Without the bug fixed, we would * successfully apply the patch to the source and return success. With * the overflow being fixed, we should return an error. */ cl_git_fail_with(GIT_EAPPLYFAIL, git_apply__patch(&patched, &path, &mode, "foo\nbar\n", 5, patch, NULL)); /* Verify that the patch succeeds if we do not truncate */ cl_git_pass(git_apply__patch(&patched, &path, &mode, "foo\nbar\n", 7, patch, NULL)); git_buf_dispose(&original); git_buf_dispose(&patched); git_patch_free(patch); git__free(path); }