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