]>
Commit | Line | Data |
---|---|---|
a2ad79ce | 1 | #include "cache.h" |
b2141fc1 | 2 | #include "config.h" |
a2ad79ce CC |
3 | #include "commit.h" |
4 | #include "diff.h" | |
5 | #include "revision.h" | |
1bf072e3 CC |
6 | #include "refs.h" |
7 | #include "list-objects.h" | |
3b437b0d | 8 | #include "quote.h" |
bc626927 | 9 | #include "hash-lookup.h" |
ef24c7ca | 10 | #include "run-command.h" |
e22278c0 | 11 | #include "log-tree.h" |
a2ad79ce | 12 | #include "bisect.h" |
fe299ec5 | 13 | #include "oid-array.h" |
dbbcd44f | 14 | #include "strvec.h" |
bb408ac9 | 15 | #include "commit-slab.h" |
64043556 | 16 | #include "commit-reach.h" |
b0eb92bb | 17 | #include "object-store.h" |
e8861ffc | 18 | #include "dir.h" |
6212b1aa | 19 | |
910650d2 | 20 | static struct oid_array good_revs; |
21 | static struct oid_array skipped_revs; | |
1bf072e3 | 22 | |
3c5ff995 | 23 | static struct object_id *current_bad_oid; |
ef24c7ca | 24 | |
ef24c7ca | 25 | static const char *argv_checkout[] = {"checkout", "-q", NULL, "--", NULL}; |
ef24c7ca | 26 | |
43f9d9f3 AD |
27 | static const char *term_bad; |
28 | static const char *term_good; | |
29 | ||
208acbfb | 30 | /* Remember to update object flag allocation in object.h */ |
a2ad79ce CC |
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 | ||
bb408ac9 NTND |
76 | define_commit_slab(commit_weight, int *); |
77 | static struct commit_weight commit_weight; | |
78 | ||
a2ad79ce CC |
79 | #define DEBUG_BISECT 0 |
80 | ||
81 | static inline int weight(struct commit_list *elem) | |
82 | { | |
bb408ac9 | 83 | return **commit_weight_at(&commit_weight, elem->item); |
a2ad79ce CC |
84 | } |
85 | ||
86 | static inline void weight_set(struct commit_list *elem, int weight) | |
87 | { | |
bb408ac9 | 88 | **commit_weight_at(&commit_weight, elem->item) = weight; |
a2ad79ce CC |
89 | } |
90 | ||
ad464a4e | 91 | static int count_interesting_parents(struct commit *commit, unsigned bisect_flags) |
a2ad79ce CC |
92 | { |
93 | struct commit_list *p; | |
94 | int count; | |
95 | ||
96 | for (count = 0, p = commit->parents; p; p = p->next) { | |
0fe305a5 AL |
97 | if (!(p->item->object.flags & UNINTERESTING)) |
98 | count++; | |
ad464a4e | 99 | if (bisect_flags & FIND_BISECTION_FIRST_PARENT_ONLY) |
0fe305a5 | 100 | break; |
a2ad79ce CC |
101 | } |
102 | return count; | |
103 | } | |
104 | ||
0afcea70 | 105 | static inline int approx_halfway(struct commit_list *p, int nr) |
a2ad79ce | 106 | { |
0afcea70 SG |
107 | int diff; |
108 | ||
a2ad79ce CC |
109 | /* |
110 | * Don't short-cut something we are not going to return! | |
111 | */ | |
112 | if (p->item->object.flags & TREESAME) | |
113 | return 0; | |
114 | if (DEBUG_BISECT) | |
115 | return 0; | |
116 | /* | |
0afcea70 | 117 | * For small number of commits 2 and 3 are halfway of 5, and |
a2ad79ce CC |
118 | * 3 is halfway of 6 but 2 and 4 are not. |
119 | */ | |
0afcea70 SG |
120 | diff = 2 * weight(p) - nr; |
121 | switch (diff) { | |
a2ad79ce CC |
122 | case -1: case 0: case 1: |
123 | return 1; | |
124 | default: | |
0afcea70 SG |
125 | /* |
126 | * For large number of commits we are not so strict, it's | |
127 | * good enough if it's within ~0.1% of the halfway point, | |
128 | * e.g. 5000 is exactly halfway of 10000, but we consider | |
129 | * the values [4996, 5004] as halfway as well. | |
130 | */ | |
131 | if (abs(diff) < nr / 1024) | |
132 | return 1; | |
a2ad79ce CC |
133 | return 0; |
134 | } | |
135 | } | |
136 | ||
a2ad79ce CC |
137 | static void show_list(const char *debug, int counted, int nr, |
138 | struct commit_list *list) | |
139 | { | |
140 | struct commit_list *p; | |
141 | ||
b0eb92bb NTND |
142 | if (!DEBUG_BISECT) |
143 | return; | |
144 | ||
a2ad79ce CC |
145 | fprintf(stderr, "%s (%d/%d)\n", debug, counted, nr); |
146 | ||
147 | for (p = list; p; p = p->next) { | |
148 | struct commit_list *pp; | |
149 | struct commit *commit = p->item; | |
ad464a4e | 150 | unsigned commit_flags = commit->object.flags; |
a2ad79ce CC |
151 | enum object_type type; |
152 | unsigned long size; | |
b4f5aca4 | 153 | char *buf = read_object_file(&commit->object.oid, &type, |
154 | &size); | |
56ff3794 CC |
155 | const char *subject_start; |
156 | int subject_len; | |
a2ad79ce CC |
157 | |
158 | fprintf(stderr, "%c%c%c ", | |
ad464a4e AL |
159 | (commit_flags & TREESAME) ? ' ' : 'T', |
160 | (commit_flags & UNINTERESTING) ? 'U' : ' ', | |
161 | (commit_flags & COUNTED) ? 'C' : ' '); | |
b0eb92bb | 162 | if (*commit_weight_at(&commit_weight, p->item)) |
a2ad79ce CC |
163 | fprintf(stderr, "%3d", weight(p)); |
164 | else | |
165 | fprintf(stderr, "---"); | |
14ced556 | 166 | fprintf(stderr, " %.*s", 8, oid_to_hex(&commit->object.oid)); |
a2ad79ce CC |
167 | for (pp = commit->parents; pp; pp = pp->next) |
168 | fprintf(stderr, " %.*s", 8, | |
14ced556 | 169 | oid_to_hex(&pp->item->object.oid)); |
a2ad79ce | 170 | |
56ff3794 CC |
171 | subject_len = find_commit_subject(buf, &subject_start); |
172 | if (subject_len) | |
173 | fprintf(stderr, " %.*s", subject_len, subject_start); | |
a2ad79ce CC |
174 | fprintf(stderr, "\n"); |
175 | } | |
176 | } | |
a2ad79ce CC |
177 | |
178 | static struct commit_list *best_bisection(struct commit_list *list, int nr) | |
179 | { | |
180 | struct commit_list *p, *best; | |
181 | int best_distance = -1; | |
182 | ||
183 | best = list; | |
184 | for (p = list; p; p = p->next) { | |
185 | int distance; | |
ad464a4e | 186 | unsigned commit_flags = p->item->object.flags; |
a2ad79ce | 187 | |
ad464a4e | 188 | if (commit_flags & TREESAME) |
a2ad79ce CC |
189 | continue; |
190 | distance = weight(p); | |
191 | if (nr - distance < distance) | |
192 | distance = nr - distance; | |
193 | if (distance > best_distance) { | |
194 | best = p; | |
195 | best_distance = distance; | |
196 | } | |
197 | } | |
198 | ||
199 | return best; | |
200 | } | |
201 | ||
202 | struct commit_dist { | |
203 | struct commit *commit; | |
204 | int distance; | |
205 | }; | |
206 | ||
207 | static int compare_commit_dist(const void *a_, const void *b_) | |
208 | { | |
209 | struct commit_dist *a, *b; | |
210 | ||
211 | a = (struct commit_dist *)a_; | |
212 | b = (struct commit_dist *)b_; | |
213 | if (a->distance != b->distance) | |
214 | return b->distance - a->distance; /* desc sort */ | |
f2fd0760 | 215 | return oidcmp(&a->commit->object.oid, &b->commit->object.oid); |
a2ad79ce CC |
216 | } |
217 | ||
218 | static struct commit_list *best_bisection_sorted(struct commit_list *list, int nr) | |
219 | { | |
220 | struct commit_list *p; | |
221 | struct commit_dist *array = xcalloc(nr, sizeof(*array)); | |
5b1ef2ce | 222 | struct strbuf buf = STRBUF_INIT; |
a2ad79ce CC |
223 | int cnt, i; |
224 | ||
225 | for (p = list, cnt = 0; p; p = p->next) { | |
226 | int distance; | |
ad464a4e | 227 | unsigned commit_flags = p->item->object.flags; |
a2ad79ce | 228 | |
ad464a4e | 229 | if (commit_flags & TREESAME) |
a2ad79ce CC |
230 | continue; |
231 | distance = weight(p); | |
232 | if (nr - distance < distance) | |
233 | distance = nr - distance; | |
234 | array[cnt].commit = p->item; | |
235 | array[cnt].distance = distance; | |
236 | cnt++; | |
237 | } | |
9ed0d8d6 | 238 | QSORT(array, cnt, compare_commit_dist); |
a2ad79ce | 239 | for (p = list, i = 0; i < cnt; i++) { |
a2ad79ce CC |
240 | struct object *obj = &(array[i].commit->object); |
241 | ||
5b1ef2ce JK |
242 | strbuf_reset(&buf); |
243 | strbuf_addf(&buf, "dist=%d", array[i].distance); | |
244 | add_name_decoration(DECORATION_NONE, buf.buf, obj); | |
662174d2 | 245 | |
a2ad79ce | 246 | p->item = array[i].commit; |
7c117184 MÅ |
247 | if (i < cnt - 1) |
248 | p = p->next; | |
a2ad79ce | 249 | } |
2e9fdc79 ÆAB |
250 | if (p) { |
251 | free_commit_list(p->next); | |
252 | p->next = NULL; | |
253 | } | |
5b1ef2ce | 254 | strbuf_release(&buf); |
a2ad79ce CC |
255 | free(array); |
256 | return list; | |
257 | } | |
258 | ||
259 | /* | |
260 | * zero or positive weight is the number of interesting commits it can | |
261 | * reach, including itself. Especially, weight = 0 means it does not | |
262 | * reach any tree-changing commits (e.g. just above uninteresting one | |
263 | * but traversal is with pathspec). | |
264 | * | |
265 | * weight = -1 means it has one parent and its distance is yet to | |
266 | * be computed. | |
267 | * | |
268 | * weight = -2 means it has more than one parent and its distance is | |
269 | * unknown. After running count_distance() first, they will get zero | |
270 | * or positive distance. | |
271 | */ | |
272 | static struct commit_list *do_find_bisection(struct commit_list *list, | |
273 | int nr, int *weights, | |
ad464a4e | 274 | unsigned bisect_flags) |
a2ad79ce CC |
275 | { |
276 | int n, counted; | |
277 | struct commit_list *p; | |
278 | ||
279 | counted = 0; | |
280 | ||
281 | for (n = 0, p = list; p; p = p->next) { | |
282 | struct commit *commit = p->item; | |
ad464a4e | 283 | unsigned commit_flags = commit->object.flags; |
a2ad79ce | 284 | |
bb408ac9 | 285 | *commit_weight_at(&commit_weight, p->item) = &weights[n++]; |
ad464a4e | 286 | switch (count_interesting_parents(commit, bisect_flags)) { |
a2ad79ce | 287 | case 0: |
ad464a4e | 288 | if (!(commit_flags & TREESAME)) { |
a2ad79ce CC |
289 | weight_set(p, 1); |
290 | counted++; | |
291 | show_list("bisection 2 count one", | |
292 | counted, nr, list); | |
293 | } | |
294 | /* | |
295 | * otherwise, it is known not to reach any | |
296 | * tree-changing commit and gets weight 0. | |
297 | */ | |
298 | break; | |
299 | case 1: | |
300 | weight_set(p, -1); | |
301 | break; | |
302 | default: | |
303 | weight_set(p, -2); | |
304 | break; | |
305 | } | |
306 | } | |
307 | ||
308 | show_list("bisection 2 initialize", counted, nr, list); | |
309 | ||
310 | /* | |
311 | * If you have only one parent in the resulting set | |
312 | * then you can reach one commit more than that parent | |
313 | * can reach. So we do not have to run the expensive | |
314 | * count_distance() for single strand of pearls. | |
315 | * | |
316 | * However, if you have more than one parents, you cannot | |
317 | * just add their distance and one for yourself, since | |
318 | * they usually reach the same ancestor and you would | |
319 | * end up counting them twice that way. | |
320 | * | |
321 | * So we will first count distance of merges the usual | |
322 | * way, and then fill the blanks using cheaper algorithm. | |
323 | */ | |
324 | for (p = list; p; p = p->next) { | |
325 | if (p->item->object.flags & UNINTERESTING) | |
326 | continue; | |
327 | if (weight(p) != -2) | |
328 | continue; | |
ad464a4e | 329 | if (bisect_flags & FIND_BISECTION_FIRST_PARENT_ONLY) |
0fe305a5 | 330 | BUG("shouldn't be calling count-distance in fp mode"); |
a2ad79ce CC |
331 | weight_set(p, count_distance(p)); |
332 | clear_distance(list); | |
333 | ||
0afcea70 SG |
334 | /* Does it happen to be at half-way? */ |
335 | if (!(bisect_flags & FIND_BISECTION_ALL) && | |
336 | approx_halfway(p, nr)) | |
a2ad79ce CC |
337 | return p; |
338 | counted++; | |
339 | } | |
340 | ||
341 | show_list("bisection 2 count_distance", counted, nr, list); | |
342 | ||
343 | while (counted < nr) { | |
344 | for (p = list; p; p = p->next) { | |
345 | struct commit_list *q; | |
ad464a4e | 346 | unsigned commit_flags = p->item->object.flags; |
a2ad79ce CC |
347 | |
348 | if (0 <= weight(p)) | |
349 | continue; | |
0fe305a5 AL |
350 | |
351 | for (q = p->item->parents; | |
352 | q; | |
ad464a4e | 353 | q = bisect_flags & FIND_BISECTION_FIRST_PARENT_ONLY ? NULL : q->next) { |
a2ad79ce CC |
354 | if (q->item->object.flags & UNINTERESTING) |
355 | continue; | |
356 | if (0 <= weight(q)) | |
357 | break; | |
358 | } | |
359 | if (!q) | |
360 | continue; | |
361 | ||
362 | /* | |
363 | * weight for p is unknown but q is known. | |
364 | * add one for p itself if p is to be counted, | |
365 | * otherwise inherit it from q directly. | |
366 | */ | |
ad464a4e | 367 | if (!(commit_flags & TREESAME)) { |
a2ad79ce CC |
368 | weight_set(p, weight(q)+1); |
369 | counted++; | |
370 | show_list("bisection 2 count one", | |
371 | counted, nr, list); | |
372 | } | |
373 | else | |
374 | weight_set(p, weight(q)); | |
375 | ||
0afcea70 SG |
376 | /* Does it happen to be at half-way? */ |
377 | if (!(bisect_flags & FIND_BISECTION_ALL) && | |
378 | approx_halfway(p, nr)) | |
a2ad79ce CC |
379 | return p; |
380 | } | |
381 | } | |
382 | ||
383 | show_list("bisection 2 counted all", counted, nr, list); | |
384 | ||
ad464a4e | 385 | if (!(bisect_flags & FIND_BISECTION_ALL)) |
a2ad79ce CC |
386 | return best_bisection(list, nr); |
387 | else | |
388 | return best_bisection_sorted(list, nr); | |
389 | } | |
390 | ||
24d707f6 | 391 | void find_bisection(struct commit_list **commit_list, int *reaches, |
ad464a4e | 392 | int *all, unsigned bisect_flags) |
a2ad79ce CC |
393 | { |
394 | int nr, on_list; | |
24d707f6 | 395 | struct commit_list *list, *p, *best, *next, *last; |
a2ad79ce CC |
396 | int *weights; |
397 | ||
24d707f6 | 398 | show_list("bisection 2 entry", 0, 0, *commit_list); |
bb408ac9 | 399 | init_commit_weight(&commit_weight); |
a2ad79ce CC |
400 | |
401 | /* | |
402 | * Count the number of total and tree-changing items on the | |
403 | * list, while reversing the list. | |
404 | */ | |
24d707f6 | 405 | for (nr = on_list = 0, last = NULL, p = *commit_list; |
a2ad79ce CC |
406 | p; |
407 | p = next) { | |
ad464a4e | 408 | unsigned commit_flags = p->item->object.flags; |
a2ad79ce CC |
409 | |
410 | next = p->next; | |
ad464a4e | 411 | if (commit_flags & UNINTERESTING) { |
fc5c40bb | 412 | free(p); |
a2ad79ce | 413 | continue; |
fc5c40bb | 414 | } |
a2ad79ce CC |
415 | p->next = last; |
416 | last = p; | |
ad464a4e | 417 | if (!(commit_flags & TREESAME)) |
a2ad79ce CC |
418 | nr++; |
419 | on_list++; | |
420 | } | |
421 | list = last; | |
422 | show_list("bisection 2 sorted", 0, nr, list); | |
423 | ||
424 | *all = nr; | |
ca56dadb | 425 | CALLOC_ARRAY(weights, on_list); |
a2ad79ce CC |
426 | |
427 | /* Do the real work of finding bisection commit. */ | |
ad464a4e | 428 | best = do_find_bisection(list, nr, weights, bisect_flags); |
a2ad79ce | 429 | if (best) { |
ad464a4e | 430 | if (!(bisect_flags & FIND_BISECTION_ALL)) { |
f4e45cb3 MÅ |
431 | list->item = best->item; |
432 | free_commit_list(list->next); | |
433 | best = list; | |
a2ad79ce | 434 | best->next = NULL; |
f4e45cb3 | 435 | } |
a2ad79ce CC |
436 | *reaches = weight(best); |
437 | } | |
438 | free(weights); | |
24d707f6 | 439 | *commit_list = best; |
bb408ac9 | 440 | clear_commit_weight(&commit_weight); |
a2ad79ce CC |
441 | } |
442 | ||
eed25148 | 443 | static int register_ref(const char *refname, const struct object_id *oid, |
5cf88fd8 | 444 | int flags UNUSED, void *cb_data UNUSED) |
1bf072e3 | 445 | { |
43f9d9f3 AD |
446 | struct strbuf good_prefix = STRBUF_INIT; |
447 | strbuf_addstr(&good_prefix, term_good); | |
448 | strbuf_addstr(&good_prefix, "-"); | |
449 | ||
450 | if (!strcmp(refname, term_bad)) { | |
3c5ff995 | 451 | current_bad_oid = xmalloc(sizeof(*current_bad_oid)); |
eed25148 | 452 | oidcpy(current_bad_oid, oid); |
43f9d9f3 | 453 | } else if (starts_with(refname, good_prefix.buf)) { |
910650d2 | 454 | oid_array_append(&good_revs, oid); |
59556548 | 455 | } else if (starts_with(refname, "skip-")) { |
910650d2 | 456 | oid_array_append(&skipped_revs, oid); |
1bf072e3 CC |
457 | } |
458 | ||
43f9d9f3 AD |
459 | strbuf_release(&good_prefix); |
460 | ||
1bf072e3 CC |
461 | return 0; |
462 | } | |
463 | ||
464 | static int read_bisect_refs(void) | |
465 | { | |
eed25148 | 466 | return for_each_ref_in("refs/bisect/", register_ref, NULL); |
1bf072e3 CC |
467 | } |
468 | ||
f932729c JK |
469 | static GIT_PATH_FUNC(git_path_bisect_names, "BISECT_NAMES") |
470 | static GIT_PATH_FUNC(git_path_bisect_expected_rev, "BISECT_EXPECTED_REV") | |
fb71a329 PB |
471 | static GIT_PATH_FUNC(git_path_bisect_ancestors_ok, "BISECT_ANCESTORS_OK") |
472 | static GIT_PATH_FUNC(git_path_bisect_run, "BISECT_RUN") | |
473 | static GIT_PATH_FUNC(git_path_bisect_start, "BISECT_START") | |
474 | static GIT_PATH_FUNC(git_path_bisect_log, "BISECT_LOG") | |
f5d284f6 | 475 | static GIT_PATH_FUNC(git_path_bisect_terms, "BISECT_TERMS") |
e8861ffc | 476 | static GIT_PATH_FUNC(git_path_bisect_first_parent, "BISECT_FIRST_PARENT") |
fb71a329 | 477 | static GIT_PATH_FUNC(git_path_head_name, "head-name") |
f932729c | 478 | |
ef8d7ac4 | 479 | static void read_bisect_paths(struct strvec *array) |
3b437b0d CC |
480 | { |
481 | struct strbuf str = STRBUF_INIT; | |
f932729c | 482 | const char *filename = git_path_bisect_names(); |
23a9e071 | 483 | FILE *fp = xfopen(filename, "r"); |
3b437b0d | 484 | |
8f309aeb | 485 | while (strbuf_getline_lf(&str, fp) != EOF) { |
3b437b0d | 486 | strbuf_trim(&str); |
2745b6b4 | 487 | if (sq_dequote_to_strvec(str.buf, array)) |
14dc4899 | 488 | die(_("Badly quoted content in file '%s': %s"), |
8a534b61 | 489 | filename, str.buf); |
3b437b0d CC |
490 | } |
491 | ||
492 | strbuf_release(&str); | |
493 | fclose(fp); | |
494 | } | |
495 | ||
7383b25d | 496 | static char *join_oid_array_hex(struct oid_array *array, char delim) |
c0537662 CC |
497 | { |
498 | struct strbuf joined_hexs = STRBUF_INIT; | |
499 | int i; | |
500 | ||
902bb364 | 501 | for (i = 0; i < array->nr; i++) { |
ee3051bd | 502 | strbuf_addstr(&joined_hexs, oid_to_hex(array->oid + i)); |
902bb364 | 503 | if (i + 1 < array->nr) |
c0537662 CC |
504 | strbuf_addch(&joined_hexs, delim); |
505 | } | |
506 | ||
507 | return strbuf_detach(&joined_hexs, NULL); | |
508 | } | |
509 | ||
9af3589e CC |
510 | /* |
511 | * In this function, passing a not NULL skipped_first is very special. | |
512 | * It means that we want to know if the first commit in the list is | |
513 | * skipped because we will want to test a commit away from it if it is | |
514 | * indeed skipped. | |
515 | * So if the first commit is skipped, we cannot take the shortcut to | |
516 | * just "return list" when we find the first non skipped commit, we | |
517 | * have to return a fully filtered list. | |
518 | * | |
519 | * We use (*skipped_first == -1) to mean "it has been found that the | |
520 | * first commit is not skipped". In this case *skipped_first is set back | |
521 | * to 0 just before the function returns. | |
522 | */ | |
95188648 CC |
523 | struct commit_list *filter_skipped(struct commit_list *list, |
524 | struct commit_list **tried, | |
9af3589e CC |
525 | int show_all, |
526 | int *count, | |
527 | int *skipped_first) | |
95188648 CC |
528 | { |
529 | struct commit_list *filtered = NULL, **f = &filtered; | |
530 | ||
531 | *tried = NULL; | |
532 | ||
9af3589e CC |
533 | if (skipped_first) |
534 | *skipped_first = 0; | |
535 | if (count) | |
536 | *count = 0; | |
537 | ||
902bb364 | 538 | if (!skipped_revs.nr) |
95188648 CC |
539 | return list; |
540 | ||
95188648 CC |
541 | while (list) { |
542 | struct commit_list *next = list->next; | |
543 | list->next = NULL; | |
910650d2 | 544 | if (0 <= oid_array_lookup(&skipped_revs, &list->item->object.oid)) { |
9af3589e CC |
545 | if (skipped_first && !*skipped_first) |
546 | *skipped_first = 1; | |
95188648 CC |
547 | /* Move current to tried list */ |
548 | *tried = list; | |
549 | tried = &list->next; | |
550 | } else { | |
9af3589e CC |
551 | if (!show_all) { |
552 | if (!skipped_first || !*skipped_first) | |
553 | return list; | |
554 | } else if (skipped_first && !*skipped_first) { | |
555 | /* This means we know it's not skipped */ | |
556 | *skipped_first = -1; | |
557 | } | |
95188648 CC |
558 | /* Move current to filtered list */ |
559 | *f = list; | |
560 | f = &list->next; | |
9af3589e CC |
561 | if (count) |
562 | (*count)++; | |
95188648 CC |
563 | } |
564 | list = next; | |
565 | } | |
566 | ||
9af3589e CC |
567 | if (skipped_first && *skipped_first == -1) |
568 | *skipped_first = 0; | |
569 | ||
95188648 CC |
570 | return filtered; |
571 | } | |
1bf072e3 | 572 | |
ebc9529f CC |
573 | #define PRN_MODULO 32768 |
574 | ||
575 | /* | |
576 | * This is a pseudo random number generator based on "man 3 rand". | |
577 | * It is not used properly because the seed is the argument and it | |
578 | * is increased by one between each call, but that should not matter | |
579 | * for this application. | |
580 | */ | |
3b335762 NTND |
581 | static unsigned get_prn(unsigned count) |
582 | { | |
ebc9529f | 583 | count = count * 1103515245 + 12345; |
7b96d888 | 584 | return (count/65536) % PRN_MODULO; |
ebc9529f CC |
585 | } |
586 | ||
587 | /* | |
588 | * Custom integer square root from | |
5e68729f | 589 | * https://en.wikipedia.org/wiki/Integer_square_root |
ebc9529f CC |
590 | */ |
591 | static int sqrti(int val) | |
592 | { | |
593 | float d, x = val; | |
594 | ||
b8e3b2f3 | 595 | if (!val) |
ebc9529f CC |
596 | return 0; |
597 | ||
598 | do { | |
599 | float y = (x + (float)val / x) / 2; | |
600 | d = (y > x) ? y - x : x - y; | |
601 | x = y; | |
602 | } while (d >= 0.5); | |
603 | ||
604 | return (int)x; | |
605 | } | |
606 | ||
607 | static struct commit_list *skip_away(struct commit_list *list, int count) | |
62d0b0da | 608 | { |
62d0b0da | 609 | struct commit_list *cur, *previous; |
ebc9529f CC |
610 | int prn, index, i; |
611 | ||
612 | prn = get_prn(count); | |
613 | index = (count * prn / PRN_MODULO) * sqrti(prn) / sqrti(PRN_MODULO); | |
62d0b0da CC |
614 | |
615 | cur = list; | |
616 | previous = NULL; | |
62d0b0da CC |
617 | |
618 | for (i = 0; cur; cur = cur->next, i++) { | |
619 | if (i == index) { | |
9001dc2a | 620 | if (!oideq(&cur->item->object.oid, current_bad_oid)) |
62d0b0da CC |
621 | return cur; |
622 | if (previous) | |
623 | return previous; | |
624 | return list; | |
625 | } | |
626 | previous = cur; | |
627 | } | |
628 | ||
629 | return list; | |
630 | } | |
631 | ||
632 | static struct commit_list *managed_skipped(struct commit_list *list, | |
633 | struct commit_list **tried) | |
634 | { | |
635 | int count, skipped_first; | |
62d0b0da CC |
636 | |
637 | *tried = NULL; | |
638 | ||
902bb364 | 639 | if (!skipped_revs.nr) |
62d0b0da CC |
640 | return list; |
641 | ||
642 | list = filter_skipped(list, tried, 0, &count, &skipped_first); | |
643 | ||
644 | if (!skipped_first) | |
645 | return list; | |
646 | ||
ebc9529f | 647 | return skip_away(list, count); |
62d0b0da CC |
648 | } |
649 | ||
69d2cfe6 | 650 | static void bisect_rev_setup(struct repository *r, struct rev_info *revs, |
57efebb9 | 651 | struct strvec *rev_argv, |
69d2cfe6 | 652 | const char *prefix, |
a22347c6 CC |
653 | const char *bad_format, const char *good_format, |
654 | int read_paths) | |
1bf072e3 | 655 | { |
f92dbdbc ÆAB |
656 | struct setup_revision_opt opt = { |
657 | .free_removed_argv_elements = 1, | |
658 | }; | |
fad2d31d CC |
659 | int i; |
660 | ||
69d2cfe6 | 661 | repo_init_revisions(r, revs, prefix); |
3b437b0d CC |
662 | revs->abbrev = 0; |
663 | revs->commit_format = CMIT_FMT_UNSPECIFIED; | |
1bf072e3 | 664 | |
1c953a1f | 665 | /* rev_argv.argv[0] will be ignored by setup_revisions */ |
57efebb9 ÆAB |
666 | strvec_push(rev_argv, "bisect_rev_setup"); |
667 | strvec_pushf(rev_argv, bad_format, oid_to_hex(current_bad_oid)); | |
902bb364 | 668 | for (i = 0; i < good_revs.nr; i++) |
57efebb9 | 669 | strvec_pushf(rev_argv, good_format, |
f6d8942b | 670 | oid_to_hex(good_revs.oid + i)); |
57efebb9 | 671 | strvec_push(rev_argv, "--"); |
a22347c6 | 672 | if (read_paths) |
57efebb9 | 673 | read_bisect_paths(rev_argv); |
3b437b0d | 674 | |
f92dbdbc | 675 | setup_revisions(rev_argv->nr, rev_argv->v, revs, &opt); |
3b437b0d CC |
676 | } |
677 | ||
a22347c6 | 678 | static void bisect_common(struct rev_info *revs) |
2ace9727 | 679 | { |
2ace9727 CC |
680 | if (prepare_revision_walk(revs)) |
681 | die("revision walk setup failed"); | |
682 | if (revs->tree_objects) | |
4f6d26b1 | 683 | mark_edges_uninteresting(revs, NULL, 0); |
2ace9727 CC |
684 | } |
685 | ||
ce58b5d8 | 686 | static enum bisect_error error_if_skipped_commits(struct commit_list *tried, |
3c5ff995 | 687 | const struct object_id *bad) |
ef24c7ca CC |
688 | { |
689 | if (!tried) | |
ce58b5d8 | 690 | return BISECT_OK; |
ef24c7ca CC |
691 | |
692 | printf("There are only 'skip'ped commits left to test.\n" | |
43f9d9f3 | 693 | "The first %s commit could be any of:\n", term_bad); |
54307ea7 JH |
694 | |
695 | for ( ; tried; tried = tried->next) | |
696 | printf("%s\n", oid_to_hex(&tried->item->object.oid)); | |
697 | ||
ef24c7ca | 698 | if (bad) |
3c5ff995 | 699 | printf("%s\n", oid_to_hex(bad)); |
14dc4899 | 700 | printf(_("We cannot bisect more!\n")); |
ce58b5d8 PB |
701 | |
702 | return BISECT_ONLY_SKIPPED_LEFT; | |
ef24c7ca CC |
703 | } |
704 | ||
3c5ff995 | 705 | static int is_expected_rev(const struct object_id *oid) |
c0537662 | 706 | { |
f932729c | 707 | const char *filename = git_path_bisect_expected_rev(); |
c0537662 CC |
708 | struct stat st; |
709 | struct strbuf str = STRBUF_INIT; | |
710 | FILE *fp; | |
711 | int res = 0; | |
712 | ||
713 | if (stat(filename, &st) || !S_ISREG(st.st_mode)) | |
714 | return 0; | |
715 | ||
e9d983f1 | 716 | fp = fopen_or_warn(filename, "r"); |
c0537662 CC |
717 | if (!fp) |
718 | return 0; | |
719 | ||
8f309aeb | 720 | if (strbuf_getline_lf(&str, fp) != EOF) |
3c5ff995 | 721 | res = !strcmp(str.buf, oid_to_hex(oid)); |
c0537662 CC |
722 | |
723 | strbuf_release(&str); | |
724 | fclose(fp); | |
725 | ||
726 | return res; | |
727 | } | |
728 | ||
48af1fde RS |
729 | enum bisect_error bisect_checkout(const struct object_id *bisect_rev, |
730 | int no_checkout) | |
ef24c7ca | 731 | { |
dc01505f | 732 | char bisect_rev_hex[GIT_MAX_HEXSZ + 1]; |
ffcb4e94 JH |
733 | struct commit *commit; |
734 | struct pretty_print_context pp = {0}; | |
735 | struct strbuf commit_msg = STRBUF_INIT; | |
ef24c7ca | 736 | |
7d23ff81 | 737 | oid_to_hex_r(bisect_rev_hex, bisect_rev); |
ae077771 | 738 | update_ref(NULL, "BISECT_EXPECTED_REV", bisect_rev, NULL, 0, UPDATE_REFS_DIE_ON_ERR); |
ef24c7ca CC |
739 | |
740 | argv_checkout[2] = bisect_rev_hex; | |
fee92fc1 | 741 | if (no_checkout) { |
ae077771 | 742 | update_ref(NULL, "BISECT_HEAD", bisect_rev, NULL, 0, |
743 | UPDATE_REFS_DIE_ON_ERR); | |
fee92fc1 | 744 | } else { |
1fcc40cd | 745 | if (run_command_v_opt(argv_checkout, RUN_GIT_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 | /* Cleanup head-name if it got left by an old version of git-bisect */ |
1192 | unlink_or_warn(git_path_head_name()); | |
1193 | /* | |
1194 | * Cleanup BISECT_START last to support the --no-checkout option | |
1195 | * introduced in the commit 4796e823a. | |
1196 | */ | |
1197 | unlink_or_warn(git_path_bisect_start()); | |
1198 | ||
1199 | return result; | |
1200 | } |