t2400: rewrite regex to avoid unintentional PCRE
[git.git] / bisect.c
blob0a5f2ed35467e47f80a7c1968b5c7de3035ed64a
1 #include "cache.h"
2 #include "config.h"
3 #include "commit.h"
4 #include "diff.h"
5 #include "environment.h"
6 #include "gettext.h"
7 #include "hex.h"
8 #include "revision.h"
9 #include "refs.h"
10 #include "list-objects.h"
11 #include "quote.h"
12 #include "hash-lookup.h"
13 #include "run-command.h"
14 #include "log-tree.h"
15 #include "bisect.h"
16 #include "oid-array.h"
17 #include "strvec.h"
18 #include "commit-slab.h"
19 #include "commit-reach.h"
20 #include "object-store.h"
21 #include "dir.h"
23 static struct oid_array good_revs;
24 static struct oid_array skipped_revs;
26 static struct object_id *current_bad_oid;
28 static const char *term_bad;
29 static const char *term_good;
31 /* Remember to update object flag allocation in object.h */
32 #define COUNTED (1u<<16)
35 * This is a truly stupid algorithm, but it's only
36 * used for bisection, and we just don't care enough.
38 * We care just barely enough to avoid recursing for
39 * non-merge entries.
41 static int count_distance(struct commit_list *entry)
43 int nr = 0;
45 while (entry) {
46 struct commit *commit = entry->item;
47 struct commit_list *p;
49 if (commit->object.flags & (UNINTERESTING | COUNTED))
50 break;
51 if (!(commit->object.flags & TREESAME))
52 nr++;
53 commit->object.flags |= COUNTED;
54 p = commit->parents;
55 entry = p;
56 if (p) {
57 p = p->next;
58 while (p) {
59 nr += count_distance(p);
60 p = p->next;
65 return nr;
68 static void clear_distance(struct commit_list *list)
70 while (list) {
71 struct commit *commit = list->item;
72 commit->object.flags &= ~COUNTED;
73 list = list->next;
77 define_commit_slab(commit_weight, int *);
78 static struct commit_weight commit_weight;
80 #define DEBUG_BISECT 0
82 static inline int weight(struct commit_list *elem)
84 return **commit_weight_at(&commit_weight, elem->item);
87 static inline void weight_set(struct commit_list *elem, int weight)
89 **commit_weight_at(&commit_weight, elem->item) = weight;
92 static int count_interesting_parents(struct commit *commit, unsigned bisect_flags)
94 struct commit_list *p;
95 int count;
97 for (count = 0, p = commit->parents; p; p = p->next) {
98 if (!(p->item->object.flags & UNINTERESTING))
99 count++;
100 if (bisect_flags & FIND_BISECTION_FIRST_PARENT_ONLY)
101 break;
103 return count;
106 static inline int approx_halfway(struct commit_list *p, int nr)
108 int diff;
111 * Don't short-cut something we are not going to return!
113 if (p->item->object.flags & TREESAME)
114 return 0;
115 if (DEBUG_BISECT)
116 return 0;
118 * For small number of commits 2 and 3 are halfway of 5, and
119 * 3 is halfway of 6 but 2 and 4 are not.
121 diff = 2 * weight(p) - nr;
122 switch (diff) {
123 case -1: case 0: case 1:
124 return 1;
125 default:
127 * For large number of commits we are not so strict, it's
128 * good enough if it's within ~0.1% of the halfway point,
129 * e.g. 5000 is exactly halfway of 10000, but we consider
130 * the values [4996, 5004] as halfway as well.
132 if (abs(diff) < nr / 1024)
133 return 1;
134 return 0;
138 static void show_list(const char *debug, int counted, int nr,
139 struct commit_list *list)
141 struct commit_list *p;
143 if (!DEBUG_BISECT)
144 return;
146 fprintf(stderr, "%s (%d/%d)\n", debug, counted, nr);
148 for (p = list; p; p = p->next) {
149 struct commit_list *pp;
150 struct commit *commit = p->item;
151 unsigned commit_flags = commit->object.flags;
152 enum object_type type;
153 unsigned long size;
154 char *buf = repo_read_object_file(the_repository,
155 &commit->object.oid, &type,
156 &size);
157 const char *subject_start;
158 int subject_len;
160 fprintf(stderr, "%c%c%c ",
161 (commit_flags & TREESAME) ? ' ' : 'T',
162 (commit_flags & UNINTERESTING) ? 'U' : ' ',
163 (commit_flags & COUNTED) ? 'C' : ' ');
164 if (*commit_weight_at(&commit_weight, p->item))
165 fprintf(stderr, "%3d", weight(p));
166 else
167 fprintf(stderr, "---");
168 fprintf(stderr, " %.*s", 8, oid_to_hex(&commit->object.oid));
169 for (pp = commit->parents; pp; pp = pp->next)
170 fprintf(stderr, " %.*s", 8,
171 oid_to_hex(&pp->item->object.oid));
173 subject_len = find_commit_subject(buf, &subject_start);
174 if (subject_len)
175 fprintf(stderr, " %.*s", subject_len, subject_start);
176 fprintf(stderr, "\n");
180 static struct commit_list *best_bisection(struct commit_list *list, int nr)
182 struct commit_list *p, *best;
183 int best_distance = -1;
185 best = list;
186 for (p = list; p; p = p->next) {
187 int distance;
188 unsigned commit_flags = p->item->object.flags;
190 if (commit_flags & TREESAME)
191 continue;
192 distance = weight(p);
193 if (nr - distance < distance)
194 distance = nr - distance;
195 if (distance > best_distance) {
196 best = p;
197 best_distance = distance;
201 return best;
204 struct commit_dist {
205 struct commit *commit;
206 int distance;
209 static int compare_commit_dist(const void *a_, const void *b_)
211 struct commit_dist *a, *b;
213 a = (struct commit_dist *)a_;
214 b = (struct commit_dist *)b_;
215 if (a->distance != b->distance)
216 return b->distance - a->distance; /* desc sort */
217 return oidcmp(&a->commit->object.oid, &b->commit->object.oid);
220 static struct commit_list *best_bisection_sorted(struct commit_list *list, int nr)
222 struct commit_list *p;
223 struct commit_dist *array = xcalloc(nr, sizeof(*array));
224 struct strbuf buf = STRBUF_INIT;
225 int cnt, i;
227 for (p = list, cnt = 0; p; p = p->next) {
228 int distance;
229 unsigned commit_flags = p->item->object.flags;
231 if (commit_flags & TREESAME)
232 continue;
233 distance = weight(p);
234 if (nr - distance < distance)
235 distance = nr - distance;
236 array[cnt].commit = p->item;
237 array[cnt].distance = distance;
238 cnt++;
240 QSORT(array, cnt, compare_commit_dist);
241 for (p = list, i = 0; i < cnt; i++) {
242 struct object *obj = &(array[i].commit->object);
244 strbuf_reset(&buf);
245 strbuf_addf(&buf, "dist=%d", array[i].distance);
246 add_name_decoration(DECORATION_NONE, buf.buf, obj);
248 p->item = array[i].commit;
249 if (i < cnt - 1)
250 p = p->next;
252 if (p) {
253 free_commit_list(p->next);
254 p->next = NULL;
256 strbuf_release(&buf);
257 free(array);
258 return list;
262 * zero or positive weight is the number of interesting commits it can
263 * reach, including itself. Especially, weight = 0 means it does not
264 * reach any tree-changing commits (e.g. just above uninteresting one
265 * but traversal is with pathspec).
267 * weight = -1 means it has one parent and its distance is yet to
268 * be computed.
270 * weight = -2 means it has more than one parent and its distance is
271 * unknown. After running count_distance() first, they will get zero
272 * or positive distance.
274 static struct commit_list *do_find_bisection(struct commit_list *list,
275 int nr, int *weights,
276 unsigned bisect_flags)
278 int n, counted;
279 struct commit_list *p;
281 counted = 0;
283 for (n = 0, p = list; p; p = p->next) {
284 struct commit *commit = p->item;
285 unsigned commit_flags = commit->object.flags;
287 *commit_weight_at(&commit_weight, p->item) = &weights[n++];
288 switch (count_interesting_parents(commit, bisect_flags)) {
289 case 0:
290 if (!(commit_flags & TREESAME)) {
291 weight_set(p, 1);
292 counted++;
293 show_list("bisection 2 count one",
294 counted, nr, list);
297 * otherwise, it is known not to reach any
298 * tree-changing commit and gets weight 0.
300 break;
301 case 1:
302 weight_set(p, -1);
303 break;
304 default:
305 weight_set(p, -2);
306 break;
310 show_list("bisection 2 initialize", counted, nr, list);
313 * If you have only one parent in the resulting set
314 * then you can reach one commit more than that parent
315 * can reach. So we do not have to run the expensive
316 * count_distance() for single strand of pearls.
318 * However, if you have more than one parents, you cannot
319 * just add their distance and one for yourself, since
320 * they usually reach the same ancestor and you would
321 * end up counting them twice that way.
323 * So we will first count distance of merges the usual
324 * way, and then fill the blanks using cheaper algorithm.
326 for (p = list; p; p = p->next) {
327 if (p->item->object.flags & UNINTERESTING)
328 continue;
329 if (weight(p) != -2)
330 continue;
331 if (bisect_flags & FIND_BISECTION_FIRST_PARENT_ONLY)
332 BUG("shouldn't be calling count-distance in fp mode");
333 weight_set(p, count_distance(p));
334 clear_distance(list);
336 /* Does it happen to be at half-way? */
337 if (!(bisect_flags & FIND_BISECTION_ALL) &&
338 approx_halfway(p, nr))
339 return p;
340 counted++;
343 show_list("bisection 2 count_distance", counted, nr, list);
345 while (counted < nr) {
346 for (p = list; p; p = p->next) {
347 struct commit_list *q;
348 unsigned commit_flags = p->item->object.flags;
350 if (0 <= weight(p))
351 continue;
353 for (q = p->item->parents;
355 q = bisect_flags & FIND_BISECTION_FIRST_PARENT_ONLY ? NULL : q->next) {
356 if (q->item->object.flags & UNINTERESTING)
357 continue;
358 if (0 <= weight(q))
359 break;
361 if (!q)
362 continue;
365 * weight for p is unknown but q is known.
366 * add one for p itself if p is to be counted,
367 * otherwise inherit it from q directly.
369 if (!(commit_flags & TREESAME)) {
370 weight_set(p, weight(q)+1);
371 counted++;
372 show_list("bisection 2 count one",
373 counted, nr, list);
375 else
376 weight_set(p, weight(q));
378 /* Does it happen to be at half-way? */
379 if (!(bisect_flags & FIND_BISECTION_ALL) &&
380 approx_halfway(p, nr))
381 return p;
385 show_list("bisection 2 counted all", counted, nr, list);
387 if (!(bisect_flags & FIND_BISECTION_ALL))
388 return best_bisection(list, nr);
389 else
390 return best_bisection_sorted(list, nr);
393 void find_bisection(struct commit_list **commit_list, int *reaches,
394 int *all, unsigned bisect_flags)
396 int nr, on_list;
397 struct commit_list *list, *p, *best, *next, *last;
398 int *weights;
400 show_list("bisection 2 entry", 0, 0, *commit_list);
401 init_commit_weight(&commit_weight);
404 * Count the number of total and tree-changing items on the
405 * list, while reversing the list.
407 for (nr = on_list = 0, last = NULL, p = *commit_list;
409 p = next) {
410 unsigned commit_flags = p->item->object.flags;
412 next = p->next;
413 if (commit_flags & UNINTERESTING) {
414 free(p);
415 continue;
417 p->next = last;
418 last = p;
419 if (!(commit_flags & TREESAME))
420 nr++;
421 on_list++;
423 list = last;
424 show_list("bisection 2 sorted", 0, nr, list);
426 *all = nr;
427 CALLOC_ARRAY(weights, on_list);
429 /* Do the real work of finding bisection commit. */
430 best = do_find_bisection(list, nr, weights, bisect_flags);
431 if (best) {
432 if (!(bisect_flags & FIND_BISECTION_ALL)) {
433 list->item = best->item;
434 free_commit_list(list->next);
435 best = list;
436 best->next = NULL;
438 *reaches = weight(best);
440 free(weights);
441 *commit_list = best;
442 clear_commit_weight(&commit_weight);
445 static int register_ref(const char *refname, const struct object_id *oid,
446 int flags UNUSED, void *cb_data UNUSED)
448 struct strbuf good_prefix = STRBUF_INIT;
449 strbuf_addstr(&good_prefix, term_good);
450 strbuf_addstr(&good_prefix, "-");
452 if (!strcmp(refname, term_bad)) {
453 current_bad_oid = xmalloc(sizeof(*current_bad_oid));
454 oidcpy(current_bad_oid, oid);
455 } else if (starts_with(refname, good_prefix.buf)) {
456 oid_array_append(&good_revs, oid);
457 } else if (starts_with(refname, "skip-")) {
458 oid_array_append(&skipped_revs, oid);
461 strbuf_release(&good_prefix);
463 return 0;
466 static int read_bisect_refs(void)
468 return for_each_ref_in("refs/bisect/", register_ref, NULL);
471 static GIT_PATH_FUNC(git_path_bisect_names, "BISECT_NAMES")
472 static GIT_PATH_FUNC(git_path_bisect_expected_rev, "BISECT_EXPECTED_REV")
473 static GIT_PATH_FUNC(git_path_bisect_ancestors_ok, "BISECT_ANCESTORS_OK")
474 static GIT_PATH_FUNC(git_path_bisect_run, "BISECT_RUN")
475 static GIT_PATH_FUNC(git_path_bisect_start, "BISECT_START")
476 static GIT_PATH_FUNC(git_path_bisect_log, "BISECT_LOG")
477 static GIT_PATH_FUNC(git_path_bisect_terms, "BISECT_TERMS")
478 static GIT_PATH_FUNC(git_path_bisect_first_parent, "BISECT_FIRST_PARENT")
480 static void read_bisect_paths(struct strvec *array)
482 struct strbuf str = STRBUF_INIT;
483 const char *filename = git_path_bisect_names();
484 FILE *fp = xfopen(filename, "r");
486 while (strbuf_getline_lf(&str, fp) != EOF) {
487 strbuf_trim(&str);
488 if (sq_dequote_to_strvec(str.buf, array))
489 die(_("Badly quoted content in file '%s': %s"),
490 filename, str.buf);
493 strbuf_release(&str);
494 fclose(fp);
497 static char *join_oid_array_hex(struct oid_array *array, char delim)
499 struct strbuf joined_hexs = STRBUF_INIT;
500 int i;
502 for (i = 0; i < array->nr; i++) {
503 strbuf_addstr(&joined_hexs, oid_to_hex(array->oid + i));
504 if (i + 1 < array->nr)
505 strbuf_addch(&joined_hexs, delim);
508 return strbuf_detach(&joined_hexs, NULL);
512 * In this function, passing a not NULL skipped_first is very special.
513 * It means that we want to know if the first commit in the list is
514 * skipped because we will want to test a commit away from it if it is
515 * indeed skipped.
516 * So if the first commit is skipped, we cannot take the shortcut to
517 * just "return list" when we find the first non skipped commit, we
518 * have to return a fully filtered list.
520 * We use (*skipped_first == -1) to mean "it has been found that the
521 * first commit is not skipped". In this case *skipped_first is set back
522 * to 0 just before the function returns.
524 struct commit_list *filter_skipped(struct commit_list *list,
525 struct commit_list **tried,
526 int show_all,
527 int *count,
528 int *skipped_first)
530 struct commit_list *filtered = NULL, **f = &filtered;
532 *tried = NULL;
534 if (skipped_first)
535 *skipped_first = 0;
536 if (count)
537 *count = 0;
539 if (!skipped_revs.nr)
540 return list;
542 while (list) {
543 struct commit_list *next = list->next;
544 list->next = NULL;
545 if (0 <= oid_array_lookup(&skipped_revs, &list->item->object.oid)) {
546 if (skipped_first && !*skipped_first)
547 *skipped_first = 1;
548 /* Move current to tried list */
549 *tried = list;
550 tried = &list->next;
551 } else {
552 if (!show_all) {
553 if (!skipped_first || !*skipped_first)
554 return list;
555 } else if (skipped_first && !*skipped_first) {
556 /* This means we know it's not skipped */
557 *skipped_first = -1;
559 /* Move current to filtered list */
560 *f = list;
561 f = &list->next;
562 if (count)
563 (*count)++;
565 list = next;
568 if (skipped_first && *skipped_first == -1)
569 *skipped_first = 0;
571 return filtered;
574 #define PRN_MODULO 32768
577 * This is a pseudo random number generator based on "man 3 rand".
578 * It is not used properly because the seed is the argument and it
579 * is increased by one between each call, but that should not matter
580 * for this application.
582 static unsigned get_prn(unsigned count)
584 count = count * 1103515245 + 12345;
585 return (count/65536) % PRN_MODULO;
589 * Custom integer square root from
590 * https://en.wikipedia.org/wiki/Integer_square_root
592 static int sqrti(int val)
594 float d, x = val;
596 if (!val)
597 return 0;
599 do {
600 float y = (x + (float)val / x) / 2;
601 d = (y > x) ? y - x : x - y;
602 x = y;
603 } while (d >= 0.5);
605 return (int)x;
608 static struct commit_list *skip_away(struct commit_list *list, int count)
610 struct commit_list *cur, *previous;
611 int prn, index, i;
613 prn = get_prn(count);
614 index = (count * prn / PRN_MODULO) * sqrti(prn) / sqrti(PRN_MODULO);
616 cur = list;
617 previous = NULL;
619 for (i = 0; cur; cur = cur->next, i++) {
620 if (i == index) {
621 if (!oideq(&cur->item->object.oid, current_bad_oid))
622 return cur;
623 if (previous)
624 return previous;
625 return list;
627 previous = cur;
630 return list;
633 static struct commit_list *managed_skipped(struct commit_list *list,
634 struct commit_list **tried)
636 int count, skipped_first;
638 *tried = NULL;
640 if (!skipped_revs.nr)
641 return list;
643 list = filter_skipped(list, tried, 0, &count, &skipped_first);
645 if (!skipped_first)
646 return list;
648 return skip_away(list, count);
651 static void bisect_rev_setup(struct repository *r, struct rev_info *revs,
652 struct strvec *rev_argv,
653 const char *prefix,
654 const char *bad_format, const char *good_format,
655 int read_paths)
657 struct setup_revision_opt opt = {
658 .free_removed_argv_elements = 1,
660 int i;
662 repo_init_revisions(r, revs, prefix);
663 revs->abbrev = 0;
664 revs->commit_format = CMIT_FMT_UNSPECIFIED;
666 /* rev_argv.argv[0] will be ignored by setup_revisions */
667 strvec_push(rev_argv, "bisect_rev_setup");
668 strvec_pushf(rev_argv, bad_format, oid_to_hex(current_bad_oid));
669 for (i = 0; i < good_revs.nr; i++)
670 strvec_pushf(rev_argv, good_format,
671 oid_to_hex(good_revs.oid + i));
672 strvec_push(rev_argv, "--");
673 if (read_paths)
674 read_bisect_paths(rev_argv);
676 setup_revisions(rev_argv->nr, rev_argv->v, revs, &opt);
679 static void bisect_common(struct rev_info *revs)
681 if (prepare_revision_walk(revs))
682 die("revision walk setup failed");
683 if (revs->tree_objects)
684 mark_edges_uninteresting(revs, NULL, 0);
687 static enum bisect_error error_if_skipped_commits(struct commit_list *tried,
688 const struct object_id *bad)
690 if (!tried)
691 return BISECT_OK;
693 printf("There are only 'skip'ped commits left to test.\n"
694 "The first %s commit could be any of:\n", term_bad);
696 for ( ; tried; tried = tried->next)
697 printf("%s\n", oid_to_hex(&tried->item->object.oid));
699 if (bad)
700 printf("%s\n", oid_to_hex(bad));
701 printf(_("We cannot bisect more!\n"));
703 return BISECT_ONLY_SKIPPED_LEFT;
706 static int is_expected_rev(const struct object_id *oid)
708 const char *filename = git_path_bisect_expected_rev();
709 struct stat st;
710 struct strbuf str = STRBUF_INIT;
711 FILE *fp;
712 int res = 0;
714 if (stat(filename, &st) || !S_ISREG(st.st_mode))
715 return 0;
717 fp = fopen_or_warn(filename, "r");
718 if (!fp)
719 return 0;
721 if (strbuf_getline_lf(&str, fp) != EOF)
722 res = !strcmp(str.buf, oid_to_hex(oid));
724 strbuf_release(&str);
725 fclose(fp);
727 return res;
730 enum bisect_error bisect_checkout(const struct object_id *bisect_rev,
731 int no_checkout)
733 struct commit *commit;
734 struct pretty_print_context pp = {0};
735 struct strbuf commit_msg = STRBUF_INIT;
737 update_ref(NULL, "BISECT_EXPECTED_REV", bisect_rev, NULL, 0, UPDATE_REFS_DIE_ON_ERR);
739 if (no_checkout) {
740 update_ref(NULL, "BISECT_HEAD", bisect_rev, NULL, 0,
741 UPDATE_REFS_DIE_ON_ERR);
742 } else {
743 struct child_process cmd = CHILD_PROCESS_INIT;
745 cmd.git_cmd = 1;
746 strvec_pushl(&cmd.args, "checkout", "-q",
747 oid_to_hex(bisect_rev), "--", NULL);
748 if (run_command(&cmd))
750 * Errors in `run_command()` itself, signaled by res < 0,
751 * and errors in the child process, signaled by res > 0
752 * can both be treated as regular BISECT_FAILED (-1).
754 return BISECT_FAILED;
757 commit = lookup_commit_reference(the_repository, bisect_rev);
758 repo_format_commit_message(the_repository, commit, "[%H] %s%n",
759 &commit_msg, &pp);
760 fputs(commit_msg.buf, stdout);
761 strbuf_release(&commit_msg);
763 return BISECT_OK;
766 static struct commit *get_commit_reference(struct repository *r,
767 const struct object_id *oid)
769 struct commit *c = lookup_commit_reference(r, oid);
770 if (!c)
771 die(_("Not a valid commit name %s"), oid_to_hex(oid));
772 return c;
775 static struct commit **get_bad_and_good_commits(struct repository *r,
776 int *rev_nr)
778 struct commit **rev;
779 int i, n = 0;
781 ALLOC_ARRAY(rev, 1 + good_revs.nr);
782 rev[n++] = get_commit_reference(r, current_bad_oid);
783 for (i = 0; i < good_revs.nr; i++)
784 rev[n++] = get_commit_reference(r, good_revs.oid + i);
785 *rev_nr = n;
787 return rev;
790 static enum bisect_error handle_bad_merge_base(void)
792 if (is_expected_rev(current_bad_oid)) {
793 char *bad_hex = oid_to_hex(current_bad_oid);
794 char *good_hex = join_oid_array_hex(&good_revs, ' ');
795 if (!strcmp(term_bad, "bad") && !strcmp(term_good, "good")) {
796 fprintf(stderr, _("The merge base %s is bad.\n"
797 "This means the bug has been fixed "
798 "between %s and [%s].\n"),
799 bad_hex, bad_hex, good_hex);
800 } else if (!strcmp(term_bad, "new") && !strcmp(term_good, "old")) {
801 fprintf(stderr, _("The merge base %s is new.\n"
802 "The property has changed "
803 "between %s and [%s].\n"),
804 bad_hex, bad_hex, good_hex);
805 } else {
806 fprintf(stderr, _("The merge base %s is %s.\n"
807 "This means the first '%s' commit is "
808 "between %s and [%s].\n"),
809 bad_hex, term_bad, term_good, bad_hex, good_hex);
811 return BISECT_MERGE_BASE_CHECK;
814 fprintf(stderr, _("Some %s revs are not ancestors of the %s rev.\n"
815 "git bisect cannot work properly in this case.\n"
816 "Maybe you mistook %s and %s revs?\n"),
817 term_good, term_bad, term_good, term_bad);
818 return BISECT_FAILED;
821 static void handle_skipped_merge_base(const struct object_id *mb)
823 char *mb_hex = oid_to_hex(mb);
824 char *bad_hex = oid_to_hex(current_bad_oid);
825 char *good_hex = join_oid_array_hex(&good_revs, ' ');
827 warning(_("the merge base between %s and [%s] "
828 "must be skipped.\n"
829 "So we cannot be sure the first %s commit is "
830 "between %s and %s.\n"
831 "We continue anyway."),
832 bad_hex, good_hex, term_bad, mb_hex, bad_hex);
833 free(good_hex);
837 * "check_merge_bases" checks that merge bases are not "bad" (or "new").
839 * - If one is "bad" (or "new"), it means the user assumed something wrong
840 * and we must return error with a non 0 error code.
841 * - If one is "good" (or "old"), that's good, we have nothing to do.
842 * - If one is "skipped", we can't know but we should warn.
843 * - If we don't know, we should check it out and ask the user to test.
844 * - If a merge base must be tested, on success return
845 * BISECT_INTERNAL_SUCCESS_MERGE_BASE (-11) a special condition
846 * for early success, this will be converted back to 0 in
847 * check_good_are_ancestors_of_bad().
849 static enum bisect_error check_merge_bases(int rev_nr, struct commit **rev, int no_checkout)
851 enum bisect_error res = BISECT_OK;
852 struct commit_list *result;
854 result = repo_get_merge_bases_many(the_repository, rev[0], rev_nr - 1,
855 rev + 1);
857 for (; result; result = result->next) {
858 const struct object_id *mb = &result->item->object.oid;
859 if (oideq(mb, current_bad_oid)) {
860 res = handle_bad_merge_base();
861 break;
862 } else if (0 <= oid_array_lookup(&good_revs, mb)) {
863 continue;
864 } else if (0 <= oid_array_lookup(&skipped_revs, mb)) {
865 handle_skipped_merge_base(mb);
866 } else {
867 printf(_("Bisecting: a merge base must be tested\n"));
868 res = bisect_checkout(mb, no_checkout);
869 if (!res)
870 /* indicate early success */
871 res = BISECT_INTERNAL_SUCCESS_MERGE_BASE;
872 break;
876 free_commit_list(result);
877 return res;
880 static int check_ancestors(struct repository *r, int rev_nr,
881 struct commit **rev, const char *prefix)
883 struct strvec rev_argv = STRVEC_INIT;
884 struct rev_info revs;
885 int res;
887 bisect_rev_setup(r, &revs, &rev_argv, prefix, "^%s", "%s", 0);
889 bisect_common(&revs);
890 res = (revs.commits != NULL);
892 /* Clean up objects used, as they will be reused. */
893 clear_commit_marks_many(rev_nr, rev, ALL_REV_FLAGS);
895 release_revisions(&revs);
896 strvec_clear(&rev_argv);
897 return res;
901 * "check_good_are_ancestors_of_bad" checks that all "good" revs are
902 * ancestor of the "bad" rev.
904 * If that's not the case, we need to check the merge bases.
905 * If a merge base must be tested by the user, its source code will be
906 * checked out to be tested by the user and we will return.
909 static enum bisect_error check_good_are_ancestors_of_bad(struct repository *r,
910 const char *prefix,
911 int no_checkout)
913 char *filename;
914 struct stat st;
915 int fd, rev_nr;
916 enum bisect_error res = BISECT_OK;
917 struct commit **rev;
919 if (!current_bad_oid)
920 return error(_("a %s revision is needed"), term_bad);
922 filename = git_pathdup("BISECT_ANCESTORS_OK");
924 /* Check if file BISECT_ANCESTORS_OK exists. */
925 if (!stat(filename, &st) && S_ISREG(st.st_mode))
926 goto done;
928 /* Bisecting with no good rev is ok. */
929 if (!good_revs.nr)
930 goto done;
932 /* Check if all good revs are ancestor of the bad rev. */
934 rev = get_bad_and_good_commits(r, &rev_nr);
935 if (check_ancestors(r, rev_nr, rev, prefix))
936 res = check_merge_bases(rev_nr, rev, no_checkout);
937 free(rev);
939 if (!res) {
940 /* Create file BISECT_ANCESTORS_OK. */
941 fd = open(filename, O_CREAT | O_TRUNC | O_WRONLY, 0600);
942 if (fd < 0)
944 * BISECT_ANCESTORS_OK file is not absolutely necessary,
945 * the bisection process will continue at the next
946 * bisection step.
947 * So, just signal with a warning that something
948 * might be wrong.
950 warning_errno(_("could not create file '%s'"),
951 filename);
952 else
953 close(fd);
955 done:
956 free(filename);
957 return res;
961 * This does "git diff-tree --pretty COMMIT" without one fork+exec.
963 static void show_diff_tree(struct repository *r,
964 const char *prefix,
965 struct commit *commit)
967 const char *argv[] = {
968 "diff-tree", "--pretty", "--stat", "--summary", "--cc", NULL
970 struct rev_info opt;
972 git_config(git_diff_ui_config, NULL);
973 repo_init_revisions(r, &opt, prefix);
975 setup_revisions(ARRAY_SIZE(argv) - 1, argv, &opt, NULL);
976 log_tree_commit(&opt, commit);
977 release_revisions(&opt);
981 * The terms used for this bisect session are stored in BISECT_TERMS.
982 * We read them and store them to adapt the messages accordingly.
983 * Default is bad/good.
985 void read_bisect_terms(const char **read_bad, const char **read_good)
987 struct strbuf str = STRBUF_INIT;
988 const char *filename = git_path_bisect_terms();
989 FILE *fp = fopen(filename, "r");
991 if (!fp) {
992 if (errno == ENOENT) {
993 *read_bad = "bad";
994 *read_good = "good";
995 return;
996 } else {
997 die_errno(_("could not read file '%s'"), filename);
999 } else {
1000 strbuf_getline_lf(&str, fp);
1001 *read_bad = strbuf_detach(&str, NULL);
1002 strbuf_getline_lf(&str, fp);
1003 *read_good = strbuf_detach(&str, NULL);
1005 strbuf_release(&str);
1006 fclose(fp);
1010 * We use the convention that return BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND (-10) means
1011 * the bisection process finished successfully.
1012 * In this case the calling function or command should not turn a
1013 * BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND return code into an error or a non zero exit code.
1015 * Checking BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND
1016 * in bisect_helper::bisect_next() and only transforming it to 0 at
1017 * the end of bisect_helper::cmd_bisect__helper() helps bypassing
1018 * all the code related to finding a commit to test.
1020 enum bisect_error bisect_next_all(struct repository *r, const char *prefix)
1022 struct strvec rev_argv = STRVEC_INIT;
1023 struct rev_info revs = REV_INFO_INIT;
1024 struct commit_list *tried;
1025 int reaches = 0, all = 0, nr, steps;
1026 enum bisect_error res = BISECT_OK;
1027 struct object_id *bisect_rev;
1028 char *steps_msg;
1030 * If no_checkout is non-zero, the bisection process does not
1031 * checkout the trial commit but instead simply updates BISECT_HEAD.
1033 int no_checkout = ref_exists("BISECT_HEAD");
1034 unsigned bisect_flags = 0;
1036 read_bisect_terms(&term_bad, &term_good);
1037 if (read_bisect_refs())
1038 die(_("reading bisect refs failed"));
1040 if (file_exists(git_path_bisect_first_parent()))
1041 bisect_flags |= FIND_BISECTION_FIRST_PARENT_ONLY;
1043 if (skipped_revs.nr)
1044 bisect_flags |= FIND_BISECTION_ALL;
1046 res = check_good_are_ancestors_of_bad(r, prefix, no_checkout);
1047 if (res)
1048 goto cleanup;
1050 bisect_rev_setup(r, &revs, &rev_argv, prefix, "%s", "^%s", 1);
1052 revs.first_parent_only = !!(bisect_flags & FIND_BISECTION_FIRST_PARENT_ONLY);
1053 revs.limited = 1;
1055 bisect_common(&revs);
1057 find_bisection(&revs.commits, &reaches, &all, bisect_flags);
1058 revs.commits = managed_skipped(revs.commits, &tried);
1060 if (!revs.commits) {
1062 * We should return error here only if the "bad"
1063 * commit is also a "skip" commit.
1065 res = error_if_skipped_commits(tried, NULL);
1066 if (res < 0)
1067 goto cleanup;
1068 printf(_("%s was both %s and %s\n"),
1069 oid_to_hex(current_bad_oid),
1070 term_good,
1071 term_bad);
1073 res = BISECT_FAILED;
1074 goto cleanup;
1077 if (!all) {
1078 fprintf(stderr, _("No testable commit found.\n"
1079 "Maybe you started with bad path arguments?\n"));
1081 res = BISECT_NO_TESTABLE_COMMIT;
1082 goto cleanup;
1085 bisect_rev = &revs.commits->item->object.oid;
1087 if (oideq(bisect_rev, current_bad_oid)) {
1088 res = error_if_skipped_commits(tried, current_bad_oid);
1089 if (res)
1090 return res;
1091 printf("%s is the first %s commit\n", oid_to_hex(bisect_rev),
1092 term_bad);
1094 show_diff_tree(r, prefix, revs.commits->item);
1096 * This means the bisection process succeeded.
1097 * Using BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND (-10)
1098 * so that the call chain can simply check
1099 * for negative return values for early returns up
1100 * until the cmd_bisect__helper() caller.
1102 res = BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND;
1103 goto cleanup;
1106 nr = all - reaches - 1;
1107 steps = estimate_bisect_steps(all);
1109 steps_msg = xstrfmt(Q_("(roughly %d step)", "(roughly %d steps)",
1110 steps), steps);
1112 * TRANSLATORS: the last %s will be replaced with "(roughly %d
1113 * steps)" translation.
1115 printf(Q_("Bisecting: %d revision left to test after this %s\n",
1116 "Bisecting: %d revisions left to test after this %s\n",
1117 nr), nr, steps_msg);
1118 free(steps_msg);
1119 /* Clean up objects used, as they will be reused. */
1120 repo_clear_commit_marks(r, ALL_REV_FLAGS);
1122 res = bisect_checkout(bisect_rev, no_checkout);
1123 cleanup:
1124 release_revisions(&revs);
1125 strvec_clear(&rev_argv);
1126 return res;
1129 static inline int log2i(int n)
1131 int log2 = 0;
1133 for (; n > 1; n >>= 1)
1134 log2++;
1136 return log2;
1139 static inline int exp2i(int n)
1141 return 1 << n;
1145 * Estimate the number of bisect steps left (after the current step)
1147 * For any x between 0 included and 2^n excluded, the probability for
1148 * n - 1 steps left looks like:
1150 * P(2^n + x) == (2^n - x) / (2^n + x)
1152 * and P(2^n + x) < 0.5 means 2^n < 3x
1154 int estimate_bisect_steps(int all)
1156 int n, x, e;
1158 if (all < 3)
1159 return 0;
1161 n = log2i(all);
1162 e = exp2i(n);
1163 x = all - e;
1165 return (e < 3 * x) ? n : n - 1;
1168 static int mark_for_removal(const char *refname,
1169 const struct object_id *oid UNUSED,
1170 int flag UNUSED, void *cb_data)
1172 struct string_list *refs = cb_data;
1173 char *ref = xstrfmt("refs/bisect%s", refname);
1174 string_list_append(refs, ref);
1175 return 0;
1178 int bisect_clean_state(void)
1180 int result = 0;
1182 /* There may be some refs packed during bisection */
1183 struct string_list refs_for_removal = STRING_LIST_INIT_NODUP;
1184 for_each_ref_in("refs/bisect", mark_for_removal, (void *) &refs_for_removal);
1185 string_list_append(&refs_for_removal, xstrdup("BISECT_HEAD"));
1186 result = delete_refs("bisect: remove", &refs_for_removal, REF_NO_DEREF);
1187 refs_for_removal.strdup_strings = 1;
1188 string_list_clear(&refs_for_removal, 0);
1189 unlink_or_warn(git_path_bisect_expected_rev());
1190 unlink_or_warn(git_path_bisect_ancestors_ok());
1191 unlink_or_warn(git_path_bisect_log());
1192 unlink_or_warn(git_path_bisect_names());
1193 unlink_or_warn(git_path_bisect_run());
1194 unlink_or_warn(git_path_bisect_terms());
1195 unlink_or_warn(git_path_bisect_first_parent());
1197 * Cleanup BISECT_START last to support the --no-checkout option
1198 * introduced in the commit 4796e823a.
1200 unlink_or_warn(git_path_bisect_start());
1202 return result;