Merge branch 'ab/commit-graph-progress-fix'

diff --git a/t/helper/test-reach.c b/t/helper/test-reach.c
index c79729cac02102379077d73882010df6d690c86a..a0272178b7791d4146cd196d402e666809753da1 100644 (file)
--- a/t/helper/test-reach.c
+++ b/t/helper/test-reach.c
@@ -4,6 +4,7 @@
 #include "commit-reach.h"
 #include "config.h"
 #include "parse-options.h"
+#include "ref-filter.h"
 #include "string-list.h"
 #include "tag.h"
 
@@ -30,8 +31,9 @@ int cmd__reach(int ac, const char **av)
        struct object_id oid_A, oid_B;
        struct commit *A, *B;
        struct commit_list *X, *Y;
-       struct commit **X_array;
-       int X_nr, X_alloc;
+       struct object_array X_obj = OBJECT_ARRAY_INIT;
+       struct commit **X_array, **Y_array;
+       int X_nr, X_alloc, Y_nr, Y_alloc;
        struct strbuf buf = STRBUF_INIT;
        struct repository *r = the_repository;
 
@@ -42,13 +44,15 @@ int cmd__reach(int ac, const char **av)
 
        A = B = NULL;
        X = Y = NULL;
-       X_nr = 0;
-       X_alloc = 16;
+       X_nr = Y_nr = 0;
+       X_alloc = Y_alloc = 16;
        ALLOC_ARRAY(X_array, X_alloc);
+       ALLOC_ARRAY(Y_array, Y_alloc);
 
        while (strbuf_getline(&buf, stdin) != EOF) {
                struct object_id oid;
-               struct object *o;
+               struct object *orig;
+               struct object *peeled;
                struct commit *c;
                if (buf.len < 3)
                        continue;
@@ -56,14 +60,14 @@ int cmd__reach(int ac, const char **av)
                if (get_oid_committish(buf.buf + 2, &oid))
                        die("failed to resolve %s", buf.buf + 2);
 
-               o = parse_object(r, &oid);
-               o = deref_tag_noverify(o);
+               orig = parse_object(r, &oid);
+               peeled = deref_tag_noverify(orig);
 
-               if (!o)
+               if (!peeled)
                        die("failed to load commit for input %s resulting in oid %s\n",
                            buf.buf, oid_to_hex(&oid));
 
-               c = object_as_type(r, o, OBJ_COMMIT, 0);
+               c = object_as_type(r, peeled, OBJ_COMMIT, 0);
 
                if (!c)
                        die("failed to load commit for input %s resulting in oid %s\n",
@@ -84,10 +88,13 @@ int cmd__reach(int ac, const char **av)
                                commit_list_insert(c, &X);
                                ALLOC_GROW(X_array, X_nr + 1, X_alloc);
                                X_array[X_nr++] = c;
+                               add_object_array(orig, NULL, &X_obj);
                                break;
 
                        case 'Y':
                                commit_list_insert(c, &Y);
+                               ALLOC_GROW(Y_array, Y_nr + 1, Y_alloc);
+                               Y_array[Y_nr++] = c;
                                break;
 
                        default:
@@ -112,6 +119,49 @@ int cmd__reach(int ac, const char **av)
                print_sorted_commit_ids(list);
        } else if (!strcmp(av[1], "can_all_from_reach")) {
                printf("%s(X,Y):%d\n", av[1], can_all_from_reach(X, Y, 1));
+       } else if (!strcmp(av[1], "can_all_from_reach_with_flag")) {
+               struct commit_list *iter = Y;
+
+               while (iter) {
+                       iter->item->object.flags |= 2;
+                       iter = iter->next;
+               }
+
+               printf("%s(X,_,_,0,0):%d\n", av[1], can_all_from_reach_with_flag(&X_obj, 2, 4, 0, 0));
+       } else if (!strcmp(av[1], "commit_contains")) {
+               struct ref_filter filter;
+               struct contains_cache cache;
+               init_contains_cache(&cache);
+
+               if (ac > 2 && !strcmp(av[2], "--tag"))
+                       filter.with_commit_tag_algo = 1;
+               else
+                       filter.with_commit_tag_algo = 0;
+
+               printf("%s(_,A,X,_):%d\n", av[1], commit_contains(&filter, A, X, &cache));
+       } else if (!strcmp(av[1], "get_reachable_subset")) {
+               const int reachable_flag = 1;
+               int i, count = 0;
+               struct commit_list *current;
+               struct commit_list *list = get_reachable_subset(X_array, X_nr,
+                                                               Y_array, Y_nr,
+                                                               reachable_flag);
+               printf("get_reachable_subset(X,Y)\n");
+               for (current = list; current; current = current->next) {
+                       if (!(list->item->object.flags & reachable_flag))
+                               die(_("commit %s is not marked reachable"),
+                                   oid_to_hex(&list->item->object.oid));
+                       count++;
+               }
+               for (i = 0; i < Y_nr; i++) {
+                       if (Y_array[i]->object.flags & reachable_flag)
+                               count--;
+               }
+
+               if (count < 0)
+                       die(_("too many commits marked reachable"));
+
+               print_sorted_commit_ids(list);
        }
 
        exit(0);