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 REACHABLE (1u<<15)
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 queue_has_nonstale(struct prio_queue
*queue
)
24 for (i
= 0; i
< queue
->nr
; i
++) {
25 struct commit
*commit
= queue
->array
[i
].data
;
26 if (!(commit
->object
.flags
& STALE
))
32 /* all input commits in one and twos[] must have been parsed! */
33 static struct commit_list
*paint_down_to_common(struct repository
*r
,
34 struct commit
*one
, int n
,
38 struct prio_queue queue
= { compare_commits_by_gen_then_commit_date
};
39 struct commit_list
*result
= NULL
;
41 uint32_t last_gen
= GENERATION_NUMBER_INFINITY
;
44 queue
.compare
= compare_commits_by_commit_date
;
46 one
->object
.flags
|= PARENT1
;
48 commit_list_append(one
, &result
);
51 prio_queue_put(&queue
, one
);
53 for (i
= 0; i
< n
; i
++) {
54 twos
[i
]->object
.flags
|= PARENT2
;
55 prio_queue_put(&queue
, twos
[i
]);
58 while (queue_has_nonstale(&queue
)) {
59 struct commit
*commit
= prio_queue_get(&queue
);
60 struct commit_list
*parents
;
63 if (min_generation
&& commit
->generation
> last_gen
)
64 BUG("bad generation skip %8x > %8x at %s",
65 commit
->generation
, last_gen
,
66 oid_to_hex(&commit
->object
.oid
));
67 last_gen
= commit
->generation
;
69 if (commit
->generation
< min_generation
)
72 flags
= commit
->object
.flags
& (PARENT1
| PARENT2
| STALE
);
73 if (flags
== (PARENT1
| PARENT2
)) {
74 if (!(commit
->object
.flags
& RESULT
)) {
75 commit
->object
.flags
|= RESULT
;
76 commit_list_insert_by_date(commit
, &result
);
78 /* Mark parents of a found merge stale */
81 parents
= commit
->parents
;
83 struct commit
*p
= parents
->item
;
84 parents
= parents
->next
;
85 if ((p
->object
.flags
& flags
) == flags
)
87 if (repo_parse_commit(r
, p
))
89 p
->object
.flags
|= flags
;
90 prio_queue_put(&queue
, p
);
94 clear_prio_queue(&queue
);
98 static struct commit_list
*merge_bases_many(struct repository
*r
,
99 struct commit
*one
, int n
,
100 struct commit
**twos
)
102 struct commit_list
*list
= NULL
;
103 struct commit_list
*result
= NULL
;
106 for (i
= 0; i
< n
; i
++) {
109 * We do not mark this even with RESULT so we do not
110 * have to clean it up.
112 return commit_list_insert(one
, &result
);
115 if (repo_parse_commit(r
, one
))
117 for (i
= 0; i
< n
; i
++) {
118 if (repo_parse_commit(r
, twos
[i
]))
122 list
= paint_down_to_common(r
, one
, n
, twos
, 0);
125 struct commit
*commit
= pop_commit(&list
);
126 if (!(commit
->object
.flags
& STALE
))
127 commit_list_insert_by_date(commit
, &result
);
132 struct commit_list
*get_octopus_merge_bases(struct commit_list
*in
)
134 struct commit_list
*i
, *j
, *k
, *ret
= NULL
;
139 commit_list_insert(in
->item
, &ret
);
141 for (i
= in
->next
; i
; i
= i
->next
) {
142 struct commit_list
*new_commits
= NULL
, *end
= NULL
;
144 for (j
= ret
; j
; j
= j
->next
) {
145 struct commit_list
*bases
;
146 bases
= get_merge_bases(i
->item
, j
->item
);
151 for (k
= bases
; k
; k
= k
->next
)
159 static int remove_redundant(struct repository
*r
, struct commit
**array
, int cnt
)
162 * Some commit in the array may be an ancestor of
163 * another commit. Move such commit to the end of
164 * the array, and return the number of commits that
165 * are independent from each other.
167 struct commit
**work
;
168 unsigned char *redundant
;
172 work
= xcalloc(cnt
, sizeof(*work
));
173 redundant
= xcalloc(cnt
, 1);
174 ALLOC_ARRAY(filled_index
, cnt
- 1);
176 for (i
= 0; i
< cnt
; i
++)
177 repo_parse_commit(r
, array
[i
]);
178 for (i
= 0; i
< cnt
; i
++) {
179 struct commit_list
*common
;
180 uint32_t min_generation
= array
[i
]->generation
;
184 for (j
= filled
= 0; j
< cnt
; j
++) {
185 if (i
== j
|| redundant
[j
])
187 filled_index
[filled
] = j
;
188 work
[filled
++] = array
[j
];
190 if (array
[j
]->generation
< min_generation
)
191 min_generation
= array
[j
]->generation
;
193 common
= paint_down_to_common(r
, array
[i
], filled
,
194 work
, min_generation
);
195 if (array
[i
]->object
.flags
& PARENT2
)
197 for (j
= 0; j
< filled
; j
++)
198 if (work
[j
]->object
.flags
& PARENT1
)
199 redundant
[filled_index
[j
]] = 1;
200 clear_commit_marks(array
[i
], all_flags
);
201 clear_commit_marks_many(filled
, work
, all_flags
);
202 free_commit_list(common
);
205 /* Now collect the result */
206 COPY_ARRAY(work
, array
, cnt
);
207 for (i
= filled
= 0; i
< cnt
; i
++)
209 array
[filled
++] = work
[i
];
210 for (j
= filled
, i
= 0; i
< cnt
; i
++)
212 array
[j
++] = work
[i
];
219 static struct commit_list
*get_merge_bases_many_0(struct repository
*r
,
222 struct commit
**twos
,
225 struct commit_list
*list
;
226 struct commit
**rslt
;
227 struct commit_list
*result
;
230 result
= merge_bases_many(r
, one
, n
, twos
);
231 for (i
= 0; i
< n
; i
++) {
235 if (!result
|| !result
->next
) {
237 clear_commit_marks(one
, all_flags
);
238 clear_commit_marks_many(n
, twos
, all_flags
);
243 /* There are more than one */
244 cnt
= commit_list_count(result
);
245 rslt
= xcalloc(cnt
, sizeof(*rslt
));
246 for (list
= result
, i
= 0; list
; list
= list
->next
)
247 rslt
[i
++] = list
->item
;
248 free_commit_list(result
);
250 clear_commit_marks(one
, all_flags
);
251 clear_commit_marks_many(n
, twos
, all_flags
);
253 cnt
= remove_redundant(r
, rslt
, cnt
);
255 for (i
= 0; i
< cnt
; i
++)
256 commit_list_insert_by_date(rslt
[i
], &result
);
261 struct commit_list
*get_merge_bases_many(struct commit
*one
,
263 struct commit
**twos
)
265 return get_merge_bases_many_0(the_repository
, one
, n
, twos
, 1);
268 struct commit_list
*get_merge_bases_many_dirty(struct commit
*one
,
270 struct commit
**twos
)
272 return get_merge_bases_many_0(the_repository
, one
, n
, twos
, 0);
275 struct commit_list
*get_merge_bases(struct commit
*one
, struct commit
*two
)
277 return get_merge_bases_many_0(the_repository
, one
, 1, &two
, 1);
281 * Is "commit" a descendant of one of the elements on the "with_commit" list?
283 int is_descendant_of(struct commit
*commit
, struct commit_list
*with_commit
)
288 if (generation_numbers_enabled(the_repository
)) {
289 struct commit_list
*from_list
= NULL
;
291 commit_list_insert(commit
, &from_list
);
292 result
= can_all_from_reach(from_list
, with_commit
, 0);
293 free_commit_list(from_list
);
296 while (with_commit
) {
297 struct commit
*other
;
299 other
= with_commit
->item
;
300 with_commit
= with_commit
->next
;
301 if (in_merge_bases(other
, commit
))
309 * Is "commit" an ancestor of one of the "references"?
311 int in_merge_bases_many(struct commit
*commit
, int nr_reference
, struct commit
**reference
)
313 struct commit_list
*bases
;
315 uint32_t min_generation
= GENERATION_NUMBER_INFINITY
;
317 if (parse_commit(commit
))
319 for (i
= 0; i
< nr_reference
; i
++) {
320 if (parse_commit(reference
[i
]))
322 if (reference
[i
]->generation
< min_generation
)
323 min_generation
= reference
[i
]->generation
;
326 if (commit
->generation
> min_generation
)
329 bases
= paint_down_to_common(the_repository
, commit
,
330 nr_reference
, reference
,
332 if (commit
->object
.flags
& PARENT2
)
334 clear_commit_marks(commit
, all_flags
);
335 clear_commit_marks_many(nr_reference
, reference
, all_flags
);
336 free_commit_list(bases
);
341 * Is "commit" an ancestor of (i.e. reachable from) the "reference"?
343 int in_merge_bases(struct commit
*commit
, struct commit
*reference
)
345 return in_merge_bases_many(commit
, 1, &reference
);
348 struct commit_list
*reduce_heads(struct commit_list
*heads
)
350 struct commit_list
*p
;
351 struct commit_list
*result
= NULL
, **tail
= &result
;
352 struct commit
**array
;
359 for (p
= heads
; p
; p
= p
->next
)
360 p
->item
->object
.flags
&= ~STALE
;
361 for (p
= heads
, num_head
= 0; p
; p
= p
->next
) {
362 if (p
->item
->object
.flags
& STALE
)
364 p
->item
->object
.flags
|= STALE
;
367 array
= xcalloc(num_head
, sizeof(*array
));
368 for (p
= heads
, i
= 0; p
; p
= p
->next
) {
369 if (p
->item
->object
.flags
& STALE
) {
370 array
[i
++] = p
->item
;
371 p
->item
->object
.flags
&= ~STALE
;
374 num_head
= remove_redundant(the_repository
, array
, num_head
);
375 for (i
= 0; i
< num_head
; i
++)
376 tail
= &commit_list_insert(array
[i
], tail
)->next
;
381 void reduce_heads_replace(struct commit_list
**heads
)
383 struct commit_list
*result
= reduce_heads(*heads
);
384 free_commit_list(*heads
);
388 int ref_newer(const struct object_id
*new_oid
, const struct object_id
*old_oid
)
391 struct commit
*old_commit
, *new_commit
;
392 struct commit_list
*old_commit_list
= NULL
;
395 * Both new_commit and old_commit must be commit-ish and new_commit is descendant of
396 * old_commit. Otherwise we require --force.
398 o
= deref_tag(the_repository
, parse_object(the_repository
, old_oid
),
400 if (!o
|| o
->type
!= OBJ_COMMIT
)
402 old_commit
= (struct commit
*) o
;
404 o
= deref_tag(the_repository
, parse_object(the_repository
, new_oid
),
406 if (!o
|| o
->type
!= OBJ_COMMIT
)
408 new_commit
= (struct commit
*) o
;
410 if (parse_commit(new_commit
) < 0)
413 commit_list_insert(old_commit
, &old_commit_list
);
414 return is_descendant_of(new_commit
, old_commit_list
);
418 * Mimicking the real stack, this stack lives on the heap, avoiding stack
421 * At each recursion step, the stack items points to the commits whose
422 * ancestors are to be inspected.
424 struct contains_stack
{
426 struct contains_stack_entry
{
427 struct commit
*commit
;
428 struct commit_list
*parents
;
432 static int in_commit_list(const struct commit_list
*want
, struct commit
*c
)
434 for (; want
; want
= want
->next
)
435 if (oideq(&want
->item
->object
.oid
, &c
->object
.oid
))
441 * Test whether the candidate is contained in the list.
442 * Do not recurse to find out, though, but return -1 if inconclusive.
444 static enum contains_result
contains_test(struct commit
*candidate
,
445 const struct commit_list
*want
,
446 struct contains_cache
*cache
,
449 enum contains_result
*cached
= contains_cache_at(cache
, candidate
);
451 /* If we already have the answer cached, return that. */
456 if (in_commit_list(want
, candidate
)) {
457 *cached
= CONTAINS_YES
;
461 /* Otherwise, we don't know; prepare to recurse */
462 parse_commit_or_die(candidate
);
464 if (candidate
->generation
< cutoff
)
467 return CONTAINS_UNKNOWN
;
470 static void push_to_contains_stack(struct commit
*candidate
, struct contains_stack
*contains_stack
)
472 ALLOC_GROW(contains_stack
->contains_stack
, contains_stack
->nr
+ 1, contains_stack
->alloc
);
473 contains_stack
->contains_stack
[contains_stack
->nr
].commit
= candidate
;
474 contains_stack
->contains_stack
[contains_stack
->nr
++].parents
= candidate
->parents
;
477 static enum contains_result
contains_tag_algo(struct commit
*candidate
,
478 const struct commit_list
*want
,
479 struct contains_cache
*cache
)
481 struct contains_stack contains_stack
= { 0, 0, NULL
};
482 enum contains_result result
;
483 uint32_t cutoff
= GENERATION_NUMBER_INFINITY
;
484 const struct commit_list
*p
;
486 for (p
= want
; p
; p
= p
->next
) {
487 struct commit
*c
= p
->item
;
488 load_commit_graph_info(the_repository
, c
);
489 if (c
->generation
< cutoff
)
490 cutoff
= c
->generation
;
493 result
= contains_test(candidate
, want
, cache
, cutoff
);
494 if (result
!= CONTAINS_UNKNOWN
)
497 push_to_contains_stack(candidate
, &contains_stack
);
498 while (contains_stack
.nr
) {
499 struct contains_stack_entry
*entry
= &contains_stack
.contains_stack
[contains_stack
.nr
- 1];
500 struct commit
*commit
= entry
->commit
;
501 struct commit_list
*parents
= entry
->parents
;
504 *contains_cache_at(cache
, commit
) = CONTAINS_NO
;
508 * If we just popped the stack, parents->item has been marked,
509 * therefore contains_test will return a meaningful yes/no.
511 else switch (contains_test(parents
->item
, want
, cache
, cutoff
)) {
513 *contains_cache_at(cache
, commit
) = CONTAINS_YES
;
517 entry
->parents
= parents
->next
;
519 case CONTAINS_UNKNOWN
:
520 push_to_contains_stack(parents
->item
, &contains_stack
);
524 free(contains_stack
.contains_stack
);
525 return contains_test(candidate
, want
, cache
, cutoff
);
528 int commit_contains(struct ref_filter
*filter
, struct commit
*commit
,
529 struct commit_list
*list
, struct contains_cache
*cache
)
531 if (filter
->with_commit_tag_algo
)
532 return contains_tag_algo(commit
, list
, cache
) == CONTAINS_YES
;
533 return is_descendant_of(commit
, list
);
536 static int compare_commits_by_gen(const void *_a
, const void *_b
)
538 const struct commit
*a
= (const struct commit
*)_a
;
539 const struct commit
*b
= (const struct commit
*)_b
;
541 if (a
->generation
< b
->generation
)
543 if (a
->generation
> b
->generation
)
548 int can_all_from_reach_with_flag(struct object_array
*from
,
549 unsigned int with_flag
,
550 unsigned int assign_flag
,
551 time_t min_commit_date
,
552 uint32_t min_generation
)
554 struct commit
**list
= NULL
;
559 ALLOC_ARRAY(list
, from
->nr
);
561 for (i
= 0; i
< from
->nr
; i
++) {
562 struct object
*from_one
= from
->objects
[i
].item
;
564 if (!from_one
|| from_one
->flags
& assign_flag
)
567 from_one
= deref_tag(the_repository
, from_one
,
569 if (!from_one
|| from_one
->type
!= OBJ_COMMIT
) {
571 * no way to tell if this is reachable by
572 * looking at the ancestry chain alone, so
573 * leave a note to ourselves not to worry about
574 * this object anymore.
576 from
->objects
[i
].item
->flags
|= assign_flag
;
580 list
[nr_commits
] = (struct commit
*)from_one
;
581 if (parse_commit(list
[nr_commits
]) ||
582 list
[nr_commits
]->generation
< min_generation
) {
590 QSORT(list
, nr_commits
, compare_commits_by_gen
);
592 for (i
= 0; i
< nr_commits
; i
++) {
593 /* DFS from list[i] */
594 struct commit_list
*stack
= NULL
;
596 list
[i
]->object
.flags
|= assign_flag
;
597 commit_list_insert(list
[i
], &stack
);
600 struct commit_list
*parent
;
602 if (stack
->item
->object
.flags
& with_flag
) {
607 for (parent
= stack
->item
->parents
; parent
; parent
= parent
->next
) {
608 if (parent
->item
->object
.flags
& (with_flag
| RESULT
))
609 stack
->item
->object
.flags
|= RESULT
;
611 if (!(parent
->item
->object
.flags
& assign_flag
)) {
612 parent
->item
->object
.flags
|= assign_flag
;
614 if (parse_commit(parent
->item
) ||
615 parent
->item
->date
< min_commit_date
||
616 parent
->item
->generation
< min_generation
)
619 commit_list_insert(parent
->item
, &stack
);
628 if (!(list
[i
]->object
.flags
& (with_flag
| RESULT
))) {
635 clear_commit_marks_many(nr_commits
, list
, RESULT
| assign_flag
);
638 for (i
= 0; i
< from
->nr
; i
++)
639 from
->objects
[i
].item
->flags
&= ~assign_flag
;
644 int can_all_from_reach(struct commit_list
*from
, struct commit_list
*to
,
645 int cutoff_by_min_date
)
647 struct object_array from_objs
= OBJECT_ARRAY_INIT
;
648 time_t min_commit_date
= cutoff_by_min_date
? from
->item
->date
: 0;
649 struct commit_list
*from_iter
= from
, *to_iter
= to
;
651 uint32_t min_generation
= GENERATION_NUMBER_INFINITY
;
654 add_object_array(&from_iter
->item
->object
, NULL
, &from_objs
);
656 if (!parse_commit(from_iter
->item
)) {
657 if (from_iter
->item
->date
< min_commit_date
)
658 min_commit_date
= from_iter
->item
->date
;
660 if (from_iter
->item
->generation
< min_generation
)
661 min_generation
= from_iter
->item
->generation
;
664 from_iter
= from_iter
->next
;
668 if (!parse_commit(to_iter
->item
)) {
669 if (to_iter
->item
->date
< min_commit_date
)
670 min_commit_date
= to_iter
->item
->date
;
672 if (to_iter
->item
->generation
< min_generation
)
673 min_generation
= to_iter
->item
->generation
;
676 to_iter
->item
->object
.flags
|= PARENT2
;
678 to_iter
= to_iter
->next
;
681 result
= can_all_from_reach_with_flag(&from_objs
, PARENT2
, PARENT1
,
682 min_commit_date
, min_generation
);
685 clear_commit_marks(from
->item
, PARENT1
);
690 clear_commit_marks(to
->item
, PARENT2
);
694 object_array_clear(&from_objs
);