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