commit-reach(repo_get_merge_bases_many): pass on "missing commits" errors
[git.git] / commit-reach.c
blobf19341da455472a9d7d704bfdd1b3d406e438916
1 #include "git-compat-util.h"
2 #include "commit.h"
3 #include "commit-graph.h"
4 #include "decorate.h"
5 #include "hex.h"
6 #include "prio-queue.h"
7 #include "ref-filter.h"
8 #include "revision.h"
9 #include "tag.h"
10 #include "commit-reach.h"
11 #include "ewah/ewok.h"
13 /* Remember to update object flag allocation in object.h */
14 #define PARENT1 (1u<<16)
15 #define PARENT2 (1u<<17)
16 #define STALE (1u<<18)
17 #define RESULT (1u<<19)
19 static const unsigned all_flags = (PARENT1 | PARENT2 | STALE | RESULT);
21 static int compare_commits_by_gen(const void *_a, const void *_b)
23 const struct commit *a = *(const struct commit * const *)_a;
24 const struct commit *b = *(const struct commit * const *)_b;
26 timestamp_t generation_a = commit_graph_generation(a);
27 timestamp_t generation_b = commit_graph_generation(b);
29 if (generation_a < generation_b)
30 return -1;
31 if (generation_a > generation_b)
32 return 1;
33 if (a->date < b->date)
34 return -1;
35 if (a->date > b->date)
36 return 1;
37 return 0;
40 static int queue_has_nonstale(struct prio_queue *queue)
42 int i;
43 for (i = 0; i < queue->nr; i++) {
44 struct commit *commit = queue->array[i].data;
45 if (!(commit->object.flags & STALE))
46 return 1;
48 return 0;
51 /* all input commits in one and twos[] must have been parsed! */
52 static int paint_down_to_common(struct repository *r,
53 struct commit *one, int n,
54 struct commit **twos,
55 timestamp_t min_generation,
56 int ignore_missing_commits,
57 struct commit_list **result)
59 struct prio_queue queue = { compare_commits_by_gen_then_commit_date };
60 int i;
61 timestamp_t last_gen = GENERATION_NUMBER_INFINITY;
63 if (!min_generation && !corrected_commit_dates_enabled(r))
64 queue.compare = compare_commits_by_commit_date;
66 one->object.flags |= PARENT1;
67 if (!n) {
68 commit_list_append(one, result);
69 return 0;
71 prio_queue_put(&queue, one);
73 for (i = 0; i < n; i++) {
74 twos[i]->object.flags |= PARENT2;
75 prio_queue_put(&queue, twos[i]);
78 while (queue_has_nonstale(&queue)) {
79 struct commit *commit = prio_queue_get(&queue);
80 struct commit_list *parents;
81 int flags;
82 timestamp_t generation = commit_graph_generation(commit);
84 if (min_generation && generation > last_gen)
85 BUG("bad generation skip %"PRItime" > %"PRItime" at %s",
86 generation, last_gen,
87 oid_to_hex(&commit->object.oid));
88 last_gen = generation;
90 if (generation < min_generation)
91 break;
93 flags = commit->object.flags & (PARENT1 | PARENT2 | STALE);
94 if (flags == (PARENT1 | PARENT2)) {
95 if (!(commit->object.flags & RESULT)) {
96 commit->object.flags |= RESULT;
97 commit_list_insert_by_date(commit, result);
99 /* Mark parents of a found merge stale */
100 flags |= STALE;
102 parents = commit->parents;
103 while (parents) {
104 struct commit *p = parents->item;
105 parents = parents->next;
106 if ((p->object.flags & flags) == flags)
107 continue;
108 if (repo_parse_commit(r, p)) {
109 clear_prio_queue(&queue);
110 free_commit_list(*result);
111 *result = NULL;
113 * At this stage, we know that the commit is
114 * missing: `repo_parse_commit()` uses
115 * `OBJECT_INFO_DIE_IF_CORRUPT` and therefore
116 * corrupt commits would already have been
117 * dispatched with a `die()`.
119 if (ignore_missing_commits)
120 return 0;
121 return error(_("could not parse commit %s"),
122 oid_to_hex(&p->object.oid));
124 p->object.flags |= flags;
125 prio_queue_put(&queue, p);
129 clear_prio_queue(&queue);
130 return 0;
133 static int merge_bases_many(struct repository *r,
134 struct commit *one, int n,
135 struct commit **twos,
136 struct commit_list **result)
138 struct commit_list *list = NULL;
139 int i;
141 for (i = 0; i < n; i++) {
142 if (one == twos[i]) {
144 * We do not mark this even with RESULT so we do not
145 * have to clean it up.
147 *result = commit_list_insert(one, result);
148 return 0;
152 if (!one)
153 return 0;
154 if (repo_parse_commit(r, one))
155 return error(_("could not parse commit %s"),
156 oid_to_hex(&one->object.oid));
157 for (i = 0; i < n; i++) {
158 if (!twos[i])
159 return 0;
160 if (repo_parse_commit(r, twos[i]))
161 return error(_("could not parse commit %s"),
162 oid_to_hex(&twos[i]->object.oid));
165 if (paint_down_to_common(r, one, n, twos, 0, 0, &list)) {
166 free_commit_list(list);
167 return -1;
170 while (list) {
171 struct commit *commit = pop_commit(&list);
172 if (!(commit->object.flags & STALE))
173 commit_list_insert_by_date(commit, result);
175 return 0;
178 int get_octopus_merge_bases(struct commit_list *in, struct commit_list **result)
180 struct commit_list *i, *j, *k;
182 if (!in)
183 return 0;
185 commit_list_insert(in->item, result);
187 for (i = in->next; i; i = i->next) {
188 struct commit_list *new_commits = NULL, *end = NULL;
190 for (j = *result; j; j = j->next) {
191 struct commit_list *bases = NULL;
192 if (repo_get_merge_bases(the_repository, i->item,
193 j->item, &bases) < 0) {
194 free_commit_list(bases);
195 free_commit_list(*result);
196 *result = NULL;
197 return -1;
199 if (!new_commits)
200 new_commits = bases;
201 else
202 end->next = bases;
203 for (k = bases; k; k = k->next)
204 end = k;
206 free_commit_list(*result);
207 *result = new_commits;
209 return 0;
212 static int remove_redundant_no_gen(struct repository *r,
213 struct commit **array, int cnt)
215 struct commit **work;
216 unsigned char *redundant;
217 int *filled_index;
218 int i, j, filled;
220 CALLOC_ARRAY(work, cnt);
221 redundant = xcalloc(cnt, 1);
222 ALLOC_ARRAY(filled_index, cnt - 1);
224 for (i = 0; i < cnt; i++)
225 repo_parse_commit(r, array[i]);
226 for (i = 0; i < cnt; i++) {
227 struct commit_list *common = NULL;
228 timestamp_t min_generation = commit_graph_generation(array[i]);
230 if (redundant[i])
231 continue;
232 for (j = filled = 0; j < cnt; j++) {
233 timestamp_t curr_generation;
234 if (i == j || redundant[j])
235 continue;
236 filled_index[filled] = j;
237 work[filled++] = array[j];
239 curr_generation = commit_graph_generation(array[j]);
240 if (curr_generation < min_generation)
241 min_generation = curr_generation;
243 if (paint_down_to_common(r, array[i], filled,
244 work, min_generation, 0, &common)) {
245 clear_commit_marks(array[i], all_flags);
246 clear_commit_marks_many(filled, work, all_flags);
247 free_commit_list(common);
248 free(work);
249 free(redundant);
250 free(filled_index);
251 return -1;
253 if (array[i]->object.flags & PARENT2)
254 redundant[i] = 1;
255 for (j = 0; j < filled; j++)
256 if (work[j]->object.flags & PARENT1)
257 redundant[filled_index[j]] = 1;
258 clear_commit_marks(array[i], all_flags);
259 clear_commit_marks_many(filled, work, all_flags);
260 free_commit_list(common);
263 /* Now collect the result */
264 COPY_ARRAY(work, array, cnt);
265 for (i = filled = 0; i < cnt; i++)
266 if (!redundant[i])
267 array[filled++] = work[i];
268 free(work);
269 free(redundant);
270 free(filled_index);
271 return filled;
274 static int remove_redundant_with_gen(struct repository *r,
275 struct commit **array, int cnt)
277 int i, count_non_stale = 0, count_still_independent = cnt;
278 timestamp_t min_generation = GENERATION_NUMBER_INFINITY;
279 struct commit **walk_start, **sorted;
280 size_t walk_start_nr = 0, walk_start_alloc = cnt;
281 int min_gen_pos = 0;
284 * Sort the input by generation number, ascending. This allows
285 * us to increase the "min_generation" limit when we discover
286 * the commit with lowest generation is STALE. The index
287 * min_gen_pos points to the current position within 'array'
288 * that is not yet known to be STALE.
290 DUP_ARRAY(sorted, array, cnt);
291 QSORT(sorted, cnt, compare_commits_by_gen);
292 min_generation = commit_graph_generation(sorted[0]);
294 ALLOC_ARRAY(walk_start, walk_start_alloc);
296 /* Mark all parents of the input as STALE */
297 for (i = 0; i < cnt; i++) {
298 struct commit_list *parents;
300 repo_parse_commit(r, array[i]);
301 array[i]->object.flags |= RESULT;
302 parents = array[i]->parents;
304 while (parents) {
305 repo_parse_commit(r, parents->item);
306 if (!(parents->item->object.flags & STALE)) {
307 parents->item->object.flags |= STALE;
308 ALLOC_GROW(walk_start, walk_start_nr + 1, walk_start_alloc);
309 walk_start[walk_start_nr++] = parents->item;
311 parents = parents->next;
315 QSORT(walk_start, walk_start_nr, compare_commits_by_gen);
317 /* remove STALE bit for now to allow walking through parents */
318 for (i = 0; i < walk_start_nr; i++)
319 walk_start[i]->object.flags &= ~STALE;
322 * Start walking from the highest generation. Hopefully, it will
323 * find all other items during the first-parent walk, and we can
324 * terminate early. Otherwise, we will do the same amount of work
325 * as before.
327 for (i = walk_start_nr - 1; i >= 0 && count_still_independent > 1; i--) {
328 /* push the STALE bits up to min generation */
329 struct commit_list *stack = NULL;
331 commit_list_insert(walk_start[i], &stack);
332 walk_start[i]->object.flags |= STALE;
334 while (stack) {
335 struct commit_list *parents;
336 struct commit *c = stack->item;
338 repo_parse_commit(r, c);
340 if (c->object.flags & RESULT) {
341 c->object.flags &= ~RESULT;
342 if (--count_still_independent <= 1)
343 break;
344 if (oideq(&c->object.oid, &sorted[min_gen_pos]->object.oid)) {
345 while (min_gen_pos < cnt - 1 &&
346 (sorted[min_gen_pos]->object.flags & STALE))
347 min_gen_pos++;
348 min_generation = commit_graph_generation(sorted[min_gen_pos]);
352 if (commit_graph_generation(c) < min_generation) {
353 pop_commit(&stack);
354 continue;
357 parents = c->parents;
358 while (parents) {
359 if (!(parents->item->object.flags & STALE)) {
360 parents->item->object.flags |= STALE;
361 commit_list_insert(parents->item, &stack);
362 break;
364 parents = parents->next;
367 /* pop if all parents have been visited already */
368 if (!parents)
369 pop_commit(&stack);
371 free_commit_list(stack);
373 free(sorted);
375 /* clear result */
376 for (i = 0; i < cnt; i++)
377 array[i]->object.flags &= ~RESULT;
379 /* rearrange array */
380 for (i = count_non_stale = 0; i < cnt; i++) {
381 if (!(array[i]->object.flags & STALE))
382 array[count_non_stale++] = array[i];
385 /* clear marks */
386 clear_commit_marks_many(walk_start_nr, walk_start, STALE);
387 free(walk_start);
389 return count_non_stale;
392 static int remove_redundant(struct repository *r, struct commit **array, int cnt)
395 * Some commit in the array may be an ancestor of
396 * another commit. Move the independent commits to the
397 * beginning of 'array' and return their number. Callers
398 * should not rely upon the contents of 'array' after
399 * that number.
401 if (generation_numbers_enabled(r)) {
402 int i;
405 * If we have a single commit with finite generation
406 * number, then the _with_gen algorithm is preferred.
408 for (i = 0; i < cnt; i++) {
409 if (commit_graph_generation(array[i]) < GENERATION_NUMBER_INFINITY)
410 return remove_redundant_with_gen(r, array, cnt);
414 return remove_redundant_no_gen(r, array, cnt);
417 static int get_merge_bases_many_0(struct repository *r,
418 struct commit *one,
419 int n,
420 struct commit **twos,
421 int cleanup,
422 struct commit_list **result)
424 struct commit_list *list;
425 struct commit **rslt;
426 int cnt, i;
428 if (merge_bases_many(r, one, n, twos, result) < 0)
429 return -1;
430 for (i = 0; i < n; i++) {
431 if (one == twos[i])
432 return 0;
434 if (!*result || !(*result)->next) {
435 if (cleanup) {
436 clear_commit_marks(one, all_flags);
437 clear_commit_marks_many(n, twos, all_flags);
439 return 0;
442 /* There are more than one */
443 cnt = commit_list_count(*result);
444 CALLOC_ARRAY(rslt, cnt);
445 for (list = *result, i = 0; list; list = list->next)
446 rslt[i++] = list->item;
447 free_commit_list(*result);
448 *result = NULL;
450 clear_commit_marks(one, all_flags);
451 clear_commit_marks_many(n, twos, all_flags);
453 cnt = remove_redundant(r, rslt, cnt);
454 if (cnt < 0) {
455 free(rslt);
456 return -1;
458 for (i = 0; i < cnt; i++)
459 commit_list_insert_by_date(rslt[i], result);
460 free(rslt);
461 return 0;
464 int repo_get_merge_bases_many(struct repository *r,
465 struct commit *one,
466 int n,
467 struct commit **twos,
468 struct commit_list **result)
470 return get_merge_bases_many_0(r, one, n, twos, 1, result);
473 struct commit_list *repo_get_merge_bases_many_dirty(struct repository *r,
474 struct commit *one,
475 int n,
476 struct commit **twos)
478 struct commit_list *result = NULL;
479 if (get_merge_bases_many_0(r, one, n, twos, 0, &result) < 0) {
480 free_commit_list(result);
481 return NULL;
483 return result;
486 int repo_get_merge_bases(struct repository *r,
487 struct commit *one,
488 struct commit *two,
489 struct commit_list **result)
491 return get_merge_bases_many_0(r, one, 1, &two, 1, result);
495 * Is "commit" a descendant of one of the elements on the "with_commit" list?
497 int repo_is_descendant_of(struct repository *r,
498 struct commit *commit,
499 struct commit_list *with_commit)
501 if (!with_commit)
502 return 1;
504 if (generation_numbers_enabled(r)) {
505 struct commit_list *from_list = NULL;
506 int result;
507 commit_list_insert(commit, &from_list);
508 result = can_all_from_reach(from_list, with_commit, 0);
509 free_commit_list(from_list);
510 return result;
511 } else {
512 while (with_commit) {
513 struct commit *other;
514 int ret;
516 other = with_commit->item;
517 with_commit = with_commit->next;
518 ret = repo_in_merge_bases_many(r, other, 1, &commit, 0);
519 if (ret)
520 return ret;
522 return 0;
527 * Is "commit" an ancestor of one of the "references"?
529 int repo_in_merge_bases_many(struct repository *r, struct commit *commit,
530 int nr_reference, struct commit **reference,
531 int ignore_missing_commits)
533 struct commit_list *bases = NULL;
534 int ret = 0, i;
535 timestamp_t generation, max_generation = GENERATION_NUMBER_ZERO;
537 if (repo_parse_commit(r, commit))
538 return ignore_missing_commits ? 0 : -1;
539 for (i = 0; i < nr_reference; i++) {
540 if (repo_parse_commit(r, reference[i]))
541 return ignore_missing_commits ? 0 : -1;
543 generation = commit_graph_generation(reference[i]);
544 if (generation > max_generation)
545 max_generation = generation;
548 generation = commit_graph_generation(commit);
549 if (generation > max_generation)
550 return ret;
552 if (paint_down_to_common(r, commit,
553 nr_reference, reference,
554 generation, ignore_missing_commits, &bases))
555 ret = -1;
556 else if (commit->object.flags & PARENT2)
557 ret = 1;
558 clear_commit_marks(commit, all_flags);
559 clear_commit_marks_many(nr_reference, reference, all_flags);
560 free_commit_list(bases);
561 return ret;
565 * Is "commit" an ancestor of (i.e. reachable from) the "reference"?
567 int repo_in_merge_bases(struct repository *r,
568 struct commit *commit,
569 struct commit *reference)
571 int res;
572 struct commit_list *list = NULL;
573 struct commit_list **next = &list;
575 next = commit_list_append(commit, next);
576 res = repo_is_descendant_of(r, reference, list);
577 free_commit_list(list);
579 return res;
582 struct commit_list *reduce_heads(struct commit_list *heads)
584 struct commit_list *p;
585 struct commit_list *result = NULL, **tail = &result;
586 struct commit **array;
587 int num_head, i;
589 if (!heads)
590 return NULL;
592 /* Uniquify */
593 for (p = heads; p; p = p->next)
594 p->item->object.flags &= ~STALE;
595 for (p = heads, num_head = 0; p; p = p->next) {
596 if (p->item->object.flags & STALE)
597 continue;
598 p->item->object.flags |= STALE;
599 num_head++;
601 CALLOC_ARRAY(array, num_head);
602 for (p = heads, i = 0; p; p = p->next) {
603 if (p->item->object.flags & STALE) {
604 array[i++] = p->item;
605 p->item->object.flags &= ~STALE;
608 num_head = remove_redundant(the_repository, array, num_head);
609 if (num_head < 0) {
610 free(array);
611 return NULL;
613 for (i = 0; i < num_head; i++)
614 tail = &commit_list_insert(array[i], tail)->next;
615 free(array);
616 return result;
619 void reduce_heads_replace(struct commit_list **heads)
621 struct commit_list *result = reduce_heads(*heads);
622 free_commit_list(*heads);
623 *heads = result;
626 int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid)
628 struct object *o;
629 struct commit *old_commit, *new_commit;
630 struct commit_list *old_commit_list = NULL;
631 int ret;
634 * Both new_commit and old_commit must be commit-ish and new_commit is descendant of
635 * old_commit. Otherwise we require --force.
637 o = deref_tag(the_repository, parse_object(the_repository, old_oid),
638 NULL, 0);
639 if (!o || o->type != OBJ_COMMIT)
640 return 0;
641 old_commit = (struct commit *) o;
643 o = deref_tag(the_repository, parse_object(the_repository, new_oid),
644 NULL, 0);
645 if (!o || o->type != OBJ_COMMIT)
646 return 0;
647 new_commit = (struct commit *) o;
649 if (repo_parse_commit(the_repository, new_commit) < 0)
650 return 0;
652 commit_list_insert(old_commit, &old_commit_list);
653 ret = repo_is_descendant_of(the_repository,
654 new_commit, old_commit_list);
655 if (ret < 0)
656 exit(128);
657 free_commit_list(old_commit_list);
658 return ret;
662 * Mimicking the real stack, this stack lives on the heap, avoiding stack
663 * overflows.
665 * At each recursion step, the stack items points to the commits whose
666 * ancestors are to be inspected.
668 struct contains_stack {
669 int nr, alloc;
670 struct contains_stack_entry {
671 struct commit *commit;
672 struct commit_list *parents;
673 } *contains_stack;
676 static int in_commit_list(const struct commit_list *want, struct commit *c)
678 for (; want; want = want->next)
679 if (oideq(&want->item->object.oid, &c->object.oid))
680 return 1;
681 return 0;
685 * Test whether the candidate is contained in the list.
686 * Do not recurse to find out, though, but return -1 if inconclusive.
688 static enum contains_result contains_test(struct commit *candidate,
689 const struct commit_list *want,
690 struct contains_cache *cache,
691 timestamp_t cutoff)
693 enum contains_result *cached = contains_cache_at(cache, candidate);
695 /* If we already have the answer cached, return that. */
696 if (*cached)
697 return *cached;
699 /* or are we it? */
700 if (in_commit_list(want, candidate)) {
701 *cached = CONTAINS_YES;
702 return CONTAINS_YES;
705 /* Otherwise, we don't know; prepare to recurse */
706 parse_commit_or_die(candidate);
708 if (commit_graph_generation(candidate) < cutoff)
709 return CONTAINS_NO;
711 return CONTAINS_UNKNOWN;
714 static void push_to_contains_stack(struct commit *candidate, struct contains_stack *contains_stack)
716 ALLOC_GROW(contains_stack->contains_stack, contains_stack->nr + 1, contains_stack->alloc);
717 contains_stack->contains_stack[contains_stack->nr].commit = candidate;
718 contains_stack->contains_stack[contains_stack->nr++].parents = candidate->parents;
721 static enum contains_result contains_tag_algo(struct commit *candidate,
722 const struct commit_list *want,
723 struct contains_cache *cache)
725 struct contains_stack contains_stack = { 0, 0, NULL };
726 enum contains_result result;
727 timestamp_t cutoff = GENERATION_NUMBER_INFINITY;
728 const struct commit_list *p;
730 for (p = want; p; p = p->next) {
731 timestamp_t generation;
732 struct commit *c = p->item;
733 load_commit_graph_info(the_repository, c);
734 generation = commit_graph_generation(c);
735 if (generation < cutoff)
736 cutoff = generation;
739 result = contains_test(candidate, want, cache, cutoff);
740 if (result != CONTAINS_UNKNOWN)
741 return result;
743 push_to_contains_stack(candidate, &contains_stack);
744 while (contains_stack.nr) {
745 struct contains_stack_entry *entry = &contains_stack.contains_stack[contains_stack.nr - 1];
746 struct commit *commit = entry->commit;
747 struct commit_list *parents = entry->parents;
749 if (!parents) {
750 *contains_cache_at(cache, commit) = CONTAINS_NO;
751 contains_stack.nr--;
754 * If we just popped the stack, parents->item has been marked,
755 * therefore contains_test will return a meaningful yes/no.
757 else switch (contains_test(parents->item, want, cache, cutoff)) {
758 case CONTAINS_YES:
759 *contains_cache_at(cache, commit) = CONTAINS_YES;
760 contains_stack.nr--;
761 break;
762 case CONTAINS_NO:
763 entry->parents = parents->next;
764 break;
765 case CONTAINS_UNKNOWN:
766 push_to_contains_stack(parents->item, &contains_stack);
767 break;
770 free(contains_stack.contains_stack);
771 return contains_test(candidate, want, cache, cutoff);
774 int commit_contains(struct ref_filter *filter, struct commit *commit,
775 struct commit_list *list, struct contains_cache *cache)
777 if (filter->with_commit_tag_algo)
778 return contains_tag_algo(commit, list, cache) == CONTAINS_YES;
779 return repo_is_descendant_of(the_repository, commit, list);
782 int can_all_from_reach_with_flag(struct object_array *from,
783 unsigned int with_flag,
784 unsigned int assign_flag,
785 time_t min_commit_date,
786 timestamp_t min_generation)
788 struct commit **list = NULL;
789 int i;
790 int nr_commits;
791 int result = 1;
793 ALLOC_ARRAY(list, from->nr);
794 nr_commits = 0;
795 for (i = 0; i < from->nr; i++) {
796 struct object *from_one = from->objects[i].item;
798 if (!from_one || from_one->flags & assign_flag)
799 continue;
801 from_one = deref_tag(the_repository, from_one,
802 "a from object", 0);
803 if (!from_one || from_one->type != OBJ_COMMIT) {
805 * no way to tell if this is reachable by
806 * looking at the ancestry chain alone, so
807 * leave a note to ourselves not to worry about
808 * this object anymore.
810 from->objects[i].item->flags |= assign_flag;
811 continue;
814 list[nr_commits] = (struct commit *)from_one;
815 if (repo_parse_commit(the_repository, list[nr_commits]) ||
816 commit_graph_generation(list[nr_commits]) < min_generation) {
817 result = 0;
818 goto cleanup;
821 nr_commits++;
824 QSORT(list, nr_commits, compare_commits_by_gen);
826 for (i = 0; i < nr_commits; i++) {
827 /* DFS from list[i] */
828 struct commit_list *stack = NULL;
830 list[i]->object.flags |= assign_flag;
831 commit_list_insert(list[i], &stack);
833 while (stack) {
834 struct commit_list *parent;
836 if (stack->item->object.flags & (with_flag | RESULT)) {
837 pop_commit(&stack);
838 if (stack)
839 stack->item->object.flags |= RESULT;
840 continue;
843 for (parent = stack->item->parents; parent; parent = parent->next) {
844 if (parent->item->object.flags & (with_flag | RESULT))
845 stack->item->object.flags |= RESULT;
847 if (!(parent->item->object.flags & assign_flag)) {
848 parent->item->object.flags |= assign_flag;
850 if (repo_parse_commit(the_repository, parent->item) ||
851 parent->item->date < min_commit_date ||
852 commit_graph_generation(parent->item) < min_generation)
853 continue;
855 commit_list_insert(parent->item, &stack);
856 break;
860 if (!parent)
861 pop_commit(&stack);
864 if (!(list[i]->object.flags & (with_flag | RESULT))) {
865 result = 0;
866 goto cleanup;
870 cleanup:
871 clear_commit_marks_many(nr_commits, list, RESULT | assign_flag);
872 free(list);
874 for (i = 0; i < from->nr; i++) {
875 struct object *from_one = from->objects[i].item;
877 if (from_one)
878 from_one->flags &= ~assign_flag;
881 return result;
884 int can_all_from_reach(struct commit_list *from, struct commit_list *to,
885 int cutoff_by_min_date)
887 struct object_array from_objs = OBJECT_ARRAY_INIT;
888 time_t min_commit_date = cutoff_by_min_date ? from->item->date : 0;
889 struct commit_list *from_iter = from, *to_iter = to;
890 int result;
891 timestamp_t min_generation = GENERATION_NUMBER_INFINITY;
893 while (from_iter) {
894 add_object_array(&from_iter->item->object, NULL, &from_objs);
896 if (!repo_parse_commit(the_repository, from_iter->item)) {
897 timestamp_t generation;
898 if (from_iter->item->date < min_commit_date)
899 min_commit_date = from_iter->item->date;
901 generation = commit_graph_generation(from_iter->item);
902 if (generation < min_generation)
903 min_generation = generation;
906 from_iter = from_iter->next;
909 while (to_iter) {
910 if (!repo_parse_commit(the_repository, to_iter->item)) {
911 timestamp_t generation;
912 if (to_iter->item->date < min_commit_date)
913 min_commit_date = to_iter->item->date;
915 generation = commit_graph_generation(to_iter->item);
916 if (generation < min_generation)
917 min_generation = generation;
920 to_iter->item->object.flags |= PARENT2;
922 to_iter = to_iter->next;
925 result = can_all_from_reach_with_flag(&from_objs, PARENT2, PARENT1,
926 min_commit_date, min_generation);
928 while (from) {
929 clear_commit_marks(from->item, PARENT1);
930 from = from->next;
933 while (to) {
934 clear_commit_marks(to->item, PARENT2);
935 to = to->next;
938 object_array_clear(&from_objs);
939 return result;
942 struct commit_list *get_reachable_subset(struct commit **from, int nr_from,
943 struct commit **to, int nr_to,
944 unsigned int reachable_flag)
946 struct commit **item;
947 struct commit *current;
948 struct commit_list *found_commits = NULL;
949 struct commit **to_last = to + nr_to;
950 struct commit **from_last = from + nr_from;
951 timestamp_t min_generation = GENERATION_NUMBER_INFINITY;
952 int num_to_find = 0;
954 struct prio_queue queue = { compare_commits_by_gen_then_commit_date };
956 for (item = to; item < to_last; item++) {
957 timestamp_t generation;
958 struct commit *c = *item;
960 repo_parse_commit(the_repository, c);
961 generation = commit_graph_generation(c);
962 if (generation < min_generation)
963 min_generation = generation;
965 if (!(c->object.flags & PARENT1)) {
966 c->object.flags |= PARENT1;
967 num_to_find++;
971 for (item = from; item < from_last; item++) {
972 struct commit *c = *item;
973 if (!(c->object.flags & PARENT2)) {
974 c->object.flags |= PARENT2;
975 repo_parse_commit(the_repository, c);
977 prio_queue_put(&queue, *item);
981 while (num_to_find && (current = prio_queue_get(&queue)) != NULL) {
982 struct commit_list *parents;
984 if (current->object.flags & PARENT1) {
985 current->object.flags &= ~PARENT1;
986 current->object.flags |= reachable_flag;
987 commit_list_insert(current, &found_commits);
988 num_to_find--;
991 for (parents = current->parents; parents; parents = parents->next) {
992 struct commit *p = parents->item;
994 repo_parse_commit(the_repository, p);
996 if (commit_graph_generation(p) < min_generation)
997 continue;
999 if (p->object.flags & PARENT2)
1000 continue;
1002 p->object.flags |= PARENT2;
1003 prio_queue_put(&queue, p);
1007 clear_prio_queue(&queue);
1009 clear_commit_marks_many(nr_to, to, PARENT1);
1010 clear_commit_marks_many(nr_from, from, PARENT2);
1012 return found_commits;
1015 define_commit_slab(bit_arrays, struct bitmap *);
1016 static struct bit_arrays bit_arrays;
1018 static void insert_no_dup(struct prio_queue *queue, struct commit *c)
1020 if (c->object.flags & PARENT2)
1021 return;
1022 prio_queue_put(queue, c);
1023 c->object.flags |= PARENT2;
1026 static struct bitmap *get_bit_array(struct commit *c, int width)
1028 struct bitmap **bitmap = bit_arrays_at(&bit_arrays, c);
1029 if (!*bitmap)
1030 *bitmap = bitmap_word_alloc(width);
1031 return *bitmap;
1034 static void free_bit_array(struct commit *c)
1036 struct bitmap **bitmap = bit_arrays_at(&bit_arrays, c);
1037 if (!*bitmap)
1038 return;
1039 bitmap_free(*bitmap);
1040 *bitmap = NULL;
1043 void ahead_behind(struct repository *r,
1044 struct commit **commits, size_t commits_nr,
1045 struct ahead_behind_count *counts, size_t counts_nr)
1047 struct prio_queue queue = { .compare = compare_commits_by_gen_then_commit_date };
1048 size_t width = DIV_ROUND_UP(commits_nr, BITS_IN_EWORD);
1050 if (!commits_nr || !counts_nr)
1051 return;
1053 for (size_t i = 0; i < counts_nr; i++) {
1054 counts[i].ahead = 0;
1055 counts[i].behind = 0;
1058 ensure_generations_valid(r, commits, commits_nr);
1060 init_bit_arrays(&bit_arrays);
1062 for (size_t i = 0; i < commits_nr; i++) {
1063 struct commit *c = commits[i];
1064 struct bitmap *bitmap = get_bit_array(c, width);
1066 bitmap_set(bitmap, i);
1067 insert_no_dup(&queue, c);
1070 while (queue_has_nonstale(&queue)) {
1071 struct commit *c = prio_queue_get(&queue);
1072 struct commit_list *p;
1073 struct bitmap *bitmap_c = get_bit_array(c, width);
1075 for (size_t i = 0; i < counts_nr; i++) {
1076 int reach_from_tip = !!bitmap_get(bitmap_c, counts[i].tip_index);
1077 int reach_from_base = !!bitmap_get(bitmap_c, counts[i].base_index);
1079 if (reach_from_tip ^ reach_from_base) {
1080 if (reach_from_base)
1081 counts[i].behind++;
1082 else
1083 counts[i].ahead++;
1087 for (p = c->parents; p; p = p->next) {
1088 struct bitmap *bitmap_p;
1090 repo_parse_commit(r, p->item);
1092 bitmap_p = get_bit_array(p->item, width);
1093 bitmap_or(bitmap_p, bitmap_c);
1096 * If this parent is reachable from every starting
1097 * commit, then none of its ancestors can contribute
1098 * to the ahead/behind count. Mark it as STALE, so
1099 * we can stop the walk when every commit in the
1100 * queue is STALE.
1102 if (bitmap_popcount(bitmap_p) == commits_nr)
1103 p->item->object.flags |= STALE;
1105 insert_no_dup(&queue, p->item);
1108 free_bit_array(c);
1111 /* STALE is used here, PARENT2 is used by insert_no_dup(). */
1112 repo_clear_commit_marks(r, PARENT2 | STALE);
1113 clear_bit_arrays(&bit_arrays);
1114 clear_prio_queue(&queue);
1117 struct commit_and_index {
1118 struct commit *commit;
1119 unsigned int index;
1120 timestamp_t generation;
1123 static int compare_commit_and_index_by_generation(const void *va, const void *vb)
1125 const struct commit_and_index *a = (const struct commit_and_index *)va;
1126 const struct commit_and_index *b = (const struct commit_and_index *)vb;
1128 if (a->generation > b->generation)
1129 return 1;
1130 if (a->generation < b->generation)
1131 return -1;
1132 return 0;
1135 void tips_reachable_from_bases(struct repository *r,
1136 struct commit_list *bases,
1137 struct commit **tips, size_t tips_nr,
1138 int mark)
1140 struct commit_and_index *commits;
1141 size_t min_generation_index = 0;
1142 timestamp_t min_generation;
1143 struct commit_list *stack = NULL;
1145 if (!bases || !tips || !tips_nr)
1146 return;
1149 * Do a depth-first search starting at 'bases' to search for the
1150 * tips. Stop at the lowest (un-found) generation number. When
1151 * finding the lowest commit, increase the minimum generation
1152 * number to the next lowest (un-found) generation number.
1155 CALLOC_ARRAY(commits, tips_nr);
1157 for (size_t i = 0; i < tips_nr; i++) {
1158 commits[i].commit = tips[i];
1159 commits[i].index = i;
1160 commits[i].generation = commit_graph_generation(tips[i]);
1163 /* Sort with generation number ascending. */
1164 QSORT(commits, tips_nr, compare_commit_and_index_by_generation);
1165 min_generation = commits[0].generation;
1167 while (bases) {
1168 repo_parse_commit(r, bases->item);
1169 commit_list_insert(bases->item, &stack);
1170 bases = bases->next;
1173 while (stack) {
1174 int explored_all_parents = 1;
1175 struct commit_list *p;
1176 struct commit *c = stack->item;
1177 timestamp_t c_gen = commit_graph_generation(c);
1179 /* Does it match any of our tips? */
1180 for (size_t j = min_generation_index; j < tips_nr; j++) {
1181 if (c_gen < commits[j].generation)
1182 break;
1184 if (commits[j].commit == c) {
1185 tips[commits[j].index]->object.flags |= mark;
1187 if (j == min_generation_index) {
1188 unsigned int k = j + 1;
1189 while (k < tips_nr &&
1190 (tips[commits[k].index]->object.flags & mark))
1191 k++;
1193 /* Terminate early if all found. */
1194 if (k >= tips_nr)
1195 goto done;
1197 min_generation_index = k;
1198 min_generation = commits[k].generation;
1203 for (p = c->parents; p; p = p->next) {
1204 repo_parse_commit(r, p->item);
1206 /* Have we already explored this parent? */
1207 if (p->item->object.flags & SEEN)
1208 continue;
1210 /* Is it below the current minimum generation? */
1211 if (commit_graph_generation(p->item) < min_generation)
1212 continue;
1214 /* Ok, we will explore from here on. */
1215 p->item->object.flags |= SEEN;
1216 explored_all_parents = 0;
1217 commit_list_insert(p->item, &stack);
1218 break;
1221 if (explored_all_parents)
1222 pop_commit(&stack);
1225 done:
1226 free(commits);
1227 repo_clear_commit_marks(r, SEEN);