cocci: apply the "rerere.h" part of "the_repository.pending"
[alt-git.git] / bisect.c
blob761dd48ad2050b5e30ffae1454771b6adf9d8793
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 = repo_read_object_file(the_repository,
152 &commit->object.oid, &type,
153 &size);
154 const char *subject_start;
155 int subject_len;
157 fprintf(stderr, "%c%c%c ",
158 (commit_flags & TREESAME) ? ' ' : 'T',
159 (commit_flags & UNINTERESTING) ? 'U' : ' ',
160 (commit_flags & COUNTED) ? 'C' : ' ');
161 if (*commit_weight_at(&commit_weight, p->item))
162 fprintf(stderr, "%3d", weight(p));
163 else
164 fprintf(stderr, "---");
165 fprintf(stderr, " %.*s", 8, oid_to_hex(&commit->object.oid));
166 for (pp = commit->parents; pp; pp = pp->next)
167 fprintf(stderr, " %.*s", 8,
168 oid_to_hex(&pp->item->object.oid));
170 subject_len = find_commit_subject(buf, &subject_start);
171 if (subject_len)
172 fprintf(stderr, " %.*s", subject_len, subject_start);
173 fprintf(stderr, "\n");
177 static struct commit_list *best_bisection(struct commit_list *list, int nr)
179 struct commit_list *p, *best;
180 int best_distance = -1;
182 best = list;
183 for (p = list; p; p = p->next) {
184 int distance;
185 unsigned commit_flags = p->item->object.flags;
187 if (commit_flags & TREESAME)
188 continue;
189 distance = weight(p);
190 if (nr - distance < distance)
191 distance = nr - distance;
192 if (distance > best_distance) {
193 best = p;
194 best_distance = distance;
198 return best;
201 struct commit_dist {
202 struct commit *commit;
203 int distance;
206 static int compare_commit_dist(const void *a_, const void *b_)
208 struct commit_dist *a, *b;
210 a = (struct commit_dist *)a_;
211 b = (struct commit_dist *)b_;
212 if (a->distance != b->distance)
213 return b->distance - a->distance; /* desc sort */
214 return oidcmp(&a->commit->object.oid, &b->commit->object.oid);
217 static struct commit_list *best_bisection_sorted(struct commit_list *list, int nr)
219 struct commit_list *p;
220 struct commit_dist *array = xcalloc(nr, sizeof(*array));
221 struct strbuf buf = STRBUF_INIT;
222 int cnt, i;
224 for (p = list, cnt = 0; p; p = p->next) {
225 int distance;
226 unsigned commit_flags = p->item->object.flags;
228 if (commit_flags & TREESAME)
229 continue;
230 distance = weight(p);
231 if (nr - distance < distance)
232 distance = nr - distance;
233 array[cnt].commit = p->item;
234 array[cnt].distance = distance;
235 cnt++;
237 QSORT(array, cnt, compare_commit_dist);
238 for (p = list, i = 0; i < cnt; i++) {
239 struct object *obj = &(array[i].commit->object);
241 strbuf_reset(&buf);
242 strbuf_addf(&buf, "dist=%d", array[i].distance);
243 add_name_decoration(DECORATION_NONE, buf.buf, obj);
245 p->item = array[i].commit;
246 if (i < cnt - 1)
247 p = p->next;
249 if (p) {
250 free_commit_list(p->next);
251 p->next = NULL;
253 strbuf_release(&buf);
254 free(array);
255 return list;
259 * zero or positive weight is the number of interesting commits it can
260 * reach, including itself. Especially, weight = 0 means it does not
261 * reach any tree-changing commits (e.g. just above uninteresting one
262 * but traversal is with pathspec).
264 * weight = -1 means it has one parent and its distance is yet to
265 * be computed.
267 * weight = -2 means it has more than one parent and its distance is
268 * unknown. After running count_distance() first, they will get zero
269 * or positive distance.
271 static struct commit_list *do_find_bisection(struct commit_list *list,
272 int nr, int *weights,
273 unsigned bisect_flags)
275 int n, counted;
276 struct commit_list *p;
278 counted = 0;
280 for (n = 0, p = list; p; p = p->next) {
281 struct commit *commit = p->item;
282 unsigned commit_flags = commit->object.flags;
284 *commit_weight_at(&commit_weight, p->item) = &weights[n++];
285 switch (count_interesting_parents(commit, bisect_flags)) {
286 case 0:
287 if (!(commit_flags & TREESAME)) {
288 weight_set(p, 1);
289 counted++;
290 show_list("bisection 2 count one",
291 counted, nr, list);
294 * otherwise, it is known not to reach any
295 * tree-changing commit and gets weight 0.
297 break;
298 case 1:
299 weight_set(p, -1);
300 break;
301 default:
302 weight_set(p, -2);
303 break;
307 show_list("bisection 2 initialize", counted, nr, list);
310 * If you have only one parent in the resulting set
311 * then you can reach one commit more than that parent
312 * can reach. So we do not have to run the expensive
313 * count_distance() for single strand of pearls.
315 * However, if you have more than one parents, you cannot
316 * just add their distance and one for yourself, since
317 * they usually reach the same ancestor and you would
318 * end up counting them twice that way.
320 * So we will first count distance of merges the usual
321 * way, and then fill the blanks using cheaper algorithm.
323 for (p = list; p; p = p->next) {
324 if (p->item->object.flags & UNINTERESTING)
325 continue;
326 if (weight(p) != -2)
327 continue;
328 if (bisect_flags & FIND_BISECTION_FIRST_PARENT_ONLY)
329 BUG("shouldn't be calling count-distance in fp mode");
330 weight_set(p, count_distance(p));
331 clear_distance(list);
333 /* Does it happen to be at half-way? */
334 if (!(bisect_flags & FIND_BISECTION_ALL) &&
335 approx_halfway(p, nr))
336 return p;
337 counted++;
340 show_list("bisection 2 count_distance", counted, nr, list);
342 while (counted < nr) {
343 for (p = list; p; p = p->next) {
344 struct commit_list *q;
345 unsigned commit_flags = p->item->object.flags;
347 if (0 <= weight(p))
348 continue;
350 for (q = p->item->parents;
352 q = bisect_flags & FIND_BISECTION_FIRST_PARENT_ONLY ? NULL : q->next) {
353 if (q->item->object.flags & UNINTERESTING)
354 continue;
355 if (0 <= weight(q))
356 break;
358 if (!q)
359 continue;
362 * weight for p is unknown but q is known.
363 * add one for p itself if p is to be counted,
364 * otherwise inherit it from q directly.
366 if (!(commit_flags & TREESAME)) {
367 weight_set(p, weight(q)+1);
368 counted++;
369 show_list("bisection 2 count one",
370 counted, nr, list);
372 else
373 weight_set(p, weight(q));
375 /* Does it happen to be at half-way? */
376 if (!(bisect_flags & FIND_BISECTION_ALL) &&
377 approx_halfway(p, nr))
378 return p;
382 show_list("bisection 2 counted all", counted, nr, list);
384 if (!(bisect_flags & FIND_BISECTION_ALL))
385 return best_bisection(list, nr);
386 else
387 return best_bisection_sorted(list, nr);
390 void find_bisection(struct commit_list **commit_list, int *reaches,
391 int *all, unsigned bisect_flags)
393 int nr, on_list;
394 struct commit_list *list, *p, *best, *next, *last;
395 int *weights;
397 show_list("bisection 2 entry", 0, 0, *commit_list);
398 init_commit_weight(&commit_weight);
401 * Count the number of total and tree-changing items on the
402 * list, while reversing the list.
404 for (nr = on_list = 0, last = NULL, p = *commit_list;
406 p = next) {
407 unsigned commit_flags = p->item->object.flags;
409 next = p->next;
410 if (commit_flags & UNINTERESTING) {
411 free(p);
412 continue;
414 p->next = last;
415 last = p;
416 if (!(commit_flags & TREESAME))
417 nr++;
418 on_list++;
420 list = last;
421 show_list("bisection 2 sorted", 0, nr, list);
423 *all = nr;
424 CALLOC_ARRAY(weights, on_list);
426 /* Do the real work of finding bisection commit. */
427 best = do_find_bisection(list, nr, weights, bisect_flags);
428 if (best) {
429 if (!(bisect_flags & FIND_BISECTION_ALL)) {
430 list->item = best->item;
431 free_commit_list(list->next);
432 best = list;
433 best->next = NULL;
435 *reaches = weight(best);
437 free(weights);
438 *commit_list = best;
439 clear_commit_weight(&commit_weight);
442 static int register_ref(const char *refname, const struct object_id *oid,
443 int flags UNUSED, void *cb_data UNUSED)
445 struct strbuf good_prefix = STRBUF_INIT;
446 strbuf_addstr(&good_prefix, term_good);
447 strbuf_addstr(&good_prefix, "-");
449 if (!strcmp(refname, term_bad)) {
450 current_bad_oid = xmalloc(sizeof(*current_bad_oid));
451 oidcpy(current_bad_oid, oid);
452 } else if (starts_with(refname, good_prefix.buf)) {
453 oid_array_append(&good_revs, oid);
454 } else if (starts_with(refname, "skip-")) {
455 oid_array_append(&skipped_revs, oid);
458 strbuf_release(&good_prefix);
460 return 0;
463 static int read_bisect_refs(void)
465 return for_each_ref_in("refs/bisect/", register_ref, NULL);
468 static GIT_PATH_FUNC(git_path_bisect_names, "BISECT_NAMES")
469 static GIT_PATH_FUNC(git_path_bisect_expected_rev, "BISECT_EXPECTED_REV")
470 static GIT_PATH_FUNC(git_path_bisect_ancestors_ok, "BISECT_ANCESTORS_OK")
471 static GIT_PATH_FUNC(git_path_bisect_run, "BISECT_RUN")
472 static GIT_PATH_FUNC(git_path_bisect_start, "BISECT_START")
473 static GIT_PATH_FUNC(git_path_bisect_log, "BISECT_LOG")
474 static GIT_PATH_FUNC(git_path_bisect_terms, "BISECT_TERMS")
475 static GIT_PATH_FUNC(git_path_bisect_first_parent, "BISECT_FIRST_PARENT")
477 static void read_bisect_paths(struct strvec *array)
479 struct strbuf str = STRBUF_INIT;
480 const char *filename = git_path_bisect_names();
481 FILE *fp = xfopen(filename, "r");
483 while (strbuf_getline_lf(&str, fp) != EOF) {
484 strbuf_trim(&str);
485 if (sq_dequote_to_strvec(str.buf, array))
486 die(_("Badly quoted content in file '%s': %s"),
487 filename, str.buf);
490 strbuf_release(&str);
491 fclose(fp);
494 static char *join_oid_array_hex(struct oid_array *array, char delim)
496 struct strbuf joined_hexs = STRBUF_INIT;
497 int i;
499 for (i = 0; i < array->nr; i++) {
500 strbuf_addstr(&joined_hexs, oid_to_hex(array->oid + i));
501 if (i + 1 < array->nr)
502 strbuf_addch(&joined_hexs, delim);
505 return strbuf_detach(&joined_hexs, NULL);
509 * In this function, passing a not NULL skipped_first is very special.
510 * It means that we want to know if the first commit in the list is
511 * skipped because we will want to test a commit away from it if it is
512 * indeed skipped.
513 * So if the first commit is skipped, we cannot take the shortcut to
514 * just "return list" when we find the first non skipped commit, we
515 * have to return a fully filtered list.
517 * We use (*skipped_first == -1) to mean "it has been found that the
518 * first commit is not skipped". In this case *skipped_first is set back
519 * to 0 just before the function returns.
521 struct commit_list *filter_skipped(struct commit_list *list,
522 struct commit_list **tried,
523 int show_all,
524 int *count,
525 int *skipped_first)
527 struct commit_list *filtered = NULL, **f = &filtered;
529 *tried = NULL;
531 if (skipped_first)
532 *skipped_first = 0;
533 if (count)
534 *count = 0;
536 if (!skipped_revs.nr)
537 return list;
539 while (list) {
540 struct commit_list *next = list->next;
541 list->next = NULL;
542 if (0 <= oid_array_lookup(&skipped_revs, &list->item->object.oid)) {
543 if (skipped_first && !*skipped_first)
544 *skipped_first = 1;
545 /* Move current to tried list */
546 *tried = list;
547 tried = &list->next;
548 } else {
549 if (!show_all) {
550 if (!skipped_first || !*skipped_first)
551 return list;
552 } else if (skipped_first && !*skipped_first) {
553 /* This means we know it's not skipped */
554 *skipped_first = -1;
556 /* Move current to filtered list */
557 *f = list;
558 f = &list->next;
559 if (count)
560 (*count)++;
562 list = next;
565 if (skipped_first && *skipped_first == -1)
566 *skipped_first = 0;
568 return filtered;
571 #define PRN_MODULO 32768
574 * This is a pseudo random number generator based on "man 3 rand".
575 * It is not used properly because the seed is the argument and it
576 * is increased by one between each call, but that should not matter
577 * for this application.
579 static unsigned get_prn(unsigned count)
581 count = count * 1103515245 + 12345;
582 return (count/65536) % PRN_MODULO;
586 * Custom integer square root from
587 * https://en.wikipedia.org/wiki/Integer_square_root
589 static int sqrti(int val)
591 float d, x = val;
593 if (!val)
594 return 0;
596 do {
597 float y = (x + (float)val / x) / 2;
598 d = (y > x) ? y - x : x - y;
599 x = y;
600 } while (d >= 0.5);
602 return (int)x;
605 static struct commit_list *skip_away(struct commit_list *list, int count)
607 struct commit_list *cur, *previous;
608 int prn, index, i;
610 prn = get_prn(count);
611 index = (count * prn / PRN_MODULO) * sqrti(prn) / sqrti(PRN_MODULO);
613 cur = list;
614 previous = NULL;
616 for (i = 0; cur; cur = cur->next, i++) {
617 if (i == index) {
618 if (!oideq(&cur->item->object.oid, current_bad_oid))
619 return cur;
620 if (previous)
621 return previous;
622 return list;
624 previous = cur;
627 return list;
630 static struct commit_list *managed_skipped(struct commit_list *list,
631 struct commit_list **tried)
633 int count, skipped_first;
635 *tried = NULL;
637 if (!skipped_revs.nr)
638 return list;
640 list = filter_skipped(list, tried, 0, &count, &skipped_first);
642 if (!skipped_first)
643 return list;
645 return skip_away(list, count);
648 static void bisect_rev_setup(struct repository *r, struct rev_info *revs,
649 struct strvec *rev_argv,
650 const char *prefix,
651 const char *bad_format, const char *good_format,
652 int read_paths)
654 struct setup_revision_opt opt = {
655 .free_removed_argv_elements = 1,
657 int i;
659 repo_init_revisions(r, revs, prefix);
660 revs->abbrev = 0;
661 revs->commit_format = CMIT_FMT_UNSPECIFIED;
663 /* rev_argv.argv[0] will be ignored by setup_revisions */
664 strvec_push(rev_argv, "bisect_rev_setup");
665 strvec_pushf(rev_argv, bad_format, oid_to_hex(current_bad_oid));
666 for (i = 0; i < good_revs.nr; i++)
667 strvec_pushf(rev_argv, good_format,
668 oid_to_hex(good_revs.oid + i));
669 strvec_push(rev_argv, "--");
670 if (read_paths)
671 read_bisect_paths(rev_argv);
673 setup_revisions(rev_argv->nr, rev_argv->v, revs, &opt);
676 static void bisect_common(struct rev_info *revs)
678 if (prepare_revision_walk(revs))
679 die("revision walk setup failed");
680 if (revs->tree_objects)
681 mark_edges_uninteresting(revs, NULL, 0);
684 static enum bisect_error error_if_skipped_commits(struct commit_list *tried,
685 const struct object_id *bad)
687 if (!tried)
688 return BISECT_OK;
690 printf("There are only 'skip'ped commits left to test.\n"
691 "The first %s commit could be any of:\n", term_bad);
693 for ( ; tried; tried = tried->next)
694 printf("%s\n", oid_to_hex(&tried->item->object.oid));
696 if (bad)
697 printf("%s\n", oid_to_hex(bad));
698 printf(_("We cannot bisect more!\n"));
700 return BISECT_ONLY_SKIPPED_LEFT;
703 static int is_expected_rev(const struct object_id *oid)
705 const char *filename = git_path_bisect_expected_rev();
706 struct stat st;
707 struct strbuf str = STRBUF_INIT;
708 FILE *fp;
709 int res = 0;
711 if (stat(filename, &st) || !S_ISREG(st.st_mode))
712 return 0;
714 fp = fopen_or_warn(filename, "r");
715 if (!fp)
716 return 0;
718 if (strbuf_getline_lf(&str, fp) != EOF)
719 res = !strcmp(str.buf, oid_to_hex(oid));
721 strbuf_release(&str);
722 fclose(fp);
724 return res;
727 enum bisect_error bisect_checkout(const struct object_id *bisect_rev,
728 int no_checkout)
730 struct commit *commit;
731 struct pretty_print_context pp = {0};
732 struct strbuf commit_msg = STRBUF_INIT;
734 update_ref(NULL, "BISECT_EXPECTED_REV", bisect_rev, NULL, 0, UPDATE_REFS_DIE_ON_ERR);
736 if (no_checkout) {
737 update_ref(NULL, "BISECT_HEAD", bisect_rev, NULL, 0,
738 UPDATE_REFS_DIE_ON_ERR);
739 } else {
740 struct child_process cmd = CHILD_PROCESS_INIT;
742 cmd.git_cmd = 1;
743 strvec_pushl(&cmd.args, "checkout", "-q",
744 oid_to_hex(bisect_rev), "--", NULL);
745 if (run_command(&cmd))
747 * Errors in `run_command()` itself, signaled by res < 0,
748 * and errors in the child process, signaled by res > 0
749 * can both be treated as regular BISECT_FAILED (-1).
751 return BISECT_FAILED;
754 commit = lookup_commit_reference(the_repository, bisect_rev);
755 repo_format_commit_message(the_repository, commit, "[%H] %s%n",
756 &commit_msg, &pp);
757 fputs(commit_msg.buf, stdout);
758 strbuf_release(&commit_msg);
760 return BISECT_OK;
763 static struct commit *get_commit_reference(struct repository *r,
764 const struct object_id *oid)
766 struct commit *c = lookup_commit_reference(r, oid);
767 if (!c)
768 die(_("Not a valid commit name %s"), oid_to_hex(oid));
769 return c;
772 static struct commit **get_bad_and_good_commits(struct repository *r,
773 int *rev_nr)
775 struct commit **rev;
776 int i, n = 0;
778 ALLOC_ARRAY(rev, 1 + good_revs.nr);
779 rev[n++] = get_commit_reference(r, current_bad_oid);
780 for (i = 0; i < good_revs.nr; i++)
781 rev[n++] = get_commit_reference(r, good_revs.oid + i);
782 *rev_nr = n;
784 return rev;
787 static enum bisect_error handle_bad_merge_base(void)
789 if (is_expected_rev(current_bad_oid)) {
790 char *bad_hex = oid_to_hex(current_bad_oid);
791 char *good_hex = join_oid_array_hex(&good_revs, ' ');
792 if (!strcmp(term_bad, "bad") && !strcmp(term_good, "good")) {
793 fprintf(stderr, _("The merge base %s is bad.\n"
794 "This means the bug has been fixed "
795 "between %s and [%s].\n"),
796 bad_hex, bad_hex, good_hex);
797 } else if (!strcmp(term_bad, "new") && !strcmp(term_good, "old")) {
798 fprintf(stderr, _("The merge base %s is new.\n"
799 "The property has changed "
800 "between %s and [%s].\n"),
801 bad_hex, bad_hex, good_hex);
802 } else {
803 fprintf(stderr, _("The merge base %s is %s.\n"
804 "This means the first '%s' commit is "
805 "between %s and [%s].\n"),
806 bad_hex, term_bad, term_good, bad_hex, good_hex);
808 return BISECT_MERGE_BASE_CHECK;
811 fprintf(stderr, _("Some %s revs are not ancestors of the %s rev.\n"
812 "git bisect cannot work properly in this case.\n"
813 "Maybe you mistook %s and %s revs?\n"),
814 term_good, term_bad, term_good, term_bad);
815 return BISECT_FAILED;
818 static void handle_skipped_merge_base(const struct object_id *mb)
820 char *mb_hex = oid_to_hex(mb);
821 char *bad_hex = oid_to_hex(current_bad_oid);
822 char *good_hex = join_oid_array_hex(&good_revs, ' ');
824 warning(_("the merge base between %s and [%s] "
825 "must be skipped.\n"
826 "So we cannot be sure the first %s commit is "
827 "between %s and %s.\n"
828 "We continue anyway."),
829 bad_hex, good_hex, term_bad, mb_hex, bad_hex);
830 free(good_hex);
834 * "check_merge_bases" checks that merge bases are not "bad" (or "new").
836 * - If one is "bad" (or "new"), it means the user assumed something wrong
837 * and we must return error with a non 0 error code.
838 * - If one is "good" (or "old"), that's good, we have nothing to do.
839 * - If one is "skipped", we can't know but we should warn.
840 * - If we don't know, we should check it out and ask the user to test.
841 * - If a merge base must be tested, on success return
842 * BISECT_INTERNAL_SUCCESS_MERGE_BASE (-11) a special condition
843 * for early success, this will be converted back to 0 in
844 * check_good_are_ancestors_of_bad().
846 static enum bisect_error check_merge_bases(int rev_nr, struct commit **rev, int no_checkout)
848 enum bisect_error res = BISECT_OK;
849 struct commit_list *result;
851 result = repo_get_merge_bases_many(the_repository, rev[0], rev_nr - 1,
852 rev + 1);
854 for (; result; result = result->next) {
855 const struct object_id *mb = &result->item->object.oid;
856 if (oideq(mb, current_bad_oid)) {
857 res = handle_bad_merge_base();
858 break;
859 } else if (0 <= oid_array_lookup(&good_revs, mb)) {
860 continue;
861 } else if (0 <= oid_array_lookup(&skipped_revs, mb)) {
862 handle_skipped_merge_base(mb);
863 } else {
864 printf(_("Bisecting: a merge base must be tested\n"));
865 res = bisect_checkout(mb, no_checkout);
866 if (!res)
867 /* indicate early success */
868 res = BISECT_INTERNAL_SUCCESS_MERGE_BASE;
869 break;
873 free_commit_list(result);
874 return res;
877 static int check_ancestors(struct repository *r, int rev_nr,
878 struct commit **rev, const char *prefix)
880 struct strvec rev_argv = STRVEC_INIT;
881 struct rev_info revs;
882 int res;
884 bisect_rev_setup(r, &revs, &rev_argv, prefix, "^%s", "%s", 0);
886 bisect_common(&revs);
887 res = (revs.commits != NULL);
889 /* Clean up objects used, as they will be reused. */
890 clear_commit_marks_many(rev_nr, rev, ALL_REV_FLAGS);
892 release_revisions(&revs);
893 strvec_clear(&rev_argv);
894 return res;
898 * "check_good_are_ancestors_of_bad" checks that all "good" revs are
899 * ancestor of the "bad" rev.
901 * If that's not the case, we need to check the merge bases.
902 * If a merge base must be tested by the user, its source code will be
903 * checked out to be tested by the user and we will return.
906 static enum bisect_error check_good_are_ancestors_of_bad(struct repository *r,
907 const char *prefix,
908 int no_checkout)
910 char *filename;
911 struct stat st;
912 int fd, rev_nr;
913 enum bisect_error res = BISECT_OK;
914 struct commit **rev;
916 if (!current_bad_oid)
917 return error(_("a %s revision is needed"), term_bad);
919 filename = git_pathdup("BISECT_ANCESTORS_OK");
921 /* Check if file BISECT_ANCESTORS_OK exists. */
922 if (!stat(filename, &st) && S_ISREG(st.st_mode))
923 goto done;
925 /* Bisecting with no good rev is ok. */
926 if (!good_revs.nr)
927 goto done;
929 /* Check if all good revs are ancestor of the bad rev. */
931 rev = get_bad_and_good_commits(r, &rev_nr);
932 if (check_ancestors(r, rev_nr, rev, prefix))
933 res = check_merge_bases(rev_nr, rev, no_checkout);
934 free(rev);
936 if (!res) {
937 /* Create file BISECT_ANCESTORS_OK. */
938 fd = open(filename, O_CREAT | O_TRUNC | O_WRONLY, 0600);
939 if (fd < 0)
941 * BISECT_ANCESTORS_OK file is not absolutely necessary,
942 * the bisection process will continue at the next
943 * bisection step.
944 * So, just signal with a warning that something
945 * might be wrong.
947 warning_errno(_("could not create file '%s'"),
948 filename);
949 else
950 close(fd);
952 done:
953 free(filename);
954 return res;
958 * This does "git diff-tree --pretty COMMIT" without one fork+exec.
960 static void show_diff_tree(struct repository *r,
961 const char *prefix,
962 struct commit *commit)
964 const char *argv[] = {
965 "diff-tree", "--pretty", "--stat", "--summary", "--cc", NULL
967 struct rev_info opt;
969 git_config(git_diff_ui_config, NULL);
970 repo_init_revisions(r, &opt, prefix);
972 setup_revisions(ARRAY_SIZE(argv) - 1, argv, &opt, NULL);
973 log_tree_commit(&opt, commit);
974 release_revisions(&opt);
978 * The terms used for this bisect session are stored in BISECT_TERMS.
979 * We read them and store them to adapt the messages accordingly.
980 * Default is bad/good.
982 void read_bisect_terms(const char **read_bad, const char **read_good)
984 struct strbuf str = STRBUF_INIT;
985 const char *filename = git_path_bisect_terms();
986 FILE *fp = fopen(filename, "r");
988 if (!fp) {
989 if (errno == ENOENT) {
990 *read_bad = "bad";
991 *read_good = "good";
992 return;
993 } else {
994 die_errno(_("could not read file '%s'"), filename);
996 } else {
997 strbuf_getline_lf(&str, fp);
998 *read_bad = strbuf_detach(&str, NULL);
999 strbuf_getline_lf(&str, fp);
1000 *read_good = strbuf_detach(&str, NULL);
1002 strbuf_release(&str);
1003 fclose(fp);
1007 * We use the convention that return BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND (-10) means
1008 * the bisection process finished successfully.
1009 * In this case the calling function or command should not turn a
1010 * BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND return code into an error or a non zero exit code.
1012 * Checking BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND
1013 * in bisect_helper::bisect_next() and only transforming it to 0 at
1014 * the end of bisect_helper::cmd_bisect__helper() helps bypassing
1015 * all the code related to finding a commit to test.
1017 enum bisect_error bisect_next_all(struct repository *r, const char *prefix)
1019 struct strvec rev_argv = STRVEC_INIT;
1020 struct rev_info revs = REV_INFO_INIT;
1021 struct commit_list *tried;
1022 int reaches = 0, all = 0, nr, steps;
1023 enum bisect_error res = BISECT_OK;
1024 struct object_id *bisect_rev;
1025 char *steps_msg;
1027 * If no_checkout is non-zero, the bisection process does not
1028 * checkout the trial commit but instead simply updates BISECT_HEAD.
1030 int no_checkout = ref_exists("BISECT_HEAD");
1031 unsigned bisect_flags = 0;
1033 read_bisect_terms(&term_bad, &term_good);
1034 if (read_bisect_refs())
1035 die(_("reading bisect refs failed"));
1037 if (file_exists(git_path_bisect_first_parent()))
1038 bisect_flags |= FIND_BISECTION_FIRST_PARENT_ONLY;
1040 if (skipped_revs.nr)
1041 bisect_flags |= FIND_BISECTION_ALL;
1043 res = check_good_are_ancestors_of_bad(r, prefix, no_checkout);
1044 if (res)
1045 goto cleanup;
1047 bisect_rev_setup(r, &revs, &rev_argv, prefix, "%s", "^%s", 1);
1049 revs.first_parent_only = !!(bisect_flags & FIND_BISECTION_FIRST_PARENT_ONLY);
1050 revs.limited = 1;
1052 bisect_common(&revs);
1054 find_bisection(&revs.commits, &reaches, &all, bisect_flags);
1055 revs.commits = managed_skipped(revs.commits, &tried);
1057 if (!revs.commits) {
1059 * We should return error here only if the "bad"
1060 * commit is also a "skip" commit.
1062 res = error_if_skipped_commits(tried, NULL);
1063 if (res < 0)
1064 goto cleanup;
1065 printf(_("%s was both %s and %s\n"),
1066 oid_to_hex(current_bad_oid),
1067 term_good,
1068 term_bad);
1070 res = BISECT_FAILED;
1071 goto cleanup;
1074 if (!all) {
1075 fprintf(stderr, _("No testable commit found.\n"
1076 "Maybe you started with bad path arguments?\n"));
1078 res = BISECT_NO_TESTABLE_COMMIT;
1079 goto cleanup;
1082 bisect_rev = &revs.commits->item->object.oid;
1084 if (oideq(bisect_rev, current_bad_oid)) {
1085 res = error_if_skipped_commits(tried, current_bad_oid);
1086 if (res)
1087 return res;
1088 printf("%s is the first %s commit\n", oid_to_hex(bisect_rev),
1089 term_bad);
1091 show_diff_tree(r, prefix, revs.commits->item);
1093 * This means the bisection process succeeded.
1094 * Using BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND (-10)
1095 * so that the call chain can simply check
1096 * for negative return values for early returns up
1097 * until the cmd_bisect__helper() caller.
1099 res = BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND;
1100 goto cleanup;
1103 nr = all - reaches - 1;
1104 steps = estimate_bisect_steps(all);
1106 steps_msg = xstrfmt(Q_("(roughly %d step)", "(roughly %d steps)",
1107 steps), steps);
1109 * TRANSLATORS: the last %s will be replaced with "(roughly %d
1110 * steps)" translation.
1112 printf(Q_("Bisecting: %d revision left to test after this %s\n",
1113 "Bisecting: %d revisions left to test after this %s\n",
1114 nr), nr, steps_msg);
1115 free(steps_msg);
1116 /* Clean up objects used, as they will be reused. */
1117 repo_clear_commit_marks(r, ALL_REV_FLAGS);
1119 res = bisect_checkout(bisect_rev, no_checkout);
1120 cleanup:
1121 release_revisions(&revs);
1122 strvec_clear(&rev_argv);
1123 return res;
1126 static inline int log2i(int n)
1128 int log2 = 0;
1130 for (; n > 1; n >>= 1)
1131 log2++;
1133 return log2;
1136 static inline int exp2i(int n)
1138 return 1 << n;
1142 * Estimate the number of bisect steps left (after the current step)
1144 * For any x between 0 included and 2^n excluded, the probability for
1145 * n - 1 steps left looks like:
1147 * P(2^n + x) == (2^n - x) / (2^n + x)
1149 * and P(2^n + x) < 0.5 means 2^n < 3x
1151 int estimate_bisect_steps(int all)
1153 int n, x, e;
1155 if (all < 3)
1156 return 0;
1158 n = log2i(all);
1159 e = exp2i(n);
1160 x = all - e;
1162 return (e < 3 * x) ? n : n - 1;
1165 static int mark_for_removal(const char *refname,
1166 const struct object_id *oid UNUSED,
1167 int flag UNUSED, void *cb_data)
1169 struct string_list *refs = cb_data;
1170 char *ref = xstrfmt("refs/bisect%s", refname);
1171 string_list_append(refs, ref);
1172 return 0;
1175 int bisect_clean_state(void)
1177 int result = 0;
1179 /* There may be some refs packed during bisection */
1180 struct string_list refs_for_removal = STRING_LIST_INIT_NODUP;
1181 for_each_ref_in("refs/bisect", mark_for_removal, (void *) &refs_for_removal);
1182 string_list_append(&refs_for_removal, xstrdup("BISECT_HEAD"));
1183 result = delete_refs("bisect: remove", &refs_for_removal, REF_NO_DEREF);
1184 refs_for_removal.strdup_strings = 1;
1185 string_list_clear(&refs_for_removal, 0);
1186 unlink_or_warn(git_path_bisect_expected_rev());
1187 unlink_or_warn(git_path_bisect_ancestors_ok());
1188 unlink_or_warn(git_path_bisect_log());
1189 unlink_or_warn(git_path_bisect_names());
1190 unlink_or_warn(git_path_bisect_run());
1191 unlink_or_warn(git_path_bisect_terms());
1192 unlink_or_warn(git_path_bisect_first_parent());
1194 * Cleanup BISECT_START last to support the --no-checkout option
1195 * introduced in the commit 4796e823a.
1197 unlink_or_warn(git_path_bisect_start());
1199 return result;