Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 1 | #include "cache.h" |
Brandon Williams | b2141fc | 2017-06-14 11:07:36 -0700 | [diff] [blame] | 2 | #include "config.h" |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 3 | #include "commit.h" |
| 4 | #include "diff.h" |
| 5 | #include "revision.h" |
Christian Couder | 1bf072e | 2009-03-26 05:55:54 +0100 | [diff] [blame] | 6 | #include "refs.h" |
| 7 | #include "list-objects.h" |
Christian Couder | 3b437b0 | 2009-03-26 05:55:59 +0100 | [diff] [blame] | 8 | #include "quote.h" |
Martin Ågren | bc62692 | 2020-12-31 12:56:23 +0100 | [diff] [blame] | 9 | #include "hash-lookup.h" |
Christian Couder | ef24c7c | 2009-04-19 11:56:07 +0200 | [diff] [blame] | 10 | #include "run-command.h" |
Christian Couder | e22278c | 2009-05-28 23:21:16 +0200 | [diff] [blame] | 11 | #include "log-tree.h" |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 12 | #include "bisect.h" |
Jeff King | fe299ec | 2020-03-30 10:03:46 -0400 | [diff] [blame] | 13 | #include "oid-array.h" |
Jeff King | dbbcd44 | 2020-07-28 16:23:39 -0400 | [diff] [blame] | 14 | #include "strvec.h" |
Nguyễn Thái Ngọc Duy | bb408ac | 2018-05-19 07:28:25 +0200 | [diff] [blame] | 15 | #include "commit-slab.h" |
Derrick Stolee | 6404355 | 2018-07-20 16:33:04 +0000 | [diff] [blame] | 16 | #include "commit-reach.h" |
Nguyễn Thái Ngọc Duy | b0eb92b | 2018-09-02 09:42:50 +0200 | [diff] [blame] | 17 | #include "object-store.h" |
Aaron Lipman | e8861ff | 2020-08-07 17:58:37 -0400 | [diff] [blame] | 18 | #include "dir.h" |
Christian Couder | 6212b1a | 2009-05-09 17:55:38 +0200 | [diff] [blame] | 19 | |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 20 | static struct oid_array good_revs; |
| 21 | static struct oid_array skipped_revs; |
Christian Couder | 1bf072e | 2009-03-26 05:55:54 +0100 | [diff] [blame] | 22 | |
brian m. carlson | 3c5ff99 | 2015-03-13 23:39:29 +0000 | [diff] [blame] | 23 | static struct object_id *current_bad_oid; |
Christian Couder | ef24c7c | 2009-04-19 11:56:07 +0200 | [diff] [blame] | 24 | |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 25 | static const char *term_bad; |
| 26 | static const char *term_good; |
| 27 | |
Nguyễn Thái Ngọc Duy | 208acbf | 2014-03-25 20:23:26 +0700 | [diff] [blame] | 28 | /* Remember to update object flag allocation in object.h */ |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 29 | #define COUNTED (1u<<16) |
| 30 | |
| 31 | /* |
| 32 | * This is a truly stupid algorithm, but it's only |
| 33 | * used for bisection, and we just don't care enough. |
| 34 | * |
| 35 | * We care just barely enough to avoid recursing for |
| 36 | * non-merge entries. |
| 37 | */ |
| 38 | static int count_distance(struct commit_list *entry) |
| 39 | { |
| 40 | int nr = 0; |
| 41 | |
| 42 | while (entry) { |
| 43 | struct commit *commit = entry->item; |
| 44 | struct commit_list *p; |
| 45 | |
| 46 | if (commit->object.flags & (UNINTERESTING | COUNTED)) |
| 47 | break; |
| 48 | if (!(commit->object.flags & TREESAME)) |
| 49 | nr++; |
| 50 | commit->object.flags |= COUNTED; |
| 51 | p = commit->parents; |
| 52 | entry = p; |
| 53 | if (p) { |
| 54 | p = p->next; |
| 55 | while (p) { |
| 56 | nr += count_distance(p); |
| 57 | p = p->next; |
| 58 | } |
| 59 | } |
| 60 | } |
| 61 | |
| 62 | return nr; |
| 63 | } |
| 64 | |
| 65 | static void clear_distance(struct commit_list *list) |
| 66 | { |
| 67 | while (list) { |
| 68 | struct commit *commit = list->item; |
| 69 | commit->object.flags &= ~COUNTED; |
| 70 | list = list->next; |
| 71 | } |
| 72 | } |
| 73 | |
Nguyễn Thái Ngọc Duy | bb408ac | 2018-05-19 07:28:25 +0200 | [diff] [blame] | 74 | define_commit_slab(commit_weight, int *); |
| 75 | static struct commit_weight commit_weight; |
| 76 | |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 77 | #define DEBUG_BISECT 0 |
| 78 | |
| 79 | static inline int weight(struct commit_list *elem) |
| 80 | { |
Nguyễn Thái Ngọc Duy | bb408ac | 2018-05-19 07:28:25 +0200 | [diff] [blame] | 81 | return **commit_weight_at(&commit_weight, elem->item); |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 82 | } |
| 83 | |
| 84 | static inline void weight_set(struct commit_list *elem, int weight) |
| 85 | { |
Nguyễn Thái Ngọc Duy | bb408ac | 2018-05-19 07:28:25 +0200 | [diff] [blame] | 86 | **commit_weight_at(&commit_weight, elem->item) = weight; |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 87 | } |
| 88 | |
Aaron Lipman | ad464a4 | 2020-08-07 17:58:38 -0400 | [diff] [blame] | 89 | static int count_interesting_parents(struct commit *commit, unsigned bisect_flags) |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 90 | { |
| 91 | struct commit_list *p; |
| 92 | int count; |
| 93 | |
| 94 | for (count = 0, p = commit->parents; p; p = p->next) { |
Aaron Lipman | 0fe305a | 2020-08-07 17:58:35 -0400 | [diff] [blame] | 95 | if (!(p->item->object.flags & UNINTERESTING)) |
| 96 | count++; |
Aaron Lipman | ad464a4 | 2020-08-07 17:58:38 -0400 | [diff] [blame] | 97 | if (bisect_flags & FIND_BISECTION_FIRST_PARENT_ONLY) |
Aaron Lipman | 0fe305a | 2020-08-07 17:58:35 -0400 | [diff] [blame] | 98 | break; |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 99 | } |
| 100 | return count; |
| 101 | } |
| 102 | |
SZEDER Gábor | 0afcea7 | 2020-11-12 17:19:38 +0100 | [diff] [blame] | 103 | static inline int approx_halfway(struct commit_list *p, int nr) |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 104 | { |
SZEDER Gábor | 0afcea7 | 2020-11-12 17:19:38 +0100 | [diff] [blame] | 105 | int diff; |
| 106 | |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 107 | /* |
| 108 | * Don't short-cut something we are not going to return! |
| 109 | */ |
| 110 | if (p->item->object.flags & TREESAME) |
| 111 | return 0; |
| 112 | if (DEBUG_BISECT) |
| 113 | return 0; |
| 114 | /* |
SZEDER Gábor | 0afcea7 | 2020-11-12 17:19:38 +0100 | [diff] [blame] | 115 | * For small number of commits 2 and 3 are halfway of 5, and |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 116 | * 3 is halfway of 6 but 2 and 4 are not. |
| 117 | */ |
SZEDER Gábor | 0afcea7 | 2020-11-12 17:19:38 +0100 | [diff] [blame] | 118 | diff = 2 * weight(p) - nr; |
| 119 | switch (diff) { |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 120 | case -1: case 0: case 1: |
| 121 | return 1; |
| 122 | default: |
SZEDER Gábor | 0afcea7 | 2020-11-12 17:19:38 +0100 | [diff] [blame] | 123 | /* |
| 124 | * For large number of commits we are not so strict, it's |
| 125 | * good enough if it's within ~0.1% of the halfway point, |
| 126 | * e.g. 5000 is exactly halfway of 10000, but we consider |
| 127 | * the values [4996, 5004] as halfway as well. |
| 128 | */ |
| 129 | if (abs(diff) < nr / 1024) |
| 130 | return 1; |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 131 | return 0; |
| 132 | } |
| 133 | } |
| 134 | |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 135 | static void show_list(const char *debug, int counted, int nr, |
| 136 | struct commit_list *list) |
| 137 | { |
| 138 | struct commit_list *p; |
| 139 | |
Nguyễn Thái Ngọc Duy | b0eb92b | 2018-09-02 09:42:50 +0200 | [diff] [blame] | 140 | if (!DEBUG_BISECT) |
| 141 | return; |
| 142 | |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 143 | fprintf(stderr, "%s (%d/%d)\n", debug, counted, nr); |
| 144 | |
| 145 | for (p = list; p; p = p->next) { |
| 146 | struct commit_list *pp; |
| 147 | struct commit *commit = p->item; |
Aaron Lipman | ad464a4 | 2020-08-07 17:58:38 -0400 | [diff] [blame] | 148 | unsigned commit_flags = commit->object.flags; |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 149 | enum object_type type; |
| 150 | unsigned long size; |
brian m. carlson | b4f5aca | 2018-03-12 02:27:53 +0000 | [diff] [blame] | 151 | char *buf = read_object_file(&commit->object.oid, &type, |
| 152 | &size); |
Christian Couder | 56ff379 | 2010-07-22 15:18:33 +0200 | [diff] [blame] | 153 | const char *subject_start; |
| 154 | int subject_len; |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 155 | |
| 156 | fprintf(stderr, "%c%c%c ", |
Aaron Lipman | ad464a4 | 2020-08-07 17:58:38 -0400 | [diff] [blame] | 157 | (commit_flags & TREESAME) ? ' ' : 'T', |
| 158 | (commit_flags & UNINTERESTING) ? 'U' : ' ', |
| 159 | (commit_flags & COUNTED) ? 'C' : ' '); |
Nguyễn Thái Ngọc Duy | b0eb92b | 2018-09-02 09:42:50 +0200 | [diff] [blame] | 160 | if (*commit_weight_at(&commit_weight, p->item)) |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 161 | fprintf(stderr, "%3d", weight(p)); |
| 162 | else |
| 163 | fprintf(stderr, "---"); |
René Scharfe | 14ced55 | 2018-03-25 12:57:36 +0200 | [diff] [blame] | 164 | fprintf(stderr, " %.*s", 8, oid_to_hex(&commit->object.oid)); |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 165 | for (pp = commit->parents; pp; pp = pp->next) |
| 166 | fprintf(stderr, " %.*s", 8, |
René Scharfe | 14ced55 | 2018-03-25 12:57:36 +0200 | [diff] [blame] | 167 | oid_to_hex(&pp->item->object.oid)); |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 168 | |
Christian Couder | 56ff379 | 2010-07-22 15:18:33 +0200 | [diff] [blame] | 169 | subject_len = find_commit_subject(buf, &subject_start); |
| 170 | if (subject_len) |
| 171 | fprintf(stderr, " %.*s", subject_len, subject_start); |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 172 | fprintf(stderr, "\n"); |
| 173 | } |
| 174 | } |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 175 | |
| 176 | static struct commit_list *best_bisection(struct commit_list *list, int nr) |
| 177 | { |
| 178 | struct commit_list *p, *best; |
| 179 | int best_distance = -1; |
| 180 | |
| 181 | best = list; |
| 182 | for (p = list; p; p = p->next) { |
| 183 | int distance; |
Aaron Lipman | ad464a4 | 2020-08-07 17:58:38 -0400 | [diff] [blame] | 184 | unsigned commit_flags = p->item->object.flags; |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 185 | |
Aaron Lipman | ad464a4 | 2020-08-07 17:58:38 -0400 | [diff] [blame] | 186 | if (commit_flags & TREESAME) |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 187 | continue; |
| 188 | distance = weight(p); |
| 189 | if (nr - distance < distance) |
| 190 | distance = nr - distance; |
| 191 | if (distance > best_distance) { |
| 192 | best = p; |
| 193 | best_distance = distance; |
| 194 | } |
| 195 | } |
| 196 | |
| 197 | return best; |
| 198 | } |
| 199 | |
| 200 | struct commit_dist { |
| 201 | struct commit *commit; |
| 202 | int distance; |
| 203 | }; |
| 204 | |
| 205 | static int compare_commit_dist(const void *a_, const void *b_) |
| 206 | { |
| 207 | struct commit_dist *a, *b; |
| 208 | |
| 209 | a = (struct commit_dist *)a_; |
| 210 | b = (struct commit_dist *)b_; |
| 211 | if (a->distance != b->distance) |
| 212 | return b->distance - a->distance; /* desc sort */ |
brian m. carlson | f2fd076 | 2015-11-10 02:22:28 +0000 | [diff] [blame] | 213 | return oidcmp(&a->commit->object.oid, &b->commit->object.oid); |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 214 | } |
| 215 | |
| 216 | static struct commit_list *best_bisection_sorted(struct commit_list *list, int nr) |
| 217 | { |
| 218 | struct commit_list *p; |
| 219 | struct commit_dist *array = xcalloc(nr, sizeof(*array)); |
Jeff King | 5b1ef2c | 2017-03-28 15:46:50 -0400 | [diff] [blame] | 220 | struct strbuf buf = STRBUF_INIT; |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 221 | int cnt, i; |
| 222 | |
| 223 | for (p = list, cnt = 0; p; p = p->next) { |
| 224 | int distance; |
Aaron Lipman | ad464a4 | 2020-08-07 17:58:38 -0400 | [diff] [blame] | 225 | unsigned commit_flags = p->item->object.flags; |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 226 | |
Aaron Lipman | ad464a4 | 2020-08-07 17:58:38 -0400 | [diff] [blame] | 227 | if (commit_flags & TREESAME) |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 228 | continue; |
| 229 | distance = weight(p); |
| 230 | if (nr - distance < distance) |
| 231 | distance = nr - distance; |
| 232 | array[cnt].commit = p->item; |
| 233 | array[cnt].distance = distance; |
| 234 | cnt++; |
| 235 | } |
René Scharfe | 9ed0d8d | 2016-09-29 17:27:31 +0200 | [diff] [blame] | 236 | QSORT(array, cnt, compare_commit_dist); |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 237 | for (p = list, i = 0; i < cnt; i++) { |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 238 | struct object *obj = &(array[i].commit->object); |
| 239 | |
Jeff King | 5b1ef2c | 2017-03-28 15:46:50 -0400 | [diff] [blame] | 240 | strbuf_reset(&buf); |
| 241 | strbuf_addf(&buf, "dist=%d", array[i].distance); |
| 242 | add_name_decoration(DECORATION_NONE, buf.buf, obj); |
Jeff King | 662174d | 2014-08-26 06:23:36 -0400 | [diff] [blame] | 243 | |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 244 | p->item = array[i].commit; |
Martin Ågren | 7c11718 | 2017-11-05 21:24:30 +0100 | [diff] [blame] | 245 | if (i < cnt - 1) |
| 246 | p = p->next; |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 247 | } |
Ævar Arnfjörð Bjarmason | 2e9fdc7 | 2018-01-03 18:48:52 +0000 | [diff] [blame] | 248 | if (p) { |
| 249 | free_commit_list(p->next); |
| 250 | p->next = NULL; |
| 251 | } |
Jeff King | 5b1ef2c | 2017-03-28 15:46:50 -0400 | [diff] [blame] | 252 | strbuf_release(&buf); |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 253 | free(array); |
| 254 | return list; |
| 255 | } |
| 256 | |
| 257 | /* |
| 258 | * zero or positive weight is the number of interesting commits it can |
| 259 | * reach, including itself. Especially, weight = 0 means it does not |
| 260 | * reach any tree-changing commits (e.g. just above uninteresting one |
| 261 | * but traversal is with pathspec). |
| 262 | * |
| 263 | * weight = -1 means it has one parent and its distance is yet to |
| 264 | * be computed. |
| 265 | * |
| 266 | * weight = -2 means it has more than one parent and its distance is |
| 267 | * unknown. After running count_distance() first, they will get zero |
| 268 | * or positive distance. |
| 269 | */ |
| 270 | static struct commit_list *do_find_bisection(struct commit_list *list, |
| 271 | int nr, int *weights, |
Aaron Lipman | ad464a4 | 2020-08-07 17:58:38 -0400 | [diff] [blame] | 272 | unsigned bisect_flags) |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 273 | { |
| 274 | int n, counted; |
| 275 | struct commit_list *p; |
| 276 | |
| 277 | counted = 0; |
| 278 | |
| 279 | for (n = 0, p = list; p; p = p->next) { |
| 280 | struct commit *commit = p->item; |
Aaron Lipman | ad464a4 | 2020-08-07 17:58:38 -0400 | [diff] [blame] | 281 | unsigned commit_flags = commit->object.flags; |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 282 | |
Nguyễn Thái Ngọc Duy | bb408ac | 2018-05-19 07:28:25 +0200 | [diff] [blame] | 283 | *commit_weight_at(&commit_weight, p->item) = &weights[n++]; |
Aaron Lipman | ad464a4 | 2020-08-07 17:58:38 -0400 | [diff] [blame] | 284 | switch (count_interesting_parents(commit, bisect_flags)) { |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 285 | case 0: |
Aaron Lipman | ad464a4 | 2020-08-07 17:58:38 -0400 | [diff] [blame] | 286 | if (!(commit_flags & TREESAME)) { |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 287 | weight_set(p, 1); |
| 288 | counted++; |
| 289 | show_list("bisection 2 count one", |
| 290 | counted, nr, list); |
| 291 | } |
| 292 | /* |
| 293 | * otherwise, it is known not to reach any |
| 294 | * tree-changing commit and gets weight 0. |
| 295 | */ |
| 296 | break; |
| 297 | case 1: |
| 298 | weight_set(p, -1); |
| 299 | break; |
| 300 | default: |
| 301 | weight_set(p, -2); |
| 302 | break; |
| 303 | } |
| 304 | } |
| 305 | |
| 306 | show_list("bisection 2 initialize", counted, nr, list); |
| 307 | |
| 308 | /* |
| 309 | * If you have only one parent in the resulting set |
| 310 | * then you can reach one commit more than that parent |
| 311 | * can reach. So we do not have to run the expensive |
| 312 | * count_distance() for single strand of pearls. |
| 313 | * |
| 314 | * However, if you have more than one parents, you cannot |
| 315 | * just add their distance and one for yourself, since |
| 316 | * they usually reach the same ancestor and you would |
| 317 | * end up counting them twice that way. |
| 318 | * |
| 319 | * So we will first count distance of merges the usual |
| 320 | * way, and then fill the blanks using cheaper algorithm. |
| 321 | */ |
| 322 | for (p = list; p; p = p->next) { |
| 323 | if (p->item->object.flags & UNINTERESTING) |
| 324 | continue; |
| 325 | if (weight(p) != -2) |
| 326 | continue; |
Aaron Lipman | ad464a4 | 2020-08-07 17:58:38 -0400 | [diff] [blame] | 327 | if (bisect_flags & FIND_BISECTION_FIRST_PARENT_ONLY) |
Aaron Lipman | 0fe305a | 2020-08-07 17:58:35 -0400 | [diff] [blame] | 328 | BUG("shouldn't be calling count-distance in fp mode"); |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 329 | weight_set(p, count_distance(p)); |
| 330 | clear_distance(list); |
| 331 | |
SZEDER Gábor | 0afcea7 | 2020-11-12 17:19:38 +0100 | [diff] [blame] | 332 | /* Does it happen to be at half-way? */ |
| 333 | if (!(bisect_flags & FIND_BISECTION_ALL) && |
| 334 | approx_halfway(p, nr)) |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 335 | return p; |
| 336 | counted++; |
| 337 | } |
| 338 | |
| 339 | show_list("bisection 2 count_distance", counted, nr, list); |
| 340 | |
| 341 | while (counted < nr) { |
| 342 | for (p = list; p; p = p->next) { |
| 343 | struct commit_list *q; |
Aaron Lipman | ad464a4 | 2020-08-07 17:58:38 -0400 | [diff] [blame] | 344 | unsigned commit_flags = p->item->object.flags; |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 345 | |
| 346 | if (0 <= weight(p)) |
| 347 | continue; |
Aaron Lipman | 0fe305a | 2020-08-07 17:58:35 -0400 | [diff] [blame] | 348 | |
| 349 | for (q = p->item->parents; |
| 350 | q; |
Aaron Lipman | ad464a4 | 2020-08-07 17:58:38 -0400 | [diff] [blame] | 351 | q = bisect_flags & FIND_BISECTION_FIRST_PARENT_ONLY ? NULL : q->next) { |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 352 | if (q->item->object.flags & UNINTERESTING) |
| 353 | continue; |
| 354 | if (0 <= weight(q)) |
| 355 | break; |
| 356 | } |
| 357 | if (!q) |
| 358 | continue; |
| 359 | |
| 360 | /* |
| 361 | * weight for p is unknown but q is known. |
| 362 | * add one for p itself if p is to be counted, |
| 363 | * otherwise inherit it from q directly. |
| 364 | */ |
Aaron Lipman | ad464a4 | 2020-08-07 17:58:38 -0400 | [diff] [blame] | 365 | if (!(commit_flags & TREESAME)) { |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 366 | weight_set(p, weight(q)+1); |
| 367 | counted++; |
| 368 | show_list("bisection 2 count one", |
| 369 | counted, nr, list); |
| 370 | } |
| 371 | else |
| 372 | weight_set(p, weight(q)); |
| 373 | |
SZEDER Gábor | 0afcea7 | 2020-11-12 17:19:38 +0100 | [diff] [blame] | 374 | /* Does it happen to be at half-way? */ |
| 375 | if (!(bisect_flags & FIND_BISECTION_ALL) && |
| 376 | approx_halfway(p, nr)) |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 377 | return p; |
| 378 | } |
| 379 | } |
| 380 | |
| 381 | show_list("bisection 2 counted all", counted, nr, list); |
| 382 | |
Aaron Lipman | ad464a4 | 2020-08-07 17:58:38 -0400 | [diff] [blame] | 383 | if (!(bisect_flags & FIND_BISECTION_ALL)) |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 384 | return best_bisection(list, nr); |
| 385 | else |
| 386 | return best_bisection_sorted(list, nr); |
| 387 | } |
| 388 | |
Martin Ågren | 24d707f | 2017-11-05 21:24:28 +0100 | [diff] [blame] | 389 | void find_bisection(struct commit_list **commit_list, int *reaches, |
Aaron Lipman | ad464a4 | 2020-08-07 17:58:38 -0400 | [diff] [blame] | 390 | int *all, unsigned bisect_flags) |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 391 | { |
| 392 | int nr, on_list; |
Martin Ågren | 24d707f | 2017-11-05 21:24:28 +0100 | [diff] [blame] | 393 | struct commit_list *list, *p, *best, *next, *last; |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 394 | int *weights; |
| 395 | |
Martin Ågren | 24d707f | 2017-11-05 21:24:28 +0100 | [diff] [blame] | 396 | show_list("bisection 2 entry", 0, 0, *commit_list); |
Nguyễn Thái Ngọc Duy | bb408ac | 2018-05-19 07:28:25 +0200 | [diff] [blame] | 397 | init_commit_weight(&commit_weight); |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 398 | |
| 399 | /* |
| 400 | * Count the number of total and tree-changing items on the |
| 401 | * list, while reversing the list. |
| 402 | */ |
Martin Ågren | 24d707f | 2017-11-05 21:24:28 +0100 | [diff] [blame] | 403 | for (nr = on_list = 0, last = NULL, p = *commit_list; |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 404 | p; |
| 405 | p = next) { |
Aaron Lipman | ad464a4 | 2020-08-07 17:58:38 -0400 | [diff] [blame] | 406 | unsigned commit_flags = p->item->object.flags; |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 407 | |
| 408 | next = p->next; |
Aaron Lipman | ad464a4 | 2020-08-07 17:58:38 -0400 | [diff] [blame] | 409 | if (commit_flags & UNINTERESTING) { |
Martin Ågren | fc5c40b | 2017-11-05 21:24:29 +0100 | [diff] [blame] | 410 | free(p); |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 411 | continue; |
Martin Ågren | fc5c40b | 2017-11-05 21:24:29 +0100 | [diff] [blame] | 412 | } |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 413 | p->next = last; |
| 414 | last = p; |
Aaron Lipman | ad464a4 | 2020-08-07 17:58:38 -0400 | [diff] [blame] | 415 | if (!(commit_flags & TREESAME)) |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 416 | nr++; |
| 417 | on_list++; |
| 418 | } |
| 419 | list = last; |
| 420 | show_list("bisection 2 sorted", 0, nr, list); |
| 421 | |
| 422 | *all = nr; |
René Scharfe | ca56dad | 2021-03-13 17:17:22 +0100 | [diff] [blame] | 423 | CALLOC_ARRAY(weights, on_list); |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 424 | |
| 425 | /* Do the real work of finding bisection commit. */ |
Aaron Lipman | ad464a4 | 2020-08-07 17:58:38 -0400 | [diff] [blame] | 426 | best = do_find_bisection(list, nr, weights, bisect_flags); |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 427 | if (best) { |
Aaron Lipman | ad464a4 | 2020-08-07 17:58:38 -0400 | [diff] [blame] | 428 | if (!(bisect_flags & FIND_BISECTION_ALL)) { |
Martin Ågren | f4e45cb | 2017-11-05 21:24:31 +0100 | [diff] [blame] | 429 | list->item = best->item; |
| 430 | free_commit_list(list->next); |
| 431 | best = list; |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 432 | best->next = NULL; |
Martin Ågren | f4e45cb | 2017-11-05 21:24:31 +0100 | [diff] [blame] | 433 | } |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 434 | *reaches = weight(best); |
| 435 | } |
| 436 | free(weights); |
Martin Ågren | 24d707f | 2017-11-05 21:24:28 +0100 | [diff] [blame] | 437 | *commit_list = best; |
Nguyễn Thái Ngọc Duy | bb408ac | 2018-05-19 07:28:25 +0200 | [diff] [blame] | 438 | clear_commit_weight(&commit_weight); |
Christian Couder | a2ad79c | 2009-03-26 05:55:24 +0100 | [diff] [blame] | 439 | } |
| 440 | |
Michael Haggerty | eed2514 | 2015-05-25 18:38:31 +0000 | [diff] [blame] | 441 | static int register_ref(const char *refname, const struct object_id *oid, |
Ævar Arnfjörð Bjarmason | 5cf88fd | 2022-08-25 19:09:48 +0200 | [diff] [blame] | 442 | int flags UNUSED, void *cb_data UNUSED) |
Christian Couder | 1bf072e | 2009-03-26 05:55:54 +0100 | [diff] [blame] | 443 | { |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 444 | struct strbuf good_prefix = STRBUF_INIT; |
| 445 | strbuf_addstr(&good_prefix, term_good); |
| 446 | strbuf_addstr(&good_prefix, "-"); |
| 447 | |
| 448 | if (!strcmp(refname, term_bad)) { |
brian m. carlson | 3c5ff99 | 2015-03-13 23:39:29 +0000 | [diff] [blame] | 449 | current_bad_oid = xmalloc(sizeof(*current_bad_oid)); |
Michael Haggerty | eed2514 | 2015-05-25 18:38:31 +0000 | [diff] [blame] | 450 | oidcpy(current_bad_oid, oid); |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 451 | } else if (starts_with(refname, good_prefix.buf)) { |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 452 | oid_array_append(&good_revs, oid); |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 453 | } else if (starts_with(refname, "skip-")) { |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 454 | oid_array_append(&skipped_revs, oid); |
Christian Couder | 1bf072e | 2009-03-26 05:55:54 +0100 | [diff] [blame] | 455 | } |
| 456 | |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 457 | strbuf_release(&good_prefix); |
| 458 | |
Christian Couder | 1bf072e | 2009-03-26 05:55:54 +0100 | [diff] [blame] | 459 | return 0; |
| 460 | } |
| 461 | |
| 462 | static int read_bisect_refs(void) |
| 463 | { |
Michael Haggerty | eed2514 | 2015-05-25 18:38:31 +0000 | [diff] [blame] | 464 | return for_each_ref_in("refs/bisect/", register_ref, NULL); |
Christian Couder | 1bf072e | 2009-03-26 05:55:54 +0100 | [diff] [blame] | 465 | } |
| 466 | |
Jeff King | f932729 | 2015-08-10 05:38:57 -0400 | [diff] [blame] | 467 | static GIT_PATH_FUNC(git_path_bisect_names, "BISECT_NAMES") |
| 468 | static GIT_PATH_FUNC(git_path_bisect_expected_rev, "BISECT_EXPECTED_REV") |
Pranit Bauva | fb71a32 | 2017-09-29 06:49:39 +0000 | [diff] [blame] | 469 | static GIT_PATH_FUNC(git_path_bisect_ancestors_ok, "BISECT_ANCESTORS_OK") |
| 470 | static GIT_PATH_FUNC(git_path_bisect_run, "BISECT_RUN") |
| 471 | static GIT_PATH_FUNC(git_path_bisect_start, "BISECT_START") |
| 472 | static GIT_PATH_FUNC(git_path_bisect_log, "BISECT_LOG") |
Jeff King | f5d284f | 2017-04-20 17:08:25 -0400 | [diff] [blame] | 473 | static GIT_PATH_FUNC(git_path_bisect_terms, "BISECT_TERMS") |
Aaron Lipman | e8861ff | 2020-08-07 17:58:37 -0400 | [diff] [blame] | 474 | static GIT_PATH_FUNC(git_path_bisect_first_parent, "BISECT_FIRST_PARENT") |
Pranit Bauva | fb71a32 | 2017-09-29 06:49:39 +0000 | [diff] [blame] | 475 | static GIT_PATH_FUNC(git_path_head_name, "head-name") |
Jeff King | f932729 | 2015-08-10 05:38:57 -0400 | [diff] [blame] | 476 | |
Jeff King | ef8d7ac | 2020-07-28 16:24:53 -0400 | [diff] [blame] | 477 | static void read_bisect_paths(struct strvec *array) |
Christian Couder | 3b437b0 | 2009-03-26 05:55:59 +0100 | [diff] [blame] | 478 | { |
| 479 | struct strbuf str = STRBUF_INIT; |
Jeff King | f932729 | 2015-08-10 05:38:57 -0400 | [diff] [blame] | 480 | const char *filename = git_path_bisect_names(); |
Nguyễn Thái Ngọc Duy | 23a9e07 | 2017-05-03 17:16:46 +0700 | [diff] [blame] | 481 | FILE *fp = xfopen(filename, "r"); |
Christian Couder | 3b437b0 | 2009-03-26 05:55:59 +0100 | [diff] [blame] | 482 | |
Junio C Hamano | 8f309ae | 2016-01-13 15:31:17 -0800 | [diff] [blame] | 483 | while (strbuf_getline_lf(&str, fp) != EOF) { |
Christian Couder | 3b437b0 | 2009-03-26 05:55:59 +0100 | [diff] [blame] | 484 | strbuf_trim(&str); |
Jeff King | 2745b6b | 2020-07-28 16:24:02 -0400 | [diff] [blame] | 485 | if (sq_dequote_to_strvec(str.buf, array)) |
Vasco Almeida | 14dc489 | 2016-06-17 20:21:12 +0000 | [diff] [blame] | 486 | die(_("Badly quoted content in file '%s': %s"), |
Jeff King | 8a534b6 | 2011-09-13 17:58:14 -0400 | [diff] [blame] | 487 | filename, str.buf); |
Christian Couder | 3b437b0 | 2009-03-26 05:55:59 +0100 | [diff] [blame] | 488 | } |
| 489 | |
| 490 | strbuf_release(&str); |
| 491 | fclose(fp); |
| 492 | } |
| 493 | |
Jeff King | 7383b25 | 2020-03-30 10:04:06 -0400 | [diff] [blame] | 494 | static char *join_oid_array_hex(struct oid_array *array, char delim) |
Christian Couder | c053766 | 2009-05-09 17:55:45 +0200 | [diff] [blame] | 495 | { |
| 496 | struct strbuf joined_hexs = STRBUF_INIT; |
| 497 | int i; |
| 498 | |
Jeff King | 902bb36 | 2011-05-19 17:34:33 -0400 | [diff] [blame] | 499 | for (i = 0; i < array->nr; i++) { |
brian m. carlson | ee3051b | 2017-03-26 16:01:37 +0000 | [diff] [blame] | 500 | strbuf_addstr(&joined_hexs, oid_to_hex(array->oid + i)); |
Jeff King | 902bb36 | 2011-05-19 17:34:33 -0400 | [diff] [blame] | 501 | if (i + 1 < array->nr) |
Christian Couder | c053766 | 2009-05-09 17:55:45 +0200 | [diff] [blame] | 502 | strbuf_addch(&joined_hexs, delim); |
| 503 | } |
| 504 | |
| 505 | return strbuf_detach(&joined_hexs, NULL); |
| 506 | } |
| 507 | |
Christian Couder | 9af3589 | 2009-06-06 06:41:33 +0200 | [diff] [blame] | 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 | */ |
Christian Couder | 9518864 | 2009-03-26 05:55:49 +0100 | [diff] [blame] | 521 | struct commit_list *filter_skipped(struct commit_list *list, |
| 522 | struct commit_list **tried, |
Christian Couder | 9af3589 | 2009-06-06 06:41:33 +0200 | [diff] [blame] | 523 | int show_all, |
| 524 | int *count, |
| 525 | int *skipped_first) |
Christian Couder | 9518864 | 2009-03-26 05:55:49 +0100 | [diff] [blame] | 526 | { |
| 527 | struct commit_list *filtered = NULL, **f = &filtered; |
| 528 | |
| 529 | *tried = NULL; |
| 530 | |
Christian Couder | 9af3589 | 2009-06-06 06:41:33 +0200 | [diff] [blame] | 531 | if (skipped_first) |
| 532 | *skipped_first = 0; |
| 533 | if (count) |
| 534 | *count = 0; |
| 535 | |
Jeff King | 902bb36 | 2011-05-19 17:34:33 -0400 | [diff] [blame] | 536 | if (!skipped_revs.nr) |
Christian Couder | 9518864 | 2009-03-26 05:55:49 +0100 | [diff] [blame] | 537 | return list; |
| 538 | |
Christian Couder | 9518864 | 2009-03-26 05:55:49 +0100 | [diff] [blame] | 539 | while (list) { |
| 540 | struct commit_list *next = list->next; |
| 541 | list->next = NULL; |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 542 | if (0 <= oid_array_lookup(&skipped_revs, &list->item->object.oid)) { |
Christian Couder | 9af3589 | 2009-06-06 06:41:33 +0200 | [diff] [blame] | 543 | if (skipped_first && !*skipped_first) |
| 544 | *skipped_first = 1; |
Christian Couder | 9518864 | 2009-03-26 05:55:49 +0100 | [diff] [blame] | 545 | /* Move current to tried list */ |
| 546 | *tried = list; |
| 547 | tried = &list->next; |
| 548 | } else { |
Christian Couder | 9af3589 | 2009-06-06 06:41:33 +0200 | [diff] [blame] | 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 | } |
Christian Couder | 9518864 | 2009-03-26 05:55:49 +0100 | [diff] [blame] | 556 | /* Move current to filtered list */ |
| 557 | *f = list; |
| 558 | f = &list->next; |
Christian Couder | 9af3589 | 2009-06-06 06:41:33 +0200 | [diff] [blame] | 559 | if (count) |
| 560 | (*count)++; |
Christian Couder | 9518864 | 2009-03-26 05:55:49 +0100 | [diff] [blame] | 561 | } |
| 562 | list = next; |
| 563 | } |
| 564 | |
Christian Couder | 9af3589 | 2009-06-06 06:41:33 +0200 | [diff] [blame] | 565 | if (skipped_first && *skipped_first == -1) |
| 566 | *skipped_first = 0; |
| 567 | |
Christian Couder | 9518864 | 2009-03-26 05:55:49 +0100 | [diff] [blame] | 568 | return filtered; |
| 569 | } |
Christian Couder | 1bf072e | 2009-03-26 05:55:54 +0100 | [diff] [blame] | 570 | |
Christian Couder | ebc9529 | 2009-06-13 07:21:06 +0200 | [diff] [blame] | 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 | */ |
Nguyễn Thái Ngọc Duy | 3b33576 | 2018-12-09 11:25:21 +0100 | [diff] [blame] | 579 | static unsigned get_prn(unsigned count) |
| 580 | { |
Christian Couder | ebc9529 | 2009-06-13 07:21:06 +0200 | [diff] [blame] | 581 | count = count * 1103515245 + 12345; |
John Keeping | 7b96d88 | 2013-04-03 20:17:55 +0100 | [diff] [blame] | 582 | return (count/65536) % PRN_MODULO; |
Christian Couder | ebc9529 | 2009-06-13 07:21:06 +0200 | [diff] [blame] | 583 | } |
| 584 | |
| 585 | /* |
| 586 | * Custom integer square root from |
Sven Strickroth | 5e68729 | 2017-05-13 11:54:51 +0200 | [diff] [blame] | 587 | * https://en.wikipedia.org/wiki/Integer_square_root |
Christian Couder | ebc9529 | 2009-06-13 07:21:06 +0200 | [diff] [blame] | 588 | */ |
| 589 | static int sqrti(int val) |
Christian Couder | 62d0b0d | 2009-06-06 06:41:34 +0200 | [diff] [blame] | 590 | { |
Christian Couder | ebc9529 | 2009-06-13 07:21:06 +0200 | [diff] [blame] | 591 | float d, x = val; |
| 592 | |
Miriam Rubio | b8e3b2f | 2020-02-17 09:40:30 +0100 | [diff] [blame] | 593 | if (!val) |
Christian Couder | ebc9529 | 2009-06-13 07:21:06 +0200 | [diff] [blame] | 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) |
| 606 | { |
Christian Couder | 62d0b0d | 2009-06-06 06:41:34 +0200 | [diff] [blame] | 607 | struct commit_list *cur, *previous; |
Christian Couder | ebc9529 | 2009-06-13 07:21:06 +0200 | [diff] [blame] | 608 | int prn, index, i; |
| 609 | |
| 610 | prn = get_prn(count); |
| 611 | index = (count * prn / PRN_MODULO) * sqrti(prn) / sqrti(PRN_MODULO); |
Christian Couder | 62d0b0d | 2009-06-06 06:41:34 +0200 | [diff] [blame] | 612 | |
| 613 | cur = list; |
| 614 | previous = NULL; |
Christian Couder | 62d0b0d | 2009-06-06 06:41:34 +0200 | [diff] [blame] | 615 | |
| 616 | for (i = 0; cur; cur = cur->next, i++) { |
| 617 | if (i == index) { |
Jeff King | 9001dc2 | 2018-08-28 17:22:48 -0400 | [diff] [blame] | 618 | if (!oideq(&cur->item->object.oid, current_bad_oid)) |
Christian Couder | 62d0b0d | 2009-06-06 06:41:34 +0200 | [diff] [blame] | 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; |
Christian Couder | 62d0b0d | 2009-06-06 06:41:34 +0200 | [diff] [blame] | 634 | |
| 635 | *tried = NULL; |
| 636 | |
Jeff King | 902bb36 | 2011-05-19 17:34:33 -0400 | [diff] [blame] | 637 | if (!skipped_revs.nr) |
Christian Couder | 62d0b0d | 2009-06-06 06:41:34 +0200 | [diff] [blame] | 638 | return list; |
| 639 | |
| 640 | list = filter_skipped(list, tried, 0, &count, &skipped_first); |
| 641 | |
| 642 | if (!skipped_first) |
| 643 | return list; |
| 644 | |
Christian Couder | ebc9529 | 2009-06-13 07:21:06 +0200 | [diff] [blame] | 645 | return skip_away(list, count); |
Christian Couder | 62d0b0d | 2009-06-06 06:41:34 +0200 | [diff] [blame] | 646 | } |
| 647 | |
Nguyễn Thái Ngọc Duy | 69d2cfe | 2018-11-10 06:48:59 +0100 | [diff] [blame] | 648 | static void bisect_rev_setup(struct repository *r, struct rev_info *revs, |
Ævar Arnfjörð Bjarmason | 57efebb | 2022-08-02 17:33:15 +0200 | [diff] [blame] | 649 | struct strvec *rev_argv, |
Nguyễn Thái Ngọc Duy | 69d2cfe | 2018-11-10 06:48:59 +0100 | [diff] [blame] | 650 | const char *prefix, |
Christian Couder | a22347c | 2009-05-17 17:36:44 +0200 | [diff] [blame] | 651 | const char *bad_format, const char *good_format, |
| 652 | int read_paths) |
Christian Couder | 1bf072e | 2009-03-26 05:55:54 +0100 | [diff] [blame] | 653 | { |
Ævar Arnfjörð Bjarmason | f92dbdb | 2022-08-02 17:33:16 +0200 | [diff] [blame] | 654 | struct setup_revision_opt opt = { |
| 655 | .free_removed_argv_elements = 1, |
| 656 | }; |
Christian Couder | fad2d31 | 2009-05-09 17:55:40 +0200 | [diff] [blame] | 657 | int i; |
| 658 | |
Nguyễn Thái Ngọc Duy | 69d2cfe | 2018-11-10 06:48:59 +0100 | [diff] [blame] | 659 | repo_init_revisions(r, revs, prefix); |
Christian Couder | 3b437b0 | 2009-03-26 05:55:59 +0100 | [diff] [blame] | 660 | revs->abbrev = 0; |
| 661 | revs->commit_format = CMIT_FMT_UNSPECIFIED; |
Christian Couder | 1bf072e | 2009-03-26 05:55:54 +0100 | [diff] [blame] | 662 | |
Christian Couder | 1c953a1 | 2009-05-09 17:55:41 +0200 | [diff] [blame] | 663 | /* rev_argv.argv[0] will be ignored by setup_revisions */ |
Ævar Arnfjörð Bjarmason | 57efebb | 2022-08-02 17:33:15 +0200 | [diff] [blame] | 664 | strvec_push(rev_argv, "bisect_rev_setup"); |
| 665 | strvec_pushf(rev_argv, bad_format, oid_to_hex(current_bad_oid)); |
Jeff King | 902bb36 | 2011-05-19 17:34:33 -0400 | [diff] [blame] | 666 | for (i = 0; i < good_revs.nr; i++) |
Ævar Arnfjörð Bjarmason | 57efebb | 2022-08-02 17:33:15 +0200 | [diff] [blame] | 667 | strvec_pushf(rev_argv, good_format, |
Jeff King | f6d8942 | 2020-07-28 16:26:31 -0400 | [diff] [blame] | 668 | oid_to_hex(good_revs.oid + i)); |
Ævar Arnfjörð Bjarmason | 57efebb | 2022-08-02 17:33:15 +0200 | [diff] [blame] | 669 | strvec_push(rev_argv, "--"); |
Christian Couder | a22347c | 2009-05-17 17:36:44 +0200 | [diff] [blame] | 670 | if (read_paths) |
Ævar Arnfjörð Bjarmason | 57efebb | 2022-08-02 17:33:15 +0200 | [diff] [blame] | 671 | read_bisect_paths(rev_argv); |
Christian Couder | 1bf072e | 2009-03-26 05:55:54 +0100 | [diff] [blame] | 672 | |
Ævar Arnfjörð Bjarmason | f92dbdb | 2022-08-02 17:33:16 +0200 | [diff] [blame] | 673 | setup_revisions(rev_argv->nr, rev_argv->v, revs, &opt); |
Christian Couder | 3b437b0 | 2009-03-26 05:55:59 +0100 | [diff] [blame] | 674 | } |
| 675 | |
Christian Couder | a22347c | 2009-05-17 17:36:44 +0200 | [diff] [blame] | 676 | static void bisect_common(struct rev_info *revs) |
Christian Couder | 2ace972 | 2009-04-19 11:55:57 +0200 | [diff] [blame] | 677 | { |
Christian Couder | 2ace972 | 2009-04-19 11:55:57 +0200 | [diff] [blame] | 678 | if (prepare_revision_walk(revs)) |
| 679 | die("revision walk setup failed"); |
| 680 | if (revs->tree_objects) |
Derrick Stolee | 4f6d26b | 2019-01-16 10:25:58 -0800 | [diff] [blame] | 681 | mark_edges_uninteresting(revs, NULL, 0); |
Christian Couder | 2ace972 | 2009-04-19 11:55:57 +0200 | [diff] [blame] | 682 | } |
| 683 | |
Pranit Bauva | ce58b5d | 2020-02-17 09:40:34 +0100 | [diff] [blame] | 684 | static enum bisect_error error_if_skipped_commits(struct commit_list *tried, |
brian m. carlson | 3c5ff99 | 2015-03-13 23:39:29 +0000 | [diff] [blame] | 685 | const struct object_id *bad) |
Christian Couder | ef24c7c | 2009-04-19 11:56:07 +0200 | [diff] [blame] | 686 | { |
| 687 | if (!tried) |
Pranit Bauva | ce58b5d | 2020-02-17 09:40:34 +0100 | [diff] [blame] | 688 | return BISECT_OK; |
Christian Couder | ef24c7c | 2009-04-19 11:56:07 +0200 | [diff] [blame] | 689 | |
| 690 | printf("There are only 'skip'ped commits left to test.\n" |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 691 | "The first %s commit could be any of:\n", term_bad); |
Junio C Hamano | 54307ea | 2016-07-08 10:09:28 -0700 | [diff] [blame] | 692 | |
| 693 | for ( ; tried; tried = tried->next) |
| 694 | printf("%s\n", oid_to_hex(&tried->item->object.oid)); |
| 695 | |
Christian Couder | ef24c7c | 2009-04-19 11:56:07 +0200 | [diff] [blame] | 696 | if (bad) |
brian m. carlson | 3c5ff99 | 2015-03-13 23:39:29 +0000 | [diff] [blame] | 697 | printf("%s\n", oid_to_hex(bad)); |
Vasco Almeida | 14dc489 | 2016-06-17 20:21:12 +0000 | [diff] [blame] | 698 | printf(_("We cannot bisect more!\n")); |
Pranit Bauva | ce58b5d | 2020-02-17 09:40:34 +0100 | [diff] [blame] | 699 | |
| 700 | return BISECT_ONLY_SKIPPED_LEFT; |
Christian Couder | ef24c7c | 2009-04-19 11:56:07 +0200 | [diff] [blame] | 701 | } |
| 702 | |
brian m. carlson | 3c5ff99 | 2015-03-13 23:39:29 +0000 | [diff] [blame] | 703 | static int is_expected_rev(const struct object_id *oid) |
Christian Couder | c053766 | 2009-05-09 17:55:45 +0200 | [diff] [blame] | 704 | { |
Jeff King | f932729 | 2015-08-10 05:38:57 -0400 | [diff] [blame] | 705 | const char *filename = git_path_bisect_expected_rev(); |
Christian Couder | c053766 | 2009-05-09 17:55:45 +0200 | [diff] [blame] | 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 | |
Nguyễn Thái Ngọc Duy | e9d983f | 2017-05-03 17:16:50 +0700 | [diff] [blame] | 714 | fp = fopen_or_warn(filename, "r"); |
Christian Couder | c053766 | 2009-05-09 17:55:45 +0200 | [diff] [blame] | 715 | if (!fp) |
| 716 | return 0; |
| 717 | |
Junio C Hamano | 8f309ae | 2016-01-13 15:31:17 -0800 | [diff] [blame] | 718 | if (strbuf_getline_lf(&str, fp) != EOF) |
brian m. carlson | 3c5ff99 | 2015-03-13 23:39:29 +0000 | [diff] [blame] | 719 | res = !strcmp(str.buf, oid_to_hex(oid)); |
Christian Couder | c053766 | 2009-05-09 17:55:45 +0200 | [diff] [blame] | 720 | |
| 721 | strbuf_release(&str); |
| 722 | fclose(fp); |
| 723 | |
| 724 | return res; |
| 725 | } |
| 726 | |
René Scharfe | 48af1fd | 2022-01-18 13:46:32 +0100 | [diff] [blame] | 727 | enum bisect_error bisect_checkout(const struct object_id *bisect_rev, |
| 728 | int no_checkout) |
Christian Couder | ef24c7c | 2009-04-19 11:56:07 +0200 | [diff] [blame] | 729 | { |
Junio C Hamano | ffcb4e9 | 2021-07-27 11:22:18 -0700 | [diff] [blame] | 730 | struct commit *commit; |
| 731 | struct pretty_print_context pp = {0}; |
| 732 | struct strbuf commit_msg = STRBUF_INIT; |
Christian Couder | ef24c7c | 2009-04-19 11:56:07 +0200 | [diff] [blame] | 733 | |
brian m. carlson | ae07777 | 2017-10-15 22:06:51 +0000 | [diff] [blame] | 734 | update_ref(NULL, "BISECT_EXPECTED_REV", bisect_rev, NULL, 0, UPDATE_REFS_DIE_ON_ERR); |
Christian Couder | ef24c7c | 2009-04-19 11:56:07 +0200 | [diff] [blame] | 735 | |
Jon Seymour | fee92fc | 2011-08-04 22:01:00 +1000 | [diff] [blame] | 736 | if (no_checkout) { |
brian m. carlson | ae07777 | 2017-10-15 22:06:51 +0000 | [diff] [blame] | 737 | update_ref(NULL, "BISECT_HEAD", bisect_rev, NULL, 0, |
| 738 | UPDATE_REFS_DIE_ON_ERR); |
Jon Seymour | fee92fc | 2011-08-04 22:01:00 +1000 | [diff] [blame] | 739 | } else { |
René Scharfe | ddbb47f | 2022-10-30 12:55:06 +0100 | [diff] [blame] | 740 | struct child_process cmd = CHILD_PROCESS_INIT; |
René Scharfe | 48750b2 | 2022-10-30 12:47:02 +0100 | [diff] [blame] | 741 | |
René Scharfe | ddbb47f | 2022-10-30 12:55:06 +0100 | [diff] [blame] | 742 | cmd.git_cmd = 1; |
| 743 | strvec_pushl(&cmd.args, "checkout", "-q", |
| 744 | oid_to_hex(bisect_rev), "--", NULL); |
| 745 | if (run_command(&cmd)) |
Pranit Bauva | e8e3ce6 | 2020-02-17 09:40:35 +0100 | [diff] [blame] | 746 | /* |
| 747 | * Errors in `run_command()` itself, signaled by res < 0, |
| 748 | * and errors in the child process, signaled by res > 0 |
Junio C Hamano | 1fcc40c | 2021-07-28 10:07:02 -0700 | [diff] [blame] | 749 | * can both be treated as regular BISECT_FAILED (-1). |
Pranit Bauva | e8e3ce6 | 2020-02-17 09:40:35 +0100 | [diff] [blame] | 750 | */ |
Junio C Hamano | 1fcc40c | 2021-07-28 10:07:02 -0700 | [diff] [blame] | 751 | return BISECT_FAILED; |
Jon Seymour | fee92fc | 2011-08-04 22:01:00 +1000 | [diff] [blame] | 752 | } |
Christian Couder | ef24c7c | 2009-04-19 11:56:07 +0200 | [diff] [blame] | 753 | |
Junio C Hamano | ffcb4e9 | 2021-07-27 11:22:18 -0700 | [diff] [blame] | 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 | |
Junio C Hamano | 1fcc40c | 2021-07-28 10:07:02 -0700 | [diff] [blame] | 759 | return BISECT_OK; |
Christian Couder | ef24c7c | 2009-04-19 11:56:07 +0200 | [diff] [blame] | 760 | } |
| 761 | |
Nguyễn Thái Ngọc Duy | 69d2cfe | 2018-11-10 06:48:59 +0100 | [diff] [blame] | 762 | static struct commit *get_commit_reference(struct repository *r, |
| 763 | const struct object_id *oid) |
Christian Couder | c053766 | 2009-05-09 17:55:45 +0200 | [diff] [blame] | 764 | { |
Nguyễn Thái Ngọc Duy | 69d2cfe | 2018-11-10 06:48:59 +0100 | [diff] [blame] | 765 | struct commit *c = lookup_commit_reference(r, oid); |
| 766 | if (!c) |
brian m. carlson | ee3051b | 2017-03-26 16:01:37 +0000 | [diff] [blame] | 767 | die(_("Not a valid commit name %s"), oid_to_hex(oid)); |
Nguyễn Thái Ngọc Duy | 69d2cfe | 2018-11-10 06:48:59 +0100 | [diff] [blame] | 768 | return c; |
Christian Couder | c053766 | 2009-05-09 17:55:45 +0200 | [diff] [blame] | 769 | } |
| 770 | |
Nguyễn Thái Ngọc Duy | 69d2cfe | 2018-11-10 06:48:59 +0100 | [diff] [blame] | 771 | static struct commit **get_bad_and_good_commits(struct repository *r, |
| 772 | int *rev_nr) |
Christian Couder | c053766 | 2009-05-09 17:55:45 +0200 | [diff] [blame] | 773 | { |
Jeff King | b32fa95 | 2016-02-22 17:44:25 -0500 | [diff] [blame] | 774 | struct commit **rev; |
Christian Couder | c053766 | 2009-05-09 17:55:45 +0200 | [diff] [blame] | 775 | int i, n = 0; |
| 776 | |
Jeff King | b32fa95 | 2016-02-22 17:44:25 -0500 | [diff] [blame] | 777 | ALLOC_ARRAY(rev, 1 + good_revs.nr); |
Nguyễn Thái Ngọc Duy | 69d2cfe | 2018-11-10 06:48:59 +0100 | [diff] [blame] | 778 | rev[n++] = get_commit_reference(r, current_bad_oid); |
Jeff King | 902bb36 | 2011-05-19 17:34:33 -0400 | [diff] [blame] | 779 | for (i = 0; i < good_revs.nr; i++) |
Nguyễn Thái Ngọc Duy | 69d2cfe | 2018-11-10 06:48:59 +0100 | [diff] [blame] | 780 | rev[n++] = get_commit_reference(r, good_revs.oid + i); |
Christian Couder | c053766 | 2009-05-09 17:55:45 +0200 | [diff] [blame] | 781 | *rev_nr = n; |
| 782 | |
| 783 | return rev; |
| 784 | } |
| 785 | |
Pranit Bauva | 9ec598e | 2020-02-17 09:40:38 +0100 | [diff] [blame] | 786 | static enum bisect_error handle_bad_merge_base(void) |
Christian Couder | c053766 | 2009-05-09 17:55:45 +0200 | [diff] [blame] | 787 | { |
brian m. carlson | 3c5ff99 | 2015-03-13 23:39:29 +0000 | [diff] [blame] | 788 | if (is_expected_rev(current_bad_oid)) { |
| 789 | char *bad_hex = oid_to_hex(current_bad_oid); |
Jeff King | 7383b25 | 2020-03-30 10:04:06 -0400 | [diff] [blame] | 790 | char *good_hex = join_oid_array_hex(&good_revs, ' '); |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 791 | if (!strcmp(term_bad, "bad") && !strcmp(term_good, "good")) { |
Vasco Almeida | 14dc489 | 2016-06-17 20:21:12 +0000 | [diff] [blame] | 792 | fprintf(stderr, _("The merge base %s is bad.\n" |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 793 | "This means the bug has been fixed " |
Vasco Almeida | 14dc489 | 2016-06-17 20:21:12 +0000 | [diff] [blame] | 794 | "between %s and [%s].\n"), |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 795 | bad_hex, bad_hex, good_hex); |
Antoine Delaite | 21e5cfd | 2015-06-29 17:40:33 +0200 | [diff] [blame] | 796 | } else if (!strcmp(term_bad, "new") && !strcmp(term_good, "old")) { |
Vasco Almeida | 14dc489 | 2016-06-17 20:21:12 +0000 | [diff] [blame] | 797 | fprintf(stderr, _("The merge base %s is new.\n" |
Antoine Delaite | 21e5cfd | 2015-06-29 17:40:33 +0200 | [diff] [blame] | 798 | "The property has changed " |
Vasco Almeida | 14dc489 | 2016-06-17 20:21:12 +0000 | [diff] [blame] | 799 | "between %s and [%s].\n"), |
Antoine Delaite | 21e5cfd | 2015-06-29 17:40:33 +0200 | [diff] [blame] | 800 | bad_hex, bad_hex, good_hex); |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 801 | } else { |
Vasco Almeida | 14dc489 | 2016-06-17 20:21:12 +0000 | [diff] [blame] | 802 | fprintf(stderr, _("The merge base %s is %s.\n" |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 803 | "This means the first '%s' commit is " |
Vasco Almeida | 14dc489 | 2016-06-17 20:21:12 +0000 | [diff] [blame] | 804 | "between %s and [%s].\n"), |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 805 | bad_hex, term_bad, term_good, bad_hex, good_hex); |
| 806 | } |
Pranit Bauva | 9ec598e | 2020-02-17 09:40:38 +0100 | [diff] [blame] | 807 | return BISECT_MERGE_BASE_CHECK; |
Christian Couder | c053766 | 2009-05-09 17:55:45 +0200 | [diff] [blame] | 808 | } |
| 809 | |
Alex Henrie | 3f407b7 | 2016-12-04 15:04:23 -0700 | [diff] [blame] | 810 | fprintf(stderr, _("Some %s revs are not ancestors of the %s rev.\n" |
Christian Couder | c053766 | 2009-05-09 17:55:45 +0200 | [diff] [blame] | 811 | "git bisect cannot work properly in this case.\n" |
Vasco Almeida | 14dc489 | 2016-06-17 20:21:12 +0000 | [diff] [blame] | 812 | "Maybe you mistook %s and %s revs?\n"), |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 813 | term_good, term_bad, term_good, term_bad); |
Pranit Bauva | 9ec598e | 2020-02-17 09:40:38 +0100 | [diff] [blame] | 814 | return BISECT_FAILED; |
Christian Couder | c053766 | 2009-05-09 17:55:45 +0200 | [diff] [blame] | 815 | } |
| 816 | |
brian m. carlson | 4ce3621 | 2017-03-31 01:39:57 +0000 | [diff] [blame] | 817 | static void handle_skipped_merge_base(const struct object_id *mb) |
Christian Couder | c053766 | 2009-05-09 17:55:45 +0200 | [diff] [blame] | 818 | { |
brian m. carlson | 4ce3621 | 2017-03-31 01:39:57 +0000 | [diff] [blame] | 819 | char *mb_hex = oid_to_hex(mb); |
brian m. carlson | c368dde | 2016-06-24 23:09:22 +0000 | [diff] [blame] | 820 | char *bad_hex = oid_to_hex(current_bad_oid); |
Jeff King | 7383b25 | 2020-03-30 10:04:06 -0400 | [diff] [blame] | 821 | char *good_hex = join_oid_array_hex(&good_revs, ' '); |
Christian Couder | c053766 | 2009-05-09 17:55:45 +0200 | [diff] [blame] | 822 | |
Vasco Almeida | 14dc489 | 2016-06-17 20:21:12 +0000 | [diff] [blame] | 823 | warning(_("the merge base between %s and [%s] " |
Christian Couder | c053766 | 2009-05-09 17:55:45 +0200 | [diff] [blame] | 824 | "must be skipped.\n" |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 825 | "So we cannot be sure the first %s commit is " |
Christian Couder | c053766 | 2009-05-09 17:55:45 +0200 | [diff] [blame] | 826 | "between %s and %s.\n" |
Vasco Almeida | 14dc489 | 2016-06-17 20:21:12 +0000 | [diff] [blame] | 827 | "We continue anyway."), |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 828 | bad_hex, good_hex, term_bad, mb_hex, bad_hex); |
Christian Couder | c053766 | 2009-05-09 17:55:45 +0200 | [diff] [blame] | 829 | free(good_hex); |
| 830 | } |
| 831 | |
| 832 | /* |
Antoine Delaite | 21e5cfd | 2015-06-29 17:40:33 +0200 | [diff] [blame] | 833 | * "check_merge_bases" checks that merge bases are not "bad" (or "new"). |
Christian Couder | c053766 | 2009-05-09 17:55:45 +0200 | [diff] [blame] | 834 | * |
Antoine Delaite | 21e5cfd | 2015-06-29 17:40:33 +0200 | [diff] [blame] | 835 | * - If one is "bad" (or "new"), it means the user assumed something wrong |
Pranit Bauva | cdd4dc2 | 2020-02-17 09:40:36 +0100 | [diff] [blame] | 836 | * and we must return error with a non 0 error code. |
Antoine Delaite | 21e5cfd | 2015-06-29 17:40:33 +0200 | [diff] [blame] | 837 | * - If one is "good" (or "old"), that's good, we have nothing to do. |
Christian Couder | c053766 | 2009-05-09 17:55:45 +0200 | [diff] [blame] | 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. |
Pranit Bauva | cdd4dc2 | 2020-02-17 09:40:36 +0100 | [diff] [blame] | 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(). |
Christian Couder | c053766 | 2009-05-09 17:55:45 +0200 | [diff] [blame] | 844 | */ |
Pranit Bauva | cdd4dc2 | 2020-02-17 09:40:36 +0100 | [diff] [blame] | 845 | static enum bisect_error check_merge_bases(int rev_nr, struct commit **rev, int no_checkout) |
Christian Couder | c053766 | 2009-05-09 17:55:45 +0200 | [diff] [blame] | 846 | { |
Pranit Bauva | cdd4dc2 | 2020-02-17 09:40:36 +0100 | [diff] [blame] | 847 | enum bisect_error res = BISECT_OK; |
Christian Couder | c053766 | 2009-05-09 17:55:45 +0200 | [diff] [blame] | 848 | struct commit_list *result; |
Christian Couder | c053766 | 2009-05-09 17:55:45 +0200 | [diff] [blame] | 849 | |
Junio C Hamano | 2ce406c | 2014-10-30 12:20:44 -0700 | [diff] [blame] | 850 | result = get_merge_bases_many(rev[0], rev_nr - 1, rev + 1); |
Christian Couder | c053766 | 2009-05-09 17:55:45 +0200 | [diff] [blame] | 851 | |
| 852 | for (; result; result = result->next) { |
brian m. carlson | 4ce3621 | 2017-03-31 01:39:57 +0000 | [diff] [blame] | 853 | const struct object_id *mb = &result->item->object.oid; |
Jeff King | 4a7e27e | 2018-08-28 17:22:40 -0400 | [diff] [blame] | 854 | if (oideq(mb, current_bad_oid)) { |
Pranit Bauva | 9ec598e | 2020-02-17 09:40:38 +0100 | [diff] [blame] | 855 | res = handle_bad_merge_base(); |
| 856 | break; |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 857 | } else if (0 <= oid_array_lookup(&good_revs, mb)) { |
Christian Couder | c053766 | 2009-05-09 17:55:45 +0200 | [diff] [blame] | 858 | continue; |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 859 | } else if (0 <= oid_array_lookup(&skipped_revs, mb)) { |
Christian Couder | c053766 | 2009-05-09 17:55:45 +0200 | [diff] [blame] | 860 | handle_skipped_merge_base(mb); |
| 861 | } else { |
Vasco Almeida | 14dc489 | 2016-06-17 20:21:12 +0000 | [diff] [blame] | 862 | printf(_("Bisecting: a merge base must be tested\n")); |
Pranit Bauva | cdd4dc2 | 2020-02-17 09:40:36 +0100 | [diff] [blame] | 863 | res = bisect_checkout(mb, no_checkout); |
| 864 | if (!res) |
| 865 | /* indicate early success */ |
| 866 | res = BISECT_INTERNAL_SUCCESS_MERGE_BASE; |
| 867 | break; |
Christian Couder | c053766 | 2009-05-09 17:55:45 +0200 | [diff] [blame] | 868 | } |
| 869 | } |
| 870 | |
Christian Couder | c053766 | 2009-05-09 17:55:45 +0200 | [diff] [blame] | 871 | free_commit_list(result); |
Pranit Bauva | cdd4dc2 | 2020-02-17 09:40:36 +0100 | [diff] [blame] | 872 | return res; |
Christian Couder | c053766 | 2009-05-09 17:55:45 +0200 | [diff] [blame] | 873 | } |
| 874 | |
Nguyễn Thái Ngọc Duy | 69d2cfe | 2018-11-10 06:48:59 +0100 | [diff] [blame] | 875 | static int check_ancestors(struct repository *r, int rev_nr, |
| 876 | struct commit **rev, const char *prefix) |
Christian Couder | d937d4a | 2009-05-09 17:55:46 +0200 | [diff] [blame] | 877 | { |
Ævar Arnfjörð Bjarmason | 57efebb | 2022-08-02 17:33:15 +0200 | [diff] [blame] | 878 | struct strvec rev_argv = STRVEC_INIT; |
Christian Couder | 2d938fc | 2009-05-17 17:36:46 +0200 | [diff] [blame] | 879 | struct rev_info revs; |
René Scharfe | 86a0a40 | 2011-10-01 18:16:08 +0200 | [diff] [blame] | 880 | int res; |
Christian Couder | d937d4a | 2009-05-09 17:55:46 +0200 | [diff] [blame] | 881 | |
Ævar Arnfjörð Bjarmason | 57efebb | 2022-08-02 17:33:15 +0200 | [diff] [blame] | 882 | bisect_rev_setup(r, &revs, &rev_argv, prefix, "^%s", "%s", 0); |
Christian Couder | d937d4a | 2009-05-09 17:55:46 +0200 | [diff] [blame] | 883 | |
Christian Couder | 2d938fc | 2009-05-17 17:36:46 +0200 | [diff] [blame] | 884 | bisect_common(&revs); |
| 885 | res = (revs.commits != NULL); |
| 886 | |
| 887 | /* Clean up objects used, as they will be reused. */ |
René Scharfe | 148f14a | 2017-12-25 18:45:36 +0100 | [diff] [blame] | 888 | clear_commit_marks_many(rev_nr, rev, ALL_REV_FLAGS); |
Christian Couder | d937d4a | 2009-05-09 17:55:46 +0200 | [diff] [blame] | 889 | |
Ævar Arnfjörð Bjarmason | 2108fe4 | 2022-04-13 22:01:36 +0200 | [diff] [blame] | 890 | release_revisions(&revs); |
Ævar Arnfjörð Bjarmason | 57efebb | 2022-08-02 17:33:15 +0200 | [diff] [blame] | 891 | strvec_clear(&rev_argv); |
Christian Couder | 2d938fc | 2009-05-17 17:36:46 +0200 | [diff] [blame] | 892 | return res; |
Christian Couder | d937d4a | 2009-05-09 17:55:46 +0200 | [diff] [blame] | 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 |
Pranit Bauva | 45b6370 | 2020-02-17 09:40:37 +0100 | [diff] [blame] | 901 | * checked out to be tested by the user and we will return. |
Christian Couder | d937d4a | 2009-05-09 17:55:46 +0200 | [diff] [blame] | 902 | */ |
Pranit Bauva | 45b6370 | 2020-02-17 09:40:37 +0100 | [diff] [blame] | 903 | |
| 904 | static enum bisect_error check_good_are_ancestors_of_bad(struct repository *r, |
Nguyễn Thái Ngọc Duy | 69d2cfe | 2018-11-10 06:48:59 +0100 | [diff] [blame] | 905 | const char *prefix, |
| 906 | int no_checkout) |
Christian Couder | d937d4a | 2009-05-09 17:55:46 +0200 | [diff] [blame] | 907 | { |
Pranit Bauva | 45b6370 | 2020-02-17 09:40:37 +0100 | [diff] [blame] | 908 | char *filename; |
Christian Couder | d937d4a | 2009-05-09 17:55:46 +0200 | [diff] [blame] | 909 | struct stat st; |
René Scharfe | 148f14a | 2017-12-25 18:45:36 +0100 | [diff] [blame] | 910 | int fd, rev_nr; |
Pranit Bauva | cdd4dc2 | 2020-02-17 09:40:36 +0100 | [diff] [blame] | 911 | enum bisect_error res = BISECT_OK; |
René Scharfe | 148f14a | 2017-12-25 18:45:36 +0100 | [diff] [blame] | 912 | struct commit **rev; |
Christian Couder | d937d4a | 2009-05-09 17:55:46 +0200 | [diff] [blame] | 913 | |
brian m. carlson | 3c5ff99 | 2015-03-13 23:39:29 +0000 | [diff] [blame] | 914 | if (!current_bad_oid) |
Pranit Bauva | 45b6370 | 2020-02-17 09:40:37 +0100 | [diff] [blame] | 915 | return error(_("a %s revision is needed"), term_bad); |
| 916 | |
| 917 | filename = git_pathdup("BISECT_ANCESTORS_OK"); |
Christian Couder | d937d4a | 2009-05-09 17:55:46 +0200 | [diff] [blame] | 918 | |
| 919 | /* Check if file BISECT_ANCESTORS_OK exists. */ |
| 920 | if (!stat(filename, &st) && S_ISREG(st.st_mode)) |
Michael Haggerty | 144e709 | 2012-04-27 00:26:59 +0200 | [diff] [blame] | 921 | goto done; |
Christian Couder | d937d4a | 2009-05-09 17:55:46 +0200 | [diff] [blame] | 922 | |
| 923 | /* Bisecting with no good rev is ok. */ |
Miriam Rubio | b8e3b2f | 2020-02-17 09:40:30 +0100 | [diff] [blame] | 924 | if (!good_revs.nr) |
Michael Haggerty | 144e709 | 2012-04-27 00:26:59 +0200 | [diff] [blame] | 925 | goto done; |
Christian Couder | d937d4a | 2009-05-09 17:55:46 +0200 | [diff] [blame] | 926 | |
Christian Couder | 2d938fc | 2009-05-17 17:36:46 +0200 | [diff] [blame] | 927 | /* Check if all good revs are ancestor of the bad rev. */ |
Pranit Bauva | cdd4dc2 | 2020-02-17 09:40:36 +0100 | [diff] [blame] | 928 | |
Nguyễn Thái Ngọc Duy | 69d2cfe | 2018-11-10 06:48:59 +0100 | [diff] [blame] | 929 | rev = get_bad_and_good_commits(r, &rev_nr); |
| 930 | if (check_ancestors(r, rev_nr, rev, prefix)) |
Pranit Bauva | cdd4dc2 | 2020-02-17 09:40:36 +0100 | [diff] [blame] | 931 | res = check_merge_bases(rev_nr, rev, no_checkout); |
René Scharfe | 148f14a | 2017-12-25 18:45:36 +0100 | [diff] [blame] | 932 | free(rev); |
Christian Couder | d937d4a | 2009-05-09 17:55:46 +0200 | [diff] [blame] | 933 | |
Pranit Bauva | 45b6370 | 2020-02-17 09:40:37 +0100 | [diff] [blame] | 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 | } |
Michael Haggerty | 144e709 | 2012-04-27 00:26:59 +0200 | [diff] [blame] | 950 | done: |
| 951 | free(filename); |
Pranit Bauva | 45b6370 | 2020-02-17 09:40:37 +0100 | [diff] [blame] | 952 | return res; |
Christian Couder | d937d4a | 2009-05-09 17:55:46 +0200 | [diff] [blame] | 953 | } |
| 954 | |
| 955 | /* |
Christian Couder | e22278c | 2009-05-28 23:21:16 +0200 | [diff] [blame] | 956 | * This does "git diff-tree --pretty COMMIT" without one fork+exec. |
| 957 | */ |
Nguyễn Thái Ngọc Duy | 69d2cfe | 2018-11-10 06:48:59 +0100 | [diff] [blame] | 958 | static void show_diff_tree(struct repository *r, |
| 959 | const char *prefix, |
| 960 | struct commit *commit) |
Christian Couder | e22278c | 2009-05-28 23:21:16 +0200 | [diff] [blame] | 961 | { |
Jeff King | 2008f29 | 2019-02-22 01:20:37 -0500 | [diff] [blame] | 962 | const char *argv[] = { |
Jeff King | b02be8b | 2019-02-22 01:23:28 -0500 | [diff] [blame] | 963 | "diff-tree", "--pretty", "--stat", "--summary", "--cc", NULL |
Jeff King | 2008f29 | 2019-02-22 01:20:37 -0500 | [diff] [blame] | 964 | }; |
Christian Couder | e22278c | 2009-05-28 23:21:16 +0200 | [diff] [blame] | 965 | struct rev_info opt; |
| 966 | |
Jeff King | b02be8b | 2019-02-22 01:23:28 -0500 | [diff] [blame] | 967 | git_config(git_diff_ui_config, NULL); |
Jeff King | 40ae3d3 | 2019-02-22 01:21:33 -0500 | [diff] [blame] | 968 | repo_init_revisions(r, &opt, prefix); |
Christian Couder | e22278c | 2009-05-28 23:21:16 +0200 | [diff] [blame] | 969 | |
Jeff King | 2008f29 | 2019-02-22 01:20:37 -0500 | [diff] [blame] | 970 | setup_revisions(ARRAY_SIZE(argv) - 1, argv, &opt, NULL); |
Christian Couder | e22278c | 2009-05-28 23:21:16 +0200 | [diff] [blame] | 971 | log_tree_commit(&opt, commit); |
Ævar Arnfjörð Bjarmason | 2108fe4 | 2022-04-13 22:01:36 +0200 | [diff] [blame] | 972 | release_revisions(&opt); |
Christian Couder | e22278c | 2009-05-28 23:21:16 +0200 | [diff] [blame] | 973 | } |
| 974 | |
| 975 | /* |
Antoine Delaite | cb46d63 | 2015-06-29 17:40:30 +0200 | [diff] [blame] | 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; |
Jeff King | f5d284f | 2017-04-20 17:08:25 -0400 | [diff] [blame] | 983 | const char *filename = git_path_bisect_terms(); |
Antoine Delaite | cb46d63 | 2015-06-29 17:40:30 +0200 | [diff] [blame] | 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 { |
Vasco Almeida | 14dc489 | 2016-06-17 20:21:12 +0000 | [diff] [blame] | 992 | die_errno(_("could not read file '%s'"), filename); |
Antoine Delaite | cb46d63 | 2015-06-29 17:40:30 +0200 | [diff] [blame] | 993 | } |
| 994 | } else { |
Junio C Hamano | 8f309ae | 2016-01-13 15:31:17 -0800 | [diff] [blame] | 995 | strbuf_getline_lf(&str, fp); |
Antoine Delaite | cb46d63 | 2015-06-29 17:40:30 +0200 | [diff] [blame] | 996 | *read_bad = strbuf_detach(&str, NULL); |
Junio C Hamano | 8f309ae | 2016-01-13 15:31:17 -0800 | [diff] [blame] | 997 | strbuf_getline_lf(&str, fp); |
Antoine Delaite | cb46d63 | 2015-06-29 17:40:30 +0200 | [diff] [blame] | 998 | *read_good = strbuf_detach(&str, NULL); |
| 999 | } |
| 1000 | strbuf_release(&str); |
| 1001 | fclose(fp); |
| 1002 | } |
| 1003 | |
| 1004 | /* |
Pranit Bauva | 6c69f22 | 2020-02-17 09:40:39 +0100 | [diff] [blame] | 1005 | * We use the convention that return BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND (-10) means |
Christian Couder | ef24c7c | 2009-04-19 11:56:07 +0200 | [diff] [blame] | 1006 | * the bisection process finished successfully. |
Pranit Bauva | 6c69f22 | 2020-02-17 09:40:39 +0100 | [diff] [blame] | 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. |
Pranit Bauva | 517ecb3 | 2020-09-24 14:33:40 +0200 | [diff] [blame] | 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. |
Christian Couder | ef24c7c | 2009-04-19 11:56:07 +0200 | [diff] [blame] | 1014 | */ |
Aaron Lipman | be5fe20 | 2020-08-07 17:58:36 -0400 | [diff] [blame] | 1015 | enum bisect_error bisect_next_all(struct repository *r, const char *prefix) |
Christian Couder | ef24c7c | 2009-04-19 11:56:07 +0200 | [diff] [blame] | 1016 | { |
Ævar Arnfjörð Bjarmason | 57efebb | 2022-08-02 17:33:15 +0200 | [diff] [blame] | 1017 | struct strvec rev_argv = STRVEC_INIT; |
Ævar Arnfjörð Bjarmason | f196c1e | 2022-04-13 22:01:38 +0200 | [diff] [blame] | 1018 | struct rev_info revs = REV_INFO_INIT; |
Christian Couder | ef24c7c | 2009-04-19 11:56:07 +0200 | [diff] [blame] | 1019 | struct commit_list *tried; |
David Ripton | 6329bad | 2010-01-19 07:13:33 -0800 | [diff] [blame] | 1020 | int reaches = 0, all = 0, nr, steps; |
Pranit Bauva | ce58b5d | 2020-02-17 09:40:34 +0100 | [diff] [blame] | 1021 | enum bisect_error res = BISECT_OK; |
brian m. carlson | 4be0dee | 2017-07-13 23:49:24 +0000 | [diff] [blame] | 1022 | struct object_id *bisect_rev; |
Maxim Moseychuk | 2cfa835 | 2017-02-16 20:07:12 +0300 | [diff] [blame] | 1023 | char *steps_msg; |
Pranit Bauva | 517ecb3 | 2020-09-24 14:33:40 +0200 | [diff] [blame] | 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 | */ |
Aaron Lipman | be5fe20 | 2020-08-07 17:58:36 -0400 | [diff] [blame] | 1028 | int no_checkout = ref_exists("BISECT_HEAD"); |
Aaron Lipman | ad464a4 | 2020-08-07 17:58:38 -0400 | [diff] [blame] | 1029 | unsigned bisect_flags = 0; |
Christian Couder | ef24c7c | 2009-04-19 11:56:07 +0200 | [diff] [blame] | 1030 | |
Antoine Delaite | cb46d63 | 2015-06-29 17:40:30 +0200 | [diff] [blame] | 1031 | read_bisect_terms(&term_bad, &term_good); |
Christian Couder | 2b02069 | 2009-05-09 17:55:42 +0200 | [diff] [blame] | 1032 | if (read_bisect_refs()) |
Vasco Almeida | 14dc489 | 2016-06-17 20:21:12 +0000 | [diff] [blame] | 1033 | die(_("reading bisect refs failed")); |
Christian Couder | 2b02069 | 2009-05-09 17:55:42 +0200 | [diff] [blame] | 1034 | |
Aaron Lipman | ad464a4 | 2020-08-07 17:58:38 -0400 | [diff] [blame] | 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 | |
Pranit Bauva | 45b6370 | 2020-02-17 09:40:37 +0100 | [diff] [blame] | 1041 | res = check_good_are_ancestors_of_bad(r, prefix, no_checkout); |
| 1042 | if (res) |
Ævar Arnfjörð Bjarmason | f196c1e | 2022-04-13 22:01:38 +0200 | [diff] [blame] | 1043 | goto cleanup; |
Christian Couder | 0871984 | 2009-05-09 17:55:47 +0200 | [diff] [blame] | 1044 | |
Ævar Arnfjörð Bjarmason | 57efebb | 2022-08-02 17:33:15 +0200 | [diff] [blame] | 1045 | bisect_rev_setup(r, &revs, &rev_argv, prefix, "%s", "^%s", 1); |
Aaron Lipman | ad464a4 | 2020-08-07 17:58:38 -0400 | [diff] [blame] | 1046 | |
| 1047 | revs.first_parent_only = !!(bisect_flags & FIND_BISECTION_FIRST_PARENT_ONLY); |
Christian Couder | a22347c | 2009-05-17 17:36:44 +0200 | [diff] [blame] | 1048 | revs.limited = 1; |
Christian Couder | 2b02069 | 2009-05-09 17:55:42 +0200 | [diff] [blame] | 1049 | |
Christian Couder | a22347c | 2009-05-17 17:36:44 +0200 | [diff] [blame] | 1050 | bisect_common(&revs); |
Christian Couder | ef24c7c | 2009-04-19 11:56:07 +0200 | [diff] [blame] | 1051 | |
Aaron Lipman | ad464a4 | 2020-08-07 17:58:38 -0400 | [diff] [blame] | 1052 | find_bisection(&revs.commits, &reaches, &all, bisect_flags); |
Christian Couder | 62d0b0d | 2009-06-06 06:41:34 +0200 | [diff] [blame] | 1053 | revs.commits = managed_skipped(revs.commits, &tried); |
Christian Couder | ef24c7c | 2009-04-19 11:56:07 +0200 | [diff] [blame] | 1054 | |
| 1055 | if (!revs.commits) { |
| 1056 | /* |
Pranit Bauva | 6c69f22 | 2020-02-17 09:40:39 +0100 | [diff] [blame] | 1057 | * We should return error here only if the "bad" |
Christian Couder | ef24c7c | 2009-04-19 11:56:07 +0200 | [diff] [blame] | 1058 | * commit is also a "skip" commit. |
| 1059 | */ |
Pranit Bauva | ce58b5d | 2020-02-17 09:40:34 +0100 | [diff] [blame] | 1060 | res = error_if_skipped_commits(tried, NULL); |
| 1061 | if (res < 0) |
Ævar Arnfjörð Bjarmason | c5365e9 | 2022-08-02 17:33:11 +0200 | [diff] [blame] | 1062 | goto cleanup; |
Vasco Almeida | 14dc489 | 2016-06-17 20:21:12 +0000 | [diff] [blame] | 1063 | printf(_("%s was both %s and %s\n"), |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 1064 | oid_to_hex(current_bad_oid), |
| 1065 | term_good, |
| 1066 | term_bad); |
Pranit Bauva | 6c69f22 | 2020-02-17 09:40:39 +0100 | [diff] [blame] | 1067 | |
Ævar Arnfjörð Bjarmason | f196c1e | 2022-04-13 22:01:38 +0200 | [diff] [blame] | 1068 | res = BISECT_FAILED; |
| 1069 | goto cleanup; |
Christian Couder | ef24c7c | 2009-04-19 11:56:07 +0200 | [diff] [blame] | 1070 | } |
| 1071 | |
Christian Couder | 8f69f72 | 2010-02-28 23:19:09 +0100 | [diff] [blame] | 1072 | if (!all) { |
Vasco Almeida | 14dc489 | 2016-06-17 20:21:12 +0000 | [diff] [blame] | 1073 | fprintf(stderr, _("No testable commit found.\n" |
Johannes Sixt | b865734 | 2021-02-23 22:11:32 +0100 | [diff] [blame] | 1074 | "Maybe you started with bad path arguments?\n")); |
Pranit Bauva | 6c69f22 | 2020-02-17 09:40:39 +0100 | [diff] [blame] | 1075 | |
Ævar Arnfjörð Bjarmason | f196c1e | 2022-04-13 22:01:38 +0200 | [diff] [blame] | 1076 | res = BISECT_NO_TESTABLE_COMMIT; |
| 1077 | goto cleanup; |
Christian Couder | 8f69f72 | 2010-02-28 23:19:09 +0100 | [diff] [blame] | 1078 | } |
| 1079 | |
brian m. carlson | 4be0dee | 2017-07-13 23:49:24 +0000 | [diff] [blame] | 1080 | bisect_rev = &revs.commits->item->object.oid; |
Christian Couder | ef24c7c | 2009-04-19 11:56:07 +0200 | [diff] [blame] | 1081 | |
Jeff King | 4a7e27e | 2018-08-28 17:22:40 -0400 | [diff] [blame] | 1082 | if (oideq(bisect_rev, current_bad_oid)) { |
Pranit Bauva | ce58b5d | 2020-02-17 09:40:34 +0100 | [diff] [blame] | 1083 | res = error_if_skipped_commits(tried, current_bad_oid); |
| 1084 | if (res) |
Pranit Bauva | 6c69f22 | 2020-02-17 09:40:39 +0100 | [diff] [blame] | 1085 | return res; |
brian m. carlson | 4be0dee | 2017-07-13 23:49:24 +0000 | [diff] [blame] | 1086 | printf("%s is the first %s commit\n", oid_to_hex(bisect_rev), |
Antoine Delaite | 43f9d9f | 2015-06-29 17:40:29 +0200 | [diff] [blame] | 1087 | term_bad); |
Pranit Bauva | 6c69f22 | 2020-02-17 09:40:39 +0100 | [diff] [blame] | 1088 | |
Nguyễn Thái Ngọc Duy | 69d2cfe | 2018-11-10 06:48:59 +0100 | [diff] [blame] | 1089 | show_diff_tree(r, prefix, revs.commits->item); |
Pranit Bauva | 6c69f22 | 2020-02-17 09:40:39 +0100 | [diff] [blame] | 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 | */ |
Ævar Arnfjörð Bjarmason | f196c1e | 2022-04-13 22:01:38 +0200 | [diff] [blame] | 1097 | res = BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND; |
| 1098 | goto cleanup; |
Christian Couder | ef24c7c | 2009-04-19 11:56:07 +0200 | [diff] [blame] | 1099 | } |
| 1100 | |
| 1101 | nr = all - reaches - 1; |
David Ripton | 6329bad | 2010-01-19 07:13:33 -0800 | [diff] [blame] | 1102 | steps = estimate_bisect_steps(all); |
Maxim Moseychuk | 2cfa835 | 2017-02-16 20:07:12 +0300 | [diff] [blame] | 1103 | |
| 1104 | steps_msg = xstrfmt(Q_("(roughly %d step)", "(roughly %d steps)", |
| 1105 | steps), steps); |
Ævar Arnfjörð Bjarmason | 66f5f6d | 2017-05-11 21:20:12 +0000 | [diff] [blame] | 1106 | /* |
| 1107 | * TRANSLATORS: the last %s will be replaced with "(roughly %d |
| 1108 | * steps)" translation. |
| 1109 | */ |
Vasco Almeida | 14dc489 | 2016-06-17 20:21:12 +0000 | [diff] [blame] | 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); |
Maxim Moseychuk | 2cfa835 | 2017-02-16 20:07:12 +0300 | [diff] [blame] | 1113 | free(steps_msg); |
Miriam Rubio | c7a7f48 | 2020-09-24 14:33:39 +0200 | [diff] [blame] | 1114 | /* Clean up objects used, as they will be reused. */ |
René Scharfe | 0795df4 | 2020-10-31 13:47:58 +0100 | [diff] [blame] | 1115 | repo_clear_commit_marks(r, ALL_REV_FLAGS); |
Christian Couder | ef24c7c | 2009-04-19 11:56:07 +0200 | [diff] [blame] | 1116 | |
Ævar Arnfjörð Bjarmason | f196c1e | 2022-04-13 22:01:38 +0200 | [diff] [blame] | 1117 | res = bisect_checkout(bisect_rev, no_checkout); |
| 1118 | cleanup: |
| 1119 | release_revisions(&revs); |
Ævar Arnfjörð Bjarmason | 57efebb | 2022-08-02 17:33:15 +0200 | [diff] [blame] | 1120 | strvec_clear(&rev_argv); |
Ævar Arnfjörð Bjarmason | f196c1e | 2022-04-13 22:01:38 +0200 | [diff] [blame] | 1121 | return res; |
Christian Couder | ef24c7c | 2009-04-19 11:56:07 +0200 | [diff] [blame] | 1122 | } |
| 1123 | |
Nguyễn Thái Ngọc Duy | c43cb38 | 2012-10-26 22:53:50 +0700 | [diff] [blame] | 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 | } |
Pranit Bauva | fb71a32 | 2017-09-29 06:49:39 +0000 | [diff] [blame] | 1162 | |
Jeff King | 63e14ee | 2022-08-19 06:08:32 -0400 | [diff] [blame] | 1163 | static int mark_for_removal(const char *refname, |
Ævar Arnfjörð Bjarmason | 5cf88fd | 2022-08-25 19:09:48 +0200 | [diff] [blame] | 1164 | const struct object_id *oid UNUSED, |
| 1165 | int flag UNUSED, void *cb_data) |
Pranit Bauva | fb71a32 | 2017-09-29 06:49:39 +0000 | [diff] [blame] | 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")); |
Junio C Hamano | a972229 | 2017-11-15 12:14:29 +0900 | [diff] [blame] | 1181 | result = delete_refs("bisect: remove", &refs_for_removal, REF_NO_DEREF); |
Pranit Bauva | fb71a32 | 2017-09-29 06:49:39 +0000 | [diff] [blame] | 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()); |
Aaron Lipman | e8861ff | 2020-08-07 17:58:37 -0400 | [diff] [blame] | 1190 | unlink_or_warn(git_path_bisect_first_parent()); |
Pranit Bauva | fb71a32 | 2017-09-29 06:49:39 +0000 | [diff] [blame] | 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 | } |