]> git.ipfire.org Git - thirdparty/git.git/blob - bisect.c
environment.h: move declarations for environment.c functions from cache.h
[thirdparty/git.git] / bisect.c
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"
22
23 static struct oid_array good_revs;
24 static struct oid_array skipped_revs;
25
26 static struct object_id *current_bad_oid;
27
28 static const char *term_bad;
29 static const char *term_good;
30
31 /* Remember to update object flag allocation in object.h */
32 #define COUNTED (1u<<16)
33
34 /*
35 * This is a truly stupid algorithm, but it's only
36 * used for bisection, and we just don't care enough.
37 *
38 * We care just barely enough to avoid recursing for
39 * non-merge entries.
40 */
41 static int count_distance(struct commit_list *entry)
42 {
43 int nr = 0;
44
45 while (entry) {
46 struct commit *commit = entry->item;
47 struct commit_list *p;
48
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;
61 }
62 }
63 }
64
65 return nr;
66 }
67
68 static void clear_distance(struct commit_list *list)
69 {
70 while (list) {
71 struct commit *commit = list->item;
72 commit->object.flags &= ~COUNTED;
73 list = list->next;
74 }
75 }
76
77 define_commit_slab(commit_weight, int *);
78 static struct commit_weight commit_weight;
79
80 #define DEBUG_BISECT 0
81
82 static inline int weight(struct commit_list *elem)
83 {
84 return **commit_weight_at(&commit_weight, elem->item);
85 }
86
87 static inline void weight_set(struct commit_list *elem, int weight)
88 {
89 **commit_weight_at(&commit_weight, elem->item) = weight;
90 }
91
92 static int count_interesting_parents(struct commit *commit, unsigned bisect_flags)
93 {
94 struct commit_list *p;
95 int count;
96
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;
102 }
103 return count;
104 }
105
106 static inline int approx_halfway(struct commit_list *p, int nr)
107 {
108 int diff;
109
110 /*
111 * Don't short-cut something we are not going to return!
112 */
113 if (p->item->object.flags & TREESAME)
114 return 0;
115 if (DEBUG_BISECT)
116 return 0;
117 /*
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.
120 */
121 diff = 2 * weight(p) - nr;
122 switch (diff) {
123 case -1: case 0: case 1:
124 return 1;
125 default:
126 /*
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.
131 */
132 if (abs(diff) < nr / 1024)
133 return 1;
134 return 0;
135 }
136 }
137
138 static void show_list(const char *debug, int counted, int nr,
139 struct commit_list *list)
140 {
141 struct commit_list *p;
142
143 if (!DEBUG_BISECT)
144 return;
145
146 fprintf(stderr, "%s (%d/%d)\n", debug, counted, nr);
147
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 = read_object_file(&commit->object.oid, &type,
155 &size);
156 const char *subject_start;
157 int subject_len;
158
159 fprintf(stderr, "%c%c%c ",
160 (commit_flags & TREESAME) ? ' ' : 'T',
161 (commit_flags & UNINTERESTING) ? 'U' : ' ',
162 (commit_flags & COUNTED) ? 'C' : ' ');
163 if (*commit_weight_at(&commit_weight, p->item))
164 fprintf(stderr, "%3d", weight(p));
165 else
166 fprintf(stderr, "---");
167 fprintf(stderr, " %.*s", 8, oid_to_hex(&commit->object.oid));
168 for (pp = commit->parents; pp; pp = pp->next)
169 fprintf(stderr, " %.*s", 8,
170 oid_to_hex(&pp->item->object.oid));
171
172 subject_len = find_commit_subject(buf, &subject_start);
173 if (subject_len)
174 fprintf(stderr, " %.*s", subject_len, subject_start);
175 fprintf(stderr, "\n");
176 }
177 }
178
179 static struct commit_list *best_bisection(struct commit_list *list, int nr)
180 {
181 struct commit_list *p, *best;
182 int best_distance = -1;
183
184 best = list;
185 for (p = list; p; p = p->next) {
186 int distance;
187 unsigned commit_flags = p->item->object.flags;
188
189 if (commit_flags & TREESAME)
190 continue;
191 distance = weight(p);
192 if (nr - distance < distance)
193 distance = nr - distance;
194 if (distance > best_distance) {
195 best = p;
196 best_distance = distance;
197 }
198 }
199
200 return best;
201 }
202
203 struct commit_dist {
204 struct commit *commit;
205 int distance;
206 };
207
208 static int compare_commit_dist(const void *a_, const void *b_)
209 {
210 struct commit_dist *a, *b;
211
212 a = (struct commit_dist *)a_;
213 b = (struct commit_dist *)b_;
214 if (a->distance != b->distance)
215 return b->distance - a->distance; /* desc sort */
216 return oidcmp(&a->commit->object.oid, &b->commit->object.oid);
217 }
218
219 static struct commit_list *best_bisection_sorted(struct commit_list *list, int nr)
220 {
221 struct commit_list *p;
222 struct commit_dist *array = xcalloc(nr, sizeof(*array));
223 struct strbuf buf = STRBUF_INIT;
224 int cnt, i;
225
226 for (p = list, cnt = 0; p; p = p->next) {
227 int distance;
228 unsigned commit_flags = p->item->object.flags;
229
230 if (commit_flags & TREESAME)
231 continue;
232 distance = weight(p);
233 if (nr - distance < distance)
234 distance = nr - distance;
235 array[cnt].commit = p->item;
236 array[cnt].distance = distance;
237 cnt++;
238 }
239 QSORT(array, cnt, compare_commit_dist);
240 for (p = list, i = 0; i < cnt; i++) {
241 struct object *obj = &(array[i].commit->object);
242
243 strbuf_reset(&buf);
244 strbuf_addf(&buf, "dist=%d", array[i].distance);
245 add_name_decoration(DECORATION_NONE, buf.buf, obj);
246
247 p->item = array[i].commit;
248 if (i < cnt - 1)
249 p = p->next;
250 }
251 if (p) {
252 free_commit_list(p->next);
253 p->next = NULL;
254 }
255 strbuf_release(&buf);
256 free(array);
257 return list;
258 }
259
260 /*
261 * zero or positive weight is the number of interesting commits it can
262 * reach, including itself. Especially, weight = 0 means it does not
263 * reach any tree-changing commits (e.g. just above uninteresting one
264 * but traversal is with pathspec).
265 *
266 * weight = -1 means it has one parent and its distance is yet to
267 * be computed.
268 *
269 * weight = -2 means it has more than one parent and its distance is
270 * unknown. After running count_distance() first, they will get zero
271 * or positive distance.
272 */
273 static struct commit_list *do_find_bisection(struct commit_list *list,
274 int nr, int *weights,
275 unsigned bisect_flags)
276 {
277 int n, counted;
278 struct commit_list *p;
279
280 counted = 0;
281
282 for (n = 0, p = list; p; p = p->next) {
283 struct commit *commit = p->item;
284 unsigned commit_flags = commit->object.flags;
285
286 *commit_weight_at(&commit_weight, p->item) = &weights[n++];
287 switch (count_interesting_parents(commit, bisect_flags)) {
288 case 0:
289 if (!(commit_flags & TREESAME)) {
290 weight_set(p, 1);
291 counted++;
292 show_list("bisection 2 count one",
293 counted, nr, list);
294 }
295 /*
296 * otherwise, it is known not to reach any
297 * tree-changing commit and gets weight 0.
298 */
299 break;
300 case 1:
301 weight_set(p, -1);
302 break;
303 default:
304 weight_set(p, -2);
305 break;
306 }
307 }
308
309 show_list("bisection 2 initialize", counted, nr, list);
310
311 /*
312 * If you have only one parent in the resulting set
313 * then you can reach one commit more than that parent
314 * can reach. So we do not have to run the expensive
315 * count_distance() for single strand of pearls.
316 *
317 * However, if you have more than one parents, you cannot
318 * just add their distance and one for yourself, since
319 * they usually reach the same ancestor and you would
320 * end up counting them twice that way.
321 *
322 * So we will first count distance of merges the usual
323 * way, and then fill the blanks using cheaper algorithm.
324 */
325 for (p = list; p; p = p->next) {
326 if (p->item->object.flags & UNINTERESTING)
327 continue;
328 if (weight(p) != -2)
329 continue;
330 if (bisect_flags & FIND_BISECTION_FIRST_PARENT_ONLY)
331 BUG("shouldn't be calling count-distance in fp mode");
332 weight_set(p, count_distance(p));
333 clear_distance(list);
334
335 /* Does it happen to be at half-way? */
336 if (!(bisect_flags & FIND_BISECTION_ALL) &&
337 approx_halfway(p, nr))
338 return p;
339 counted++;
340 }
341
342 show_list("bisection 2 count_distance", counted, nr, list);
343
344 while (counted < nr) {
345 for (p = list; p; p = p->next) {
346 struct commit_list *q;
347 unsigned commit_flags = p->item->object.flags;
348
349 if (0 <= weight(p))
350 continue;
351
352 for (q = p->item->parents;
353 q;
354 q = bisect_flags & FIND_BISECTION_FIRST_PARENT_ONLY ? NULL : q->next) {
355 if (q->item->object.flags & UNINTERESTING)
356 continue;
357 if (0 <= weight(q))
358 break;
359 }
360 if (!q)
361 continue;
362
363 /*
364 * weight for p is unknown but q is known.
365 * add one for p itself if p is to be counted,
366 * otherwise inherit it from q directly.
367 */
368 if (!(commit_flags & TREESAME)) {
369 weight_set(p, weight(q)+1);
370 counted++;
371 show_list("bisection 2 count one",
372 counted, nr, list);
373 }
374 else
375 weight_set(p, weight(q));
376
377 /* Does it happen to be at half-way? */
378 if (!(bisect_flags & FIND_BISECTION_ALL) &&
379 approx_halfway(p, nr))
380 return p;
381 }
382 }
383
384 show_list("bisection 2 counted all", counted, nr, list);
385
386 if (!(bisect_flags & FIND_BISECTION_ALL))
387 return best_bisection(list, nr);
388 else
389 return best_bisection_sorted(list, nr);
390 }
391
392 void find_bisection(struct commit_list **commit_list, int *reaches,
393 int *all, unsigned bisect_flags)
394 {
395 int nr, on_list;
396 struct commit_list *list, *p, *best, *next, *last;
397 int *weights;
398
399 show_list("bisection 2 entry", 0, 0, *commit_list);
400 init_commit_weight(&commit_weight);
401
402 /*
403 * Count the number of total and tree-changing items on the
404 * list, while reversing the list.
405 */
406 for (nr = on_list = 0, last = NULL, p = *commit_list;
407 p;
408 p = next) {
409 unsigned commit_flags = p->item->object.flags;
410
411 next = p->next;
412 if (commit_flags & UNINTERESTING) {
413 free(p);
414 continue;
415 }
416 p->next = last;
417 last = p;
418 if (!(commit_flags & TREESAME))
419 nr++;
420 on_list++;
421 }
422 list = last;
423 show_list("bisection 2 sorted", 0, nr, list);
424
425 *all = nr;
426 CALLOC_ARRAY(weights, on_list);
427
428 /* Do the real work of finding bisection commit. */
429 best = do_find_bisection(list, nr, weights, bisect_flags);
430 if (best) {
431 if (!(bisect_flags & FIND_BISECTION_ALL)) {
432 list->item = best->item;
433 free_commit_list(list->next);
434 best = list;
435 best->next = NULL;
436 }
437 *reaches = weight(best);
438 }
439 free(weights);
440 *commit_list = best;
441 clear_commit_weight(&commit_weight);
442 }
443
444 static int register_ref(const char *refname, const struct object_id *oid,
445 int flags UNUSED, void *cb_data UNUSED)
446 {
447 struct strbuf good_prefix = STRBUF_INIT;
448 strbuf_addstr(&good_prefix, term_good);
449 strbuf_addstr(&good_prefix, "-");
450
451 if (!strcmp(refname, term_bad)) {
452 current_bad_oid = xmalloc(sizeof(*current_bad_oid));
453 oidcpy(current_bad_oid, oid);
454 } else if (starts_with(refname, good_prefix.buf)) {
455 oid_array_append(&good_revs, oid);
456 } else if (starts_with(refname, "skip-")) {
457 oid_array_append(&skipped_revs, oid);
458 }
459
460 strbuf_release(&good_prefix);
461
462 return 0;
463 }
464
465 static int read_bisect_refs(void)
466 {
467 return for_each_ref_in("refs/bisect/", register_ref, NULL);
468 }
469
470 static GIT_PATH_FUNC(git_path_bisect_names, "BISECT_NAMES")
471 static GIT_PATH_FUNC(git_path_bisect_expected_rev, "BISECT_EXPECTED_REV")
472 static GIT_PATH_FUNC(git_path_bisect_ancestors_ok, "BISECT_ANCESTORS_OK")
473 static GIT_PATH_FUNC(git_path_bisect_run, "BISECT_RUN")
474 static GIT_PATH_FUNC(git_path_bisect_start, "BISECT_START")
475 static GIT_PATH_FUNC(git_path_bisect_log, "BISECT_LOG")
476 static GIT_PATH_FUNC(git_path_bisect_terms, "BISECT_TERMS")
477 static GIT_PATH_FUNC(git_path_bisect_first_parent, "BISECT_FIRST_PARENT")
478
479 static void read_bisect_paths(struct strvec *array)
480 {
481 struct strbuf str = STRBUF_INIT;
482 const char *filename = git_path_bisect_names();
483 FILE *fp = xfopen(filename, "r");
484
485 while (strbuf_getline_lf(&str, fp) != EOF) {
486 strbuf_trim(&str);
487 if (sq_dequote_to_strvec(str.buf, array))
488 die(_("Badly quoted content in file '%s': %s"),
489 filename, str.buf);
490 }
491
492 strbuf_release(&str);
493 fclose(fp);
494 }
495
496 static char *join_oid_array_hex(struct oid_array *array, char delim)
497 {
498 struct strbuf joined_hexs = STRBUF_INIT;
499 int i;
500
501 for (i = 0; i < array->nr; i++) {
502 strbuf_addstr(&joined_hexs, oid_to_hex(array->oid + i));
503 if (i + 1 < array->nr)
504 strbuf_addch(&joined_hexs, delim);
505 }
506
507 return strbuf_detach(&joined_hexs, NULL);
508 }
509
510 /*
511 * In this function, passing a not NULL skipped_first is very special.
512 * It means that we want to know if the first commit in the list is
513 * skipped because we will want to test a commit away from it if it is
514 * indeed skipped.
515 * So if the first commit is skipped, we cannot take the shortcut to
516 * just "return list" when we find the first non skipped commit, we
517 * have to return a fully filtered list.
518 *
519 * We use (*skipped_first == -1) to mean "it has been found that the
520 * first commit is not skipped". In this case *skipped_first is set back
521 * to 0 just before the function returns.
522 */
523 struct commit_list *filter_skipped(struct commit_list *list,
524 struct commit_list **tried,
525 int show_all,
526 int *count,
527 int *skipped_first)
528 {
529 struct commit_list *filtered = NULL, **f = &filtered;
530
531 *tried = NULL;
532
533 if (skipped_first)
534 *skipped_first = 0;
535 if (count)
536 *count = 0;
537
538 if (!skipped_revs.nr)
539 return list;
540
541 while (list) {
542 struct commit_list *next = list->next;
543 list->next = NULL;
544 if (0 <= oid_array_lookup(&skipped_revs, &list->item->object.oid)) {
545 if (skipped_first && !*skipped_first)
546 *skipped_first = 1;
547 /* Move current to tried list */
548 *tried = list;
549 tried = &list->next;
550 } else {
551 if (!show_all) {
552 if (!skipped_first || !*skipped_first)
553 return list;
554 } else if (skipped_first && !*skipped_first) {
555 /* This means we know it's not skipped */
556 *skipped_first = -1;
557 }
558 /* Move current to filtered list */
559 *f = list;
560 f = &list->next;
561 if (count)
562 (*count)++;
563 }
564 list = next;
565 }
566
567 if (skipped_first && *skipped_first == -1)
568 *skipped_first = 0;
569
570 return filtered;
571 }
572
573 #define PRN_MODULO 32768
574
575 /*
576 * This is a pseudo random number generator based on "man 3 rand".
577 * It is not used properly because the seed is the argument and it
578 * is increased by one between each call, but that should not matter
579 * for this application.
580 */
581 static unsigned get_prn(unsigned count)
582 {
583 count = count * 1103515245 + 12345;
584 return (count/65536) % PRN_MODULO;
585 }
586
587 /*
588 * Custom integer square root from
589 * https://en.wikipedia.org/wiki/Integer_square_root
590 */
591 static int sqrti(int val)
592 {
593 float d, x = val;
594
595 if (!val)
596 return 0;
597
598 do {
599 float y = (x + (float)val / x) / 2;
600 d = (y > x) ? y - x : x - y;
601 x = y;
602 } while (d >= 0.5);
603
604 return (int)x;
605 }
606
607 static struct commit_list *skip_away(struct commit_list *list, int count)
608 {
609 struct commit_list *cur, *previous;
610 int prn, index, i;
611
612 prn = get_prn(count);
613 index = (count * prn / PRN_MODULO) * sqrti(prn) / sqrti(PRN_MODULO);
614
615 cur = list;
616 previous = NULL;
617
618 for (i = 0; cur; cur = cur->next, i++) {
619 if (i == index) {
620 if (!oideq(&cur->item->object.oid, current_bad_oid))
621 return cur;
622 if (previous)
623 return previous;
624 return list;
625 }
626 previous = cur;
627 }
628
629 return list;
630 }
631
632 static struct commit_list *managed_skipped(struct commit_list *list,
633 struct commit_list **tried)
634 {
635 int count, skipped_first;
636
637 *tried = NULL;
638
639 if (!skipped_revs.nr)
640 return list;
641
642 list = filter_skipped(list, tried, 0, &count, &skipped_first);
643
644 if (!skipped_first)
645 return list;
646
647 return skip_away(list, count);
648 }
649
650 static void bisect_rev_setup(struct repository *r, struct rev_info *revs,
651 struct strvec *rev_argv,
652 const char *prefix,
653 const char *bad_format, const char *good_format,
654 int read_paths)
655 {
656 struct setup_revision_opt opt = {
657 .free_removed_argv_elements = 1,
658 };
659 int i;
660
661 repo_init_revisions(r, revs, prefix);
662 revs->abbrev = 0;
663 revs->commit_format = CMIT_FMT_UNSPECIFIED;
664
665 /* rev_argv.argv[0] will be ignored by setup_revisions */
666 strvec_push(rev_argv, "bisect_rev_setup");
667 strvec_pushf(rev_argv, bad_format, oid_to_hex(current_bad_oid));
668 for (i = 0; i < good_revs.nr; i++)
669 strvec_pushf(rev_argv, good_format,
670 oid_to_hex(good_revs.oid + i));
671 strvec_push(rev_argv, "--");
672 if (read_paths)
673 read_bisect_paths(rev_argv);
674
675 setup_revisions(rev_argv->nr, rev_argv->v, revs, &opt);
676 }
677
678 static void bisect_common(struct rev_info *revs)
679 {
680 if (prepare_revision_walk(revs))
681 die("revision walk setup failed");
682 if (revs->tree_objects)
683 mark_edges_uninteresting(revs, NULL, 0);
684 }
685
686 static enum bisect_error error_if_skipped_commits(struct commit_list *tried,
687 const struct object_id *bad)
688 {
689 if (!tried)
690 return BISECT_OK;
691
692 printf("There are only 'skip'ped commits left to test.\n"
693 "The first %s commit could be any of:\n", term_bad);
694
695 for ( ; tried; tried = tried->next)
696 printf("%s\n", oid_to_hex(&tried->item->object.oid));
697
698 if (bad)
699 printf("%s\n", oid_to_hex(bad));
700 printf(_("We cannot bisect more!\n"));
701
702 return BISECT_ONLY_SKIPPED_LEFT;
703 }
704
705 static int is_expected_rev(const struct object_id *oid)
706 {
707 const char *filename = git_path_bisect_expected_rev();
708 struct stat st;
709 struct strbuf str = STRBUF_INIT;
710 FILE *fp;
711 int res = 0;
712
713 if (stat(filename, &st) || !S_ISREG(st.st_mode))
714 return 0;
715
716 fp = fopen_or_warn(filename, "r");
717 if (!fp)
718 return 0;
719
720 if (strbuf_getline_lf(&str, fp) != EOF)
721 res = !strcmp(str.buf, oid_to_hex(oid));
722
723 strbuf_release(&str);
724 fclose(fp);
725
726 return res;
727 }
728
729 enum bisect_error bisect_checkout(const struct object_id *bisect_rev,
730 int no_checkout)
731 {
732 struct commit *commit;
733 struct pretty_print_context pp = {0};
734 struct strbuf commit_msg = STRBUF_INIT;
735
736 update_ref(NULL, "BISECT_EXPECTED_REV", bisect_rev, NULL, 0, UPDATE_REFS_DIE_ON_ERR);
737
738 if (no_checkout) {
739 update_ref(NULL, "BISECT_HEAD", bisect_rev, NULL, 0,
740 UPDATE_REFS_DIE_ON_ERR);
741 } else {
742 struct child_process cmd = CHILD_PROCESS_INIT;
743
744 cmd.git_cmd = 1;
745 strvec_pushl(&cmd.args, "checkout", "-q",
746 oid_to_hex(bisect_rev), "--", NULL);
747 if (run_command(&cmd))
748 /*
749 * Errors in `run_command()` itself, signaled by res < 0,
750 * and errors in the child process, signaled by res > 0
751 * can both be treated as regular BISECT_FAILED (-1).
752 */
753 return BISECT_FAILED;
754 }
755
756 commit = lookup_commit_reference(the_repository, bisect_rev);
757 format_commit_message(commit, "[%H] %s%n", &commit_msg, &pp);
758 fputs(commit_msg.buf, stdout);
759 strbuf_release(&commit_msg);
760
761 return BISECT_OK;
762 }
763
764 static struct commit *get_commit_reference(struct repository *r,
765 const struct object_id *oid)
766 {
767 struct commit *c = lookup_commit_reference(r, oid);
768 if (!c)
769 die(_("Not a valid commit name %s"), oid_to_hex(oid));
770 return c;
771 }
772
773 static struct commit **get_bad_and_good_commits(struct repository *r,
774 int *rev_nr)
775 {
776 struct commit **rev;
777 int i, n = 0;
778
779 ALLOC_ARRAY(rev, 1 + good_revs.nr);
780 rev[n++] = get_commit_reference(r, current_bad_oid);
781 for (i = 0; i < good_revs.nr; i++)
782 rev[n++] = get_commit_reference(r, good_revs.oid + i);
783 *rev_nr = n;
784
785 return rev;
786 }
787
788 static enum bisect_error handle_bad_merge_base(void)
789 {
790 if (is_expected_rev(current_bad_oid)) {
791 char *bad_hex = oid_to_hex(current_bad_oid);
792 char *good_hex = join_oid_array_hex(&good_revs, ' ');
793 if (!strcmp(term_bad, "bad") && !strcmp(term_good, "good")) {
794 fprintf(stderr, _("The merge base %s is bad.\n"
795 "This means the bug has been fixed "
796 "between %s and [%s].\n"),
797 bad_hex, bad_hex, good_hex);
798 } else if (!strcmp(term_bad, "new") && !strcmp(term_good, "old")) {
799 fprintf(stderr, _("The merge base %s is new.\n"
800 "The property has changed "
801 "between %s and [%s].\n"),
802 bad_hex, bad_hex, good_hex);
803 } else {
804 fprintf(stderr, _("The merge base %s is %s.\n"
805 "This means the first '%s' commit is "
806 "between %s and [%s].\n"),
807 bad_hex, term_bad, term_good, bad_hex, good_hex);
808 }
809 return BISECT_MERGE_BASE_CHECK;
810 }
811
812 fprintf(stderr, _("Some %s revs are not ancestors of the %s rev.\n"
813 "git bisect cannot work properly in this case.\n"
814 "Maybe you mistook %s and %s revs?\n"),
815 term_good, term_bad, term_good, term_bad);
816 return BISECT_FAILED;
817 }
818
819 static void handle_skipped_merge_base(const struct object_id *mb)
820 {
821 char *mb_hex = oid_to_hex(mb);
822 char *bad_hex = oid_to_hex(current_bad_oid);
823 char *good_hex = join_oid_array_hex(&good_revs, ' ');
824
825 warning(_("the merge base between %s and [%s] "
826 "must be skipped.\n"
827 "So we cannot be sure the first %s commit is "
828 "between %s and %s.\n"
829 "We continue anyway."),
830 bad_hex, good_hex, term_bad, mb_hex, bad_hex);
831 free(good_hex);
832 }
833
834 /*
835 * "check_merge_bases" checks that merge bases are not "bad" (or "new").
836 *
837 * - If one is "bad" (or "new"), it means the user assumed something wrong
838 * and we must return error with a non 0 error code.
839 * - If one is "good" (or "old"), that's good, we have nothing to do.
840 * - If one is "skipped", we can't know but we should warn.
841 * - If we don't know, we should check it out and ask the user to test.
842 * - If a merge base must be tested, on success return
843 * BISECT_INTERNAL_SUCCESS_MERGE_BASE (-11) a special condition
844 * for early success, this will be converted back to 0 in
845 * check_good_are_ancestors_of_bad().
846 */
847 static enum bisect_error check_merge_bases(int rev_nr, struct commit **rev, int no_checkout)
848 {
849 enum bisect_error res = BISECT_OK;
850 struct commit_list *result;
851
852 result = get_merge_bases_many(rev[0], rev_nr - 1, rev + 1);
853
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;
870 }
871 }
872
873 free_commit_list(result);
874 return res;
875 }
876
877 static int check_ancestors(struct repository *r, int rev_nr,
878 struct commit **rev, const char *prefix)
879 {
880 struct strvec rev_argv = STRVEC_INIT;
881 struct rev_info revs;
882 int res;
883
884 bisect_rev_setup(r, &revs, &rev_argv, prefix, "^%s", "%s", 0);
885
886 bisect_common(&revs);
887 res = (revs.commits != NULL);
888
889 /* Clean up objects used, as they will be reused. */
890 clear_commit_marks_many(rev_nr, rev, ALL_REV_FLAGS);
891
892 release_revisions(&revs);
893 strvec_clear(&rev_argv);
894 return res;
895 }
896
897 /*
898 * "check_good_are_ancestors_of_bad" checks that all "good" revs are
899 * ancestor of the "bad" rev.
900 *
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.
904 */
905
906 static enum bisect_error check_good_are_ancestors_of_bad(struct repository *r,
907 const char *prefix,
908 int no_checkout)
909 {
910 char *filename;
911 struct stat st;
912 int fd, rev_nr;
913 enum bisect_error res = BISECT_OK;
914 struct commit **rev;
915
916 if (!current_bad_oid)
917 return error(_("a %s revision is needed"), term_bad);
918
919 filename = git_pathdup("BISECT_ANCESTORS_OK");
920
921 /* Check if file BISECT_ANCESTORS_OK exists. */
922 if (!stat(filename, &st) && S_ISREG(st.st_mode))
923 goto done;
924
925 /* Bisecting with no good rev is ok. */
926 if (!good_revs.nr)
927 goto done;
928
929 /* Check if all good revs are ancestor of the bad rev. */
930
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);
935
936 if (!res) {
937 /* Create file BISECT_ANCESTORS_OK. */
938 fd = open(filename, O_CREAT | O_TRUNC | O_WRONLY, 0600);
939 if (fd < 0)
940 /*
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.
946 */
947 warning_errno(_("could not create file '%s'"),
948 filename);
949 else
950 close(fd);
951 }
952 done:
953 free(filename);
954 return res;
955 }
956
957 /*
958 * This does "git diff-tree --pretty COMMIT" without one fork+exec.
959 */
960 static void show_diff_tree(struct repository *r,
961 const char *prefix,
962 struct commit *commit)
963 {
964 const char *argv[] = {
965 "diff-tree", "--pretty", "--stat", "--summary", "--cc", NULL
966 };
967 struct rev_info opt;
968
969 git_config(git_diff_ui_config, NULL);
970 repo_init_revisions(r, &opt, prefix);
971
972 setup_revisions(ARRAY_SIZE(argv) - 1, argv, &opt, NULL);
973 log_tree_commit(&opt, commit);
974 release_revisions(&opt);
975 }
976
977 /*
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.
981 */
982 void read_bisect_terms(const char **read_bad, const char **read_good)
983 {
984 struct strbuf str = STRBUF_INIT;
985 const char *filename = git_path_bisect_terms();
986 FILE *fp = fopen(filename, "r");
987
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);
995 }
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);
1001 }
1002 strbuf_release(&str);
1003 fclose(fp);
1004 }
1005
1006 /*
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.
1011 *
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.
1016 */
1017 enum bisect_error bisect_next_all(struct repository *r, const char *prefix)
1018 {
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;
1026 /*
1027 * If no_checkout is non-zero, the bisection process does not
1028 * checkout the trial commit but instead simply updates BISECT_HEAD.
1029 */
1030 int no_checkout = ref_exists("BISECT_HEAD");
1031 unsigned bisect_flags = 0;
1032
1033 read_bisect_terms(&term_bad, &term_good);
1034 if (read_bisect_refs())
1035 die(_("reading bisect refs failed"));
1036
1037 if (file_exists(git_path_bisect_first_parent()))
1038 bisect_flags |= FIND_BISECTION_FIRST_PARENT_ONLY;
1039
1040 if (skipped_revs.nr)
1041 bisect_flags |= FIND_BISECTION_ALL;
1042
1043 res = check_good_are_ancestors_of_bad(r, prefix, no_checkout);
1044 if (res)
1045 goto cleanup;
1046
1047 bisect_rev_setup(r, &revs, &rev_argv, prefix, "%s", "^%s", 1);
1048
1049 revs.first_parent_only = !!(bisect_flags & FIND_BISECTION_FIRST_PARENT_ONLY);
1050 revs.limited = 1;
1051
1052 bisect_common(&revs);
1053
1054 find_bisection(&revs.commits, &reaches, &all, bisect_flags);
1055 revs.commits = managed_skipped(revs.commits, &tried);
1056
1057 if (!revs.commits) {
1058 /*
1059 * We should return error here only if the "bad"
1060 * commit is also a "skip" commit.
1061 */
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);
1069
1070 res = BISECT_FAILED;
1071 goto cleanup;
1072 }
1073
1074 if (!all) {
1075 fprintf(stderr, _("No testable commit found.\n"
1076 "Maybe you started with bad path arguments?\n"));
1077
1078 res = BISECT_NO_TESTABLE_COMMIT;
1079 goto cleanup;
1080 }
1081
1082 bisect_rev = &revs.commits->item->object.oid;
1083
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);
1090
1091 show_diff_tree(r, prefix, revs.commits->item);
1092 /*
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.
1098 */
1099 res = BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND;
1100 goto cleanup;
1101 }
1102
1103 nr = all - reaches - 1;
1104 steps = estimate_bisect_steps(all);
1105
1106 steps_msg = xstrfmt(Q_("(roughly %d step)", "(roughly %d steps)",
1107 steps), steps);
1108 /*
1109 * TRANSLATORS: the last %s will be replaced with "(roughly %d
1110 * steps)" translation.
1111 */
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);
1118
1119 res = bisect_checkout(bisect_rev, no_checkout);
1120 cleanup:
1121 release_revisions(&revs);
1122 strvec_clear(&rev_argv);
1123 return res;
1124 }
1125
1126 static inline int log2i(int n)
1127 {
1128 int log2 = 0;
1129
1130 for (; n > 1; n >>= 1)
1131 log2++;
1132
1133 return log2;
1134 }
1135
1136 static inline int exp2i(int n)
1137 {
1138 return 1 << n;
1139 }
1140
1141 /*
1142 * Estimate the number of bisect steps left (after the current step)
1143 *
1144 * For any x between 0 included and 2^n excluded, the probability for
1145 * n - 1 steps left looks like:
1146 *
1147 * P(2^n + x) == (2^n - x) / (2^n + x)
1148 *
1149 * and P(2^n + x) < 0.5 means 2^n < 3x
1150 */
1151 int estimate_bisect_steps(int all)
1152 {
1153 int n, x, e;
1154
1155 if (all < 3)
1156 return 0;
1157
1158 n = log2i(all);
1159 e = exp2i(n);
1160 x = all - e;
1161
1162 return (e < 3 * x) ? n : n - 1;
1163 }
1164
1165 static int mark_for_removal(const char *refname,
1166 const struct object_id *oid UNUSED,
1167 int flag UNUSED, void *cb_data)
1168 {
1169 struct string_list *refs = cb_data;
1170 char *ref = xstrfmt("refs/bisect%s", refname);
1171 string_list_append(refs, ref);
1172 return 0;
1173 }
1174
1175 int bisect_clean_state(void)
1176 {
1177 int result = 0;
1178
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());
1193 /*
1194 * Cleanup BISECT_START last to support the --no-checkout option
1195 * introduced in the commit 4796e823a.
1196 */
1197 unlink_or_warn(git_path_bisect_start());
1198
1199 return result;
1200 }