thodg/libgit2/tests-clar/diff/iterator.c
Tag
-
Show log
Commit
-
Hash : 41a82592
Author :
Date : 2012-05-15T14:17:39
Ranged iterators and rewritten git_status_file The goal of this work is to rewrite git_status_file to use the same underlying code as git_status_foreach. This is done in 3 phases: 1. Extend iterators to allow ranged iteration with start and end prefixes for the range of file names to be covered. 2. Improve diff so that when there is a pathspec and there is a common non-wildcard prefix of the pathspec, it will use ranged iterators to minimize excess iteration. 3. Rewrite git_status_file to call git_status_foreach_ext with a pathspec that covers just the one file being checked. Since ranged iterators underlie the status & diff implementation, this is actually fairly efficient. The workdir iterator does end up loading the contents of all the directories down to the single file, which should ideally be avoided, but it is pretty good.
-
tests-clar/diff/iterator.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 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570
#include "clar_libgit2.h" #include "diff_helpers.h" #include "iterator.h" void test_diff_iterator__initialize(void) { /* since we are doing tests with different sandboxes, defer setup * to the actual tests. cleanup will still be done in the global * cleanup function so that assertion failures don't result in a * missed cleanup. */ } void test_diff_iterator__cleanup(void) { cl_git_sandbox_cleanup(); } /* -- TREE ITERATOR TESTS -- */ static void tree_iterator_test( const char *sandbox, const char *treeish, const char *start, const char *end, int expected_count, const char **expected_values) { git_tree *t; git_iterator *i; const git_index_entry *entry; int count = 0; git_repository *repo = cl_git_sandbox_init(sandbox); cl_assert(t = resolve_commit_oid_to_tree(repo, treeish)); cl_git_pass(git_iterator_for_tree_range(&i, repo, t, start, end)); cl_git_pass(git_iterator_current(i, &entry)); while (entry != NULL) { if (expected_values != NULL) cl_assert_equal_s(expected_values[count], entry->path); count++; cl_git_pass(git_iterator_advance(i, &entry)); } git_iterator_free(i); cl_assert(expected_count == count); git_tree_free(t); } /* results of: git ls-tree -r --name-only 605812a */ const char *expected_tree_0[] = { ".gitattributes", "attr0", "attr1", "attr2", "attr3", "binfile", "macro_test", "root_test1", "root_test2", "root_test3", "root_test4.txt", "subdir/.gitattributes", "subdir/abc", "subdir/subdir_test1", "subdir/subdir_test2.txt", "subdir2/subdir2_test1", NULL }; void test_diff_iterator__tree_0(void) { tree_iterator_test("attr", "605812a", NULL, NULL, 16, expected_tree_0); } /* results of: git ls-tree -r --name-only 6bab5c79 */ const char *expected_tree_1[] = { ".gitattributes", "attr0", "attr1", "attr2", "attr3", "root_test1", "root_test2", "root_test3", "root_test4.txt", "subdir/.gitattributes", "subdir/subdir_test1", "subdir/subdir_test2.txt", "subdir2/subdir2_test1", NULL }; void test_diff_iterator__tree_1(void) { tree_iterator_test("attr", "6bab5c79cd5", NULL, NULL, 13, expected_tree_1); } /* results of: git ls-tree -r --name-only 26a125ee1 */ const char *expected_tree_2[] = { "current_file", "file_deleted", "modified_file", "staged_changes", "staged_changes_file_deleted", "staged_changes_modified_file", "staged_delete_file_deleted", "staged_delete_modified_file", "subdir.txt", "subdir/current_file", "subdir/deleted_file", "subdir/modified_file", NULL }; void test_diff_iterator__tree_2(void) { tree_iterator_test("status", "26a125ee1", NULL, NULL, 12, expected_tree_2); } /* $ git ls-tree -r --name-only 0017bd4ab1e */ const char *expected_tree_3[] = { "current_file", "file_deleted", "modified_file", "staged_changes", "staged_changes_file_deleted", "staged_changes_modified_file", "staged_delete_file_deleted", "staged_delete_modified_file" }; void test_diff_iterator__tree_3(void) { tree_iterator_test("status", "0017bd4ab1e", NULL, NULL, 8, expected_tree_3); } /* $ git ls-tree -r --name-only 24fa9a9fc4e202313e24b648087495441dab432b */ const char *expected_tree_4[] = { "attr0", "attr1", "attr2", "attr3", "binfile", "gitattributes", "macro_bad", "macro_test", "root_test1", "root_test2", "root_test3", "root_test4.txt", "sub/abc", "sub/file", "sub/sub/file", "sub/sub/subsub.txt", "sub/subdir_test1", "sub/subdir_test2.txt", "subdir/.gitattributes", "subdir/abc", "subdir/subdir_test1", "subdir/subdir_test2.txt", "subdir2/subdir2_test1", NULL }; void test_diff_iterator__tree_4(void) { tree_iterator_test( "attr", "24fa9a9fc4e202313e24b648087495441dab432b", NULL, NULL, 23, expected_tree_4); } void test_diff_iterator__tree_4_ranged(void) { tree_iterator_test( "attr", "24fa9a9fc4e202313e24b648087495441dab432b", "sub", "sub", 11, &expected_tree_4[12]); } const char *expected_tree_ranged_0[] = { "gitattributes", "macro_bad", "macro_test", "root_test1", "root_test2", "root_test3", "root_test4.txt", NULL }; void test_diff_iterator__tree_ranged_0(void) { tree_iterator_test( "attr", "24fa9a9fc4e202313e24b648087495441dab432b", "git", "root", 7, expected_tree_ranged_0); } const char *expected_tree_ranged_1[] = { "sub/subdir_test2.txt", NULL }; void test_diff_iterator__tree_ranged_1(void) { tree_iterator_test( "attr", "24fa9a9fc4e202313e24b648087495441dab432b", "sub/subdir_test2.txt", "sub/subdir_test2.txt", 1, expected_tree_ranged_1); } void test_diff_iterator__tree_range_empty_0(void) { tree_iterator_test( "attr", "24fa9a9fc4e202313e24b648087495441dab432b", "empty", "empty", 0, NULL); } void test_diff_iterator__tree_range_empty_1(void) { tree_iterator_test( "attr", "24fa9a9fc4e202313e24b648087495441dab432b", "z_empty_after", NULL, 0, NULL); } void test_diff_iterator__tree_range_empty_2(void) { tree_iterator_test( "attr", "24fa9a9fc4e202313e24b648087495441dab432b", NULL, ".aaa_empty_before", 0, NULL); } /* -- INDEX ITERATOR TESTS -- */ static void index_iterator_test( const char *sandbox, const char *start, const char *end, int expected_count, const char **expected_names, const char **expected_oids) { git_iterator *i; const git_index_entry *entry; int count = 0; git_repository *repo = cl_git_sandbox_init(sandbox); cl_git_pass(git_iterator_for_index_range(&i, repo, start, end)); cl_git_pass(git_iterator_current(i, &entry)); while (entry != NULL) { if (expected_names != NULL) cl_assert_equal_s(expected_names[count], entry->path); if (expected_oids != NULL) { git_oid oid; cl_git_pass(git_oid_fromstr(&oid, expected_oids[count])); cl_assert_equal_i(git_oid_cmp(&oid, &entry->oid), 0); } count++; cl_git_pass(git_iterator_advance(i, &entry)); } git_iterator_free(i); cl_assert_equal_i(expected_count, count); } static const char *expected_index_0[] = { "attr0", "attr1", "attr2", "attr3", "binfile", "gitattributes", "macro_bad", "macro_test", "root_test1", "root_test2", "root_test3", "root_test4.txt", "sub/abc", "sub/file", "sub/sub/file", "sub/sub/subsub.txt", "sub/subdir_test1", "sub/subdir_test2.txt", "subdir/.gitattributes", "subdir/abc", "subdir/subdir_test1", "subdir/subdir_test2.txt", "subdir2/subdir2_test1", }; static const char *expected_index_oids_0[] = { "556f8c827b8e4a02ad5cab77dca2bcb3e226b0b3", "3b74db7ab381105dc0d28f8295a77f6a82989292", "2c66e14f77196ea763fb1e41612c1aa2bc2d8ed2", "c485abe35abd4aa6fd83b076a78bbea9e2e7e06c", "d800886d9c86731ae5c4a62b0b77c437015e00d2", "2b40c5aca159b04ea8d20ffe36cdf8b09369b14a", "5819a185d77b03325aaf87cafc771db36f6ddca7", "ff69f8639ce2e6010b3f33a74160aad98b48da2b", "45141a79a77842c59a63229403220a4e4be74e3d", "4d713dc48e6b1bd75b0d61ad078ba9ca3a56745d", "108bb4e7fd7b16490dc33ff7d972151e73d7166e", "fe773770c5a6cc7185580c9204b1ff18a33ff3fc", "3e42ffc54a663f9401cc25843d6c0e71a33e4249", "45b983be36b73c0788dc9cbcb76cbb80fc7bb057", "45b983be36b73c0788dc9cbcb76cbb80fc7bb057", "9e5bdc47d6a80f2be0ea3049ad74231b94609242", "e563cf4758f0d646f1b14b76016aa17fa9e549a4", "fb5067b1aef3ac1ada4b379dbcb7d17255df7d78", "99eae476896f4907224978b88e5ecaa6c5bb67a9", "3e42ffc54a663f9401cc25843d6c0e71a33e4249", "e563cf4758f0d646f1b14b76016aa17fa9e549a4", "fb5067b1aef3ac1ada4b379dbcb7d17255df7d78", "dccada462d3df8ac6de596fb8c896aba9344f941" }; void test_diff_iterator__index_0(void) { index_iterator_test( "attr", NULL, NULL, 23, expected_index_0, expected_index_oids_0); } static const char *expected_index_range[] = { "root_test1", "root_test2", "root_test3", "root_test4.txt", }; static const char *expected_index_oids_range[] = { "45141a79a77842c59a63229403220a4e4be74e3d", "4d713dc48e6b1bd75b0d61ad078ba9ca3a56745d", "108bb4e7fd7b16490dc33ff7d972151e73d7166e", "fe773770c5a6cc7185580c9204b1ff18a33ff3fc", }; void test_diff_iterator__index_range(void) { index_iterator_test( "attr", "root", "root", 4, expected_index_range, expected_index_oids_range); } void test_diff_iterator__index_range_empty_0(void) { index_iterator_test( "attr", "empty", "empty", 0, NULL, NULL); } void test_diff_iterator__index_range_empty_1(void) { index_iterator_test( "attr", "z_empty_after", NULL, 0, NULL, NULL); } void test_diff_iterator__index_range_empty_2(void) { index_iterator_test( "attr", NULL, ".aaa_empty_before", 0, NULL, NULL); } static const char *expected_index_1[] = { "current_file", "file_deleted", "modified_file", "staged_changes", "staged_changes_file_deleted", "staged_changes_modified_file", "staged_new_file", "staged_new_file_deleted_file", "staged_new_file_modified_file", "subdir.txt", "subdir/current_file", "subdir/deleted_file", "subdir/modified_file", }; static const char* expected_index_oids_1[] = { "a0de7e0ac200c489c41c59dfa910154a70264e6e", "5452d32f1dd538eb0405e8a83cc185f79e25e80f", "452e4244b5d083ddf0460acf1ecc74db9dcfa11a", "55d316c9ba708999f1918e9677d01dfcae69c6b9", "a6be623522ce87a1d862128ac42672604f7b468b", "906ee7711f4f4928ddcb2a5f8fbc500deba0d2a8", "529a16e8e762d4acb7b9636ff540a00831f9155a", "90b8c29d8ba39434d1c63e1b093daaa26e5bd972", "ed062903b8f6f3dccb2fa81117ba6590944ef9bd", "e8ee89e15bbe9b20137715232387b3de5b28972e", "53ace0d1cc1145a5f4fe4f78a186a60263190733", "1888c805345ba265b0ee9449b8877b6064592058", "a6191982709b746d5650e93c2acf34ef74e11504" }; void test_diff_iterator__index_1(void) { index_iterator_test( "status", NULL, NULL, 13, expected_index_1, expected_index_oids_1); } /* -- WORKDIR ITERATOR TESTS -- */ static void workdir_iterator_test( const char *sandbox, const char *start, const char *end, int expected_count, int expected_ignores, const char **expected_names, const char *an_ignored_name) { git_iterator *i; const git_index_entry *entry; int count = 0, count_all = 0; git_repository *repo = cl_git_sandbox_init(sandbox); cl_git_pass(git_iterator_for_workdir_range(&i, repo, start, end)); cl_git_pass(git_iterator_current(i, &entry)); while (entry != NULL) { int ignored = git_iterator_current_is_ignored(i); if (S_ISDIR(entry->mode)) { cl_git_pass(git_iterator_advance_into_directory(i, &entry)); continue; } if (expected_names != NULL) cl_assert_equal_s(expected_names[count_all], entry->path); if (an_ignored_name && strcmp(an_ignored_name,entry->path)==0) cl_assert(ignored); if (!ignored) count++; count_all++; cl_git_pass(git_iterator_advance(i, &entry)); } git_iterator_free(i); cl_assert(count == expected_count); cl_assert(count_all == expected_count + expected_ignores); } void test_diff_iterator__workdir_0(void) { workdir_iterator_test("attr", NULL, NULL, 25, 2, NULL, "ign"); } static const char *status_paths[] = { "current_file", "ignored_file", "modified_file", "new_file", "staged_changes", "staged_changes_modified_file", "staged_delete_modified_file", "staged_new_file", "staged_new_file_modified_file", "subdir.txt", "subdir/current_file", "subdir/modified_file", "subdir/new_file", NULL }; void test_diff_iterator__workdir_1(void) { workdir_iterator_test( "status", NULL, NULL, 12, 1, status_paths, "ignored_file"); } static const char *status_paths_range_0[] = { "staged_changes", "staged_changes_modified_file", "staged_delete_modified_file", "staged_new_file", "staged_new_file_modified_file", NULL }; void test_diff_iterator__workdir_1_ranged_0(void) { workdir_iterator_test( "status", "staged", "staged", 5, 0, status_paths_range_0, NULL); } static const char *status_paths_range_1[] = { "modified_file", NULL }; void test_diff_iterator__workdir_1_ranged_1(void) { workdir_iterator_test( "status", "modified_file", "modified_file", 1, 0, status_paths_range_1, NULL); } static const char *status_paths_range_3[] = { "subdir.txt", "subdir/current_file", "subdir/modified_file", NULL }; void test_diff_iterator__workdir_1_ranged_3(void) { workdir_iterator_test( "status", "subdir", "subdir/modified_file", 3, 0, status_paths_range_3, NULL); } static const char *status_paths_range_4[] = { "subdir/current_file", "subdir/modified_file", "subdir/new_file", NULL }; void test_diff_iterator__workdir_1_ranged_4(void) { workdir_iterator_test( "status", "subdir/", NULL, 3, 0, status_paths_range_4, NULL); } static const char *status_paths_range_5[] = { "subdir/modified_file", NULL }; void test_diff_iterator__workdir_1_ranged_5(void) { workdir_iterator_test( "status", "subdir/modified_file", "subdir/modified_file", 1, 0, status_paths_range_5, NULL); } void test_diff_iterator__workdir_1_ranged_empty_0(void) { workdir_iterator_test( "status", "z_does_not_exist", NULL, 0, 0, NULL, NULL); } void test_diff_iterator__workdir_1_ranged_empty_1(void) { workdir_iterator_test( "status", "empty", "empty", 0, 0, NULL, NULL); } void test_diff_iterator__workdir_1_ranged_empty_2(void) { workdir_iterator_test( "status", NULL, "aaaa_empty_before", 0, 0, NULL, NULL); }