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