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