fetch-pack: remove unused 'struct loose_object_iter'
[alt-git.git] / bisect.c
blobef5ee5a6436f066e33510219e9a0f73b09bf7aaf
1 #include "cache.h"
2 #include "config.h"
3 #include "commit.h"
4 #include "diff.h"
5 #include "revision.h"
6 #include "refs.h"
7 #include "list-objects.h"
8 #include "quote.h"
9 #include "hash-lookup.h"
10 #include "run-command.h"
11 #include "log-tree.h"
12 #include "bisect.h"
13 #include "oid-array.h"
14 #include "strvec.h"
15 #include "commit-slab.h"
16 #include "commit-reach.h"
17 #include "object-store.h"
18 #include "dir.h"
20 static struct oid_array good_revs;
21 static struct oid_array skipped_revs;
23 static struct object_id *current_bad_oid;
25 static const char *term_bad;
26 static const char *term_good;
28 /* Remember to update object flag allocation in object.h */
29 #define COUNTED (1u<<16)
32 * This is a truly stupid algorithm, but it's only
33 * used for bisection, and we just don't care enough.
35 * We care just barely enough to avoid recursing for
36 * non-merge entries.
38 static int count_distance(struct commit_list *entry)
40 int nr = 0;
42 while (entry) {
43 struct commit *commit = entry->item;
44 struct commit_list *p;
46 if (commit->object.flags & (UNINTERESTING | COUNTED))
47 break;
48 if (!(commit->object.flags & TREESAME))
49 nr++;
50 commit->object.flags |= COUNTED;
51 p = commit->parents;
52 entry = p;
53 if (p) {
54 p = p->next;
55 while (p) {
56 nr += count_distance(p);
57 p = p->next;
62 return nr;
65 static void clear_distance(struct commit_list *list)
67 while (list) {
68 struct commit *commit = list->item;
69 commit->object.flags &= ~COUNTED;
70 list = list->next;
74 define_commit_slab(commit_weight, int *);
75 static struct commit_weight commit_weight;
77 #define DEBUG_BISECT 0
79 static inline int weight(struct commit_list *elem)
81 return **commit_weight_at(&commit_weight, elem->item);
84 static inline void weight_set(struct commit_list *elem, int weight)
86 **commit_weight_at(&commit_weight, elem->item) = weight;
89 static int count_interesting_parents(struct commit *commit, unsigned bisect_flags)
91 struct commit_list *p;
92 int count;
94 for (count = 0, p = commit->parents; p; p = p->next) {
95 if (!(p->item->object.flags & UNINTERESTING))
96 count++;
97 if (bisect_flags & FIND_BISECTION_FIRST_PARENT_ONLY)
98 break;
100 return count;
103 static inline int approx_halfway(struct commit_list *p, int nr)
105 int diff;
108 * Don't short-cut something we are not going to return!
110 if (p->item->object.flags & TREESAME)
111 return 0;
112 if (DEBUG_BISECT)
113 return 0;
115 * For small number of commits 2 and 3 are halfway of 5, and
116 * 3 is halfway of 6 but 2 and 4 are not.
118 diff = 2 * weight(p) - nr;
119 switch (diff) {
120 case -1: case 0: case 1:
121 return 1;
122 default:
124 * For large number of commits we are not so strict, it's
125 * good enough if it's within ~0.1% of the halfway point,
126 * e.g. 5000 is exactly halfway of 10000, but we consider
127 * the values [4996, 5004] as halfway as well.
129 if (abs(diff) < nr / 1024)
130 return 1;
131 return 0;
135 static void show_list(const char *debug, int counted, int nr,
136 struct commit_list *list)
138 struct commit_list *p;
140 if (!DEBUG_BISECT)
141 return;
143 fprintf(stderr, "%s (%d/%d)\n", debug, counted, nr);
145 for (p = list; p; p = p->next) {
146 struct commit_list *pp;
147 struct commit *commit = p->item;
148 unsigned commit_flags = commit->object.flags;
149 enum object_type type;
150 unsigned long size;
151 char *buf = read_object_file(&commit->object.oid, &type,
152 &size);
153 const char *subject_start;
154 int subject_len;
156 fprintf(stderr, "%c%c%c ",
157 (commit_flags & TREESAME) ? ' ' : 'T',
158 (commit_flags & UNINTERESTING) ? 'U' : ' ',
159 (commit_flags & COUNTED) ? 'C' : ' ');
160 if (*commit_weight_at(&commit_weight, p->item))
161 fprintf(stderr, "%3d", weight(p));
162 else
163 fprintf(stderr, "---");
164 fprintf(stderr, " %.*s", 8, oid_to_hex(&commit->object.oid));
165 for (pp = commit->parents; pp; pp = pp->next)
166 fprintf(stderr, " %.*s", 8,
167 oid_to_hex(&pp->item->object.oid));
169 subject_len = find_commit_subject(buf, &subject_start);
170 if (subject_len)
171 fprintf(stderr, " %.*s", subject_len, subject_start);
172 fprintf(stderr, "\n");
176 static struct commit_list *best_bisection(struct commit_list *list, int nr)
178 struct commit_list *p, *best;
179 int best_distance = -1;
181 best = list;
182 for (p = list; p; p = p->next) {
183 int distance;
184 unsigned commit_flags = p->item->object.flags;
186 if (commit_flags & TREESAME)
187 continue;
188 distance = weight(p);
189 if (nr - distance < distance)
190 distance = nr - distance;
191 if (distance > best_distance) {
192 best = p;
193 best_distance = distance;
197 return best;
200 struct commit_dist {
201 struct commit *commit;
202 int distance;
205 static int compare_commit_dist(const void *a_, const void *b_)
207 struct commit_dist *a, *b;
209 a = (struct commit_dist *)a_;
210 b = (struct commit_dist *)b_;
211 if (a->distance != b->distance)
212 return b->distance - a->distance; /* desc sort */
213 return oidcmp(&a->commit->object.oid, &b->commit->object.oid);
216 static struct commit_list *best_bisection_sorted(struct commit_list *list, int nr)
218 struct commit_list *p;
219 struct commit_dist *array = xcalloc(nr, sizeof(*array));
220 struct strbuf buf = STRBUF_INIT;
221 int cnt, i;
223 for (p = list, cnt = 0; p; p = p->next) {
224 int distance;
225 unsigned commit_flags = p->item->object.flags;
227 if (commit_flags & TREESAME)
228 continue;
229 distance = weight(p);
230 if (nr - distance < distance)
231 distance = nr - distance;
232 array[cnt].commit = p->item;
233 array[cnt].distance = distance;
234 cnt++;
236 QSORT(array, cnt, compare_commit_dist);
237 for (p = list, i = 0; i < cnt; i++) {
238 struct object *obj = &(array[i].commit->object);
240 strbuf_reset(&buf);
241 strbuf_addf(&buf, "dist=%d", array[i].distance);
242 add_name_decoration(DECORATION_NONE, buf.buf, obj);
244 p->item = array[i].commit;
245 if (i < cnt - 1)
246 p = p->next;
248 if (p) {
249 free_commit_list(p->next);
250 p->next = NULL;
252 strbuf_release(&buf);
253 free(array);
254 return list;
258 * zero or positive weight is the number of interesting commits it can
259 * reach, including itself. Especially, weight = 0 means it does not
260 * reach any tree-changing commits (e.g. just above uninteresting one
261 * but traversal is with pathspec).
263 * weight = -1 means it has one parent and its distance is yet to
264 * be computed.
266 * weight = -2 means it has more than one parent and its distance is
267 * unknown. After running count_distance() first, they will get zero
268 * or positive distance.
270 static struct commit_list *do_find_bisection(struct commit_list *list,
271 int nr, int *weights,
272 unsigned bisect_flags)
274 int n, counted;
275 struct commit_list *p;
277 counted = 0;
279 for (n = 0, p = list; p; p = p->next) {
280 struct commit *commit = p->item;
281 unsigned commit_flags = commit->object.flags;
283 *commit_weight_at(&commit_weight, p->item) = &weights[n++];
284 switch (count_interesting_parents(commit, bisect_flags)) {
285 case 0:
286 if (!(commit_flags & TREESAME)) {
287 weight_set(p, 1);
288 counted++;
289 show_list("bisection 2 count one",
290 counted, nr, list);
293 * otherwise, it is known not to reach any
294 * tree-changing commit and gets weight 0.
296 break;
297 case 1:
298 weight_set(p, -1);
299 break;
300 default:
301 weight_set(p, -2);
302 break;
306 show_list("bisection 2 initialize", counted, nr, list);
309 * If you have only one parent in the resulting set
310 * then you can reach one commit more than that parent
311 * can reach. So we do not have to run the expensive
312 * count_distance() for single strand of pearls.
314 * However, if you have more than one parents, you cannot
315 * just add their distance and one for yourself, since
316 * they usually reach the same ancestor and you would
317 * end up counting them twice that way.
319 * So we will first count distance of merges the usual
320 * way, and then fill the blanks using cheaper algorithm.
322 for (p = list; p; p = p->next) {
323 if (p->item->object.flags & UNINTERESTING)
324 continue;
325 if (weight(p) != -2)
326 continue;
327 if (bisect_flags & FIND_BISECTION_FIRST_PARENT_ONLY)
328 BUG("shouldn't be calling count-distance in fp mode");
329 weight_set(p, count_distance(p));
330 clear_distance(list);
332 /* Does it happen to be at half-way? */
333 if (!(bisect_flags & FIND_BISECTION_ALL) &&
334 approx_halfway(p, nr))
335 return p;
336 counted++;
339 show_list("bisection 2 count_distance", counted, nr, list);
341 while (counted < nr) {
342 for (p = list; p; p = p->next) {
343 struct commit_list *q;
344 unsigned commit_flags = p->item->object.flags;
346 if (0 <= weight(p))
347 continue;
349 for (q = p->item->parents;
351 q = bisect_flags & FIND_BISECTION_FIRST_PARENT_ONLY ? NULL : q->next) {
352 if (q->item->object.flags & UNINTERESTING)
353 continue;
354 if (0 <= weight(q))
355 break;
357 if (!q)
358 continue;
361 * weight for p is unknown but q is known.
362 * add one for p itself if p is to be counted,
363 * otherwise inherit it from q directly.
365 if (!(commit_flags & TREESAME)) {
366 weight_set(p, weight(q)+1);
367 counted++;
368 show_list("bisection 2 count one",
369 counted, nr, list);
371 else
372 weight_set(p, weight(q));
374 /* Does it happen to be at half-way? */
375 if (!(bisect_flags & FIND_BISECTION_ALL) &&
376 approx_halfway(p, nr))
377 return p;
381 show_list("bisection 2 counted all", counted, nr, list);
383 if (!(bisect_flags & FIND_BISECTION_ALL))
384 return best_bisection(list, nr);
385 else
386 return best_bisection_sorted(list, nr);
389 void find_bisection(struct commit_list **commit_list, int *reaches,
390 int *all, unsigned bisect_flags)
392 int nr, on_list;
393 struct commit_list *list, *p, *best, *next, *last;
394 int *weights;
396 show_list("bisection 2 entry", 0, 0, *commit_list);
397 init_commit_weight(&commit_weight);
400 * Count the number of total and tree-changing items on the
401 * list, while reversing the list.
403 for (nr = on_list = 0, last = NULL, p = *commit_list;
405 p = next) {
406 unsigned commit_flags = p->item->object.flags;
408 next = p->next;
409 if (commit_flags & UNINTERESTING) {
410 free(p);
411 continue;
413 p->next = last;
414 last = p;
415 if (!(commit_flags & TREESAME))
416 nr++;
417 on_list++;
419 list = last;
420 show_list("bisection 2 sorted", 0, nr, list);
422 *all = nr;
423 CALLOC_ARRAY(weights, on_list);
425 /* Do the real work of finding bisection commit. */
426 best = do_find_bisection(list, nr, weights, bisect_flags);
427 if (best) {
428 if (!(bisect_flags & FIND_BISECTION_ALL)) {
429 list->item = best->item;
430 free_commit_list(list->next);
431 best = list;
432 best->next = NULL;
434 *reaches = weight(best);
436 free(weights);
437 *commit_list = best;
438 clear_commit_weight(&commit_weight);
441 static int register_ref(const char *refname, const struct object_id *oid,
442 int flags UNUSED, void *cb_data UNUSED)
444 struct strbuf good_prefix = STRBUF_INIT;
445 strbuf_addstr(&good_prefix, term_good);
446 strbuf_addstr(&good_prefix, "-");
448 if (!strcmp(refname, term_bad)) {
449 current_bad_oid = xmalloc(sizeof(*current_bad_oid));
450 oidcpy(current_bad_oid, oid);
451 } else if (starts_with(refname, good_prefix.buf)) {
452 oid_array_append(&good_revs, oid);
453 } else if (starts_with(refname, "skip-")) {
454 oid_array_append(&skipped_revs, oid);
457 strbuf_release(&good_prefix);
459 return 0;
462 static int read_bisect_refs(void)
464 return for_each_ref_in("refs/bisect/", register_ref, NULL);
467 static GIT_PATH_FUNC(git_path_bisect_names, "BISECT_NAMES")
468 static GIT_PATH_FUNC(git_path_bisect_expected_rev, "BISECT_EXPECTED_REV")
469 static GIT_PATH_FUNC(git_path_bisect_ancestors_ok, "BISECT_ANCESTORS_OK")
470 static GIT_PATH_FUNC(git_path_bisect_run, "BISECT_RUN")
471 static GIT_PATH_FUNC(git_path_bisect_start, "BISECT_START")
472 static GIT_PATH_FUNC(git_path_bisect_log, "BISECT_LOG")
473 static GIT_PATH_FUNC(git_path_bisect_terms, "BISECT_TERMS")
474 static GIT_PATH_FUNC(git_path_bisect_first_parent, "BISECT_FIRST_PARENT")
476 static void read_bisect_paths(struct strvec *array)
478 struct strbuf str = STRBUF_INIT;
479 const char *filename = git_path_bisect_names();
480 FILE *fp = xfopen(filename, "r");
482 while (strbuf_getline_lf(&str, fp) != EOF) {
483 strbuf_trim(&str);
484 if (sq_dequote_to_strvec(str.buf, array))
485 die(_("Badly quoted content in file '%s': %s"),
486 filename, str.buf);
489 strbuf_release(&str);
490 fclose(fp);
493 static char *join_oid_array_hex(struct oid_array *array, char delim)
495 struct strbuf joined_hexs = STRBUF_INIT;
496 int i;
498 for (i = 0; i < array->nr; i++) {
499 strbuf_addstr(&joined_hexs, oid_to_hex(array->oid + i));
500 if (i + 1 < array->nr)
501 strbuf_addch(&joined_hexs, delim);
504 return strbuf_detach(&joined_hexs, NULL);
508 * In this function, passing a not NULL skipped_first is very special.
509 * It means that we want to know if the first commit in the list is
510 * skipped because we will want to test a commit away from it if it is
511 * indeed skipped.
512 * So if the first commit is skipped, we cannot take the shortcut to
513 * just "return list" when we find the first non skipped commit, we
514 * have to return a fully filtered list.
516 * We use (*skipped_first == -1) to mean "it has been found that the
517 * first commit is not skipped". In this case *skipped_first is set back
518 * to 0 just before the function returns.
520 struct commit_list *filter_skipped(struct commit_list *list,
521 struct commit_list **tried,
522 int show_all,
523 int *count,
524 int *skipped_first)
526 struct commit_list *filtered = NULL, **f = &filtered;
528 *tried = NULL;
530 if (skipped_first)
531 *skipped_first = 0;
532 if (count)
533 *count = 0;
535 if (!skipped_revs.nr)
536 return list;
538 while (list) {
539 struct commit_list *next = list->next;
540 list->next = NULL;
541 if (0 <= oid_array_lookup(&skipped_revs, &list->item->object.oid)) {
542 if (skipped_first && !*skipped_first)
543 *skipped_first = 1;
544 /* Move current to tried list */
545 *tried = list;
546 tried = &list->next;
547 } else {
548 if (!show_all) {
549 if (!skipped_first || !*skipped_first)
550 return list;
551 } else if (skipped_first && !*skipped_first) {
552 /* This means we know it's not skipped */
553 *skipped_first = -1;
555 /* Move current to filtered list */
556 *f = list;
557 f = &list->next;
558 if (count)
559 (*count)++;
561 list = next;
564 if (skipped_first && *skipped_first == -1)
565 *skipped_first = 0;
567 return filtered;
570 #define PRN_MODULO 32768
573 * This is a pseudo random number generator based on "man 3 rand".
574 * It is not used properly because the seed is the argument and it
575 * is increased by one between each call, but that should not matter
576 * for this application.
578 static unsigned get_prn(unsigned count)
580 count = count * 1103515245 + 12345;
581 return (count/65536) % PRN_MODULO;
585 * Custom integer square root from
586 * https://en.wikipedia.org/wiki/Integer_square_root
588 static int sqrti(int val)
590 float d, x = val;
592 if (!val)
593 return 0;
595 do {
596 float y = (x + (float)val / x) / 2;
597 d = (y > x) ? y - x : x - y;
598 x = y;
599 } while (d >= 0.5);
601 return (int)x;
604 static struct commit_list *skip_away(struct commit_list *list, int count)
606 struct commit_list *cur, *previous;
607 int prn, index, i;
609 prn = get_prn(count);
610 index = (count * prn / PRN_MODULO) * sqrti(prn) / sqrti(PRN_MODULO);
612 cur = list;
613 previous = NULL;
615 for (i = 0; cur; cur = cur->next, i++) {
616 if (i == index) {
617 if (!oideq(&cur->item->object.oid, current_bad_oid))
618 return cur;
619 if (previous)
620 return previous;
621 return list;
623 previous = cur;
626 return list;
629 static struct commit_list *managed_skipped(struct commit_list *list,
630 struct commit_list **tried)
632 int count, skipped_first;
634 *tried = NULL;
636 if (!skipped_revs.nr)
637 return list;
639 list = filter_skipped(list, tried, 0, &count, &skipped_first);
641 if (!skipped_first)
642 return list;
644 return skip_away(list, count);
647 static void bisect_rev_setup(struct repository *r, struct rev_info *revs,
648 struct strvec *rev_argv,
649 const char *prefix,
650 const char *bad_format, const char *good_format,
651 int read_paths)
653 struct setup_revision_opt opt = {
654 .free_removed_argv_elements = 1,
656 int i;
658 repo_init_revisions(r, revs, prefix);
659 revs->abbrev = 0;
660 revs->commit_format = CMIT_FMT_UNSPECIFIED;
662 /* rev_argv.argv[0] will be ignored by setup_revisions */
663 strvec_push(rev_argv, "bisect_rev_setup");
664 strvec_pushf(rev_argv, bad_format, oid_to_hex(current_bad_oid));
665 for (i = 0; i < good_revs.nr; i++)
666 strvec_pushf(rev_argv, good_format,
667 oid_to_hex(good_revs.oid + i));
668 strvec_push(rev_argv, "--");
669 if (read_paths)
670 read_bisect_paths(rev_argv);
672 setup_revisions(rev_argv->nr, rev_argv->v, revs, &opt);
675 static void bisect_common(struct rev_info *revs)
677 if (prepare_revision_walk(revs))
678 die("revision walk setup failed");
679 if (revs->tree_objects)
680 mark_edges_uninteresting(revs, NULL, 0);
683 static enum bisect_error error_if_skipped_commits(struct commit_list *tried,
684 const struct object_id *bad)
686 if (!tried)
687 return BISECT_OK;
689 printf("There are only 'skip'ped commits left to test.\n"
690 "The first %s commit could be any of:\n", term_bad);
692 for ( ; tried; tried = tried->next)
693 printf("%s\n", oid_to_hex(&tried->item->object.oid));
695 if (bad)
696 printf("%s\n", oid_to_hex(bad));
697 printf(_("We cannot bisect more!\n"));
699 return BISECT_ONLY_SKIPPED_LEFT;
702 static int is_expected_rev(const struct object_id *oid)
704 const char *filename = git_path_bisect_expected_rev();
705 struct stat st;
706 struct strbuf str = STRBUF_INIT;
707 FILE *fp;
708 int res = 0;
710 if (stat(filename, &st) || !S_ISREG(st.st_mode))
711 return 0;
713 fp = fopen_or_warn(filename, "r");
714 if (!fp)
715 return 0;
717 if (strbuf_getline_lf(&str, fp) != EOF)
718 res = !strcmp(str.buf, oid_to_hex(oid));
720 strbuf_release(&str);
721 fclose(fp);
723 return res;
726 enum bisect_error bisect_checkout(const struct object_id *bisect_rev,
727 int no_checkout)
729 struct commit *commit;
730 struct pretty_print_context pp = {0};
731 struct strbuf commit_msg = STRBUF_INIT;
733 update_ref(NULL, "BISECT_EXPECTED_REV", bisect_rev, NULL, 0, UPDATE_REFS_DIE_ON_ERR);
735 if (no_checkout) {
736 update_ref(NULL, "BISECT_HEAD", bisect_rev, NULL, 0,
737 UPDATE_REFS_DIE_ON_ERR);
738 } else {
739 struct child_process cmd = CHILD_PROCESS_INIT;
741 cmd.git_cmd = 1;
742 strvec_pushl(&cmd.args, "checkout", "-q",
743 oid_to_hex(bisect_rev), "--", NULL);
744 if (run_command(&cmd))
746 * Errors in `run_command()` itself, signaled by res < 0,
747 * and errors in the child process, signaled by res > 0
748 * can both be treated as regular BISECT_FAILED (-1).
750 return BISECT_FAILED;
753 commit = lookup_commit_reference(the_repository, bisect_rev);
754 format_commit_message(commit, "[%H] %s%n", &commit_msg, &pp);
755 fputs(commit_msg.buf, stdout);
756 strbuf_release(&commit_msg);
758 return BISECT_OK;
761 static struct commit *get_commit_reference(struct repository *r,
762 const struct object_id *oid)
764 struct commit *c = lookup_commit_reference(r, oid);
765 if (!c)
766 die(_("Not a valid commit name %s"), oid_to_hex(oid));
767 return c;
770 static struct commit **get_bad_and_good_commits(struct repository *r,
771 int *rev_nr)
773 struct commit **rev;
774 int i, n = 0;
776 ALLOC_ARRAY(rev, 1 + good_revs.nr);
777 rev[n++] = get_commit_reference(r, current_bad_oid);
778 for (i = 0; i < good_revs.nr; i++)
779 rev[n++] = get_commit_reference(r, good_revs.oid + i);
780 *rev_nr = n;
782 return rev;
785 static enum bisect_error handle_bad_merge_base(void)
787 if (is_expected_rev(current_bad_oid)) {
788 char *bad_hex = oid_to_hex(current_bad_oid);
789 char *good_hex = join_oid_array_hex(&good_revs, ' ');
790 if (!strcmp(term_bad, "bad") && !strcmp(term_good, "good")) {
791 fprintf(stderr, _("The merge base %s is bad.\n"
792 "This means the bug has been fixed "
793 "between %s and [%s].\n"),
794 bad_hex, bad_hex, good_hex);
795 } else if (!strcmp(term_bad, "new") && !strcmp(term_good, "old")) {
796 fprintf(stderr, _("The merge base %s is new.\n"
797 "The property has changed "
798 "between %s and [%s].\n"),
799 bad_hex, bad_hex, good_hex);
800 } else {
801 fprintf(stderr, _("The merge base %s is %s.\n"
802 "This means the first '%s' commit is "
803 "between %s and [%s].\n"),
804 bad_hex, term_bad, term_good, bad_hex, good_hex);
806 return BISECT_MERGE_BASE_CHECK;
809 fprintf(stderr, _("Some %s revs are not ancestors of the %s rev.\n"
810 "git bisect cannot work properly in this case.\n"
811 "Maybe you mistook %s and %s revs?\n"),
812 term_good, term_bad, term_good, term_bad);
813 return BISECT_FAILED;
816 static void handle_skipped_merge_base(const struct object_id *mb)
818 char *mb_hex = oid_to_hex(mb);
819 char *bad_hex = oid_to_hex(current_bad_oid);
820 char *good_hex = join_oid_array_hex(&good_revs, ' ');
822 warning(_("the merge base between %s and [%s] "
823 "must be skipped.\n"
824 "So we cannot be sure the first %s commit is "
825 "between %s and %s.\n"
826 "We continue anyway."),
827 bad_hex, good_hex, term_bad, mb_hex, bad_hex);
828 free(good_hex);
832 * "check_merge_bases" checks that merge bases are not "bad" (or "new").
834 * - If one is "bad" (or "new"), it means the user assumed something wrong
835 * and we must return error with a non 0 error code.
836 * - If one is "good" (or "old"), that's good, we have nothing to do.
837 * - If one is "skipped", we can't know but we should warn.
838 * - If we don't know, we should check it out and ask the user to test.
839 * - If a merge base must be tested, on success return
840 * BISECT_INTERNAL_SUCCESS_MERGE_BASE (-11) a special condition
841 * for early success, this will be converted back to 0 in
842 * check_good_are_ancestors_of_bad().
844 static enum bisect_error check_merge_bases(int rev_nr, struct commit **rev, int no_checkout)
846 enum bisect_error res = BISECT_OK;
847 struct commit_list *result;
849 result = get_merge_bases_many(rev[0], rev_nr - 1, rev + 1);
851 for (; result; result = result->next) {
852 const struct object_id *mb = &result->item->object.oid;
853 if (oideq(mb, current_bad_oid)) {
854 res = handle_bad_merge_base();
855 break;
856 } else if (0 <= oid_array_lookup(&good_revs, mb)) {
857 continue;
858 } else if (0 <= oid_array_lookup(&skipped_revs, mb)) {
859 handle_skipped_merge_base(mb);
860 } else {
861 printf(_("Bisecting: a merge base must be tested\n"));
862 res = bisect_checkout(mb, no_checkout);
863 if (!res)
864 /* indicate early success */
865 res = BISECT_INTERNAL_SUCCESS_MERGE_BASE;
866 break;
870 free_commit_list(result);
871 return res;
874 static int check_ancestors(struct repository *r, int rev_nr,
875 struct commit **rev, const char *prefix)
877 struct strvec rev_argv = STRVEC_INIT;
878 struct rev_info revs;
879 int res;
881 bisect_rev_setup(r, &revs, &rev_argv, prefix, "^%s", "%s", 0);
883 bisect_common(&revs);
884 res = (revs.commits != NULL);
886 /* Clean up objects used, as they will be reused. */
887 clear_commit_marks_many(rev_nr, rev, ALL_REV_FLAGS);
889 release_revisions(&revs);
890 strvec_clear(&rev_argv);
891 return res;
895 * "check_good_are_ancestors_of_bad" checks that all "good" revs are
896 * ancestor of the "bad" rev.
898 * If that's not the case, we need to check the merge bases.
899 * If a merge base must be tested by the user, its source code will be
900 * checked out to be tested by the user and we will return.
903 static enum bisect_error check_good_are_ancestors_of_bad(struct repository *r,
904 const char *prefix,
905 int no_checkout)
907 char *filename;
908 struct stat st;
909 int fd, rev_nr;
910 enum bisect_error res = BISECT_OK;
911 struct commit **rev;
913 if (!current_bad_oid)
914 return error(_("a %s revision is needed"), term_bad);
916 filename = git_pathdup("BISECT_ANCESTORS_OK");
918 /* Check if file BISECT_ANCESTORS_OK exists. */
919 if (!stat(filename, &st) && S_ISREG(st.st_mode))
920 goto done;
922 /* Bisecting with no good rev is ok. */
923 if (!good_revs.nr)
924 goto done;
926 /* Check if all good revs are ancestor of the bad rev. */
928 rev = get_bad_and_good_commits(r, &rev_nr);
929 if (check_ancestors(r, rev_nr, rev, prefix))
930 res = check_merge_bases(rev_nr, rev, no_checkout);
931 free(rev);
933 if (!res) {
934 /* Create file BISECT_ANCESTORS_OK. */
935 fd = open(filename, O_CREAT | O_TRUNC | O_WRONLY, 0600);
936 if (fd < 0)
938 * BISECT_ANCESTORS_OK file is not absolutely necessary,
939 * the bisection process will continue at the next
940 * bisection step.
941 * So, just signal with a warning that something
942 * might be wrong.
944 warning_errno(_("could not create file '%s'"),
945 filename);
946 else
947 close(fd);
949 done:
950 free(filename);
951 return res;
955 * This does "git diff-tree --pretty COMMIT" without one fork+exec.
957 static void show_diff_tree(struct repository *r,
958 const char *prefix,
959 struct commit *commit)
961 const char *argv[] = {
962 "diff-tree", "--pretty", "--stat", "--summary", "--cc", NULL
964 struct rev_info opt;
966 git_config(git_diff_ui_config, NULL);
967 repo_init_revisions(r, &opt, prefix);
969 setup_revisions(ARRAY_SIZE(argv) - 1, argv, &opt, NULL);
970 log_tree_commit(&opt, commit);
971 release_revisions(&opt);
975 * The terms used for this bisect session are stored in BISECT_TERMS.
976 * We read them and store them to adapt the messages accordingly.
977 * Default is bad/good.
979 void read_bisect_terms(const char **read_bad, const char **read_good)
981 struct strbuf str = STRBUF_INIT;
982 const char *filename = git_path_bisect_terms();
983 FILE *fp = fopen(filename, "r");
985 if (!fp) {
986 if (errno == ENOENT) {
987 *read_bad = "bad";
988 *read_good = "good";
989 return;
990 } else {
991 die_errno(_("could not read file '%s'"), filename);
993 } else {
994 strbuf_getline_lf(&str, fp);
995 *read_bad = strbuf_detach(&str, NULL);
996 strbuf_getline_lf(&str, fp);
997 *read_good = strbuf_detach(&str, NULL);
999 strbuf_release(&str);
1000 fclose(fp);
1004 * We use the convention that return BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND (-10) means
1005 * the bisection process finished successfully.
1006 * In this case the calling function or command should not turn a
1007 * BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND return code into an error or a non zero exit code.
1009 * Checking BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND
1010 * in bisect_helper::bisect_next() and only transforming it to 0 at
1011 * the end of bisect_helper::cmd_bisect__helper() helps bypassing
1012 * all the code related to finding a commit to test.
1014 enum bisect_error bisect_next_all(struct repository *r, const char *prefix)
1016 struct strvec rev_argv = STRVEC_INIT;
1017 struct rev_info revs = REV_INFO_INIT;
1018 struct commit_list *tried;
1019 int reaches = 0, all = 0, nr, steps;
1020 enum bisect_error res = BISECT_OK;
1021 struct object_id *bisect_rev;
1022 char *steps_msg;
1024 * If no_checkout is non-zero, the bisection process does not
1025 * checkout the trial commit but instead simply updates BISECT_HEAD.
1027 int no_checkout = ref_exists("BISECT_HEAD");
1028 unsigned bisect_flags = 0;
1030 read_bisect_terms(&term_bad, &term_good);
1031 if (read_bisect_refs())
1032 die(_("reading bisect refs failed"));
1034 if (file_exists(git_path_bisect_first_parent()))
1035 bisect_flags |= FIND_BISECTION_FIRST_PARENT_ONLY;
1037 if (skipped_revs.nr)
1038 bisect_flags |= FIND_BISECTION_ALL;
1040 res = check_good_are_ancestors_of_bad(r, prefix, no_checkout);
1041 if (res)
1042 goto cleanup;
1044 bisect_rev_setup(r, &revs, &rev_argv, prefix, "%s", "^%s", 1);
1046 revs.first_parent_only = !!(bisect_flags & FIND_BISECTION_FIRST_PARENT_ONLY);
1047 revs.limited = 1;
1049 bisect_common(&revs);
1051 find_bisection(&revs.commits, &reaches, &all, bisect_flags);
1052 revs.commits = managed_skipped(revs.commits, &tried);
1054 if (!revs.commits) {
1056 * We should return error here only if the "bad"
1057 * commit is also a "skip" commit.
1059 res = error_if_skipped_commits(tried, NULL);
1060 if (res < 0)
1061 goto cleanup;
1062 printf(_("%s was both %s and %s\n"),
1063 oid_to_hex(current_bad_oid),
1064 term_good,
1065 term_bad);
1067 res = BISECT_FAILED;
1068 goto cleanup;
1071 if (!all) {
1072 fprintf(stderr, _("No testable commit found.\n"
1073 "Maybe you started with bad path arguments?\n"));
1075 res = BISECT_NO_TESTABLE_COMMIT;
1076 goto cleanup;
1079 bisect_rev = &revs.commits->item->object.oid;
1081 if (oideq(bisect_rev, current_bad_oid)) {
1082 res = error_if_skipped_commits(tried, current_bad_oid);
1083 if (res)
1084 return res;
1085 printf("%s is the first %s commit\n", oid_to_hex(bisect_rev),
1086 term_bad);
1088 show_diff_tree(r, prefix, revs.commits->item);
1090 * This means the bisection process succeeded.
1091 * Using BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND (-10)
1092 * so that the call chain can simply check
1093 * for negative return values for early returns up
1094 * until the cmd_bisect__helper() caller.
1096 res = BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND;
1097 goto cleanup;
1100 nr = all - reaches - 1;
1101 steps = estimate_bisect_steps(all);
1103 steps_msg = xstrfmt(Q_("(roughly %d step)", "(roughly %d steps)",
1104 steps), steps);
1106 * TRANSLATORS: the last %s will be replaced with "(roughly %d
1107 * steps)" translation.
1109 printf(Q_("Bisecting: %d revision left to test after this %s\n",
1110 "Bisecting: %d revisions left to test after this %s\n",
1111 nr), nr, steps_msg);
1112 free(steps_msg);
1113 /* Clean up objects used, as they will be reused. */
1114 repo_clear_commit_marks(r, ALL_REV_FLAGS);
1116 res = bisect_checkout(bisect_rev, no_checkout);
1117 cleanup:
1118 release_revisions(&revs);
1119 strvec_clear(&rev_argv);
1120 return res;
1123 static inline int log2i(int n)
1125 int log2 = 0;
1127 for (; n > 1; n >>= 1)
1128 log2++;
1130 return log2;
1133 static inline int exp2i(int n)
1135 return 1 << n;
1139 * Estimate the number of bisect steps left (after the current step)
1141 * For any x between 0 included and 2^n excluded, the probability for
1142 * n - 1 steps left looks like:
1144 * P(2^n + x) == (2^n - x) / (2^n + x)
1146 * and P(2^n + x) < 0.5 means 2^n < 3x
1148 int estimate_bisect_steps(int all)
1150 int n, x, e;
1152 if (all < 3)
1153 return 0;
1155 n = log2i(all);
1156 e = exp2i(n);
1157 x = all - e;
1159 return (e < 3 * x) ? n : n - 1;
1162 static int mark_for_removal(const char *refname,
1163 const struct object_id *oid UNUSED,
1164 int flag UNUSED, void *cb_data)
1166 struct string_list *refs = cb_data;
1167 char *ref = xstrfmt("refs/bisect%s", refname);
1168 string_list_append(refs, ref);
1169 return 0;
1172 int bisect_clean_state(void)
1174 int result = 0;
1176 /* There may be some refs packed during bisection */
1177 struct string_list refs_for_removal = STRING_LIST_INIT_NODUP;
1178 for_each_ref_in("refs/bisect", mark_for_removal, (void *) &refs_for_removal);
1179 string_list_append(&refs_for_removal, xstrdup("BISECT_HEAD"));
1180 result = delete_refs("bisect: remove", &refs_for_removal, REF_NO_DEREF);
1181 refs_for_removal.strdup_strings = 1;
1182 string_list_clear(&refs_for_removal, 0);
1183 unlink_or_warn(git_path_bisect_expected_rev());
1184 unlink_or_warn(git_path_bisect_ancestors_ok());
1185 unlink_or_warn(git_path_bisect_log());
1186 unlink_or_warn(git_path_bisect_names());
1187 unlink_or_warn(git_path_bisect_run());
1188 unlink_or_warn(git_path_bisect_terms());
1189 unlink_or_warn(git_path_bisect_first_parent());
1191 * Cleanup BISECT_START last to support the --no-checkout option
1192 * introduced in the commit 4796e823a.
1194 unlink_or_warn(git_path_bisect_start());
1196 return result;