]>
Commit | Line | Data |
---|---|---|
64745109 LT |
1 | #include "cache.h" |
2 | #include "commit.h" | |
c4e05b1a | 3 | #include "diff.h" |
ae563542 | 4 | #include "revision.h" |
c64ed70d | 5 | #include "list-objects.h" |
5fb61b8d | 6 | #include "builtin.h" |
50e62a8e | 7 | #include "log-tree.h" |
7fefda5c | 8 | #include "graph.h" |
a2ad79ce | 9 | #include "bisect.h" |
8906300f | 10 | |
a6f68d47 | 11 | static const char rev_list_usage[] = |
1b1dd23f | 12 | "git rev-list [OPTION] <commit-id>... [ -- paths... ]\n" |
69e0c256 | 13 | " limiting output:\n" |
62b4698e ŠN |
14 | " --max-count=<n>\n" |
15 | " --max-age=<epoch>\n" | |
16 | " --min-age=<epoch>\n" | |
69e0c256 JH |
17 | " --sparse\n" |
18 | " --no-merges\n" | |
ad5aeede MG |
19 | " --min-parents=<n>\n" |
20 | " --no-min-parents\n" | |
21 | " --max-parents=<n>\n" | |
22 | " --no-max-parents\n" | |
93b74bca | 23 | " --remove-empty\n" |
69e0c256 | 24 | " --all\n" |
a5aa930d UKK |
25 | " --branches\n" |
26 | " --tags\n" | |
27 | " --remotes\n" | |
42cabc34 | 28 | " --stdin\n" |
27350891 | 29 | " --quiet\n" |
69e0c256 | 30 | " ordering output:\n" |
69e0c256 | 31 | " --topo-order\n" |
4c8725f1 | 32 | " --date-order\n" |
7ccd3667 | 33 | " --reverse\n" |
69e0c256 JH |
34 | " formatting output:\n" |
35 | " --parents\n" | |
72276a3e | 36 | " --children\n" |
c6496575 | 37 | " --objects | --objects-edge\n" |
69e0c256 JH |
38 | " --unpacked\n" |
39 | " --header | --pretty\n" | |
62b4698e | 40 | " --abbrev=<n> | --no-abbrev\n" |
5c51c985 | 41 | " --abbrev-commit\n" |
b24bace5 | 42 | " --left-right\n" |
69e0c256 | 43 | " special purpose:\n" |
457f08a0 | 44 | " --bisect\n" |
50e62a8e CC |
45 | " --bisect-vars\n" |
46 | " --bisect-all" | |
69e0c256 | 47 | ; |
a6f68d47 | 48 | |
11c211fa CC |
49 | static void finish_commit(struct commit *commit, void *data); |
50 | static void show_commit(struct commit *commit, void *data) | |
81f2bb1f | 51 | { |
d797257e CC |
52 | struct rev_list_info *info = data; |
53 | struct rev_info *revs = info->revs; | |
11c211fa CC |
54 | |
55 | graph_show_commit(revs->graph); | |
7fefda5c | 56 | |
f69c5018 | 57 | if (revs->count) { |
b388e14b MG |
58 | if (commit->object.flags & PATCHSAME) |
59 | revs->count_same++; | |
60 | else if (commit->object.flags & SYMMETRIC_LEFT) | |
f69c5018 TR |
61 | revs->count_left++; |
62 | else | |
63 | revs->count_right++; | |
64 | finish_commit(commit, data); | |
65 | return; | |
66 | } | |
67 | ||
d797257e | 68 | if (info->show_timestamp) |
dc68c4ff | 69 | printf("%lu ", commit->date); |
d797257e CC |
70 | if (info->header_prefix) |
71 | fputs(info->header_prefix, stdout); | |
7528f27d | 72 | |
1df2d656 MG |
73 | if (!revs->graph) |
74 | fputs(get_revision_mark(revs, commit), stdout); | |
11c211fa CC |
75 | if (revs->abbrev_commit && revs->abbrev) |
76 | fputs(find_unique_abbrev(commit->object.sha1, revs->abbrev), | |
7594c4b2 | 77 | stdout); |
5c51c985 JH |
78 | else |
79 | fputs(sha1_to_hex(commit->object.sha1), stdout); | |
11c211fa | 80 | if (revs->print_parents) { |
81f2bb1f LT |
81 | struct commit_list *parents = commit->parents; |
82 | while (parents) { | |
1ed84157 | 83 | printf(" %s", sha1_to_hex(parents->item->object.sha1)); |
81f2bb1f LT |
84 | parents = parents->next; |
85 | } | |
86 | } | |
11c211fa | 87 | if (revs->children.name) { |
72276a3e JH |
88 | struct commit_list *children; |
89 | ||
11c211fa | 90 | children = lookup_decoration(&revs->children, &commit->object); |
72276a3e JH |
91 | while (children) { |
92 | printf(" %s", sha1_to_hex(children->item->object.sha1)); | |
93 | children = children->next; | |
94 | } | |
95 | } | |
11c211fa CC |
96 | show_decorations(revs, commit); |
97 | if (revs->commit_format == CMIT_FMT_ONELINE) | |
d87449c5 JH |
98 | putchar(' '); |
99 | else | |
100 | putchar('\n'); | |
101 | ||
11c211fa | 102 | if (revs->verbose_header && commit->buffer) { |
f285a2d7 | 103 | struct strbuf buf = STRBUF_INIT; |
dd2e794a TR |
104 | struct pretty_print_context ctx = {0}; |
105 | ctx.abbrev = revs->abbrev; | |
106 | ctx.date_mode = revs->date_mode; | |
6bf13944 JK |
107 | ctx.fmt = revs->commit_format; |
108 | pretty_print_commit(&ctx, commit, &buf); | |
11c211fa | 109 | if (revs->graph) { |
7fefda5c | 110 | if (buf.len) { |
11c211fa CC |
111 | if (revs->commit_format != CMIT_FMT_ONELINE) |
112 | graph_show_oneline(revs->graph); | |
7fefda5c | 113 | |
11c211fa | 114 | graph_show_commit_msg(revs->graph, &buf); |
7fefda5c AS |
115 | |
116 | /* | |
117 | * Add a newline after the commit message. | |
118 | * | |
119 | * Usually, this newline produces a blank | |
120 | * padding line between entries, in which case | |
121 | * we need to add graph padding on this line. | |
122 | * | |
123 | * However, the commit message may not end in a | |
124 | * newline. In this case the newline simply | |
125 | * ends the last line of the commit message, | |
126 | * and we don't need any graph output. (This | |
127 | * always happens with CMIT_FMT_ONELINE, and it | |
128 | * happens with CMIT_FMT_USERFORMAT when the | |
129 | * format doesn't explicitly end in a newline.) | |
130 | */ | |
131 | if (buf.len && buf.buf[buf.len - 1] == '\n') | |
11c211fa | 132 | graph_show_padding(revs->graph); |
7fefda5c AS |
133 | putchar('\n'); |
134 | } else { | |
135 | /* | |
136 | * If the message buffer is empty, just show | |
137 | * the rest of the graph output for this | |
138 | * commit. | |
139 | */ | |
11c211fa | 140 | if (graph_show_remainder(revs->graph)) |
7fefda5c | 141 | putchar('\n'); |
1fb5fdd2 EFL |
142 | if (revs->commit_format == CMIT_FMT_ONELINE) |
143 | putchar('\n'); | |
7fefda5c AS |
144 | } |
145 | } else { | |
1fb5fdd2 | 146 | if (revs->commit_format != CMIT_FMT_USERFORMAT || |
9130ac9f JK |
147 | buf.len) { |
148 | fwrite(buf.buf, 1, buf.len, stdout); | |
149 | putchar(info->hdr_termination); | |
150 | } | |
7fefda5c | 151 | } |
674d1727 | 152 | strbuf_release(&buf); |
7fefda5c | 153 | } else { |
11c211fa | 154 | if (graph_show_remainder(revs->graph)) |
7fefda5c | 155 | putchar('\n'); |
7620d39f | 156 | } |
06f59e9f | 157 | maybe_flush_or_die(stdout, "stdout"); |
11c211fa | 158 | finish_commit(commit, data); |
27350891 SP |
159 | } |
160 | ||
11c211fa | 161 | static void finish_commit(struct commit *commit, void *data) |
27350891 | 162 | { |
cb115748 LT |
163 | if (commit->parents) { |
164 | free_commit_list(commit->parents); | |
165 | commit->parents = NULL; | |
166 | } | |
4cac42b1 JH |
167 | free(commit->buffer); |
168 | commit->buffer = NULL; | |
a3437b8c JS |
169 | } |
170 | ||
49473672 JH |
171 | static void finish_object(struct object *obj, |
172 | const struct name_path *path, const char *name, | |
173 | void *cb_data) | |
27350891 | 174 | { |
8d2dfc49 LT |
175 | if (obj->type == OBJ_BLOB && !has_sha1_file(obj->sha1)) |
176 | die("missing blob object '%s'", sha1_to_hex(obj->sha1)); | |
27350891 SP |
177 | } |
178 | ||
49473672 JH |
179 | static void show_object(struct object *obj, |
180 | const struct name_path *path, const char *component, | |
181 | void *cb_data) | |
9de48752 | 182 | { |
cb8da705 | 183 | struct rev_list_info *info = cb_data; |
5a48d240 | 184 | |
49473672 | 185 | finish_object(obj, path, component, cb_data); |
cb8da705 | 186 | if (info->revs->verify_objects && !obj->parsed && obj->type != OBJ_COMMIT) |
5a48d240 | 187 | parse_object(obj->sha1); |
91f17516 | 188 | show_object_with_name(stdout, obj, path, component); |
9de48752 LT |
189 | } |
190 | ||
8d1d8f83 JH |
191 | static void show_edge(struct commit *commit) |
192 | { | |
193 | printf("-%s\n", sha1_to_hex(commit->object.sha1)); | |
194 | } | |
195 | ||
9f199b15 CC |
196 | static inline int log2i(int n) |
197 | { | |
198 | int log2 = 0; | |
199 | ||
200 | for (; n > 1; n >>= 1) | |
201 | log2++; | |
202 | ||
203 | return log2; | |
204 | } | |
205 | ||
206 | static inline int exp2i(int n) | |
207 | { | |
208 | return 1 << n; | |
209 | } | |
210 | ||
211 | /* | |
212 | * Estimate the number of bisect steps left (after the current step) | |
213 | * | |
214 | * For any x between 0 included and 2^n excluded, the probability for | |
215 | * n - 1 steps left looks like: | |
216 | * | |
217 | * P(2^n + x) == (2^n - x) / (2^n + x) | |
218 | * | |
219 | * and P(2^n + x) < 0.5 means 2^n < 3x | |
220 | */ | |
1c876546 | 221 | int estimate_bisect_steps(int all) |
9f199b15 CC |
222 | { |
223 | int n, x, e; | |
224 | ||
225 | if (all < 3) | |
226 | return 0; | |
227 | ||
228 | n = log2i(all); | |
229 | e = exp2i(n); | |
230 | x = all - e; | |
231 | ||
232 | return (e < 3 * x) ? n : n - 1; | |
233 | } | |
234 | ||
280e65cb CC |
235 | void print_commit_list(struct commit_list *list, |
236 | const char *format_cur, | |
237 | const char *format_last) | |
238 | { | |
239 | for ( ; list; list = list->next) { | |
240 | const char *format = list->next ? format_cur : format_last; | |
241 | printf(format, sha1_to_hex(list->item->object.sha1)); | |
242 | } | |
243 | } | |
244 | ||
38ef7507 | 245 | static void show_tried_revs(struct commit_list *tried) |
95188648 CC |
246 | { |
247 | printf("bisect_tried='"); | |
280e65cb | 248 | print_commit_list(tried, "%s|", "%s"); |
38ef7507 | 249 | printf("'\n"); |
95188648 CC |
250 | } |
251 | ||
38ef7507 | 252 | static void print_var_str(const char *var, const char *val) |
280e65cb | 253 | { |
38ef7507 | 254 | printf("%s='%s'\n", var, val); |
280e65cb CC |
255 | } |
256 | ||
38ef7507 | 257 | static void print_var_int(const char *var, int val) |
280e65cb | 258 | { |
38ef7507 | 259 | printf("%s=%d\n", var, val); |
280e65cb CC |
260 | } |
261 | ||
f1c92c63 | 262 | static int show_bisect_vars(struct rev_list_info *info, int reaches, int all) |
9996983c | 263 | { |
38ef7507 | 264 | int cnt, flags = info->bisect_show_flags; |
280e65cb | 265 | char hex[41] = ""; |
95188648 | 266 | struct commit_list *tried; |
d797257e | 267 | struct rev_info *revs = info->revs; |
9996983c | 268 | |
37c4c38d | 269 | if (!revs->commits && !(flags & BISECT_SHOW_TRIED)) |
9996983c CC |
270 | return 1; |
271 | ||
9af3589e CC |
272 | revs->commits = filter_skipped(revs->commits, &tried, |
273 | flags & BISECT_SHOW_ALL, | |
274 | NULL, NULL); | |
95188648 | 275 | |
9996983c | 276 | /* |
7428d754 | 277 | * revs->commits can reach "reaches" commits among |
9996983c CC |
278 | * "all" commits. If it is good, then there are |
279 | * (all-reaches) commits left to be bisected. | |
280 | * On the other hand, if it is bad, then the set | |
281 | * to bisect is "reaches". | |
282 | * A bisect set of size N has (N-1) commits further | |
283 | * to test, as we already know one bad one. | |
284 | */ | |
285 | cnt = all - reaches; | |
286 | if (cnt < reaches) | |
287 | cnt = reaches; | |
6a17fad7 | 288 | |
95188648 CC |
289 | if (revs->commits) |
290 | strcpy(hex, sha1_to_hex(revs->commits->item->object.sha1)); | |
9996983c | 291 | |
37c4c38d | 292 | if (flags & BISECT_SHOW_ALL) { |
d797257e | 293 | traverse_commit_list(revs, show_commit, show_object, info); |
9996983c CC |
294 | printf("------\n"); |
295 | } | |
296 | ||
37c4c38d | 297 | if (flags & BISECT_SHOW_TRIED) |
38ef7507 CC |
298 | show_tried_revs(tried); |
299 | ||
300 | print_var_str("bisect_rev", hex); | |
301 | print_var_int("bisect_nr", cnt - 1); | |
302 | print_var_int("bisect_good", all - reaches - 1); | |
303 | print_var_int("bisect_bad", reaches - 1); | |
304 | print_var_int("bisect_all", all); | |
305 | print_var_int("bisect_steps", estimate_bisect_steps(all)); | |
9996983c CC |
306 | |
307 | return 0; | |
308 | } | |
309 | ||
a633fca0 | 310 | int cmd_rev_list(int argc, const char **argv, const char *prefix) |
64745109 | 311 | { |
11c211fa | 312 | struct rev_info revs; |
d797257e | 313 | struct rev_list_info info; |
d9a83684 | 314 | int i; |
ff62d732 | 315 | int bisect_list = 0; |
457f08a0 | 316 | int bisect_show_vars = 0; |
50e62a8e | 317 | int bisect_find_all = 0; |
27350891 | 318 | int quiet = 0; |
64745109 | 319 | |
ef90d6d4 | 320 | git_config(git_default_config, NULL); |
a633fca0 | 321 | init_revisions(&revs, prefix); |
7337b138 | 322 | revs.abbrev = DEFAULT_ABBREV; |
7594c4b2 | 323 | revs.commit_format = CMIT_FMT_UNSPECIFIED; |
a4a88b2b | 324 | argc = setup_revisions(argc, argv, &revs, NULL); |
ae563542 | 325 | |
d797257e CC |
326 | memset(&info, 0, sizeof(info)); |
327 | info.revs = &revs; | |
ad3f9a71 LT |
328 | if (revs.bisect) |
329 | bisect_list = 1; | |
d797257e | 330 | |
90b19941 | 331 | quiet = DIFF_OPT_TST(&revs.diffopt, QUICK); |
fcfda02b | 332 | for (i = 1 ; i < argc; i++) { |
cf484544 | 333 | const char *arg = argv[i]; |
fcfda02b | 334 | |
a6f68d47 | 335 | if (!strcmp(arg, "--header")) { |
7594c4b2 | 336 | revs.verbose_header = 1; |
9d97aa64 LT |
337 | continue; |
338 | } | |
dc68c4ff | 339 | if (!strcmp(arg, "--timestamp")) { |
d797257e | 340 | info.show_timestamp = 1; |
dc68c4ff JH |
341 | continue; |
342 | } | |
8b3a1e05 LT |
343 | if (!strcmp(arg, "--bisect")) { |
344 | bisect_list = 1; | |
345 | continue; | |
346 | } | |
50e62a8e CC |
347 | if (!strcmp(arg, "--bisect-all")) { |
348 | bisect_list = 1; | |
349 | bisect_find_all = 1; | |
13858e57 | 350 | info.bisect_show_flags = BISECT_SHOW_ALL; |
6e46cc0d | 351 | revs.show_decorations = 1; |
50e62a8e CC |
352 | continue; |
353 | } | |
457f08a0 JH |
354 | if (!strcmp(arg, "--bisect-vars")) { |
355 | bisect_list = 1; | |
356 | bisect_show_vars = 1; | |
357 | continue; | |
358 | } | |
ae563542 | 359 | usage(rev_list_usage); |
a6f68d47 | 360 | |
fcfda02b | 361 | } |
7594c4b2 JH |
362 | if (revs.commit_format != CMIT_FMT_UNSPECIFIED) { |
363 | /* The command line has a --pretty */ | |
d797257e | 364 | info.hdr_termination = '\n'; |
7594c4b2 | 365 | if (revs.commit_format == CMIT_FMT_ONELINE) |
d797257e | 366 | info.header_prefix = ""; |
7594c4b2 | 367 | else |
d797257e | 368 | info.header_prefix = "commit "; |
7594c4b2 | 369 | } |
db89665f JH |
370 | else if (revs.verbose_header) |
371 | /* Only --header was specified */ | |
372 | revs.commit_format = CMIT_FMT_RAW; | |
fcfda02b | 373 | |
d797257e | 374 | if ((!revs.commits && |
8c1f0b44 | 375 | (!(revs.tag_objects||revs.tree_objects||revs.blob_objects) && |
1f1e895f | 376 | !revs.pending.nr)) || |
8c1f0b44 | 377 | revs.diff) |
7b34c2fa LT |
378 | usage(rev_list_usage); |
379 | ||
80235ba7 JH |
380 | save_commit_buffer = (revs.verbose_header || |
381 | revs.grep_filter.pattern_list || | |
382 | revs.grep_filter.header_list); | |
4e1dc640 JH |
383 | if (bisect_list) |
384 | revs.limited = 1; | |
9181ca2c | 385 | |
3d51e1b5 MK |
386 | if (prepare_revision_walk(&revs)) |
387 | die("revision walk setup failed"); | |
a4a88b2b | 388 | if (revs.tree_objects) |
8d1d8f83 | 389 | mark_edges_uninteresting(revs.commits, &revs, show_edge); |
a4a88b2b | 390 | |
457f08a0 JH |
391 | if (bisect_list) { |
392 | int reaches = reaches, all = all; | |
393 | ||
50e62a8e CC |
394 | revs.commits = find_bisection(revs.commits, &reaches, &all, |
395 | bisect_find_all); | |
95188648 | 396 | |
9996983c | 397 | if (bisect_show_vars) |
13858e57 | 398 | return show_bisect_vars(&info, reaches, all); |
457f08a0 | 399 | } |
7b34c2fa | 400 | |
27350891 | 401 | traverse_commit_list(&revs, |
11c211fa CC |
402 | quiet ? finish_commit : show_commit, |
403 | quiet ? finish_object : show_object, | |
d797257e | 404 | &info); |
8906300f | 405 | |
f69c5018 | 406 | if (revs.count) { |
b388e14b MG |
407 | if (revs.left_right && revs.cherry_mark) |
408 | printf("%d\t%d\t%d\n", revs.count_left, revs.count_right, revs.count_same); | |
409 | else if (revs.left_right) | |
f69c5018 | 410 | printf("%d\t%d\n", revs.count_left, revs.count_right); |
b388e14b MG |
411 | else if (revs.cherry_mark) |
412 | printf("%d\t%d\n", revs.count_left + revs.count_right, revs.count_same); | |
f69c5018 TR |
413 | else |
414 | printf("%d\n", revs.count_left + revs.count_right); | |
415 | } | |
416 | ||
64745109 LT |
417 | return 0; |
418 | } |