iterators: refactored tree iterator Refactored the tree iterator to never recurse; simply process the next entry in order in `advance`. Additionally, reduce the number of allocations and sorting as much as possible to provide a ~30% speedup on case-sensitive iteration. (The gains for case-insensitive iteration are less majestic.)
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 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300
diff --git a/src/iterator.c b/src/iterator.c
index 14182a8..91a7145 100644
--- a/src/iterator.c
+++ b/src/iterator.c
@@ -266,6 +266,225 @@ GIT_INLINE(void) iterator__clear_entry(const git_index_entry **entry)
}
+static int iterator_range_init(
+ git_iterator *iter, const char *start, const char *end)
+{
+ if (start) {
+ iter->start = git__strdup(start);
+ GITERR_CHECK_ALLOC(iter->start);
+ }
+
+ if (end) {
+ iter->end = git__strdup(end);
+ GITERR_CHECK_ALLOC(iter->end);
+ }
+
+ iter->started = (iter->start == NULL);
+ iter->ended = false;
+
+ return 0;
+}
+
+static void iterator_range_free(git_iterator *iter)
+{
+ if (iter->start) {
+ git__free(iter->start);
+ iter->start = NULL;
+ }
+
+ if (iter->end) {
+ git__free(iter->end);
+ iter->end = NULL;
+ }
+}
+
+static int iterator_range_reset(
+ git_iterator *iter, const char *start, const char *end)
+{
+ iterator_range_free(iter);
+ return iterator_range_init(iter, start, end);
+}
+
+static int iterator_pathlist_init(git_iterator *iter, git_strarray *pathlist)
+{
+ size_t i;
+
+ if (git_vector_init(&iter->pathlist, pathlist->count,
+ (git_vector_cmp)iter->strcomp) < 0)
+ return -1;
+
+ for (i = 0; i < pathlist->count; i++) {
+ if (!pathlist->strings[i])
+ continue;
+
+ if (git_vector_insert(&iter->pathlist, pathlist->strings[i]) < 0)
+ return -1;
+ }
+
+ git_vector_sort(&iter->pathlist);
+ return 0;
+}
+
+static int iterator_init_common(
+ git_iterator *iter,
+ git_repository *repo,
+ git_iterator_options *given_opts)
+{
+ static git_iterator_options default_opts = GIT_ITERATOR_OPTIONS_INIT;
+ git_iterator_options *options = given_opts ? given_opts : &default_opts;
+ bool ignore_case;
+ int error;
+
+ assert(repo);
+
+ iter->repo = repo;
+ iter->flags = options->flags;
+
+ if ((iter->flags & GIT_ITERATOR_IGNORE_CASE) != 0) {
+ ignore_case = true;
+ } else if ((iter->flags & GIT_ITERATOR_DONT_IGNORE_CASE) != 0) {
+ ignore_case = false;
+ } else {
+ git_index *index;
+
+ if ((error = git_repository_index__weakptr(&index, iter->repo)) < 0)
+ return error;
+
+ ignore_case = !!index->ignore_case;
+
+ if (ignore_case == 1)
+ iter->flags |= GIT_ITERATOR_IGNORE_CASE;
+ else
+ iter->flags |= GIT_ITERATOR_DONT_IGNORE_CASE;
+ }
+
+ if ((iter->flags & GIT_ITERATOR_DONT_AUTOEXPAND))
+ iter->flags |= GIT_ITERATOR_INCLUDE_TREES;
+
+ iter->strcomp = ignore_case ? git__strcasecmp : git__strcmp;
+ iter->strncomp = ignore_case ? git__strncasecmp : git__strncmp;
+ iter->prefixcomp = ignore_case ? git__prefixcmp_icase : git__prefixcmp;
+
+ if ((error = iterator_range_init(iter, options->start, options->end)) < 0 ||
+ (error = iterator_pathlist_init(iter, &options->pathlist)) < 0)
+ return error;
+
+ return 0;
+}
+
+static void iterator_clear(git_iterator *iter)
+{
+ iter->started = false;
+ iter->ended = false;
+ iter->pathlist_walk_idx = 0;
+ iter->flags &= ~GIT_ITERATOR_FIRST_ACCESS;
+}
+
+GIT_INLINE(bool) iterator_has_started(git_iterator *iter, const char *path)
+{
+ size_t path_len;
+
+ if (iter->start == NULL || iter->started == true)
+ return true;
+
+ /* the starting path is generally a prefix - we have started once we
+ * are prefixed by this path
+ */
+ iter->started = (iter->prefixcomp(path, iter->start) >= 0);
+
+ /* if, however, our current path is a directory, and our starting path
+ * is _beneath_ that directory, then recurse into the directory (even
+ * though we have not yet "started")
+ */
+ if (!iter->started &&
+ (path_len = strlen(path)) > 0 && path[path_len-1] == '/' &&
+ iter->strncomp(path, iter->start, path_len) == 0)
+ return true;
+
+ return iter->started;
+}
+
+GIT_INLINE(bool) iterator_has_ended(git_iterator *iter, const char *path)
+{
+ if (iter->end == NULL || iter->ended == true)
+ return false;
+
+ iter->ended = (iter->prefixcomp(path, iter->end) > 0);
+ return iter->ended;
+}
+
+/* walker for the index iterator that allows it to walk the sorted pathlist
+ * entries alongside sorted iterator entries.
+ */
+static bool iterator_pathlist_contains(git_iterator *iter, const char *path)
+{
+ char *p;
+ size_t path_len, p_len, cmp_len, i;
+ int cmp;
+
+ if (iter->pathlist.length == 0)
+ return true;
+
+ path_len = strlen(path);
+
+ /* for comparison, drop the trailing slash on the current '/' */
+ if (path_len && path[path_len-1] == '/')
+ path_len--;
+
+ for (i = iter->pathlist_walk_idx; i < iter->pathlist.length; i++) {
+ p = iter->pathlist.contents[i];
+ p_len = strlen(p);
+
+ if (p_len && p[p_len-1] == '/')
+ p_len--;
+
+ cmp_len = min(path_len, p_len);
+
+ /* see if the pathlist entry is a prefix of this path */
+ cmp = iter->strncomp(p, path, cmp_len);
+
+ /* prefix match - see if there's an exact match, or if we were
+ * given a path that matches the directory
+ */
+ if (cmp == 0) {
+ /* if this pathlist entry is not suffixed with a '/' then
+ * it matches a path that is a file or a directory.
+ * (eg, pathlist = "foo" and path is "foo" or "foo/" or
+ * "foo/something")
+ */
+ if (p[cmp_len] == '\0' &&
+ (path[cmp_len] == '\0' || path[cmp_len] == '/'))
+ return true;
+
+ /* if this pathlist entry _is_ suffixed with a '/' then
+ * it matches only paths that are directories.
+ * (eg, pathlist = "foo/" and path is "foo/" or "foo/something")
+ */
+ if (p[cmp_len] == '/' && path[cmp_len] == '/')
+ return true;
+
+ /* examine the next character */
+ cmp = (int)((const unsigned char)p[cmp_len]) -
+ (int)((const unsigned char)path[cmp_len]);
+ }
+
+ /* this pathlist entry sorts before the given path, try the next */
+ if (cmp < 0) {
+ iter->pathlist_walk_idx++;
+ continue;
+ }
+
+ /* this pathlist sorts after the given path, no match. */
+ else if (cmp > 0) {
+ break;
+ }
+ }
+
+ return false;
+}
+
+/* Empty iterator */
+
static int empty_iterator__noop(const git_index_entry **e, git_iterator *i)
{
GIT_UNUSED(i);
@@ -322,529 +541,591 @@ int git_iterator_for_nothing(
return 0;
}
+/* Tree iterator */
-typedef struct tree_iterator_entry tree_iterator_entry;
-struct tree_iterator_entry {
- tree_iterator_entry *parent;
- const git_tree_entry *te;
- git_tree *tree;
-};
+typedef struct {
+ git_tree_entry *tree_entry;
+ const char *parent_path;
+} tree_iterator_entry;
-typedef struct tree_iterator_frame tree_iterator_frame;
-struct tree_iterator_frame {
- tree_iterator_frame *up, *down;
+typedef struct {
+ git_tree *tree;
- size_t n_entries; /* items in this frame */
- size_t current; /* start of currently active range in frame */
- size_t next; /* start of next range in frame */
+ /* a sorted list of the entries for this frame (folder), these are
+ * actually pointers to the iterator's entry pool.
+ */
+ git_vector entries;
+ tree_iterator_entry *current;
- const char *start;
- size_t startlen;
+ size_t next_idx;
- tree_iterator_entry *entries[GIT_FLEX_ARRAY];
-};
+ /* the path to this particular frame (folder); on case insensitive
+ * iterations, we also have an array of other paths that we were
+ * case insensitively equal to this one, whose contents we have
+ * coalesced into this frame. a child `tree_iterator_entry` will
+ * contain a pointer to its actual parent path.
+ */
+ git_buf path;
+ git_array_t(git_buf) similar_paths;
+} tree_iterator_frame;
typedef struct {
git_iterator base;
- git_iterator_callbacks cb;
- tree_iterator_frame *head, *root;
- git_pool pool;
+ git_tree *root;
+ git_array_t(tree_iterator_frame) frames;
+
git_index_entry entry;
- git_buf path;
- int path_ambiguities;
- bool path_has_filename;
- bool entry_is_current;
+ git_buf entry_path;
+
+ /* a pool of entries to reduce the number of allocations */
+ git_pool entry_pool;
} tree_iterator;
-static char *tree_iterator__current_filename(
- tree_iterator *ti, const git_tree_entry *te)
+GIT_INLINE(tree_iterator_frame *) tree_iterator_parent_frame(
+ tree_iterator *iter)
{
- if (!ti->path_has_filename) {
- if (git_buf_joinpath(&ti->path, ti->path.ptr, te->filename) < 0)
- return NULL;
-
- if (git_tree_entry__is_tree(te) && git_buf_putc(&ti->path, '/') < 0)
- return NULL;
-
- ti->path_has_filename = true;
- }
-
- return ti->path.ptr;
+ return iter->frames.size > 1 ?
+ &iter->frames.ptr[iter->frames.size-2] : NULL;
}
-static void tree_iterator__rewrite_filename(tree_iterator *ti)
+GIT_INLINE(tree_iterator_frame *) tree_iterator_current_frame(
+ tree_iterator *iter)
{
- tree_iterator_entry *scan = ti->head->entries[ti->head->current];
- ssize_t strpos = ti->path.size;
- const git_tree_entry *te;
-
- if (strpos && ti->path.ptr[strpos - 1] == '/')
- strpos--;
-
- for (; scan && (te = scan->te); scan = scan->parent) {
- strpos -= te->filename_len;
- memcpy(&ti->path.ptr[strpos], te->filename, te->filename_len);
- strpos -= 1; /* separator */
- }
+ return iter->frames.size ? &iter->frames.ptr[iter->frames.size-1] : NULL;
}
-static int tree_iterator__te_cmp(
- const git_tree_entry *a,
- const git_tree_entry *b,
- int (*compare)(const char *, const char *, size_t))
+GIT_INLINE(int) tree_entry_cmp(
+ const git_tree_entry *a, const git_tree_entry *b, bool icase)
{
return git_path_cmp(
a->filename, a->filename_len, a->attr == GIT_FILEMODE_TREE,
b->filename, b->filename_len, b->attr == GIT_FILEMODE_TREE,
- compare);
+ icase ? git__strncasecmp : git__strncmp);
}
-static int tree_iterator__ci_cmp(const void *a, const void *b, void *p)
+GIT_INLINE(int) tree_iterator_entry_cmp(const void *ptr_a, const void *ptr_b)
{
- const tree_iterator_entry *ae = a, *be = b;
- int cmp = tree_iterator__te_cmp(ae->te, be->te, git__strncasecmp);
+ const tree_iterator_entry *a = (const tree_iterator_entry *)ptr_a;
+ const tree_iterator_entry *b = (const tree_iterator_entry *)ptr_b;
- if (!cmp) {
- /* stabilize sort order among equivalent names */
- if (!ae->parent->te || !be->parent->te)
- cmp = tree_iterator__te_cmp(ae->te, be->te, git__strncmp);
- else
- cmp = tree_iterator__ci_cmp(ae->parent, be->parent, p);
- }
-
- return cmp;
+ return tree_entry_cmp(a->tree_entry, b->tree_entry, false);
}
-static int tree_iterator__search_cmp(const void *key, const void *val, void *p)
+GIT_INLINE(int) tree_iterator_entry_cmp_icase(
+ const void *ptr_a, const void *ptr_b)
{
- const tree_iterator_frame *tf = key;
- const git_tree_entry *te = ((tree_iterator_entry *)val)->te;
+ const tree_iterator_entry *a = (const tree_iterator_entry *)ptr_a;
+ const tree_iterator_entry *b = (const tree_iterator_entry *)ptr_b;
- return git_path_cmp(
- tf->start, tf->startlen, false,
- te->filename, te->filename_len, te->attr == GIT_FILEMODE_TREE,
- ((git_iterator *)p)->strncomp);
+ return tree_entry_cmp(a->tree_entry, b->tree_entry, true);
}
-static bool tree_iterator__move_to_next(
- tree_iterator *ti, tree_iterator_frame *tf)
+static int tree_iterator_entry_sort_icase(const void *ptr_a, const void *ptr_b)
{
- if (tf->next > tf->current + 1)
- ti->path_ambiguities--;
+ const tree_iterator_entry *a = (const tree_iterator_entry *)ptr_a;
+ const tree_iterator_entry *b = (const tree_iterator_entry *)ptr_b;
- if (!tf->up) { /* at root */
- tf->current = tf->next;
- return false;
- }
+ int c = tree_entry_cmp(a->tree_entry, b->tree_entry, true);
- for (; tf->current < tf->next; tf->current++) {
- git_tree_free(tf->entries[tf->current]->tree);
- tf->entries[tf->current]->tree = NULL;
- }
+ /* stabilize the sort order for filenames that are (case insensitively)
+ * the same by examining the parent path (case sensitively) before
+ * falling back to a case sensitive sort of the filename.
+ */
+ if (!c && a->parent_path != b->parent_path)
+ c = git__strcmp(a->parent_path, b->parent_path);
+
+ if (!c)
+ c = tree_entry_cmp(a->tree_entry, b->tree_entry, false);
- return (tf->current < tf->n_entries);
+ return c;
}
-static int tree_iterator__set_next(tree_iterator *ti, tree_iterator_frame *tf)
+static int tree_iterator_compute_path(
+ git_buf *out,
+ tree_iterator_entry *entry)
{
- int error = 0;
- const git_tree_entry *te, *last = NULL;
+ git_buf_clear(out);
- tf->next = tf->current;
-
- for (; tf->next < tf->n_entries; tf->next++, last = te) {
- te = tf->entries[tf->next]->te;
-
- if (last && tree_iterator__te_cmp(last, te, ti->base.strncomp))
- break;
-
- /* try to load trees for items in [current,next) range */
- if (!error && git_tree_entry__is_tree(te))
- error = git_tree_lookup(
- &tf->entries[tf->next]->tree, ti->base.repo, te->oid);
- }
-
- if (tf->next > tf->current + 1)
- ti->path_ambiguities++;
+ if (entry->parent_path)
+ git_buf_joinpath(out, entry->parent_path, entry->tree_entry->filename);
+ else
+ git_buf_puts(out, entry->tree_entry->filename);
- /* if a tree lookup failed, advance over this span and return failure */
- if (error < 0) {
- tree_iterator__move_to_next(ti, tf);
- return error;
- }
+ if (git_tree_entry__is_tree(entry->tree_entry))
+ git_buf_putc(out, '/');
- if (last && !tree_iterator__current_filename(ti, last))
- return -1; /* must have been allocation failure */
+ if (git_buf_oom(out))
+ return -1;
return 0;
}
-GIT_INLINE(bool) tree_iterator__at_tree(tree_iterator *ti)
-{
- return (ti->head->current < ti->head->n_entries &&
- ti->head->entries[ti->head->current]->tree != NULL);
-}
-
-static int tree_iterator__push_frame(tree_iterator *ti)
+static int tree_iterator_frame_init(
+ tree_iterator *iter,
+ git_tree *tree,
+ tree_iterator_entry *frame_entry)
{
+ tree_iterator_frame *new_frame = NULL;
+ tree_iterator_entry *new_entry;
+ git_tree *dup = NULL;
+ git_tree_entry *tree_entry;
+ git_vector_cmp cmp;
+ size_t i;
int error = 0;
- tree_iterator_frame *head = ti->head, *tf = NULL;
- size_t i, n_entries = 0, alloclen;
-
- if (head->current >= head->n_entries || !head->entries[head->current]->tree)
- return GIT_ITEROVER;
- for (i = head->current; i < head->next; ++i)
- n_entries += git_tree_entrycount(head->entries[i]->tree);
+ new_frame = git_array_alloc(iter->frames);
+ GITERR_CHECK_ALLOC(new_frame);
- GITERR_CHECK_ALLOC_MULTIPLY(&alloclen, sizeof(tree_iterator_entry *), n_entries);
- GITERR_CHECK_ALLOC_ADD(&alloclen, alloclen, sizeof(tree_iterator_frame));
+ memset(new_frame, 0, sizeof(tree_iterator_frame));
- tf = git__calloc(1, alloclen);
- GITERR_CHECK_ALLOC(tf);
+ if ((error = git_tree_dup(&dup, tree)) < 0)
+ goto done;
- tf->n_entries = n_entries;
+ memset(new_frame, 0x0, sizeof(tree_iterator_frame));
+ new_frame->tree = dup;
- tf->up = head;
- head->down = tf;
- ti->head = tf;
- for (i = head->current, n_entries = 0; i < head->next; ++i) {
- git_tree *tree = head->entries[i]->tree;
- size_t j, max_j = git_tree_entrycount(tree);
- for (j = 0; j < max_j; ++j) {
- tree_iterator_entry *entry = git_pool_malloc(&ti->pool, 1);
- GITERR_CHECK_ALLOC(entry);
+ if (frame_entry &&
+ (error = tree_iterator_compute_path(&new_frame->path, frame_entry)) < 0)
+ goto done;
- entry->parent = head->entries[i];
- entry->te = git_tree_entry_byindex(tree, j);
- entry->tree = NULL;
+ cmp = iterator__ignore_case(&iter->base) ?
+ tree_iterator_entry_sort_icase : NULL;
- tf->entries[n_entries++] = entry;
- }
- }
-
- /* if ignore_case, sort entries case insensitively */
- if (iterator__ignore_case(ti))
- git__tsort_r(
- (void **)tf->entries, tf->n_entries, tree_iterator__ci_cmp, tf);
+ if ((error = git_vector_init(
+ &new_frame->entries, dup->entries.size, cmp)) < 0)
+ goto done;
- /* pick tf->current based on "start" (or start at zero) */
- if (head->startlen > 0) {
- git__bsearch_r((void **)tf->entries, tf->n_entries, head,
- tree_iterator__search_cmp, ti, &tf->current);
+ git_array_foreach(dup->entries, i, tree_entry) {
+ new_entry = git_pool_malloc(&iter->entry_pool, 1);
+ GITERR_CHECK_ALLOC(new_entry);
- while (tf->current &&
- !tree_iterator__search_cmp(head, tf->entries[tf->current-1], ti))
- tf->current--;
+ new_entry->tree_entry = tree_entry;
+ new_entry->parent_path = new_frame->path.ptr;
- if ((tf->start = strchr(head->start, '/')) != NULL) {
- tf->start++;
- tf->startlen = strlen(tf->start);
- }
+ if ((error = git_vector_insert(&new_frame->entries, new_entry)) < 0)
+ goto done;
}
- ti->path_has_filename = ti->entry_is_current = false;
+ git_vector_set_sorted(&new_frame->entries,
+ !iterator__ignore_case(&iter->base));
- if ((error = tree_iterator__set_next(ti, tf)) < 0)
- return error;
+done:
+ if (error < 0) {
+ git_tree_free(dup);
+ git_array_pop(iter->frames);
+ }
- /* autoexpand as needed */
- if (!iterator__include_trees(ti) && tree_iterator__at_tree(ti))
- return tree_iterator__push_frame(ti);
+ return error;
+}
- return 0;
+GIT_INLINE(tree_iterator_entry *) tree_iterator_current_entry(
+ tree_iterator_frame *frame)
+{
+ return frame->current;
}
-static bool tree_iterator__pop_frame(tree_iterator *ti, bool final)
+GIT_INLINE(int) tree_iterator_frame_push_neighbors(
+ tree_iterator *iter,
+ tree_iterator_frame *parent_frame,
+ tree_iterator_frame *frame,
+ const char *filename)
{
- tree_iterator_frame *tf = ti->head;
+ tree_iterator_entry *entry, *new_entry;
+ git_tree *tree = NULL;
+ git_tree_entry *tree_entry;
+ git_buf *path;
+ size_t new_size, i;
+ int error = 0;
- assert(tf);
+ while (parent_frame->next_idx < parent_frame->entries.length) {
+ entry = parent_frame->entries.contents[parent_frame->next_idx];
- if (!tf->up)
- return false;
+ if (strcasecmp(filename, entry->tree_entry->filename) != 0)
+ break;
- ti->head = tf->up;
- ti->head->down = NULL;
+ if ((error = git_tree_lookup(&tree,
+ iter->base.repo, entry->tree_entry->oid)) < 0)
+ break;
- tree_iterator__move_to_next(ti, tf);
+ path = git_array_alloc(parent_frame->similar_paths);
+ GITERR_CHECK_ALLOC(path);
- if (!final) { /* if final, don't bother to clean up */
- // TODO: maybe free the pool so far?
- git_buf_rtruncate_at_char(&ti->path, '/');
- }
+ memset(path, 0, sizeof(git_buf));
- git__free(tf);
+ if ((error = tree_iterator_compute_path(path, entry)) < 0)
+ break;
- return true;
-}
+ GITERR_CHECK_ALLOC_ADD(&new_size,
+ frame->entries.length, tree->entries.size);
+ git_vector_size_hint(&frame->entries, new_size);
-static void tree_iterator__pop_all(tree_iterator *ti, bool to_end, bool final)
-{
- while (tree_iterator__pop_frame(ti, final)) /* pop to root */;
+ git_array_foreach(tree->entries, i, tree_entry) {
+ new_entry = git_pool_malloc(&iter->entry_pool, 1);
+ GITERR_CHECK_ALLOC(new_entry);
- if (!final) {
- assert(ti->head);
+ new_entry->tree_entry = tree_entry;
+ new_entry->parent_path = path->ptr;
- ti->head->current = to_end ? ti->head->n_entries : 0;
- ti->path_ambiguities = 0;
- git_buf_clear(&ti->path);
+ if ((error = git_vector_insert(&frame->entries, new_entry)) < 0)
+ break;
+ }
+
+ if (error)
+ break;
+
+ parent_frame->next_idx++;
}
+
+ return error;
}
-static int tree_iterator__update_entry(tree_iterator *ti)
+GIT_INLINE(int) tree_iterator_frame_push(
+ tree_iterator *iter, tree_iterator_entry *entry)
{
- tree_iterator_frame *tf;
- const git_tree_entry *te;
+ tree_iterator_frame *parent_frame, *frame;
+ git_tree *tree = NULL;
+ int error;
- if (ti->entry_is_current)
- return 0;
+ if ((error = git_tree_lookup(&tree,
+ iter->base.repo, entry->tree_entry->oid)) < 0 ||
+ (error = tree_iterator_frame_init(iter, tree, entry)) < 0)
+ goto done;
- tf = ti->head;
- te = tf->entries[tf->current]->te;
+ parent_frame = tree_iterator_parent_frame(iter);
+ frame = tree_iterator_current_frame(iter);
- ti->entry.mode = te->attr;
- git_oid_cpy(&ti->entry.id, te->oid);
+ /* if we're case insensitive, then we may have another directory that
+ * is (case insensitively) equal to this one. coalesce those children
+ * into this tree.
+ */
+ if (iterator__ignore_case(&iter->base))
+ error = tree_iterator_frame_push_neighbors(iter,
+ parent_frame, frame, entry->tree_entry->filename);
- ti->entry.path = tree_iterator__current_filename(ti, te);
- GITERR_CHECK_ALLOC(ti->entry.path);
+done:
+ git_tree_free(tree);
+ return error;
+}
- if (ti->path_ambiguities > 0)
- tree_iterator__rewrite_filename(ti);
+static void tree_iterator_frame_pop(tree_iterator *iter)
+{
+ tree_iterator_frame *frame;
- if (iterator__past_end(ti, ti->entry.path)) {
- tree_iterator__pop_all(ti, true, false);
- return GIT_ITEROVER;
- }
+ assert(iter->frames.size);
- ti->entry_is_current = true;
+ frame = git_array_pop(iter->frames);
- return 0;
+ git_vector_free(&frame->entries);
+ git_tree_free(frame->tree);
}
-static int tree_iterator__current_internal(
- const git_index_entry **entry, git_iterator *self)
+static int tree_iterator_current(
+ const git_index_entry **out, git_iterator *i)
{
- int error;
- tree_iterator *ti = (tree_iterator *)self;
- tree_iterator_frame *tf = ti->head;
+ tree_iterator *iter = (tree_iterator *)i;
- iterator__clear_entry(entry);
+ if (!iterator__has_been_accessed(i))
+ return iter->base.cb->advance(out, i);
- if (tf->current >= tf->n_entries)
+ if (!iter->frames.size) {
+ *out = NULL;
return GIT_ITEROVER;
+ }
- if ((error = tree_iterator__update_entry(ti)) < 0)
- return error;
-
- if (entry)
- *entry = &ti->entry;
-
- ti->base.flags |= GIT_ITERATOR_FIRST_ACCESS;
-
+ *out = &iter->entry;
return 0;
}
-static int tree_iterator__advance_into_internal(git_iterator *self)
+static void tree_iterator_set_current(
+ tree_iterator *iter,
+ tree_iterator_frame *frame,
+ tree_iterator_entry *entry)
{
- int error = 0;
- tree_iterator *ti = (tree_iterator *)self;
+ git_tree_entry *tree_entry = entry->tree_entry;
- if (tree_iterator__at_tree(ti))
- error = tree_iterator__push_frame(ti);
+ frame->current = entry;
- return error;
+ memset(&iter->entry, 0x0, sizeof(git_index_entry));
+
+ iter->entry.mode = tree_entry->attr;
+ iter->entry.path = iter->entry_path.ptr;
+ git_oid_cpy(&iter->entry.id, tree_entry->oid);
}
-static int tree_iterator__advance_internal(git_iterator *self)
+static int tree_iterator_advance(const git_index_entry **out, git_iterator *i)
{
- int error;
- tree_iterator *ti = (tree_iterator *)self;
- tree_iterator_frame *tf = ti->head;
+ tree_iterator *iter = (tree_iterator *)i;
+ int error = 0;
- if (tf->current >= tf->n_entries)
- return GIT_ITEROVER;
+ iter->base.flags |= GIT_ITERATOR_FIRST_ACCESS;
- if (!iterator__has_been_accessed(ti))
- return 0;
+ /* examine tree entries until we find the next one to return */
+ while (true) {
+ tree_iterator_entry *prev_entry, *entry;
+ tree_iterator_frame *frame;
+ bool is_tree;
- if (iterator__do_autoexpand(ti) && iterator__include_trees(ti) &&
- tree_iterator__at_tree(ti))
- return tree_iterator__advance_into_internal(self);
+ if ((frame = tree_iterator_current_frame(iter)) == NULL) {
+ error = GIT_ITEROVER;
+ break;
+ }
- if (ti->path_has_filename) {
- git_buf_rtruncate_at_char(&ti->path, '/');
- ti->path_has_filename = ti->entry_is_current = false;
- }
+ /* no more entries in this frame. pop the frame out */
+ if (frame->next_idx == frame->entries.length) {
+ tree_iterator_frame_pop(iter);
+ continue;
+ }
- /* scan forward and up, advancing in frame or popping frame when done */
- while (!tree_iterator__move_to_next(ti, tf) &&
- tree_iterator__pop_frame(ti, false))
- tf = ti->head;
+ /* we may have coalesced the contents of case-insensitively same-named
+ * directories, so do the sort now.
+ */
+ if (frame->next_idx == 0 && !git_vector_is_sorted(&frame->entries))
+ git_vector_sort(&frame->entries);
- /* find next and load trees */
- if ((error = tree_iterator__set_next(ti, tf)) < 0)
- return error;
+ /* we have more entries in the current frame, that's our next entry */
+ prev_entry = tree_iterator_current_entry(frame);
+ entry = frame->entries.contents[frame->next_idx];
+ frame->next_idx++;
- /* deal with include_trees / auto_expand as needed */
- if (!iterator__include_trees(ti) && tree_iterator__at_tree(ti))
- return tree_iterator__advance_into_internal(self);
+ /* we can have collisions when iterating case insensitively. (eg,
+ * 'A/a' and 'a/A'). squash this one if it's already been seen.
+ */
+ if (iterator__ignore_case(&iter->base) &&
+ prev_entry &&
+ tree_iterator_entry_cmp_icase(prev_entry, entry) == 0)
+ continue;
- return 0;
-}
+ if ((error = tree_iterator_compute_path(&iter->entry_path, entry)) < 0)
+ break;
-static int tree_iterator__current(
- const git_index_entry **out, git_iterator *self)
-{
- const git_index_entry *entry = NULL;
- iterator_pathlist__match_t m;
- int error;
+ /* if this path is before our start, advance over this entry */
+ if (!iterator_has_started(&iter->base, iter->entry_path.ptr))
+ continue;
- do {
- if ((error = tree_iterator__current_internal(&entry, self)) < 0)
- return error;
+ /* if this path is after our end, stop */
+ if (iterator_has_ended(&iter->base, iter->entry_path.ptr)) {
+ error = GIT_ITEROVER;
+ break;
+ }
+
+ /* if we have a list of paths we're interested in, examine it */
+ if (!iterator_pathlist_contains(&iter->base, iter->entry_path.ptr))
+ continue;
- if (self->pathlist.length) {
- m = iterator_pathlist__match(
- self, entry->path, strlen(entry->path));
+ is_tree = git_tree_entry__is_tree(entry->tree_entry);
- if (m != ITERATOR_PATHLIST_MATCH) {
- if ((error = tree_iterator__advance_internal(self)) < 0)
- return error;
+ /* if we are *not* including trees then advance over this entry */
+ if (is_tree && !iterator__include_trees(iter)) {
- entry = NULL;
+ /* if we've found a tree (and are not returning it to the caller)
+ * and we are autoexpanding, then we want to return the first
+ * child. push the new directory and advance.
+ */
+ if (iterator__do_autoexpand(iter)) {
+ if ((error = tree_iterator_frame_push(iter, entry)) < 0)
+ break;
}
+
+ continue;
}
- } while (!entry);
+
+ tree_iterator_set_current(iter, frame, entry);
+
+ /* if we are autoexpanding, then push this as a new frame, so that
+ * the next call to `advance` will dive into this directory.
+ */
+ if (is_tree && iterator__do_autoexpand(iter))
+ error = tree_iterator_frame_push(iter, entry);
+
+ break;
+ }
if (out)
- *out = entry;
+ *out = (error == 0) ? &iter->entry : NULL;
return error;
}
-static int tree_iterator__advance(
- const git_index_entry **entry, git_iterator *self)
+static int tree_iterator_advance_into(
+ const git_index_entry **out, git_iterator *i)
{
- int error = tree_iterator__advance_internal(self);
+ tree_iterator *iter = (tree_iterator *)i;
+ tree_iterator_frame *frame;
+ tree_iterator_entry *prev_entry;
+ int error;
- iterator__clear_entry(entry);
+ if (out)
+ *out = NULL;
- if (error < 0)
- return error;
+ if ((frame = tree_iterator_current_frame(iter)) == NULL)
+ return GIT_ITEROVER;
+
+ /* get the last seen entry */
+ prev_entry = tree_iterator_current_entry(frame);
+
+ /* it's legal to call advance_into when auto-expand is on. in this case,
+ * we will have pushed a new (empty) frame on to the stack for this
+ * new directory. since it's empty, its current_entry should be null.
+ */
+ assert(iterator__do_autoexpand(i) ^ (prev_entry != NULL));
+
+ if (prev_entry) {
+ if (!git_tree_entry__is_tree(prev_entry->tree_entry))
+ return 0;
- return tree_iterator__current(entry, self);
+ if ((error = tree_iterator_frame_push(iter, prev_entry)) < 0)
+ return error;
+ }
+
+ /* we've advanced into the directory in question, let advance
+ * find the first entry
+ */
+ return tree_iterator_advance(out, i);
}
-static int tree_iterator__advance_into(
- const git_index_entry **entry, git_iterator *self)
+static void tree_iterator_clear(tree_iterator *iter)
{
- int error = tree_iterator__advance_into_internal(self);
+ while (iter->frames.size)
+ tree_iterator_frame_pop(iter);
- iterator__clear_entry(entry);
+ git_array_clear(iter->frames);
- if (error < 0)
- return error;
+ git_pool_clear(&iter->entry_pool);
+ git_buf_clear(&iter->entry_path);
- return tree_iterator__current(entry, self);
+ iterator_clear(&iter->base);
}
-static int tree_iterator__reset(git_iterator *self)
+static int tree_iterator_init(tree_iterator *iter)
{
- tree_iterator *ti = (tree_iterator *)self;
+ int error;
+
+ git_pool_init(&iter->entry_pool, sizeof(tree_iterator_entry));
- ti->base.flags &= ~GIT_ITERATOR_FIRST_ACCESS;
+ if ((error = tree_iterator_frame_init(iter, iter->root, NULL)) < 0)
+ return error;
- tree_iterator__pop_all(ti, false, false);
- return tree_iterator__push_frame(ti); /* re-expand root tree */
+ iter->base.flags &= ~GIT_ITERATOR_FIRST_ACCESS;
+
+ return 0;
}
-static int tree_iterator__reset_range(
- git_iterator *self, const char *start, const char *end)
+static int tree_iterator_reset(git_iterator *i)
{
- if (iterator__reset_range(self, start, end) < 0)
- return -1;
+ tree_iterator *iter = (tree_iterator *)i;
- return tree_iterator__reset(self);
+ tree_iterator_clear(iter);
+ return tree_iterator_init(iter);
}
-static int tree_iterator__at_end(git_iterator *self)
+static int tree_iterator_reset_range(
+ git_iterator *i, const char *start, const char *end)
{
- tree_iterator *ti = (tree_iterator *)self;
- return (ti->head->current >= ti->head->n_entries);
+ if (iterator_range_reset(i, start, end) < 0)
+ return -1;
+
+ return tree_iterator_reset(i);
}
-static void tree_iterator__free(git_iterator *self)
+static int tree_iterator_at_end(git_iterator *i)
{
- tree_iterator *ti = (tree_iterator *)self;
+ tree_iterator *iter = (tree_iterator *)i;
- if (ti->head) {
- tree_iterator__pop_all(ti, true, false);
- git_tree_free(ti->head->entries[0]->tree);
- git__free(ti->head);
- }
-
- git_pool_clear(&ti->pool);
- git_buf_free(&ti->path);
+ return (iter->frames.size == 0);
}
-static int tree_iterator__create_root_frame(tree_iterator *ti, git_tree *tree)
+static void tree_iterator_free(git_iterator *i)
{
- size_t sz = sizeof(tree_iterator_frame) + sizeof(tree_iterator_entry);
- tree_iterator_frame *root = git__calloc(sz, sizeof(char));
- GITERR_CHECK_ALLOC(root);
-
- root->n_entries = 1;
- root->next = 1;
- root->start = ti->base.start;
- root->startlen = root->start ? strlen(root->start) : 0;
- root->entries[0] = git_pool_mallocz(&ti->pool, 1);
- GITERR_CHECK_ALLOC(root->entries[0]);
- root->entries[0]->tree = tree;
+ tree_iterator *iter = (tree_iterator *)i;
- ti->head = ti->root = root;
+ tree_iterator_clear(iter);
- return 0;
+ git_tree_free(iter->root);
+ git_buf_free(&iter->entry_path);
}
int git_iterator_for_tree(
- git_iterator **iter,
+ git_iterator **out,
git_tree *tree,
git_iterator_options *options)
{
+ tree_iterator *iter;
int error;
- tree_iterator *ti;
+
+ static git_iterator_callbacks callbacks = {
+ tree_iterator_current,
+ tree_iterator_advance,
+ tree_iterator_advance_into,
+ tree_iterator_reset,
+ tree_iterator_reset_range,
+ tree_iterator_at_end,
+ tree_iterator_free
+ };
+
+ *out = NULL;
if (tree == NULL)
- return git_iterator_for_nothing(iter, options);
+ return git_iterator_for_nothing(out, options);
- if ((error = git_tree_dup(&tree, tree)) < 0)
- return error;
+ iter = git__calloc(1, sizeof(tree_iterator));
+ GITERR_CHECK_ALLOC(iter);
- ti = git__calloc(1, sizeof(tree_iterator));
- GITERR_CHECK_ALLOC(ti);
+ iter->base.type = GIT_ITERATOR_TYPE_TREE;
+ iter->base.cb = &callbacks;
- ITERATOR_BASE_INIT(ti, tree, TREE, git_tree_owner(tree));
+ if ((error = iterator_init_common(&iter->base,
+ git_tree_owner(tree), options)) < 0 ||
+ (error = git_tree_dup(&iter->root, tree)) < 0 ||
+ (error = tree_iterator_init(iter)) < 0)
+ goto on_error;
- if ((error = iterator__update_ignore_case((git_iterator *)ti, options ? options->flags : 0)) < 0)
- goto fail;
+ *out = &iter->base;
+ return 0;
- git_pool_init(&ti->pool, sizeof(tree_iterator_entry));
+on_error:
+ git_iterator_free(&iter->base);
+ return error;
+}
- if ((error = tree_iterator__create_root_frame(ti, tree)) < 0 ||
- (error = tree_iterator__push_frame(ti)) < 0) /* expand root now */
- goto fail;
+int git_iterator_current_tree_entry(
+ const git_tree_entry **tree_entry, git_iterator *i)
+{
+ tree_iterator *iter;
+ tree_iterator_frame *frame;
+ tree_iterator_entry *entry;
- *iter = (git_iterator *)ti;
+ assert(i->type == GIT_ITERATOR_TYPE_TREE);
+
+ iter = (tree_iterator *)i;
+
+ frame = tree_iterator_current_frame(iter);
+ entry = tree_iterator_current_entry(frame);
+
+ *tree_entry = entry->tree_entry;
return 0;
+}
-fail:
- git_iterator_free((git_iterator *)ti);
- return error;
+int git_iterator_current_parent_tree(
+ const git_tree **parent_tree, git_iterator *i, size_t depth)
+{
+ tree_iterator *iter;
+ tree_iterator_frame *frame;
+
+ assert(i->type == GIT_ITERATOR_TYPE_TREE);
+
+ iter = (tree_iterator *)i;
+
+ assert(depth < iter->frames.size);
+ frame = &iter->frames.ptr[iter->frames.size-depth-1];
+
+ *parent_tree = frame->tree;
+ return 0;
}
+/* Index iterator */
+
typedef struct {
git_iterator base;
@@ -1914,51 +2195,6 @@ git_index *git_iterator_get_index(git_iterator *iter)
return NULL;
}
-int git_iterator_current_tree_entry(
- const git_tree_entry **tree_entry, git_iterator *iter)
-{
- if (iter->type != GIT_ITERATOR_TYPE_TREE)
- *tree_entry = NULL;
- else {
- tree_iterator_frame *tf = ((tree_iterator *)iter)->head;
- *tree_entry = (tf->current < tf->n_entries) ?
- tf->entries[tf->current]->te : NULL;
- }
-
- return 0;
-}
-
-int git_iterator_current_parent_tree(
- const git_tree **tree_ptr,
- git_iterator *iter,
- const char *parent_path)
-{
- tree_iterator *ti = (tree_iterator *)iter;
- tree_iterator_frame *tf;
- const char *scan = parent_path;
- const git_tree_entry *te;
-
- *tree_ptr = NULL;
-
- if (iter->type != GIT_ITERATOR_TYPE_TREE)
- return 0;
-
- for (tf = ti->root; *scan; ) {
- if (!(tf = tf->down) ||
- tf->current >= tf->n_entries ||
- !(te = tf->entries[tf->current]->te) ||
- ti->base.strncomp(scan, te->filename, te->filename_len) != 0)
- return 0;
-
- scan += te->filename_len;
- if (*scan == '/')
- scan++;
- }
-
- *tree_ptr = tf->entries[tf->current]->tree;
- return 0;
-}
-
static void workdir_iterator_update_is_ignored(workdir_iterator *wi)
{
git_dir_flag dir_flag = git_entry__dir_flag(&wi->fi.entry);
diff --git a/src/iterator.h b/src/iterator.h
index 019f2e6..8cd774b 100644
--- a/src/iterator.h
+++ b/src/iterator.h
@@ -69,6 +69,8 @@ struct git_iterator {
git_repository *repo;
char *start;
char *end;
+ bool started;
+ bool ended;
git_vector pathlist;
size_t pathlist_walk_idx;
int (*strcomp)(const char *a, const char *b);
@@ -254,7 +256,7 @@ extern int git_iterator_current_tree_entry(
const git_tree_entry **entry_out, git_iterator *iter);
extern int git_iterator_current_parent_tree(
- const git_tree **tree_out, git_iterator *iter, const char *parent_path);
+ const git_tree **tree_out, git_iterator *iter, size_t depth);
extern bool git_iterator_current_is_ignored(git_iterator *iter);
diff --git a/tests/diff/iterator.c b/tests/diff/iterator.c
index b64c954..4c95850 100644
--- a/tests/diff/iterator.c
+++ b/tests/diff/iterator.c
@@ -264,37 +264,30 @@ static void check_tree_entry(
const git_index_entry *ie;
const git_tree_entry *te;
const git_tree *tree;
- git_buf path = GIT_BUF_INIT;
cl_git_pass(git_iterator_current_tree_entry(&te, i));
cl_assert(te);
cl_assert(git_oid_streq(te->oid, oid) == 0);
cl_git_pass(git_iterator_current(&ie, i));
- cl_git_pass(git_buf_sets(&path, ie->path));
if (oid_p) {
- git_buf_rtruncate_at_char(&path, '/');
- cl_git_pass(git_iterator_current_parent_tree(&tree, i, path.ptr));
+ cl_git_pass(git_iterator_current_parent_tree(&tree, i, 0));
cl_assert(tree);
cl_assert(git_oid_streq(git_tree_id(tree), oid_p) == 0);
}
if (oid_pp) {
- git_buf_rtruncate_at_char(&path, '/');
- cl_git_pass(git_iterator_current_parent_tree(&tree, i, path.ptr));
+ cl_git_pass(git_iterator_current_parent_tree(&tree, i, 1));
cl_assert(tree);
cl_assert(git_oid_streq(git_tree_id(tree), oid_pp) == 0);
}
if (oid_ppp) {
- git_buf_rtruncate_at_char(&path, '/');
- cl_git_pass(git_iterator_current_parent_tree(&tree, i, path.ptr));
+ cl_git_pass(git_iterator_current_parent_tree(&tree, i, 2));
cl_assert(tree);
cl_assert(git_oid_streq(git_tree_id(tree), oid_ppp) == 0);
}
-
- git_buf_free(&path);
}
void test_diff_iterator__tree_special_functions(void)
diff --git a/tests/repo/iterator.c b/tests/repo/iterator.c
index 0ab8d68..f3a0682 100644
--- a/tests/repo/iterator.c
+++ b/tests/repo/iterator.c
@@ -1455,7 +1455,7 @@ void test_repo_iterator__treefilelist(void)
git_repository_head_tree(&tree, g_repo);
/* All indexfilelist iterator tests are "autoexpand with no tree entries" */
- /* In this test we DO NOT force a case on the iteratords and verify default behavior. */
+ /* In this test we DO NOT force a case on the iterators and verify default behavior. */
i_opts.pathlist.strings = (char **)filelist.contents;
i_opts.pathlist.count = filelist.length;