]>
Commit | Line | Data |
---|---|---|
bc5c5ec0 | 1 | #include "builtin.h" |
b2141fc1 | 2 | #include "config.h" |
64745109 | 3 | #include "commit.h" |
c4e05b1a | 4 | #include "diff.h" |
32a8f510 | 5 | #include "environment.h" |
f394e093 | 6 | #include "gettext.h" |
41771fa4 | 7 | #include "hex.h" |
ae563542 | 8 | #include "revision.h" |
c64ed70d | 9 | #include "list-objects.h" |
caf3827e | 10 | #include "list-objects-filter-options.h" |
7c0fe330 | 11 | #include "object.h" |
dabab1d6 | 12 | #include "object-name.h" |
87bed179 | 13 | #include "object-file.h" |
a034e910 | 14 | #include "object-store-ll.h" |
aa32939f | 15 | #include "pack-bitmap.h" |
50e62a8e | 16 | #include "log-tree.h" |
7fefda5c | 17 | #include "graph.h" |
a2ad79ce | 18 | #include "bisect.h" |
434ea3cd | 19 | #include "progress.h" |
7f97de5e | 20 | #include "reflog-walk.h" |
caf3827e | 21 | #include "oidset.h" |
df11e196 | 22 | #include "packfile.h" |
8906300f | 23 | |
a6f68d47 | 24 | static const char rev_list_usage[] = |
c08cfc39 | 25 | "git rev-list [<options>] <commit>... [--] [<path>...]\n" |
acf7828e | 26 | "\n" |
69e0c256 | 27 | " limiting output:\n" |
62b4698e ŠN |
28 | " --max-count=<n>\n" |
29 | " --max-age=<epoch>\n" | |
30 | " --min-age=<epoch>\n" | |
69e0c256 JH |
31 | " --sparse\n" |
32 | " --no-merges\n" | |
ad5aeede MG |
33 | " --min-parents=<n>\n" |
34 | " --no-min-parents\n" | |
35 | " --max-parents=<n>\n" | |
36 | " --no-max-parents\n" | |
93b74bca | 37 | " --remove-empty\n" |
69e0c256 | 38 | " --all\n" |
a5aa930d UKK |
39 | " --branches\n" |
40 | " --tags\n" | |
41 | " --remotes\n" | |
42cabc34 | 42 | " --stdin\n" |
c6ce27ab | 43 | " --exclude-hidden=[fetch|receive|uploadpack]\n" |
27350891 | 44 | " --quiet\n" |
69e0c256 | 45 | " ordering output:\n" |
69e0c256 | 46 | " --topo-order\n" |
4c8725f1 | 47 | " --date-order\n" |
7ccd3667 | 48 | " --reverse\n" |
69e0c256 JH |
49 | " formatting output:\n" |
50 | " --parents\n" | |
72276a3e | 51 | " --children\n" |
c6496575 | 52 | " --objects | --objects-edge\n" |
9096451a | 53 | " --disk-usage[=human]\n" |
69e0c256 JH |
54 | " --unpacked\n" |
55 | " --header | --pretty\n" | |
42357b4e | 56 | " --[no-]object-names\n" |
62b4698e | 57 | " --abbrev=<n> | --no-abbrev\n" |
5c51c985 | 58 | " --abbrev-commit\n" |
b24bace5 | 59 | " --left-right\n" |
75d2e5a7 | 60 | " --count\n" |
69e0c256 | 61 | " special purpose:\n" |
457f08a0 | 62 | " --bisect\n" |
50e62a8e CC |
63 | " --bisect-vars\n" |
64 | " --bisect-all" | |
69e0c256 | 65 | ; |
a6f68d47 | 66 | |
434ea3cd JK |
67 | static struct progress *progress; |
68 | static unsigned progress_counter; | |
69 | ||
caf3827e JH |
70 | static struct oidset omitted_objects; |
71 | static int arg_print_omitted; /* print objects omitted by filter */ | |
72 | ||
73 | static struct oidset missing_objects; | |
74 | enum missing_action { | |
75 | MA_ERROR = 0, /* fail if any missing objects are encountered */ | |
76 | MA_ALLOW_ANY, /* silently allow ALL missing objects */ | |
77 | MA_PRINT, /* print ALL missing objects in special section */ | |
df11e196 | 78 | MA_ALLOW_PROMISOR, /* silently allow all missing PROMISOR objects */ |
caf3827e JH |
79 | }; |
80 | static enum missing_action arg_missing_action; | |
81 | ||
42357b4e ES |
82 | /* display only the oid of each object encountered */ |
83 | static int arg_show_object_names = 1; | |
84 | ||
caf3827e JH |
85 | #define DEFAULT_OIDSET_SIZE (16*1024) |
86 | ||
16950f83 JK |
87 | static int show_disk_usage; |
88 | static off_t total_disk_usage; | |
9096451a | 89 | static int human_readable; |
16950f83 JK |
90 | |
91 | static off_t get_object_disk_usage(struct object *obj) | |
92 | { | |
93 | off_t size; | |
94 | struct object_info oi = OBJECT_INFO_INIT; | |
95 | oi.disk_sizep = &size; | |
96 | if (oid_object_info_extended(the_repository, &obj->oid, &oi, 0) < 0) | |
97 | die(_("unable to get disk usage of %s"), oid_to_hex(&obj->oid)); | |
98 | return size; | |
99 | } | |
100 | ||
b4952923 KN |
101 | static inline void finish_object__ma(struct object *obj) |
102 | { | |
103 | /* | |
104 | * Whether or not we try to dynamically fetch missing objects | |
105 | * from the server, we currently DO NOT have the object. We | |
106 | * can either print, allow (ignore), or conditionally allow | |
107 | * (ignore) them. | |
108 | */ | |
109 | switch (arg_missing_action) { | |
110 | case MA_ERROR: | |
111 | die("missing %s object '%s'", | |
112 | type_name(obj->type), oid_to_hex(&obj->oid)); | |
113 | return; | |
114 | ||
115 | case MA_ALLOW_ANY: | |
116 | return; | |
117 | ||
118 | case MA_PRINT: | |
119 | oidset_insert(&missing_objects, &obj->oid); | |
120 | return; | |
121 | ||
122 | case MA_ALLOW_PROMISOR: | |
123 | if (is_promisor_object(&obj->oid)) | |
124 | return; | |
125 | die("unexpected missing %s object '%s'", | |
126 | type_name(obj->type), oid_to_hex(&obj->oid)); | |
127 | return; | |
128 | ||
129 | default: | |
130 | BUG("unhandled missing_action"); | |
131 | return; | |
132 | } | |
133 | } | |
134 | ||
135 | static void finish_commit(struct commit *commit) | |
136 | { | |
137 | free_commit_list(commit->parents); | |
138 | commit->parents = NULL; | |
139 | free_commit_buffer(the_repository->parsed_objects, | |
140 | commit); | |
141 | } | |
142 | ||
11c211fa | 143 | static void show_commit(struct commit *commit, void *data) |
81f2bb1f | 144 | { |
d797257e CC |
145 | struct rev_list_info *info = data; |
146 | struct rev_info *revs = info->revs; | |
11c211fa | 147 | |
434ea3cd JK |
148 | display_progress(progress, ++progress_counter); |
149 | ||
9830926c KN |
150 | if (revs->do_not_die_on_missing_objects && |
151 | oidset_contains(&revs->missing_commits, &commit->object.oid)) { | |
152 | finish_object__ma(&commit->object); | |
153 | return; | |
154 | } | |
155 | ||
16950f83 JK |
156 | if (show_disk_usage) |
157 | total_disk_usage += get_object_disk_usage(&commit->object); | |
158 | ||
98993722 | 159 | if (info->flags & REV_LIST_QUIET) { |
d92349dd | 160 | finish_commit(commit); |
98993722 NTND |
161 | return; |
162 | } | |
163 | ||
11c211fa | 164 | graph_show_commit(revs->graph); |
7fefda5c | 165 | |
f69c5018 | 166 | if (revs->count) { |
b388e14b MG |
167 | if (commit->object.flags & PATCHSAME) |
168 | revs->count_same++; | |
169 | else if (commit->object.flags & SYMMETRIC_LEFT) | |
f69c5018 TR |
170 | revs->count_left++; |
171 | else | |
172 | revs->count_right++; | |
d92349dd | 173 | finish_commit(commit); |
f69c5018 TR |
174 | return; |
175 | } | |
176 | ||
d797257e | 177 | if (info->show_timestamp) |
cb71f8bd | 178 | printf("%"PRItime" ", commit->date); |
d797257e CC |
179 | if (info->header_prefix) |
180 | fputs(info->header_prefix, stdout); | |
7528f27d | 181 | |
d1c5ae78 | 182 | if (revs->include_header) { |
183 | if (!revs->graph) | |
184 | fputs(get_revision_mark(revs, commit), stdout); | |
185 | if (revs->abbrev_commit && revs->abbrev) | |
d850b7a5 | 186 | fputs(repo_find_unique_abbrev(the_repository, &commit->object.oid, revs->abbrev), |
d1c5ae78 | 187 | stdout); |
188 | else | |
189 | fputs(oid_to_hex(&commit->object.oid), stdout); | |
190 | } | |
11c211fa | 191 | if (revs->print_parents) { |
81f2bb1f LT |
192 | struct commit_list *parents = commit->parents; |
193 | while (parents) { | |
f2fd0760 | 194 | printf(" %s", oid_to_hex(&parents->item->object.oid)); |
81f2bb1f LT |
195 | parents = parents->next; |
196 | } | |
197 | } | |
11c211fa | 198 | if (revs->children.name) { |
72276a3e JH |
199 | struct commit_list *children; |
200 | ||
11c211fa | 201 | children = lookup_decoration(&revs->children, &commit->object); |
72276a3e | 202 | while (children) { |
f2fd0760 | 203 | printf(" %s", oid_to_hex(&children->item->object.oid)); |
72276a3e JH |
204 | children = children->next; |
205 | } | |
206 | } | |
11c211fa CC |
207 | show_decorations(revs, commit); |
208 | if (revs->commit_format == CMIT_FMT_ONELINE) | |
d87449c5 | 209 | putchar(' '); |
d1c5ae78 | 210 | else if (revs->include_header) |
d87449c5 JH |
211 | putchar('\n'); |
212 | ||
7fa31b64 | 213 | if (revs->verbose_header) { |
f285a2d7 | 214 | struct strbuf buf = STRBUF_INIT; |
dd2e794a TR |
215 | struct pretty_print_context ctx = {0}; |
216 | ctx.abbrev = revs->abbrev; | |
217 | ctx.date_mode = revs->date_mode; | |
f026c756 | 218 | ctx.date_mode_explicit = revs->date_mode_explicit; |
6bf13944 | 219 | ctx.fmt = revs->commit_format; |
ecaee805 | 220 | ctx.output_encoding = get_log_output_encoding(); |
d75dfb10 | 221 | ctx.color = revs->diffopt.use_color; |
d5a90d63 | 222 | ctx.rev = revs; |
6bf13944 | 223 | pretty_print_commit(&ctx, commit, &buf); |
660e113c JK |
224 | if (buf.len) { |
225 | if (revs->commit_format != CMIT_FMT_ONELINE) | |
226 | graph_show_oneline(revs->graph); | |
7fefda5c | 227 | |
660e113c | 228 | graph_show_commit_msg(revs->graph, stdout, &buf); |
7fefda5c | 229 | |
660e113c JK |
230 | /* |
231 | * Add a newline after the commit message. | |
232 | * | |
233 | * Usually, this newline produces a blank | |
234 | * padding line between entries, in which case | |
235 | * we need to add graph padding on this line. | |
236 | * | |
237 | * However, the commit message may not end in a | |
238 | * newline. In this case the newline simply | |
239 | * ends the last line of the commit message, | |
240 | * and we don't need any graph output. (This | |
241 | * always happens with CMIT_FMT_ONELINE, and it | |
242 | * happens with CMIT_FMT_USERFORMAT when the | |
243 | * format doesn't explicitly end in a newline.) | |
244 | */ | |
245 | if (buf.len && buf.buf[buf.len - 1] == '\n') | |
246 | graph_show_padding(revs->graph); | |
98985c69 | 247 | putchar(info->hdr_termination); |
7fefda5c | 248 | } else { |
660e113c JK |
249 | /* |
250 | * If the message buffer is empty, just show | |
251 | * the rest of the graph output for this | |
252 | * commit. | |
253 | */ | |
254 | if (graph_show_remainder(revs->graph)) | |
255 | putchar('\n'); | |
256 | if (revs->commit_format == CMIT_FMT_ONELINE) | |
257 | putchar('\n'); | |
7fefda5c | 258 | } |
674d1727 | 259 | strbuf_release(&buf); |
7fefda5c | 260 | } else { |
11c211fa | 261 | if (graph_show_remainder(revs->graph)) |
7fefda5c | 262 | putchar('\n'); |
7620d39f | 263 | } |
06f59e9f | 264 | maybe_flush_or_die(stdout, "stdout"); |
d92349dd | 265 | finish_commit(commit); |
27350891 SP |
266 | } |
267 | ||
be252d33 JK |
268 | static int finish_object(struct object *obj, const char *name UNUSED, |
269 | void *cb_data) | |
27350891 | 270 | { |
98993722 | 271 | struct rev_list_info *info = cb_data; |
f06ab027 | 272 | if (oid_object_info_extended(the_repository, &obj->oid, NULL, 0) < 0) { |
caf3827e | 273 | finish_object__ma(obj); |
df11e196 JT |
274 | return 1; |
275 | } | |
98993722 | 276 | if (info->revs->verify_objects && !obj->parsed && obj->type != OBJ_COMMIT) |
109cd76d | 277 | parse_object(the_repository, &obj->oid); |
df11e196 | 278 | return 0; |
27350891 SP |
279 | } |
280 | ||
de1e67d0 | 281 | static void show_object(struct object *obj, const char *name, void *cb_data) |
9de48752 | 282 | { |
cb8da705 | 283 | struct rev_list_info *info = cb_data; |
55cb10f9 JK |
284 | struct rev_info *revs = info->revs; |
285 | ||
df11e196 JT |
286 | if (finish_object(obj, name, cb_data)) |
287 | return; | |
434ea3cd | 288 | display_progress(progress, ++progress_counter); |
16950f83 JK |
289 | if (show_disk_usage) |
290 | total_disk_usage += get_object_disk_usage(obj); | |
98993722 NTND |
291 | if (info->flags & REV_LIST_QUIET) |
292 | return; | |
55cb10f9 JK |
293 | |
294 | if (revs->count) { | |
20a5fd88 JH |
295 | /* |
296 | * The object count is always accumulated in the .count_right | |
297 | * field for traversal that is not a left-right traversal, | |
298 | * and cmd_rev_list() made sure that a .count request that | |
299 | * wants to count non-commit objects, which is handled by | |
300 | * the show_object() callback, does not ask for .left_right. | |
301 | */ | |
55cb10f9 JK |
302 | revs->count_right++; |
303 | return; | |
304 | } | |
305 | ||
42357b4e ES |
306 | if (arg_show_object_names) |
307 | show_object_with_name(stdout, obj, name); | |
308 | else | |
309 | printf("%s\n", oid_to_hex(&obj->oid)); | |
9de48752 LT |
310 | } |
311 | ||
8d1d8f83 JH |
312 | static void show_edge(struct commit *commit) |
313 | { | |
f2fd0760 | 314 | printf("-%s\n", oid_to_hex(&commit->object.oid)); |
8d1d8f83 JH |
315 | } |
316 | ||
38ef7507 | 317 | static void print_var_str(const char *var, const char *val) |
280e65cb | 318 | { |
38ef7507 | 319 | printf("%s='%s'\n", var, val); |
280e65cb CC |
320 | } |
321 | ||
38ef7507 | 322 | static void print_var_int(const char *var, int val) |
280e65cb | 323 | { |
38ef7507 | 324 | printf("%s=%d\n", var, val); |
280e65cb CC |
325 | } |
326 | ||
f1c92c63 | 327 | static int show_bisect_vars(struct rev_list_info *info, int reaches, int all) |
9996983c | 328 | { |
98993722 | 329 | int cnt, flags = info->flags; |
dc01505f | 330 | char hex[GIT_MAX_HEXSZ + 1] = ""; |
95188648 | 331 | struct commit_list *tried; |
d797257e | 332 | struct rev_info *revs = info->revs; |
9996983c | 333 | |
8ba8fe04 | 334 | if (!revs->commits) |
9996983c CC |
335 | return 1; |
336 | ||
9af3589e CC |
337 | revs->commits = filter_skipped(revs->commits, &tried, |
338 | flags & BISECT_SHOW_ALL, | |
339 | NULL, NULL); | |
95188648 | 340 | |
9996983c | 341 | /* |
7428d754 | 342 | * revs->commits can reach "reaches" commits among |
9996983c CC |
343 | * "all" commits. If it is good, then there are |
344 | * (all-reaches) commits left to be bisected. | |
345 | * On the other hand, if it is bad, then the set | |
346 | * to bisect is "reaches". | |
347 | * A bisect set of size N has (N-1) commits further | |
348 | * to test, as we already know one bad one. | |
349 | */ | |
350 | cnt = all - reaches; | |
351 | if (cnt < reaches) | |
352 | cnt = reaches; | |
6a17fad7 | 353 | |
95188648 | 354 | if (revs->commits) |
2490574d | 355 | oid_to_hex_r(hex, &revs->commits->item->object.oid); |
9996983c | 356 | |
37c4c38d | 357 | if (flags & BISECT_SHOW_ALL) { |
d797257e | 358 | traverse_commit_list(revs, show_commit, show_object, info); |
9996983c CC |
359 | printf("------\n"); |
360 | } | |
361 | ||
38ef7507 CC |
362 | print_var_str("bisect_rev", hex); |
363 | print_var_int("bisect_nr", cnt - 1); | |
364 | print_var_int("bisect_good", all - reaches - 1); | |
365 | print_var_int("bisect_bad", reaches - 1); | |
366 | print_var_int("bisect_all", all); | |
367 | print_var_int("bisect_steps", estimate_bisect_steps(all)); | |
9996983c CC |
368 | |
369 | return 0; | |
370 | } | |
371 | ||
aa32939f | 372 | static int show_object_fast( |
20664967 | 373 | const struct object_id *oid, |
c50dca2a JK |
374 | enum object_type type UNUSED, |
375 | int exclude UNUSED, | |
376 | uint32_t name_hash UNUSED, | |
377 | struct packed_git *found_pack UNUSED, | |
378 | off_t found_offset UNUSED) | |
aa32939f | 379 | { |
20664967 | 380 | fprintf(stdout, "%s\n", oid_to_hex(oid)); |
aa32939f VM |
381 | return 1; |
382 | } | |
383 | ||
9096451a LL |
384 | static void print_disk_usage(off_t size) |
385 | { | |
386 | struct strbuf sb = STRBUF_INIT; | |
387 | if (human_readable) | |
388 | strbuf_humanise_bytes(&sb, size); | |
389 | else | |
390 | strbuf_addf(&sb, "%"PRIuMAX, (uintmax_t)size); | |
391 | puts(sb.buf); | |
392 | strbuf_release(&sb); | |
393 | } | |
394 | ||
caf3827e JH |
395 | static inline int parse_missing_action_value(const char *value) |
396 | { | |
397 | if (!strcmp(value, "error")) { | |
398 | arg_missing_action = MA_ERROR; | |
399 | return 1; | |
400 | } | |
401 | ||
402 | if (!strcmp(value, "allow-any")) { | |
403 | arg_missing_action = MA_ALLOW_ANY; | |
df11e196 | 404 | fetch_if_missing = 0; |
caf3827e JH |
405 | return 1; |
406 | } | |
407 | ||
408 | if (!strcmp(value, "print")) { | |
409 | arg_missing_action = MA_PRINT; | |
df11e196 JT |
410 | fetch_if_missing = 0; |
411 | return 1; | |
412 | } | |
413 | ||
414 | if (!strcmp(value, "allow-promisor")) { | |
415 | arg_missing_action = MA_ALLOW_PROMISOR; | |
416 | fetch_if_missing = 0; | |
caf3827e JH |
417 | return 1; |
418 | } | |
419 | ||
420 | return 0; | |
421 | } | |
422 | ||
2aaeb9ac | 423 | static int try_bitmap_count(struct rev_info *revs, |
9cf68b27 | 424 | int filter_provided_objects) |
792f8119 | 425 | { |
608d9c93 JK |
426 | uint32_t commit_count = 0, |
427 | tag_count = 0, | |
428 | tree_count = 0, | |
429 | blob_count = 0; | |
792f8119 JK |
430 | int max_count; |
431 | struct bitmap_index *bitmap_git; | |
432 | ||
433 | /* This function only handles counting, not general traversal. */ | |
434 | if (!revs->count) | |
435 | return -1; | |
436 | ||
437 | /* | |
438 | * A bitmap result can't know left/right, etc, because we don't | |
439 | * actually traverse. | |
440 | */ | |
441 | if (revs->left_right || revs->cherry_mark) | |
442 | return -1; | |
443 | ||
608d9c93 JK |
444 | /* |
445 | * If we're counting reachable objects, we can't handle a max count of | |
446 | * commits to traverse, since we don't know which objects go with which | |
447 | * commit. | |
448 | */ | |
449 | if (revs->max_count >= 0 && | |
450 | (revs->tag_objects || revs->tree_objects || revs->blob_objects)) | |
451 | return -1; | |
452 | ||
792f8119 JK |
453 | /* |
454 | * This must be saved before doing any walking, since the revision | |
455 | * machinery will count it down to zero while traversing. | |
456 | */ | |
457 | max_count = revs->max_count; | |
458 | ||
09d4a79e | 459 | bitmap_git = prepare_bitmap_walk(revs, filter_provided_objects); |
792f8119 JK |
460 | if (!bitmap_git) |
461 | return -1; | |
462 | ||
608d9c93 JK |
463 | count_bitmap_commit_list(bitmap_git, &commit_count, |
464 | revs->tree_objects ? &tree_count : NULL, | |
465 | revs->blob_objects ? &blob_count : NULL, | |
466 | revs->tag_objects ? &tag_count : NULL); | |
792f8119 JK |
467 | if (max_count >= 0 && max_count < commit_count) |
468 | commit_count = max_count; | |
469 | ||
608d9c93 | 470 | printf("%d\n", commit_count + tree_count + blob_count + tag_count); |
792f8119 JK |
471 | free_bitmap_index(bitmap_git); |
472 | return 0; | |
473 | } | |
474 | ||
2aaeb9ac | 475 | static int try_bitmap_traversal(struct rev_info *revs, |
9cf68b27 | 476 | int filter_provided_objects) |
792f8119 JK |
477 | { |
478 | struct bitmap_index *bitmap_git; | |
479 | ||
480 | /* | |
481 | * We can't use a bitmap result with a traversal limit, since the set | |
482 | * of commits we'd get would be essentially random. | |
483 | */ | |
484 | if (revs->max_count >= 0) | |
485 | return -1; | |
486 | ||
09d4a79e | 487 | bitmap_git = prepare_bitmap_walk(revs, filter_provided_objects); |
792f8119 JK |
488 | if (!bitmap_git) |
489 | return -1; | |
490 | ||
4eb707eb | 491 | traverse_bitmap_commit_list(bitmap_git, revs, &show_object_fast); |
792f8119 JK |
492 | free_bitmap_index(bitmap_git); |
493 | return 0; | |
494 | } | |
495 | ||
16950f83 | 496 | static int try_bitmap_disk_usage(struct rev_info *revs, |
9cf68b27 | 497 | int filter_provided_objects) |
16950f83 JK |
498 | { |
499 | struct bitmap_index *bitmap_git; | |
9096451a | 500 | off_t size_from_bitmap; |
16950f83 JK |
501 | |
502 | if (!show_disk_usage) | |
503 | return -1; | |
504 | ||
09d4a79e | 505 | bitmap_git = prepare_bitmap_walk(revs, filter_provided_objects); |
16950f83 JK |
506 | if (!bitmap_git) |
507 | return -1; | |
508 | ||
9096451a LL |
509 | size_from_bitmap = get_disk_usage_from_bitmap(bitmap_git, revs); |
510 | print_disk_usage(size_from_bitmap); | |
16950f83 JK |
511 | return 0; |
512 | } | |
513 | ||
a633fca0 | 514 | int cmd_rev_list(int argc, const char **argv, const char *prefix) |
64745109 | 515 | { |
11c211fa | 516 | struct rev_info revs; |
d797257e | 517 | struct rev_list_info info; |
bbcde41a MD |
518 | struct setup_revision_opt s_r_opt = { |
519 | .allow_exclude_promisor_objects = 1, | |
520 | }; | |
d9a83684 | 521 | int i; |
ff62d732 | 522 | int bisect_list = 0; |
457f08a0 | 523 | int bisect_show_vars = 0; |
50e62a8e | 524 | int bisect_find_all = 0; |
aa32939f | 525 | int use_bitmap_index = 0; |
9cf68b27 | 526 | int filter_provided_objects = 0; |
434ea3cd | 527 | const char *show_progress = NULL; |
0139c58a | 528 | int ret = 0; |
64745109 | 529 | |
5a88f97c JH |
530 | if (argc == 2 && !strcmp(argv[1], "-h")) |
531 | usage(rev_list_usage); | |
532 | ||
ef90d6d4 | 533 | git_config(git_default_config, NULL); |
2abf3503 | 534 | repo_init_revisions(the_repository, &revs, prefix); |
7337b138 | 535 | revs.abbrev = DEFAULT_ABBREV; |
7594c4b2 | 536 | revs.commit_format = CMIT_FMT_UNSPECIFIED; |
d1c5ae78 | 537 | revs.include_header = 1; |
df11e196 JT |
538 | |
539 | /* | |
540 | * Scan the argument list before invoking setup_revisions(), so that we | |
541 | * know if fetch_if_missing needs to be set to 0. | |
542 | * | |
543 | * "--exclude-promisor-objects" acts as a pre-filter on missing objects | |
544 | * by not crossing the boundary from realized objects to promisor | |
545 | * objects. | |
546 | * | |
547 | * Let "--missing" to conditionally set fetch_if_missing. | |
548 | */ | |
7b644c8c CC |
549 | /* |
550 | * NEEDSWORK: These loops that attempt to find presence of | |
551 | * options without understanding that the options they are | |
552 | * skipping are broken (e.g., it would not know "--grep | |
553 | * --exclude-promisor-objects" is not triggering | |
554 | * "--exclude-promisor-objects" option). We really need | |
555 | * setup_revisions() to have a mechanism to allow and disallow | |
556 | * some sets of options for different commands (like rev-list, | |
557 | * replay, etc). Such a mechanism should do an early parsing | |
558 | * of options and be able to manage the `--missing=...` and | |
559 | * `--exclude-promisor-objects` options below. | |
560 | */ | |
df11e196 JT |
561 | for (i = 1; i < argc; i++) { |
562 | const char *arg = argv[i]; | |
563 | if (!strcmp(arg, "--exclude-promisor-objects")) { | |
564 | fetch_if_missing = 0; | |
565 | revs.exclude_promisor_objects = 1; | |
566 | break; | |
567 | } | |
568 | } | |
569 | for (i = 1; i < argc; i++) { | |
570 | const char *arg = argv[i]; | |
571 | if (skip_prefix(arg, "--missing=", &arg)) { | |
572 | if (revs.exclude_promisor_objects) | |
12909b6b | 573 | die(_("options '%s' and '%s' cannot be used together"), "--exclude-promisor-objects", "--missing"); |
df11e196 JT |
574 | if (parse_missing_action_value(arg)) |
575 | break; | |
576 | } | |
577 | } | |
578 | ||
ee4dfee2 | 579 | if (arg_missing_action) |
ca556f47 | 580 | revs.do_not_die_on_missing_objects = 1; |
ee4dfee2 | 581 | |
bbcde41a | 582 | argc = setup_revisions(argc, argv, &revs, &s_r_opt); |
ae563542 | 583 | |
d797257e CC |
584 | memset(&info, 0, sizeof(info)); |
585 | info.revs = &revs; | |
ad3f9a71 LT |
586 | if (revs.bisect) |
587 | bisect_list = 1; | |
d797257e | 588 | |
0d1e0e78 | 589 | if (revs.diffopt.flags.quick) |
98993722 | 590 | info.flags |= REV_LIST_QUIET; |
fcfda02b | 591 | for (i = 1 ; i < argc; i++) { |
cf484544 | 592 | const char *arg = argv[i]; |
fcfda02b | 593 | |
a6f68d47 | 594 | if (!strcmp(arg, "--header")) { |
7594c4b2 | 595 | revs.verbose_header = 1; |
9d97aa64 LT |
596 | continue; |
597 | } | |
dc68c4ff | 598 | if (!strcmp(arg, "--timestamp")) { |
d797257e | 599 | info.show_timestamp = 1; |
dc68c4ff JH |
600 | continue; |
601 | } | |
8b3a1e05 LT |
602 | if (!strcmp(arg, "--bisect")) { |
603 | bisect_list = 1; | |
604 | continue; | |
605 | } | |
50e62a8e CC |
606 | if (!strcmp(arg, "--bisect-all")) { |
607 | bisect_list = 1; | |
608 | bisect_find_all = 1; | |
98993722 | 609 | info.flags |= BISECT_SHOW_ALL; |
6e46cc0d | 610 | revs.show_decorations = 1; |
50e62a8e CC |
611 | continue; |
612 | } | |
457f08a0 JH |
613 | if (!strcmp(arg, "--bisect-vars")) { |
614 | bisect_list = 1; | |
615 | bisect_show_vars = 1; | |
616 | continue; | |
617 | } | |
aa32939f VM |
618 | if (!strcmp(arg, "--use-bitmap-index")) { |
619 | use_bitmap_index = 1; | |
620 | continue; | |
621 | } | |
622 | if (!strcmp(arg, "--test-bitmap")) { | |
623 | test_bitmap_walk(&revs); | |
0139c58a | 624 | goto cleanup; |
aa32939f | 625 | } |
434ea3cd JK |
626 | if (skip_prefix(arg, "--progress=", &arg)) { |
627 | show_progress = arg; | |
628 | continue; | |
629 | } | |
9cf68b27 PS |
630 | if (!strcmp(arg, "--filter-provided-objects")) { |
631 | filter_provided_objects = 1; | |
632 | continue; | |
633 | } | |
caf3827e JH |
634 | if (!strcmp(arg, "--filter-print-omitted")) { |
635 | arg_print_omitted = 1; | |
636 | continue; | |
637 | } | |
638 | ||
df11e196 JT |
639 | if (!strcmp(arg, "--exclude-promisor-objects")) |
640 | continue; /* already handled above */ | |
641 | if (skip_prefix(arg, "--missing=", &arg)) | |
642 | continue; /* already handled above */ | |
caf3827e | 643 | |
42357b4e ES |
644 | if (!strcmp(arg, ("--no-object-names"))) { |
645 | arg_show_object_names = 0; | |
646 | continue; | |
647 | } | |
648 | ||
649 | if (!strcmp(arg, ("--object-names"))) { | |
650 | arg_show_object_names = 1; | |
651 | continue; | |
652 | } | |
653 | ||
d1c5ae78 | 654 | if (!strcmp(arg, ("--commit-header"))) { |
655 | revs.include_header = 1; | |
656 | continue; | |
657 | } | |
658 | ||
659 | if (!strcmp(arg, ("--no-commit-header"))) { | |
660 | revs.include_header = 0; | |
661 | continue; | |
662 | } | |
663 | ||
9096451a LL |
664 | if (skip_prefix(arg, "--disk-usage", &arg)) { |
665 | if (*arg == '=') { | |
666 | if (!strcmp(++arg, "human")) { | |
667 | human_readable = 1; | |
668 | } else | |
669 | die(_("invalid value for '%s': '%s', the only allowed format is '%s'"), | |
670 | "--disk-usage=<format>", arg, "human"); | |
671 | } else if (*arg) { | |
672 | /* | |
673 | * Arguably should goto a label to continue chain of ifs? | |
674 | * Doesn't matter unless we try to add --disk-usage-foo | |
675 | * afterwards. | |
676 | */ | |
677 | usage(rev_list_usage); | |
678 | } | |
16950f83 JK |
679 | show_disk_usage = 1; |
680 | info.flags |= REV_LIST_QUIET; | |
681 | continue; | |
682 | } | |
683 | ||
ae563542 | 684 | usage(rev_list_usage); |
a6f68d47 | 685 | |
fcfda02b | 686 | } |
d1c5ae78 | 687 | if (revs.commit_format != CMIT_FMT_USERFORMAT) |
688 | revs.include_header = 1; | |
7594c4b2 JH |
689 | if (revs.commit_format != CMIT_FMT_UNSPECIFIED) { |
690 | /* The command line has a --pretty */ | |
d797257e | 691 | info.hdr_termination = '\n'; |
d1c5ae78 | 692 | if (revs.commit_format == CMIT_FMT_ONELINE || !revs.include_header) |
d797257e | 693 | info.header_prefix = ""; |
7594c4b2 | 694 | else |
d797257e | 695 | info.header_prefix = "commit "; |
7594c4b2 | 696 | } |
db89665f JH |
697 | else if (revs.verbose_header) |
698 | /* Only --header was specified */ | |
699 | revs.commit_format = CMIT_FMT_RAW; | |
fcfda02b | 700 | |
7f97de5e | 701 | if ((!revs.commits && reflog_walk_empty(revs.reflog_info) && |
c01499ef | 702 | (!(revs.tag_objects || revs.tree_objects || revs.blob_objects) && |
0159ba32 | 703 | !revs.pending.nr) && |
a12cbe23 | 704 | !revs.rev_input_given && !revs.read_from_stdin) || |
8c1f0b44 | 705 | revs.diff) |
7b34c2fa LT |
706 | usage(rev_list_usage); |
707 | ||
2aea7a51 JK |
708 | if (revs.show_notes) |
709 | die(_("rev-list does not support display of notes")); | |
710 | ||
55cb10f9 JK |
711 | if (revs.count && |
712 | (revs.tag_objects || revs.tree_objects || revs.blob_objects) && | |
713 | (revs.left_right || revs.cherry_mark)) | |
246cac85 | 714 | die(_("marked counting and '%s' cannot be used together"), "--objects"); |
55cb10f9 | 715 | |
80235ba7 JH |
716 | save_commit_buffer = (revs.verbose_header || |
717 | revs.grep_filter.pattern_list || | |
718 | revs.grep_filter.header_list); | |
4e1dc640 JH |
719 | if (bisect_list) |
720 | revs.limited = 1; | |
9181ca2c | 721 | |
434ea3cd | 722 | if (show_progress) |
8aade107 | 723 | progress = start_delayed_progress(show_progress, 0); |
434ea3cd | 724 | |
d90fe06e | 725 | if (use_bitmap_index) { |
ffaa137f | 726 | if (!try_bitmap_count(&revs, filter_provided_objects)) |
0139c58a | 727 | goto cleanup; |
ffaa137f | 728 | if (!try_bitmap_disk_usage(&revs, filter_provided_objects)) |
0139c58a | 729 | goto cleanup; |
ffaa137f | 730 | if (!try_bitmap_traversal(&revs, filter_provided_objects)) |
0139c58a | 731 | goto cleanup; |
aa32939f VM |
732 | } |
733 | ||
3d51e1b5 MK |
734 | if (prepare_revision_walk(&revs)) |
735 | die("revision walk setup failed"); | |
a4a88b2b | 736 | if (revs.tree_objects) |
4f6d26b1 | 737 | mark_edges_uninteresting(&revs, show_edge, 0); |
a4a88b2b | 738 | |
457f08a0 | 739 | if (bisect_list) { |
156e1782 | 740 | int reaches, all; |
ad464a4e | 741 | unsigned bisect_flags = 0; |
457f08a0 | 742 | |
ad464a4e AL |
743 | if (bisect_find_all) |
744 | bisect_flags |= FIND_BISECTION_ALL; | |
745 | ||
746 | if (revs.first_parent_only) | |
747 | bisect_flags |= FIND_BISECTION_FIRST_PARENT_ONLY; | |
748 | ||
749 | find_bisection(&revs.commits, &reaches, &all, bisect_flags); | |
95188648 | 750 | |
0139c58a ÆAB |
751 | if (bisect_show_vars) { |
752 | ret = show_bisect_vars(&info, reaches, all); | |
753 | goto cleanup; | |
754 | } | |
457f08a0 | 755 | } |
7b34c2fa | 756 | |
9cf68b27 PS |
757 | if (filter_provided_objects) { |
758 | struct commit_list *c; | |
759 | for (i = 0; i < revs.pending.nr; i++) { | |
760 | struct object_array_entry *pending = revs.pending.objects + i; | |
761 | pending->item->flags |= NOT_USER_GIVEN; | |
762 | } | |
763 | for (c = revs.commits; c; c = c->next) | |
764 | c->item->object.flags |= NOT_USER_GIVEN; | |
765 | } | |
766 | ||
caf3827e JH |
767 | if (arg_print_omitted) |
768 | oidset_init(&omitted_objects, DEFAULT_OIDSET_SIZE); | |
7b644c8c | 769 | if (arg_missing_action == MA_PRINT) { |
caf3827e | 770 | oidset_init(&missing_objects, DEFAULT_OIDSET_SIZE); |
7b644c8c CC |
771 | /* Add missing tips */ |
772 | oidset_insert_from_set(&missing_objects, &revs.missing_commits); | |
773 | oidset_clear(&revs.missing_commits); | |
774 | } | |
caf3827e JH |
775 | |
776 | traverse_commit_list_filtered( | |
3e0370a8 | 777 | &revs, show_commit, show_object, &info, |
caf3827e JH |
778 | (arg_print_omitted ? &omitted_objects : NULL)); |
779 | ||
780 | if (arg_print_omitted) { | |
781 | struct oidset_iter iter; | |
782 | struct object_id *oid; | |
783 | oidset_iter_init(&omitted_objects, &iter); | |
784 | while ((oid = oidset_iter_next(&iter))) | |
785 | printf("~%s\n", oid_to_hex(oid)); | |
786 | oidset_clear(&omitted_objects); | |
787 | } | |
788 | if (arg_missing_action == MA_PRINT) { | |
789 | struct oidset_iter iter; | |
790 | struct object_id *oid; | |
791 | oidset_iter_init(&missing_objects, &iter); | |
792 | while ((oid = oidset_iter_next(&iter))) | |
793 | printf("?%s\n", oid_to_hex(oid)); | |
794 | oidset_clear(&missing_objects); | |
795 | } | |
8906300f | 796 | |
434ea3cd JK |
797 | stop_progress(&progress); |
798 | ||
f69c5018 | 799 | if (revs.count) { |
b388e14b MG |
800 | if (revs.left_right && revs.cherry_mark) |
801 | printf("%d\t%d\t%d\n", revs.count_left, revs.count_right, revs.count_same); | |
802 | else if (revs.left_right) | |
f69c5018 | 803 | printf("%d\t%d\n", revs.count_left, revs.count_right); |
b388e14b MG |
804 | else if (revs.cherry_mark) |
805 | printf("%d\t%d\n", revs.count_left + revs.count_right, revs.count_same); | |
f69c5018 TR |
806 | else |
807 | printf("%d\n", revs.count_left + revs.count_right); | |
808 | } | |
809 | ||
16950f83 | 810 | if (show_disk_usage) |
9096451a | 811 | print_disk_usage(total_disk_usage); |
16950f83 | 812 | |
0139c58a ÆAB |
813 | cleanup: |
814 | release_revisions(&revs); | |
815 | return ret; | |
64745109 | 816 | } |