3 #include "commit-graph.h"
5 #include "prio-queue.h"
7 #include "ref-filter.h"
10 #include "commit-reach.h"
12 /* Remember to update object flag allocation in object.h */
13 #define PARENT1 (1u<<16)
14 #define PARENT2 (1u<<17)
15 #define STALE (1u<<18)
16 #define RESULT (1u<<19)
18 static const unsigned all_flags
= (PARENT1
| PARENT2
| STALE
| RESULT
);
20 static int queue_has_nonstale(struct prio_queue
*queue
)
23 for (i
= 0; i
< queue
->nr
; i
++) {
24 struct commit
*commit
= queue
->array
[i
].data
;
25 if (!(commit
->object
.flags
& STALE
))
31 /* all input commits in one and twos[] must have been parsed! */
32 static struct commit_list
*paint_down_to_common(struct repository
*r
,
33 struct commit
*one
, int n
,
37 struct prio_queue queue
= { compare_commits_by_gen_then_commit_date
};
38 struct commit_list
*result
= NULL
;
40 uint32_t last_gen
= GENERATION_NUMBER_INFINITY
;
43 queue
.compare
= compare_commits_by_commit_date
;
45 one
->object
.flags
|= PARENT1
;
47 commit_list_append(one
, &result
);
50 prio_queue_put(&queue
, one
);
52 for (i
= 0; i
< n
; i
++) {
53 twos
[i
]->object
.flags
|= PARENT2
;
54 prio_queue_put(&queue
, twos
[i
]);
57 while (queue_has_nonstale(&queue
)) {
58 struct commit
*commit
= prio_queue_get(&queue
);
59 struct commit_list
*parents
;
62 if (min_generation
&& commit
->generation
> last_gen
)
63 BUG("bad generation skip %8x > %8x at %s",
64 commit
->generation
, last_gen
,
65 oid_to_hex(&commit
->object
.oid
));
66 last_gen
= commit
->generation
;
68 if (commit
->generation
< min_generation
)
71 flags
= commit
->object
.flags
& (PARENT1
| PARENT2
| STALE
);
72 if (flags
== (PARENT1
| PARENT2
)) {
73 if (!(commit
->object
.flags
& RESULT
)) {
74 commit
->object
.flags
|= RESULT
;
75 commit_list_insert_by_date(commit
, &result
);
77 /* Mark parents of a found merge stale */
80 parents
= commit
->parents
;
82 struct commit
*p
= parents
->item
;
83 parents
= parents
->next
;
84 if ((p
->object
.flags
& flags
) == flags
)
86 if (repo_parse_commit(r
, p
))
88 p
->object
.flags
|= flags
;
89 prio_queue_put(&queue
, p
);
93 clear_prio_queue(&queue
);
97 static struct commit_list
*merge_bases_many(struct repository
*r
,
98 struct commit
*one
, int n
,
101 struct commit_list
*list
= NULL
;
102 struct commit_list
*result
= NULL
;
105 for (i
= 0; i
< n
; i
++) {
108 * We do not mark this even with RESULT so we do not
109 * have to clean it up.
111 return commit_list_insert(one
, &result
);
114 if (repo_parse_commit(r
, one
))
116 for (i
= 0; i
< n
; i
++) {
117 if (repo_parse_commit(r
, twos
[i
]))
121 list
= paint_down_to_common(r
, one
, n
, twos
, 0);
124 struct commit
*commit
= pop_commit(&list
);
125 if (!(commit
->object
.flags
& STALE
))
126 commit_list_insert_by_date(commit
, &result
);
131 struct commit_list
*get_octopus_merge_bases(struct commit_list
*in
)
133 struct commit_list
*i
, *j
, *k
, *ret
= NULL
;
138 commit_list_insert(in
->item
, &ret
);
140 for (i
= in
->next
; i
; i
= i
->next
) {
141 struct commit_list
*new_commits
= NULL
, *end
= NULL
;
143 for (j
= ret
; j
; j
= j
->next
) {
144 struct commit_list
*bases
;
145 bases
= get_merge_bases(i
->item
, j
->item
);
150 for (k
= bases
; k
; k
= k
->next
)
158 static int remove_redundant(struct repository
*r
, struct commit
**array
, int cnt
)
161 * Some commit in the array may be an ancestor of
162 * another commit. Move such commit to the end of
163 * the array, and return the number of commits that
164 * are independent from each other.
166 struct commit
**work
;
167 unsigned char *redundant
;
171 work
= xcalloc(cnt
, sizeof(*work
));
172 redundant
= xcalloc(cnt
, 1);
173 ALLOC_ARRAY(filled_index
, cnt
- 1);
175 for (i
= 0; i
< cnt
; i
++)
176 repo_parse_commit(r
, array
[i
]);
177 for (i
= 0; i
< cnt
; i
++) {
178 struct commit_list
*common
;
179 uint32_t min_generation
= array
[i
]->generation
;
183 for (j
= filled
= 0; j
< cnt
; j
++) {
184 if (i
== j
|| redundant
[j
])
186 filled_index
[filled
] = j
;
187 work
[filled
++] = array
[j
];
189 if (array
[j
]->generation
< min_generation
)
190 min_generation
= array
[j
]->generation
;
192 common
= paint_down_to_common(r
, array
[i
], filled
,
193 work
, min_generation
);
194 if (array
[i
]->object
.flags
& PARENT2
)
196 for (j
= 0; j
< filled
; j
++)
197 if (work
[j
]->object
.flags
& PARENT1
)
198 redundant
[filled_index
[j
]] = 1;
199 clear_commit_marks(array
[i
], all_flags
);
200 clear_commit_marks_many(filled
, work
, all_flags
);
201 free_commit_list(common
);
204 /* Now collect the result */
205 COPY_ARRAY(work
, array
, cnt
);
206 for (i
= filled
= 0; i
< cnt
; i
++)
208 array
[filled
++] = work
[i
];
209 for (j
= filled
, i
= 0; i
< cnt
; i
++)
211 array
[j
++] = work
[i
];
218 static struct commit_list
*get_merge_bases_many_0(struct repository
*r
,
221 struct commit
**twos
,
224 struct commit_list
*list
;
225 struct commit
**rslt
;
226 struct commit_list
*result
;
229 result
= merge_bases_many(r
, one
, n
, twos
);
230 for (i
= 0; i
< n
; i
++) {
234 if (!result
|| !result
->next
) {
236 clear_commit_marks(one
, all_flags
);
237 clear_commit_marks_many(n
, twos
, all_flags
);
242 /* There are more than one */
243 cnt
= commit_list_count(result
);
244 rslt
= xcalloc(cnt
, sizeof(*rslt
));
245 for (list
= result
, i
= 0; list
; list
= list
->next
)
246 rslt
[i
++] = list
->item
;
247 free_commit_list(result
);
249 clear_commit_marks(one
, all_flags
);
250 clear_commit_marks_many(n
, twos
, all_flags
);
252 cnt
= remove_redundant(r
, rslt
, cnt
);
254 for (i
= 0; i
< cnt
; i
++)
255 commit_list_insert_by_date(rslt
[i
], &result
);
260 struct commit_list
*repo_get_merge_bases_many(struct repository
*r
,
263 struct commit
**twos
)
265 return get_merge_bases_many_0(r
, one
, n
, twos
, 1);
268 struct commit_list
*repo_get_merge_bases_many_dirty(struct repository
*r
,
271 struct commit
**twos
)
273 return get_merge_bases_many_0(r
, one
, n
, twos
, 0);
276 struct commit_list
*repo_get_merge_bases(struct repository
*r
,
280 return get_merge_bases_many_0(r
, one
, 1, &two
, 1);
284 * Is "commit" a descendant of one of the elements on the "with_commit" list?
286 int repo_is_descendant_of(struct repository
*r
,
287 struct commit
*commit
,
288 struct commit_list
*with_commit
)
293 if (generation_numbers_enabled(the_repository
)) {
294 struct commit_list
*from_list
= NULL
;
296 commit_list_insert(commit
, &from_list
);
297 result
= can_all_from_reach(from_list
, with_commit
, 0);
298 free_commit_list(from_list
);
301 while (with_commit
) {
302 struct commit
*other
;
304 other
= with_commit
->item
;
305 with_commit
= with_commit
->next
;
306 if (repo_in_merge_bases_many(r
, other
, 1, &commit
))
314 * Is "commit" an ancestor of one of the "references"?
316 int repo_in_merge_bases_many(struct repository
*r
, struct commit
*commit
,
317 int nr_reference
, struct commit
**reference
)
319 struct commit_list
*bases
;
321 uint32_t min_generation
= GENERATION_NUMBER_INFINITY
;
323 if (repo_parse_commit(r
, commit
))
325 for (i
= 0; i
< nr_reference
; i
++) {
326 if (repo_parse_commit(r
, reference
[i
]))
328 if (reference
[i
]->generation
< min_generation
)
329 min_generation
= reference
[i
]->generation
;
332 if (commit
->generation
> min_generation
)
335 bases
= paint_down_to_common(r
, commit
,
336 nr_reference
, reference
,
338 if (commit
->object
.flags
& PARENT2
)
340 clear_commit_marks(commit
, all_flags
);
341 clear_commit_marks_many(nr_reference
, reference
, all_flags
);
342 free_commit_list(bases
);
347 * Is "commit" an ancestor of (i.e. reachable from) the "reference"?
349 int repo_in_merge_bases(struct repository
*r
,
350 struct commit
*commit
,
351 struct commit
*reference
)
354 struct commit_list
*list
= NULL
;
355 struct commit_list
**next
= &list
;
357 next
= commit_list_append(commit
, next
);
358 res
= repo_is_descendant_of(r
, reference
, list
);
359 free_commit_list(list
);
364 struct commit_list
*reduce_heads(struct commit_list
*heads
)
366 struct commit_list
*p
;
367 struct commit_list
*result
= NULL
, **tail
= &result
;
368 struct commit
**array
;
375 for (p
= heads
; p
; p
= p
->next
)
376 p
->item
->object
.flags
&= ~STALE
;
377 for (p
= heads
, num_head
= 0; p
; p
= p
->next
) {
378 if (p
->item
->object
.flags
& STALE
)
380 p
->item
->object
.flags
|= STALE
;
383 array
= xcalloc(num_head
, sizeof(*array
));
384 for (p
= heads
, i
= 0; p
; p
= p
->next
) {
385 if (p
->item
->object
.flags
& STALE
) {
386 array
[i
++] = p
->item
;
387 p
->item
->object
.flags
&= ~STALE
;
390 num_head
= remove_redundant(the_repository
, array
, num_head
);
391 for (i
= 0; i
< num_head
; i
++)
392 tail
= &commit_list_insert(array
[i
], tail
)->next
;
397 void reduce_heads_replace(struct commit_list
**heads
)
399 struct commit_list
*result
= reduce_heads(*heads
);
400 free_commit_list(*heads
);
404 int ref_newer(const struct object_id
*new_oid
, const struct object_id
*old_oid
)
407 struct commit
*old_commit
, *new_commit
;
408 struct commit_list
*old_commit_list
= NULL
;
411 * Both new_commit and old_commit must be commit-ish and new_commit is descendant of
412 * old_commit. Otherwise we require --force.
414 o
= deref_tag(the_repository
, parse_object(the_repository
, old_oid
),
416 if (!o
|| o
->type
!= OBJ_COMMIT
)
418 old_commit
= (struct commit
*) o
;
420 o
= deref_tag(the_repository
, parse_object(the_repository
, new_oid
),
422 if (!o
|| o
->type
!= OBJ_COMMIT
)
424 new_commit
= (struct commit
*) o
;
426 if (parse_commit(new_commit
) < 0)
429 commit_list_insert(old_commit
, &old_commit_list
);
430 return repo_is_descendant_of(the_repository
,
431 new_commit
, old_commit_list
);
435 * Mimicking the real stack, this stack lives on the heap, avoiding stack
438 * At each recursion step, the stack items points to the commits whose
439 * ancestors are to be inspected.
441 struct contains_stack
{
443 struct contains_stack_entry
{
444 struct commit
*commit
;
445 struct commit_list
*parents
;
449 static int in_commit_list(const struct commit_list
*want
, struct commit
*c
)
451 for (; want
; want
= want
->next
)
452 if (oideq(&want
->item
->object
.oid
, &c
->object
.oid
))
458 * Test whether the candidate is contained in the list.
459 * Do not recurse to find out, though, but return -1 if inconclusive.
461 static enum contains_result
contains_test(struct commit
*candidate
,
462 const struct commit_list
*want
,
463 struct contains_cache
*cache
,
466 enum contains_result
*cached
= contains_cache_at(cache
, candidate
);
468 /* If we already have the answer cached, return that. */
473 if (in_commit_list(want
, candidate
)) {
474 *cached
= CONTAINS_YES
;
478 /* Otherwise, we don't know; prepare to recurse */
479 parse_commit_or_die(candidate
);
481 if (candidate
->generation
< cutoff
)
484 return CONTAINS_UNKNOWN
;
487 static void push_to_contains_stack(struct commit
*candidate
, struct contains_stack
*contains_stack
)
489 ALLOC_GROW(contains_stack
->contains_stack
, contains_stack
->nr
+ 1, contains_stack
->alloc
);
490 contains_stack
->contains_stack
[contains_stack
->nr
].commit
= candidate
;
491 contains_stack
->contains_stack
[contains_stack
->nr
++].parents
= candidate
->parents
;
494 static enum contains_result
contains_tag_algo(struct commit
*candidate
,
495 const struct commit_list
*want
,
496 struct contains_cache
*cache
)
498 struct contains_stack contains_stack
= { 0, 0, NULL
};
499 enum contains_result result
;
500 uint32_t cutoff
= GENERATION_NUMBER_INFINITY
;
501 const struct commit_list
*p
;
503 for (p
= want
; p
; p
= p
->next
) {
504 struct commit
*c
= p
->item
;
505 load_commit_graph_info(the_repository
, c
);
506 if (c
->generation
< cutoff
)
507 cutoff
= c
->generation
;
510 result
= contains_test(candidate
, want
, cache
, cutoff
);
511 if (result
!= CONTAINS_UNKNOWN
)
514 push_to_contains_stack(candidate
, &contains_stack
);
515 while (contains_stack
.nr
) {
516 struct contains_stack_entry
*entry
= &contains_stack
.contains_stack
[contains_stack
.nr
- 1];
517 struct commit
*commit
= entry
->commit
;
518 struct commit_list
*parents
= entry
->parents
;
521 *contains_cache_at(cache
, commit
) = CONTAINS_NO
;
525 * If we just popped the stack, parents->item has been marked,
526 * therefore contains_test will return a meaningful yes/no.
528 else switch (contains_test(parents
->item
, want
, cache
, cutoff
)) {
530 *contains_cache_at(cache
, commit
) = CONTAINS_YES
;
534 entry
->parents
= parents
->next
;
536 case CONTAINS_UNKNOWN
:
537 push_to_contains_stack(parents
->item
, &contains_stack
);
541 free(contains_stack
.contains_stack
);
542 return contains_test(candidate
, want
, cache
, cutoff
);
545 int commit_contains(struct ref_filter
*filter
, struct commit
*commit
,
546 struct commit_list
*list
, struct contains_cache
*cache
)
548 if (filter
->with_commit_tag_algo
)
549 return contains_tag_algo(commit
, list
, cache
) == CONTAINS_YES
;
550 return repo_is_descendant_of(the_repository
, commit
, list
);
553 static int compare_commits_by_gen(const void *_a
, const void *_b
)
555 const struct commit
*a
= *(const struct commit
* const *)_a
;
556 const struct commit
*b
= *(const struct commit
* const *)_b
;
558 if (a
->generation
< b
->generation
)
560 if (a
->generation
> b
->generation
)
565 int can_all_from_reach_with_flag(struct object_array
*from
,
566 unsigned int with_flag
,
567 unsigned int assign_flag
,
568 time_t min_commit_date
,
569 uint32_t min_generation
)
571 struct commit
**list
= NULL
;
576 ALLOC_ARRAY(list
, from
->nr
);
578 for (i
= 0; i
< from
->nr
; i
++) {
579 struct object
*from_one
= from
->objects
[i
].item
;
581 if (!from_one
|| from_one
->flags
& assign_flag
)
584 from_one
= deref_tag(the_repository
, from_one
,
586 if (!from_one
|| from_one
->type
!= OBJ_COMMIT
) {
588 * no way to tell if this is reachable by
589 * looking at the ancestry chain alone, so
590 * leave a note to ourselves not to worry about
591 * this object anymore.
593 from
->objects
[i
].item
->flags
|= assign_flag
;
597 list
[nr_commits
] = (struct commit
*)from_one
;
598 if (parse_commit(list
[nr_commits
]) ||
599 list
[nr_commits
]->generation
< min_generation
) {
607 QSORT(list
, nr_commits
, compare_commits_by_gen
);
609 for (i
= 0; i
< nr_commits
; i
++) {
610 /* DFS from list[i] */
611 struct commit_list
*stack
= NULL
;
613 list
[i
]->object
.flags
|= assign_flag
;
614 commit_list_insert(list
[i
], &stack
);
617 struct commit_list
*parent
;
619 if (stack
->item
->object
.flags
& (with_flag
| RESULT
)) {
622 stack
->item
->object
.flags
|= RESULT
;
626 for (parent
= stack
->item
->parents
; parent
; parent
= parent
->next
) {
627 if (parent
->item
->object
.flags
& (with_flag
| RESULT
))
628 stack
->item
->object
.flags
|= RESULT
;
630 if (!(parent
->item
->object
.flags
& assign_flag
)) {
631 parent
->item
->object
.flags
|= assign_flag
;
633 if (parse_commit(parent
->item
) ||
634 parent
->item
->date
< min_commit_date
||
635 parent
->item
->generation
< min_generation
)
638 commit_list_insert(parent
->item
, &stack
);
647 if (!(list
[i
]->object
.flags
& (with_flag
| RESULT
))) {
654 clear_commit_marks_many(nr_commits
, list
, RESULT
| assign_flag
);
657 for (i
= 0; i
< from
->nr
; i
++)
658 from
->objects
[i
].item
->flags
&= ~assign_flag
;
663 int can_all_from_reach(struct commit_list
*from
, struct commit_list
*to
,
664 int cutoff_by_min_date
)
666 struct object_array from_objs
= OBJECT_ARRAY_INIT
;
667 time_t min_commit_date
= cutoff_by_min_date
? from
->item
->date
: 0;
668 struct commit_list
*from_iter
= from
, *to_iter
= to
;
670 uint32_t min_generation
= GENERATION_NUMBER_INFINITY
;
673 add_object_array(&from_iter
->item
->object
, NULL
, &from_objs
);
675 if (!parse_commit(from_iter
->item
)) {
676 if (from_iter
->item
->date
< min_commit_date
)
677 min_commit_date
= from_iter
->item
->date
;
679 if (from_iter
->item
->generation
< min_generation
)
680 min_generation
= from_iter
->item
->generation
;
683 from_iter
= from_iter
->next
;
687 if (!parse_commit(to_iter
->item
)) {
688 if (to_iter
->item
->date
< min_commit_date
)
689 min_commit_date
= to_iter
->item
->date
;
691 if (to_iter
->item
->generation
< min_generation
)
692 min_generation
= to_iter
->item
->generation
;
695 to_iter
->item
->object
.flags
|= PARENT2
;
697 to_iter
= to_iter
->next
;
700 result
= can_all_from_reach_with_flag(&from_objs
, PARENT2
, PARENT1
,
701 min_commit_date
, min_generation
);
704 clear_commit_marks(from
->item
, PARENT1
);
709 clear_commit_marks(to
->item
, PARENT2
);
713 object_array_clear(&from_objs
);
717 struct commit_list
*get_reachable_subset(struct commit
**from
, int nr_from
,
718 struct commit
**to
, int nr_to
,
719 unsigned int reachable_flag
)
721 struct commit
**item
;
722 struct commit
*current
;
723 struct commit_list
*found_commits
= NULL
;
724 struct commit
**to_last
= to
+ nr_to
;
725 struct commit
**from_last
= from
+ nr_from
;
726 uint32_t min_generation
= GENERATION_NUMBER_INFINITY
;
729 struct prio_queue queue
= { compare_commits_by_gen_then_commit_date
};
731 for (item
= to
; item
< to_last
; item
++) {
732 struct commit
*c
= *item
;
735 if (c
->generation
< min_generation
)
736 min_generation
= c
->generation
;
738 if (!(c
->object
.flags
& PARENT1
)) {
739 c
->object
.flags
|= PARENT1
;
744 for (item
= from
; item
< from_last
; item
++) {
745 struct commit
*c
= *item
;
746 if (!(c
->object
.flags
& PARENT2
)) {
747 c
->object
.flags
|= PARENT2
;
750 prio_queue_put(&queue
, *item
);
754 while (num_to_find
&& (current
= prio_queue_get(&queue
)) != NULL
) {
755 struct commit_list
*parents
;
757 if (current
->object
.flags
& PARENT1
) {
758 current
->object
.flags
&= ~PARENT1
;
759 current
->object
.flags
|= reachable_flag
;
760 commit_list_insert(current
, &found_commits
);
764 for (parents
= current
->parents
; parents
; parents
= parents
->next
) {
765 struct commit
*p
= parents
->item
;
769 if (p
->generation
< min_generation
)
772 if (p
->object
.flags
& PARENT2
)
775 p
->object
.flags
|= PARENT2
;
776 prio_queue_put(&queue
, p
);
780 clear_commit_marks_many(nr_to
, to
, PARENT1
);
781 clear_commit_marks_many(nr_from
, from
, PARENT2
);
783 return found_commits
;