thodg/libgit2/tests/diff/parse.c
Tag
-
Show log
Commit
-
Hash : 11de594f
Author :
Date : 2019-10-16T22:11:33
patch_parse: handle patches without extended headers Extended header lines (especially the "index <hash>..<hash> <mode>") are not required by "git apply" so it import patches. So we allow the from-file/to-file lines (--- a/file\n+++ b/file) to directly follow the git diff header. This fixes #5267.
-
tests/diff/parse.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 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428
#include "clar_libgit2.h" #include "patch.h" #include "patch_parse.h" #include "diff_helpers.h" #include "../src/diff.h" #include "../patch/patch_common.h" void test_diff_parse__cleanup(void) { cl_git_sandbox_cleanup(); } void test_diff_parse__nonpatches_fail_with_notfound(void) { git_diff *diff; const char *not = PATCH_NOT_A_PATCH; const char *not_with_leading = "Leading text.\n" PATCH_NOT_A_PATCH; const char *not_with_trailing = PATCH_NOT_A_PATCH "Trailing text.\n"; const char *not_with_both = "Lead.\n" PATCH_NOT_A_PATCH "Trail.\n"; cl_git_fail_with(GIT_ENOTFOUND, git_diff_from_buffer(&diff, not, strlen(not))); cl_git_fail_with(GIT_ENOTFOUND, git_diff_from_buffer(&diff, not_with_leading, strlen(not_with_leading))); cl_git_fail_with(GIT_ENOTFOUND, git_diff_from_buffer(&diff, not_with_trailing, strlen(not_with_trailing))); cl_git_fail_with(GIT_ENOTFOUND, git_diff_from_buffer(&diff, not_with_both, strlen(not_with_both))); } static void test_parse_invalid_diff(const char *invalid_diff) { git_diff *diff; git_buf buf = GIT_BUF_INIT; /* throw some random (legitimate) diffs in with the given invalid * one. */ git_buf_puts(&buf, PATCH_ORIGINAL_TO_CHANGE_FIRSTLINE); git_buf_puts(&buf, PATCH_BINARY_DELTA); git_buf_puts(&buf, invalid_diff); git_buf_puts(&buf, PATCH_ORIGINAL_TO_CHANGE_MIDDLE); git_buf_puts(&buf, PATCH_BINARY_LITERAL); cl_git_fail_with(GIT_ERROR, git_diff_from_buffer(&diff, buf.ptr, buf.size)); git_buf_dispose(&buf); } void test_diff_parse__exact_rename(void) { const char *content = "---\n" " old_name.c => new_name.c | 0\n" " 1 file changed, 0 insertions(+), 0 deletions(-)\n" " rename old_name.c => new_name.c (100%)\n" "\n" "diff --git a/old_name.c b/new_name.c\n" "similarity index 100%\n" "rename from old_name.c\n" "rename to new_name.c\n" "-- \n" "2.9.3\n"; git_diff *diff; cl_git_pass(git_diff_from_buffer( &diff, content, strlen(content))); git_diff_free(diff); } void test_diff_parse__empty_file(void) { const char *content = "---\n" " file | 0\n" " 1 file changed, 0 insertions(+), 0 deletions(-)\n" " created mode 100644 file\n" "\n" "diff --git a/file b/file\n" "new file mode 100644\n" "index 0000000..e69de29\n" "-- \n" "2.20.1\n"; git_diff *diff; cl_git_pass(git_diff_from_buffer( &diff, content, strlen(content))); git_diff_free(diff); } void test_diff_parse__no_extended_headers(void) { const char *content = PATCH_NO_EXTENDED_HEADERS; git_diff *diff; cl_git_pass(git_diff_from_buffer( &diff, content, strlen(content))); git_diff_free(diff); } void test_diff_parse__invalid_patches_fails(void) { test_parse_invalid_diff(PATCH_CORRUPT_MISSING_NEW_FILE); test_parse_invalid_diff(PATCH_CORRUPT_MISSING_OLD_FILE); test_parse_invalid_diff(PATCH_CORRUPT_NO_CHANGES); test_parse_invalid_diff(PATCH_CORRUPT_MISSING_HUNK_HEADER); } static void test_tree_to_tree_computed_to_parsed( const char *sandbox, const char *a_id, const char *b_id, uint32_t diff_flags, uint32_t find_flags) { git_repository *repo; git_diff *computed, *parsed; git_tree *a, *b; git_diff_options opts = GIT_DIFF_OPTIONS_INIT; git_diff_find_options findopts = GIT_DIFF_FIND_OPTIONS_INIT; git_buf computed_buf = GIT_BUF_INIT; repo = cl_git_sandbox_init(sandbox); opts.id_abbrev = GIT_OID_HEXSZ; opts.flags = GIT_DIFF_SHOW_BINARY | diff_flags; findopts.flags = find_flags; cl_assert((a = resolve_commit_oid_to_tree(repo, a_id)) != NULL); cl_assert((b = resolve_commit_oid_to_tree(repo, b_id)) != NULL); cl_git_pass(git_diff_tree_to_tree(&computed, repo, a, b, &opts)); if (find_flags) cl_git_pass(git_diff_find_similar(computed, &findopts)); cl_git_pass(git_diff_to_buf(&computed_buf, computed, GIT_DIFF_FORMAT_PATCH)); cl_git_pass(git_diff_from_buffer(&parsed, computed_buf.ptr, computed_buf.size)); diff_assert_equal(computed, parsed); git_tree_free(a); git_tree_free(b); git_diff_free(computed); git_diff_free(parsed); git_buf_dispose(&computed_buf); cl_git_sandbox_cleanup(); } void test_diff_parse__can_parse_generated_diff(void) { test_tree_to_tree_computed_to_parsed( "diff", "d70d245e", "7a9e0b02", 0, 0); test_tree_to_tree_computed_to_parsed( "unsymlinked.git", "806999", "a8595c", 0, 0); test_tree_to_tree_computed_to_parsed("diff", "d70d245ed97ed2aa596dd1af6536e4bfdb047b69", "7a9e0b02e63179929fed24f0a3e0f19168114d10", 0, 0); test_tree_to_tree_computed_to_parsed( "unsymlinked.git", "7fccd7", "806999", 0, 0); test_tree_to_tree_computed_to_parsed( "unsymlinked.git", "7fccd7", "a8595c", 0, 0); test_tree_to_tree_computed_to_parsed( "attr", "605812a", "370fe9ec22", 0, 0); test_tree_to_tree_computed_to_parsed( "attr", "f5b0af1fb4f5c", "370fe9ec22", 0, 0); test_tree_to_tree_computed_to_parsed( "diff", "d70d245e", "d70d245e", 0, 0); test_tree_to_tree_computed_to_parsed("diff_format_email", "873806f6f27e631eb0b23e4b56bea2bfac14a373", "897d3af16ca9e420cd071b1c4541bd2b91d04c8c", GIT_DIFF_SHOW_BINARY, 0); test_tree_to_tree_computed_to_parsed("diff_format_email", "897d3af16ca9e420cd071b1c4541bd2b91d04c8c", "873806f6f27e631eb0b23e4b56bea2bfac14a373", GIT_DIFF_SHOW_BINARY, 0); test_tree_to_tree_computed_to_parsed("renames", "31e47d8c1fa36d7f8d537b96158e3f024de0a9f2", "2bc7f351d20b53f1c72c16c4b036e491c478c49a", 0, GIT_DIFF_FIND_RENAMES); test_tree_to_tree_computed_to_parsed("renames", "31e47d8c1fa36d7f8d537b96158e3f024de0a9f2", "2bc7f351d20b53f1c72c16c4b036e491c478c49a", GIT_DIFF_INCLUDE_UNMODIFIED, 0); test_tree_to_tree_computed_to_parsed("renames", "31e47d8c1fa36d7f8d537b96158e3f024de0a9f2", "2bc7f351d20b53f1c72c16c4b036e491c478c49a", GIT_DIFF_INCLUDE_UNMODIFIED, GIT_DIFF_FIND_COPIES_FROM_UNMODIFIED | GIT_DIFF_FIND_EXACT_MATCH_ONLY); } void test_diff_parse__get_patch_from_diff(void) { git_repository *repo; git_diff *computed, *parsed; git_tree *a, *b; git_diff_options opts = GIT_DIFF_OPTIONS_INIT; git_buf computed_buf = GIT_BUF_INIT; git_patch *patch_computed, *patch_parsed; repo = cl_git_sandbox_init("diff"); opts.flags = GIT_DIFF_SHOW_BINARY; cl_assert((a = resolve_commit_oid_to_tree(repo, "d70d245ed97ed2aa596dd1af6536e4bfdb047b69")) != NULL); cl_assert((b = resolve_commit_oid_to_tree(repo, "7a9e0b02e63179929fed24f0a3e0f19168114d10")) != NULL); cl_git_pass(git_diff_tree_to_tree(&computed, repo, a, b, &opts)); cl_git_pass(git_diff_to_buf(&computed_buf, computed, GIT_DIFF_FORMAT_PATCH)); cl_git_pass(git_patch_from_diff(&patch_computed, computed, 0)); cl_git_pass(git_diff_from_buffer(&parsed, computed_buf.ptr, computed_buf.size)); cl_git_pass(git_patch_from_diff(&patch_parsed, parsed, 0)); cl_assert_equal_i( git_patch_num_hunks(patch_computed), git_patch_num_hunks(patch_parsed)); git_patch_free(patch_computed); git_patch_free(patch_parsed); git_tree_free(a); git_tree_free(b); git_diff_free(computed); git_diff_free(parsed); git_buf_dispose(&computed_buf); cl_git_sandbox_cleanup(); } static int file_cb(const git_diff_delta *delta, float progress, void *payload) { int *called = (int *) payload; GIT_UNUSED(delta); GIT_UNUSED(progress); (*called)++; return 0; } void test_diff_parse__foreach_works_with_parsed_patch(void) { const char patch[] = "diff --git a/obj1 b/obj2\n" "index 1234567..7654321 10644\n" "--- a/obj1\n" "+++ b/obj2\n" "@@ -1 +1 @@\n" "-abcde\n" "+12345\n"; int called = 0; git_diff *diff; cl_git_pass(git_diff_from_buffer(&diff, patch, strlen(patch))); cl_git_pass(git_diff_foreach(diff, file_cb, NULL, NULL, NULL, &called)); cl_assert_equal_i(called, 1); git_diff_free(diff); } void test_diff_parse__parsing_minimal_patch_succeeds(void) { const char patch[] = "diff --git a/obj1 b/obj2\n" "index 1234567..7654321 10644\n" "--- a/obj1\n" "+++ b/obj2\n" "@@ -1 +1 @@\n" "-a\n" "+\n"; git_buf buf = GIT_BUF_INIT; git_diff *diff; cl_git_pass(git_diff_from_buffer(&diff, patch, strlen(patch))); cl_git_pass(git_diff_to_buf(&buf, diff, GIT_DIFF_FORMAT_PATCH)); cl_assert_equal_s(patch, buf.ptr); git_diff_free(diff); git_buf_dispose(&buf); } void test_diff_parse__patch_roundtrip_succeeds(void) { const char buf1[] = "a\n", buf2[] = "b\n"; git_buf patchbuf = GIT_BUF_INIT, diffbuf = GIT_BUF_INIT; git_patch *patch; git_diff *diff; cl_git_pass(git_patch_from_buffers(&patch, buf1, strlen(buf1), "obj1", buf2, strlen(buf2), "obj2", NULL)); cl_git_pass(git_patch_to_buf(&patchbuf, patch)); cl_git_pass(git_diff_from_buffer(&diff, patchbuf.ptr, patchbuf.size)); cl_git_pass(git_diff_to_buf(&diffbuf, diff, GIT_DIFF_FORMAT_PATCH)); cl_assert_equal_s(patchbuf.ptr, diffbuf.ptr); git_patch_free(patch); git_diff_free(diff); git_buf_dispose(&patchbuf); git_buf_dispose(&diffbuf); } #define cl_assert_equal_i_src(i1,i2,file,line) clar__assert_equal(file,line,#i1 " != " #i2, 1, "%d", (int)(i1), (int)(i2)) static void cl_git_assert_lineinfo_(int old_lineno, int new_lineno, int num_lines, git_patch *patch, size_t hunk_idx, size_t line_idx, const char *file, int lineno) { const git_diff_line *line; cl_git_expect(git_patch_get_line_in_hunk(&line, patch, hunk_idx, line_idx), 0, file, lineno); cl_assert_equal_i_src(old_lineno, line->old_lineno, file, lineno); cl_assert_equal_i_src(new_lineno, line->new_lineno, file, lineno); cl_assert_equal_i_src(num_lines, line->num_lines, file, lineno); } #define cl_git_assert_lineinfo(old, new, num, p, h, l) \ cl_git_assert_lineinfo_(old,new,num,p,h,l,__FILE__,__LINE__) void test_diff_parse__issue4672(void) { const char *text = "diff --git a/a b/a\n" "index 7f129fd..af431f2 100644\n" "--- a/a\n" "+++ b/a\n" "@@ -3 +3 @@\n" "-a contents 2\n" "+a contents\n"; git_diff *diff; git_patch *patch; const git_diff_hunk *hunk; size_t n, l = 0; cl_git_pass(git_diff_from_buffer(&diff, text, strlen(text))); cl_git_pass(git_patch_from_diff(&patch, diff, 0)); cl_git_pass(git_patch_get_hunk(&hunk, &n, patch, 0)); cl_git_assert_lineinfo(3, -1, 1, patch, 0, l++); cl_git_assert_lineinfo(-1, 3, 1, patch, 0, l++); cl_assert_equal_i(n, l); git_patch_free(patch); git_diff_free(diff); } void test_diff_parse__lineinfo(void) { const char *text = PATCH_ORIGINAL_TO_CHANGE_MIDDLE; git_diff *diff; git_patch *patch; const git_diff_hunk *hunk; size_t n, l = 0; cl_git_pass(git_diff_from_buffer(&diff, text, strlen(text))); cl_git_pass(git_patch_from_diff(&patch, diff, 0)); cl_git_pass(git_patch_get_hunk(&hunk, &n, patch, 0)); cl_git_assert_lineinfo(3, 3, 1, patch, 0, l++); cl_git_assert_lineinfo(4, 4, 1, patch, 0, l++); cl_git_assert_lineinfo(5, 5, 1, patch, 0, l++); cl_git_assert_lineinfo(6, -1, 1, patch, 0, l++); cl_git_assert_lineinfo(-1, 6, 1, patch, 0, l++); cl_git_assert_lineinfo(7, 7, 1, patch, 0, l++); cl_git_assert_lineinfo(8, 8, 1, patch, 0, l++); cl_git_assert_lineinfo(9, 9, 1, patch, 0, l++); cl_assert_equal_i(n, l); git_patch_free(patch); git_diff_free(diff); } void test_diff_parse__new_file_with_space(void) { const char *content = PATCH_ORIGINAL_NEW_FILE_WITH_SPACE; git_patch *patch; git_diff *diff; cl_git_pass(git_diff_from_buffer(&diff, content, strlen(content))); cl_git_pass(git_patch_from_diff((git_patch **) &patch, diff, 0)); cl_assert_equal_p(patch->diff_opts.old_prefix, NULL); cl_assert_equal_p(patch->delta->old_file.path, NULL); cl_assert_equal_s(patch->diff_opts.new_prefix, "b/"); cl_assert_equal_s(patch->delta->new_file.path, "sp ace.txt"); git_patch_free(patch); git_diff_free(diff); } void test_diff_parse__crlf(void) { const char *text = PATCH_CRLF; git_diff *diff; git_patch *patch; const git_diff_delta *delta; cl_git_pass(git_diff_from_buffer(&diff, text, strlen(text))); cl_git_pass(git_patch_from_diff(&patch, diff, 0)); delta = git_patch_get_delta(patch); cl_assert_equal_s(delta->old_file.path, "test-file"); cl_assert_equal_s(delta->new_file.path, "test-file"); git_patch_free(patch); git_diff_free(diff); }