6 #include "list-objects.h"
8 #include "sha1-lookup.h"
9 #include "run-command.h"
12 #include "sha1-array.h"
13 #include "argv-array.h"
15 static struct oid_array good_revs;
16 static struct oid_array skipped_revs;
18 static struct object_id *current_bad_oid;
20 static const char *argv_checkout[] = {"checkout", "-q", NULL, "--", NULL};
21 static const char *argv_show_branch[] = {"show-branch", NULL, NULL};
23 static const char *term_bad;
24 static const char *term_good;
26 /* Remember to update object flag allocation in object.h */
27 #define COUNTED (1u<<16)
30 * This is a truly stupid algorithm, but it's only
31 * used for bisection, and we just don't care enough.
33 * We care just barely enough to avoid recursing for
36 static int count_distance(struct commit_list *entry)
41 struct commit *commit = entry->item;
42 struct commit_list *p;
44 if (commit->object.flags & (UNINTERESTING | COUNTED))
46 if (!(commit->object.flags & TREESAME))
48 commit->object.flags |= COUNTED;
54 nr += count_distance(p);
63 static void clear_distance(struct commit_list *list)
66 struct commit *commit = list->item;
67 commit->object.flags &= ~COUNTED;
72 #define DEBUG_BISECT 0
74 static inline int weight(struct commit_list *elem)
76 return *((int*)(elem->item->util));
79 static inline void weight_set(struct commit_list *elem, int weight)
81 *((int*)(elem->item->util)) = weight;
84 static int count_interesting_parents(struct commit *commit)
86 struct commit_list *p;
89 for (count = 0, p = commit->parents; p; p = p->next) {
90 if (p->item->object.flags & UNINTERESTING)
97 static inline int halfway(struct commit_list *p, int nr)
100 * Don't short-cut something we are not going to return!
102 if (p->item->object.flags & TREESAME)
107 * 2 and 3 are halfway of 5.
108 * 3 is halfway of 6 but 2 and 4 are not.
110 switch (2 * weight(p) - nr) {
111 case -1: case 0: case 1:
119 #define show_list(a,b,c,d) do { ; } while (0)
121 static void show_list(const char *debug, int counted, int nr,
122 struct commit_list *list)
124 struct commit_list *p;
126 fprintf(stderr, "%s (%d/%d)\n", debug, counted, nr);
128 for (p = list; p; p = p->next) {
129 struct commit_list *pp;
130 struct commit *commit = p->item;
131 unsigned flags = commit->object.flags;
132 enum object_type type;
134 char *buf = read_sha1_file(commit->object.sha1, &type, &size);
135 const char *subject_start;
138 fprintf(stderr, "%c%c%c ",
139 (flags & TREESAME) ? ' ' : 'T',
140 (flags & UNINTERESTING) ? 'U' : ' ',
141 (flags & COUNTED) ? 'C' : ' ');
143 fprintf(stderr, "%3d", weight(p));
145 fprintf(stderr, "---");
146 fprintf(stderr, " %.*s", 8, sha1_to_hex(commit->object.sha1));
147 for (pp = commit->parents; pp; pp = pp->next)
148 fprintf(stderr, " %.*s", 8,
149 sha1_to_hex(pp->item->object.sha1));
151 subject_len = find_commit_subject(buf, &subject_start);
153 fprintf(stderr, " %.*s", subject_len, subject_start);
154 fprintf(stderr, "\n");
157 #endif /* DEBUG_BISECT */
159 static struct commit_list *best_bisection(struct commit_list *list, int nr)
161 struct commit_list *p, *best;
162 int best_distance = -1;
165 for (p = list; p; p = p->next) {
167 unsigned flags = p->item->object.flags;
169 if (flags & TREESAME)
171 distance = weight(p);
172 if (nr - distance < distance)
173 distance = nr - distance;
174 if (distance > best_distance) {
176 best_distance = distance;
184 struct commit *commit;
188 static int compare_commit_dist(const void *a_, const void *b_)
190 struct commit_dist *a, *b;
192 a = (struct commit_dist *)a_;
193 b = (struct commit_dist *)b_;
194 if (a->distance != b->distance)
195 return b->distance - a->distance; /* desc sort */
196 return oidcmp(&a->commit->object.oid, &b->commit->object.oid);
199 static struct commit_list *best_bisection_sorted(struct commit_list *list, int nr)
201 struct commit_list *p;
202 struct commit_dist *array = xcalloc(nr, sizeof(*array));
203 struct strbuf buf = STRBUF_INIT;
206 for (p = list, cnt = 0; p; p = p->next) {
208 unsigned flags = p->item->object.flags;
210 if (flags & TREESAME)
212 distance = weight(p);
213 if (nr - distance < distance)
214 distance = nr - distance;
215 array[cnt].commit = p->item;
216 array[cnt].distance = distance;
219 QSORT(array, cnt, compare_commit_dist);
220 for (p = list, i = 0; i < cnt; i++) {
221 struct object *obj = &(array[i].commit->object);
224 strbuf_addf(&buf, "dist=%d", array[i].distance);
225 add_name_decoration(DECORATION_NONE, buf.buf, obj);
227 p->item = array[i].commit;
232 strbuf_release(&buf);
238 * zero or positive weight is the number of interesting commits it can
239 * reach, including itself. Especially, weight = 0 means it does not
240 * reach any tree-changing commits (e.g. just above uninteresting one
241 * but traversal is with pathspec).
243 * weight = -1 means it has one parent and its distance is yet to
246 * weight = -2 means it has more than one parent and its distance is
247 * unknown. After running count_distance() first, they will get zero
248 * or positive distance.
250 static struct commit_list *do_find_bisection(struct commit_list *list,
251 int nr, int *weights,
255 struct commit_list *p;
259 for (n = 0, p = list; p; p = p->next) {
260 struct commit *commit = p->item;
261 unsigned flags = commit->object.flags;
263 p->item->util = &weights[n++];
264 switch (count_interesting_parents(commit)) {
266 if (!(flags & TREESAME)) {
269 show_list("bisection 2 count one",
273 * otherwise, it is known not to reach any
274 * tree-changing commit and gets weight 0.
286 show_list("bisection 2 initialize", counted, nr, list);
289 * If you have only one parent in the resulting set
290 * then you can reach one commit more than that parent
291 * can reach. So we do not have to run the expensive
292 * count_distance() for single strand of pearls.
294 * However, if you have more than one parents, you cannot
295 * just add their distance and one for yourself, since
296 * they usually reach the same ancestor and you would
297 * end up counting them twice that way.
299 * So we will first count distance of merges the usual
300 * way, and then fill the blanks using cheaper algorithm.
302 for (p = list; p; p = p->next) {
303 if (p->item->object.flags & UNINTERESTING)
307 weight_set(p, count_distance(p));
308 clear_distance(list);
310 /* Does it happen to be at exactly half-way? */
311 if (!find_all && halfway(p, nr))
316 show_list("bisection 2 count_distance", counted, nr, list);
318 while (counted < nr) {
319 for (p = list; p; p = p->next) {
320 struct commit_list *q;
321 unsigned flags = p->item->object.flags;
325 for (q = p->item->parents; q; q = q->next) {
326 if (q->item->object.flags & UNINTERESTING)
335 * weight for p is unknown but q is known.
336 * add one for p itself if p is to be counted,
337 * otherwise inherit it from q directly.
339 if (!(flags & TREESAME)) {
340 weight_set(p, weight(q)+1);
342 show_list("bisection 2 count one",
346 weight_set(p, weight(q));
348 /* Does it happen to be at exactly half-way? */
349 if (!find_all && halfway(p, nr))
354 show_list("bisection 2 counted all", counted, nr, list);
357 return best_bisection(list, nr);
359 return best_bisection_sorted(list, nr);
362 struct commit_list *find_bisection(struct commit_list *list,
363 int *reaches, int *all,
367 struct commit_list *p, *best, *next, *last;
370 show_list("bisection 2 entry", 0, 0, list);
373 * Count the number of total and tree-changing items on the
374 * list, while reversing the list.
376 for (nr = on_list = 0, last = NULL, p = list;
379 unsigned flags = p->item->object.flags;
382 if (flags & UNINTERESTING)
386 if (!(flags & TREESAME))
391 show_list("bisection 2 sorted", 0, nr, list);
394 weights = xcalloc(on_list, sizeof(*weights));
396 /* Do the real work of finding bisection commit. */
397 best = do_find_bisection(list, nr, weights, find_all);
401 *reaches = weight(best);
407 static int register_ref(const char *refname, const struct object_id *oid,
408 int flags, void *cb_data)
410 struct strbuf good_prefix = STRBUF_INIT;
411 strbuf_addstr(&good_prefix, term_good);
412 strbuf_addstr(&good_prefix, "-");
414 if (!strcmp(refname, term_bad)) {
415 current_bad_oid = xmalloc(sizeof(*current_bad_oid));
416 oidcpy(current_bad_oid, oid);
417 } else if (starts_with(refname, good_prefix.buf)) {
418 oid_array_append(&good_revs, oid);
419 } else if (starts_with(refname, "skip-")) {
420 oid_array_append(&skipped_revs, oid);
423 strbuf_release(&good_prefix);
428 static int read_bisect_refs(void)
430 return for_each_ref_in("refs/bisect/", register_ref, NULL);
433 static GIT_PATH_FUNC(git_path_bisect_names, "BISECT_NAMES")
434 static GIT_PATH_FUNC(git_path_bisect_expected_rev, "BISECT_EXPECTED_REV")
435 static GIT_PATH_FUNC(git_path_bisect_terms, "BISECT_TERMS")
437 static void read_bisect_paths(struct argv_array *array)
439 struct strbuf str = STRBUF_INIT;
440 const char *filename = git_path_bisect_names();
441 FILE *fp = xfopen(filename, "r");
443 while (strbuf_getline_lf(&str, fp) != EOF) {
445 if (sq_dequote_to_argv_array(str.buf, array))
446 die(_("Badly quoted content in file '%s': %s"),
450 strbuf_release(&str);
454 static char *join_sha1_array_hex(struct oid_array *array, char delim)
456 struct strbuf joined_hexs = STRBUF_INIT;
459 for (i = 0; i < array->nr; i++) {
460 strbuf_addstr(&joined_hexs, oid_to_hex(array->oid + i));
461 if (i + 1 < array->nr)
462 strbuf_addch(&joined_hexs, delim);
465 return strbuf_detach(&joined_hexs, NULL);
469 * In this function, passing a not NULL skipped_first is very special.
470 * It means that we want to know if the first commit in the list is
471 * skipped because we will want to test a commit away from it if it is
473 * So if the first commit is skipped, we cannot take the shortcut to
474 * just "return list" when we find the first non skipped commit, we
475 * have to return a fully filtered list.
477 * We use (*skipped_first == -1) to mean "it has been found that the
478 * first commit is not skipped". In this case *skipped_first is set back
479 * to 0 just before the function returns.
481 struct commit_list *filter_skipped(struct commit_list *list,
482 struct commit_list **tried,
487 struct commit_list *filtered = NULL, **f = &filtered;
496 if (!skipped_revs.nr)
500 struct commit_list *next = list->next;
502 if (0 <= oid_array_lookup(&skipped_revs, &list->item->object.oid)) {
503 if (skipped_first && !*skipped_first)
505 /* Move current to tried list */
510 if (!skipped_first || !*skipped_first)
512 } else if (skipped_first && !*skipped_first) {
513 /* This means we know it's not skipped */
516 /* Move current to filtered list */
525 if (skipped_first && *skipped_first == -1)
531 #define PRN_MODULO 32768
534 * This is a pseudo random number generator based on "man 3 rand".
535 * It is not used properly because the seed is the argument and it
536 * is increased by one between each call, but that should not matter
537 * for this application.
539 static unsigned get_prn(unsigned count) {
540 count = count * 1103515245 + 12345;
541 return (count/65536) % PRN_MODULO;
545 * Custom integer square root from
546 * https://en.wikipedia.org/wiki/Integer_square_root
548 static int sqrti(int val)
556 float y = (x + (float)val / x) / 2;
557 d = (y > x) ? y - x : x - y;
564 static struct commit_list *skip_away(struct commit_list *list, int count)
566 struct commit_list *cur, *previous;
569 prn = get_prn(count);
570 index = (count * prn / PRN_MODULO) * sqrti(prn) / sqrti(PRN_MODULO);
575 for (i = 0; cur; cur = cur->next, i++) {
577 if (oidcmp(&cur->item->object.oid, current_bad_oid))
589 static struct commit_list *managed_skipped(struct commit_list *list,
590 struct commit_list **tried)
592 int count, skipped_first;
596 if (!skipped_revs.nr)
599 list = filter_skipped(list, tried, 0, &count, &skipped_first);
604 return skip_away(list, count);
607 static void bisect_rev_setup(struct rev_info *revs, const char *prefix,
608 const char *bad_format, const char *good_format,
611 struct argv_array rev_argv = ARGV_ARRAY_INIT;
614 init_revisions(revs, prefix);
616 revs->commit_format = CMIT_FMT_UNSPECIFIED;
618 /* rev_argv.argv[0] will be ignored by setup_revisions */
619 argv_array_push(&rev_argv, "bisect_rev_setup");
620 argv_array_pushf(&rev_argv, bad_format, oid_to_hex(current_bad_oid));
621 for (i = 0; i < good_revs.nr; i++)
622 argv_array_pushf(&rev_argv, good_format,
623 oid_to_hex(good_revs.oid + i));
624 argv_array_push(&rev_argv, "--");
626 read_bisect_paths(&rev_argv);
628 setup_revisions(rev_argv.argc, rev_argv.argv, revs, NULL);
629 /* XXX leak rev_argv, as "revs" may still be pointing to it */
632 static void bisect_common(struct rev_info *revs)
634 if (prepare_revision_walk(revs))
635 die("revision walk setup failed");
636 if (revs->tree_objects)
637 mark_edges_uninteresting(revs, NULL);
640 static void exit_if_skipped_commits(struct commit_list *tried,
641 const struct object_id *bad)
646 printf("There are only 'skip'ped commits left to test.\n"
647 "The first %s commit could be any of:\n", term_bad);
649 for ( ; tried; tried = tried->next)
650 printf("%s\n", oid_to_hex(&tried->item->object.oid));
653 printf("%s\n", oid_to_hex(bad));
654 printf(_("We cannot bisect more!\n"));
658 static int is_expected_rev(const struct object_id *oid)
660 const char *filename = git_path_bisect_expected_rev();
662 struct strbuf str = STRBUF_INIT;
666 if (stat(filename, &st) || !S_ISREG(st.st_mode))
669 fp = fopen_or_warn(filename, "r");
673 if (strbuf_getline_lf(&str, fp) != EOF)
674 res = !strcmp(str.buf, oid_to_hex(oid));
676 strbuf_release(&str);
682 static int bisect_checkout(const unsigned char *bisect_rev, int no_checkout)
684 char bisect_rev_hex[GIT_MAX_HEXSZ + 1];
686 memcpy(bisect_rev_hex, sha1_to_hex(bisect_rev), GIT_SHA1_HEXSZ + 1);
687 update_ref(NULL, "BISECT_EXPECTED_REV", bisect_rev, NULL, 0, UPDATE_REFS_DIE_ON_ERR);
689 argv_checkout[2] = bisect_rev_hex;
691 update_ref(NULL, "BISECT_HEAD", bisect_rev, NULL, 0, UPDATE_REFS_DIE_ON_ERR);
694 res = run_command_v_opt(argv_checkout, RUN_GIT_CMD);
699 argv_show_branch[1] = bisect_rev_hex;
700 return run_command_v_opt(argv_show_branch, RUN_GIT_CMD);
703 static struct commit *get_commit_reference(const struct object_id *oid)
705 struct commit *r = lookup_commit_reference(oid);
707 die(_("Not a valid commit name %s"), oid_to_hex(oid));
711 static struct commit **get_bad_and_good_commits(int *rev_nr)
716 ALLOC_ARRAY(rev, 1 + good_revs.nr);
717 rev[n++] = get_commit_reference(current_bad_oid);
718 for (i = 0; i < good_revs.nr; i++)
719 rev[n++] = get_commit_reference(good_revs.oid + i);
725 static void handle_bad_merge_base(void)
727 if (is_expected_rev(current_bad_oid)) {
728 char *bad_hex = oid_to_hex(current_bad_oid);
729 char *good_hex = join_sha1_array_hex(&good_revs, ' ');
730 if (!strcmp(term_bad, "bad") && !strcmp(term_good, "good")) {
731 fprintf(stderr, _("The merge base %s is bad.\n"
732 "This means the bug has been fixed "
733 "between %s and [%s].\n"),
734 bad_hex, bad_hex, good_hex);
735 } else if (!strcmp(term_bad, "new") && !strcmp(term_good, "old")) {
736 fprintf(stderr, _("The merge base %s is new.\n"
737 "The property has changed "
738 "between %s and [%s].\n"),
739 bad_hex, bad_hex, good_hex);
741 fprintf(stderr, _("The merge base %s is %s.\n"
742 "This means the first '%s' commit is "
743 "between %s and [%s].\n"),
744 bad_hex, term_bad, term_good, bad_hex, good_hex);
749 fprintf(stderr, _("Some %s revs are not ancestors of the %s rev.\n"
750 "git bisect cannot work properly in this case.\n"
751 "Maybe you mistook %s and %s revs?\n"),
752 term_good, term_bad, term_good, term_bad);
756 static void handle_skipped_merge_base(const struct object_id *mb)
758 char *mb_hex = oid_to_hex(mb);
759 char *bad_hex = oid_to_hex(current_bad_oid);
760 char *good_hex = join_sha1_array_hex(&good_revs, ' ');
762 warning(_("the merge base between %s and [%s] "
764 "So we cannot be sure the first %s commit is "
765 "between %s and %s.\n"
766 "We continue anyway."),
767 bad_hex, good_hex, term_bad, mb_hex, bad_hex);
772 * "check_merge_bases" checks that merge bases are not "bad" (or "new").
774 * - If one is "bad" (or "new"), it means the user assumed something wrong
775 * and we must exit with a non 0 error code.
776 * - If one is "good" (or "old"), that's good, we have nothing to do.
777 * - If one is "skipped", we can't know but we should warn.
778 * - If we don't know, we should check it out and ask the user to test.
780 static void check_merge_bases(int no_checkout)
782 struct commit_list *result;
784 struct commit **rev = get_bad_and_good_commits(&rev_nr);
786 result = get_merge_bases_many(rev[0], rev_nr - 1, rev + 1);
788 for (; result; result = result->next) {
789 const struct object_id *mb = &result->item->object.oid;
790 if (!oidcmp(mb, current_bad_oid)) {
791 handle_bad_merge_base();
792 } else if (0 <= oid_array_lookup(&good_revs, mb)) {
794 } else if (0 <= oid_array_lookup(&skipped_revs, mb)) {
795 handle_skipped_merge_base(mb);
797 printf(_("Bisecting: a merge base must be tested\n"));
798 exit(bisect_checkout(mb->hash, no_checkout));
803 free_commit_list(result);
806 static int check_ancestors(const char *prefix)
808 struct rev_info revs;
809 struct object_array pending_copy;
812 bisect_rev_setup(&revs, prefix, "^%s", "%s", 0);
814 /* Save pending objects, so they can be cleaned up later. */
815 pending_copy = revs.pending;
816 revs.leak_pending = 1;
819 * bisect_common calls prepare_revision_walk right away, which
820 * (together with .leak_pending = 1) makes us the sole owner of
821 * the list of pending objects.
823 bisect_common(&revs);
824 res = (revs.commits != NULL);
826 /* Clean up objects used, as they will be reused. */
827 clear_commit_marks_for_object_array(&pending_copy, ALL_REV_FLAGS);
828 free(pending_copy.objects);
834 * "check_good_are_ancestors_of_bad" checks that all "good" revs are
835 * ancestor of the "bad" rev.
837 * If that's not the case, we need to check the merge bases.
838 * If a merge base must be tested by the user, its source code will be
839 * checked out to be tested by the user and we will exit.
841 static void check_good_are_ancestors_of_bad(const char *prefix, int no_checkout)
843 char *filename = git_pathdup("BISECT_ANCESTORS_OK");
847 if (!current_bad_oid)
848 die(_("a %s revision is needed"), term_bad);
850 /* Check if file BISECT_ANCESTORS_OK exists. */
851 if (!stat(filename, &st) && S_ISREG(st.st_mode))
854 /* Bisecting with no good rev is ok. */
855 if (good_revs.nr == 0)
858 /* Check if all good revs are ancestor of the bad rev. */
859 if (check_ancestors(prefix))
860 check_merge_bases(no_checkout);
862 /* Create file BISECT_ANCESTORS_OK. */
863 fd = open(filename, O_CREAT | O_TRUNC | O_WRONLY, 0600);
865 warning_errno(_("could not create file '%s'"),
874 * This does "git diff-tree --pretty COMMIT" without one fork+exec.
876 static void show_diff_tree(const char *prefix, struct commit *commit)
881 init_revisions(&opt, prefix);
882 git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
886 /* This is what "--pretty" does */
887 opt.verbose_header = 1;
888 opt.use_terminator = 0;
889 opt.commit_format = CMIT_FMT_DEFAULT;
892 if (!opt.diffopt.output_format)
893 opt.diffopt.output_format = DIFF_FORMAT_RAW;
895 setup_revisions(0, NULL, &opt, NULL);
896 log_tree_commit(&opt, commit);
900 * The terms used for this bisect session are stored in BISECT_TERMS.
901 * We read them and store them to adapt the messages accordingly.
902 * Default is bad/good.
904 void read_bisect_terms(const char **read_bad, const char **read_good)
906 struct strbuf str = STRBUF_INIT;
907 const char *filename = git_path_bisect_terms();
908 FILE *fp = fopen(filename, "r");
911 if (errno == ENOENT) {
916 die_errno(_("could not read file '%s'"), filename);
919 strbuf_getline_lf(&str, fp);
920 *read_bad = strbuf_detach(&str, NULL);
921 strbuf_getline_lf(&str, fp);
922 *read_good = strbuf_detach(&str, NULL);
924 strbuf_release(&str);
929 * We use the convention that exiting with an exit code 10 means that
930 * the bisection process finished successfully.
931 * In this case the calling shell script should exit 0.
933 * If no_checkout is non-zero, the bisection process does not
934 * checkout the trial commit but instead simply updates BISECT_HEAD.
936 int bisect_next_all(const char *prefix, int no_checkout)
938 struct rev_info revs;
939 struct commit_list *tried;
940 int reaches = 0, all = 0, nr, steps;
941 const unsigned char *bisect_rev;
944 read_bisect_terms(&term_bad, &term_good);
945 if (read_bisect_refs())
946 die(_("reading bisect refs failed"));
948 check_good_are_ancestors_of_bad(prefix, no_checkout);
950 bisect_rev_setup(&revs, prefix, "%s", "^%s", 1);
953 bisect_common(&revs);
955 revs.commits = find_bisection(revs.commits, &reaches, &all,
957 revs.commits = managed_skipped(revs.commits, &tried);
961 * We should exit here only if the "bad"
962 * commit is also a "skip" commit.
964 exit_if_skipped_commits(tried, NULL);
966 printf(_("%s was both %s and %s\n"),
967 oid_to_hex(current_bad_oid),
974 fprintf(stderr, _("No testable commit found.\n"
975 "Maybe you started with bad path parameters?\n"));
979 bisect_rev = revs.commits->item->object.oid.hash;
981 if (!hashcmp(bisect_rev, current_bad_oid->hash)) {
982 exit_if_skipped_commits(tried, current_bad_oid);
983 printf("%s is the first %s commit\n", sha1_to_hex(bisect_rev),
985 show_diff_tree(prefix, revs.commits->item);
986 /* This means the bisection process succeeded. */
990 nr = all - reaches - 1;
991 steps = estimate_bisect_steps(all);
993 steps_msg = xstrfmt(Q_("(roughly %d step)", "(roughly %d steps)",
996 * TRANSLATORS: the last %s will be replaced with "(roughly %d
997 * steps)" translation.
999 printf(Q_("Bisecting: %d revision left to test after this %s\n",
1000 "Bisecting: %d revisions left to test after this %s\n",
1001 nr), nr, steps_msg);
1004 return bisect_checkout(bisect_rev, no_checkout);
1007 static inline int log2i(int n)
1011 for (; n > 1; n >>= 1)
1017 static inline int exp2i(int n)
1023 * Estimate the number of bisect steps left (after the current step)
1025 * For any x between 0 included and 2^n excluded, the probability for
1026 * n - 1 steps left looks like:
1028 * P(2^n + x) == (2^n - x) / (2^n + x)
1030 * and P(2^n + x) < 0.5 means 2^n < 3x
1032 int estimate_bisect_steps(int all)
1043 return (e < 3 * x) ? n : n - 1;