6 #include "list-objects.h"
7 #include "list-objects-filter.h"
8 #include "list-objects-filter-options.h"
10 #include "pack-bitmap.h"
16 #include "reflog-walk.h"
20 static const char rev_list_usage
[] =
21 "git rev-list [OPTION] <commit-id>... [ -- paths... ]\n"
24 " --max-age=<epoch>\n"
25 " --min-age=<epoch>\n"
28 " --min-parents=<n>\n"
30 " --max-parents=<n>\n"
43 " formatting output:\n"
46 " --objects | --objects-edge\n"
48 " --header | --pretty\n"
49 " --abbrev=<n> | --no-abbrev\n"
59 static struct progress
*progress
;
60 static unsigned progress_counter
;
62 static struct list_objects_filter_options filter_options
;
63 static struct oidset omitted_objects
;
64 static int arg_print_omitted
; /* print objects omitted by filter */
66 static struct oidset missing_objects
;
68 MA_ERROR
= 0, /* fail if any missing objects are encountered */
69 MA_ALLOW_ANY
, /* silently allow ALL missing objects */
70 MA_PRINT
, /* print ALL missing objects in special section */
71 MA_ALLOW_PROMISOR
, /* silently allow all missing PROMISOR objects */
73 static enum missing_action arg_missing_action
;
75 #define DEFAULT_OIDSET_SIZE (16*1024)
77 static void finish_commit(struct commit
*commit
, void *data
);
78 static void show_commit(struct commit
*commit
, void *data
)
80 struct rev_list_info
*info
= data
;
81 struct rev_info
*revs
= info
->revs
;
83 display_progress(progress
, ++progress_counter
);
85 if (info
->flags
& REV_LIST_QUIET
) {
86 finish_commit(commit
, data
);
90 graph_show_commit(revs
->graph
);
93 if (commit
->object
.flags
& PATCHSAME
)
95 else if (commit
->object
.flags
& SYMMETRIC_LEFT
)
99 finish_commit(commit
, data
);
103 if (info
->show_timestamp
)
104 printf("%"PRItime
" ", commit
->date
);
105 if (info
->header_prefix
)
106 fputs(info
->header_prefix
, stdout
);
109 fputs(get_revision_mark(revs
, commit
), stdout
);
110 if (revs
->abbrev_commit
&& revs
->abbrev
)
111 fputs(find_unique_abbrev(&commit
->object
.oid
, revs
->abbrev
),
114 fputs(oid_to_hex(&commit
->object
.oid
), stdout
);
115 if (revs
->print_parents
) {
116 struct commit_list
*parents
= commit
->parents
;
118 printf(" %s", oid_to_hex(&parents
->item
->object
.oid
));
119 parents
= parents
->next
;
122 if (revs
->children
.name
) {
123 struct commit_list
*children
;
125 children
= lookup_decoration(&revs
->children
, &commit
->object
);
127 printf(" %s", oid_to_hex(&children
->item
->object
.oid
));
128 children
= children
->next
;
131 show_decorations(revs
, commit
);
132 if (revs
->commit_format
== CMIT_FMT_ONELINE
)
137 if (revs
->verbose_header
) {
138 struct strbuf buf
= STRBUF_INIT
;
139 struct pretty_print_context ctx
= {0};
140 ctx
.abbrev
= revs
->abbrev
;
141 ctx
.date_mode
= revs
->date_mode
;
142 ctx
.date_mode_explicit
= revs
->date_mode_explicit
;
143 ctx
.fmt
= revs
->commit_format
;
144 ctx
.output_encoding
= get_log_output_encoding();
145 ctx
.color
= revs
->diffopt
.use_color
;
146 pretty_print_commit(&ctx
, commit
, &buf
);
148 if (revs
->commit_format
!= CMIT_FMT_ONELINE
)
149 graph_show_oneline(revs
->graph
);
151 graph_show_commit_msg(revs
->graph
, stdout
, &buf
);
154 * Add a newline after the commit message.
156 * Usually, this newline produces a blank
157 * padding line between entries, in which case
158 * we need to add graph padding on this line.
160 * However, the commit message may not end in a
161 * newline. In this case the newline simply
162 * ends the last line of the commit message,
163 * and we don't need any graph output. (This
164 * always happens with CMIT_FMT_ONELINE, and it
165 * happens with CMIT_FMT_USERFORMAT when the
166 * format doesn't explicitly end in a newline.)
168 if (buf
.len
&& buf
.buf
[buf
.len
- 1] == '\n')
169 graph_show_padding(revs
->graph
);
170 putchar(info
->hdr_termination
);
173 * If the message buffer is empty, just show
174 * the rest of the graph output for this
177 if (graph_show_remainder(revs
->graph
))
179 if (revs
->commit_format
== CMIT_FMT_ONELINE
)
182 strbuf_release(&buf
);
184 if (graph_show_remainder(revs
->graph
))
187 maybe_flush_or_die(stdout
, "stdout");
188 finish_commit(commit
, data
);
191 static void finish_commit(struct commit
*commit
, void *data
)
193 if (commit
->parents
) {
194 free_commit_list(commit
->parents
);
195 commit
->parents
= NULL
;
197 free_commit_buffer(commit
);
200 static inline void finish_object__ma(struct object
*obj
)
203 * Whether or not we try to dynamically fetch missing objects
204 * from the server, we currently DO NOT have the object. We
205 * can either print, allow (ignore), or conditionally allow
208 switch (arg_missing_action
) {
210 die("missing blob object '%s'", oid_to_hex(&obj
->oid
));
217 oidset_insert(&missing_objects
, &obj
->oid
);
220 case MA_ALLOW_PROMISOR
:
221 if (is_promisor_object(&obj
->oid
))
223 die("unexpected missing blob object '%s'",
224 oid_to_hex(&obj
->oid
));
228 BUG("unhandled missing_action");
233 static int finish_object(struct object
*obj
, const char *name
, void *cb_data
)
235 struct rev_list_info
*info
= cb_data
;
236 if (obj
->type
== OBJ_BLOB
&& !has_object_file(&obj
->oid
)) {
237 finish_object__ma(obj
);
240 if (info
->revs
->verify_objects
&& !obj
->parsed
&& obj
->type
!= OBJ_COMMIT
)
241 parse_object(&obj
->oid
);
245 static void show_object(struct object
*obj
, const char *name
, void *cb_data
)
247 struct rev_list_info
*info
= cb_data
;
248 if (finish_object(obj
, name
, cb_data
))
250 display_progress(progress
, ++progress_counter
);
251 if (info
->flags
& REV_LIST_QUIET
)
253 show_object_with_name(stdout
, obj
, name
);
256 static void show_edge(struct commit
*commit
)
258 printf("-%s\n", oid_to_hex(&commit
->object
.oid
));
261 static void print_var_str(const char *var
, const char *val
)
263 printf("%s='%s'\n", var
, val
);
266 static void print_var_int(const char *var
, int val
)
268 printf("%s=%d\n", var
, val
);
271 static int show_bisect_vars(struct rev_list_info
*info
, int reaches
, int all
)
273 int cnt
, flags
= info
->flags
;
274 char hex
[GIT_MAX_HEXSZ
+ 1] = "";
275 struct commit_list
*tried
;
276 struct rev_info
*revs
= info
->revs
;
281 revs
->commits
= filter_skipped(revs
->commits
, &tried
,
282 flags
& BISECT_SHOW_ALL
,
286 * revs->commits can reach "reaches" commits among
287 * "all" commits. If it is good, then there are
288 * (all-reaches) commits left to be bisected.
289 * On the other hand, if it is bad, then the set
290 * to bisect is "reaches".
291 * A bisect set of size N has (N-1) commits further
292 * to test, as we already know one bad one.
299 oid_to_hex_r(hex
, &revs
->commits
->item
->object
.oid
);
301 if (flags
& BISECT_SHOW_ALL
) {
302 traverse_commit_list(revs
, show_commit
, show_object
, info
);
306 print_var_str("bisect_rev", hex
);
307 print_var_int("bisect_nr", cnt
- 1);
308 print_var_int("bisect_good", all
- reaches
- 1);
309 print_var_int("bisect_bad", reaches
- 1);
310 print_var_int("bisect_all", all
);
311 print_var_int("bisect_steps", estimate_bisect_steps(all
));
316 static int show_object_fast(
317 const struct object_id
*oid
,
318 enum object_type type
,
321 struct packed_git
*found_pack
,
324 fprintf(stdout
, "%s\n", oid_to_hex(oid
));
328 static inline int parse_missing_action_value(const char *value
)
330 if (!strcmp(value
, "error")) {
331 arg_missing_action
= MA_ERROR
;
335 if (!strcmp(value
, "allow-any")) {
336 arg_missing_action
= MA_ALLOW_ANY
;
337 fetch_if_missing
= 0;
341 if (!strcmp(value
, "print")) {
342 arg_missing_action
= MA_PRINT
;
343 fetch_if_missing
= 0;
347 if (!strcmp(value
, "allow-promisor")) {
348 arg_missing_action
= MA_ALLOW_PROMISOR
;
349 fetch_if_missing
= 0;
356 int cmd_rev_list(int argc
, const char **argv
, const char *prefix
)
358 struct rev_info revs
;
359 struct rev_list_info info
;
362 int bisect_show_vars
= 0;
363 int bisect_find_all
= 0;
364 int use_bitmap_index
= 0;
365 const char *show_progress
= NULL
;
367 if (argc
== 2 && !strcmp(argv
[1], "-h"))
368 usage(rev_list_usage
);
370 git_config(git_default_config
, NULL
);
371 init_revisions(&revs
, prefix
);
372 revs
.abbrev
= DEFAULT_ABBREV
;
373 revs
.commit_format
= CMIT_FMT_UNSPECIFIED
;
376 * Scan the argument list before invoking setup_revisions(), so that we
377 * know if fetch_if_missing needs to be set to 0.
379 * "--exclude-promisor-objects" acts as a pre-filter on missing objects
380 * by not crossing the boundary from realized objects to promisor
383 * Let "--missing" to conditionally set fetch_if_missing.
385 for (i
= 1; i
< argc
; i
++) {
386 const char *arg
= argv
[i
];
387 if (!strcmp(arg
, "--exclude-promisor-objects")) {
388 fetch_if_missing
= 0;
389 revs
.exclude_promisor_objects
= 1;
393 for (i
= 1; i
< argc
; i
++) {
394 const char *arg
= argv
[i
];
395 if (skip_prefix(arg
, "--missing=", &arg
)) {
396 if (revs
.exclude_promisor_objects
)
397 die(_("cannot combine --exclude-promisor-objects and --missing"));
398 if (parse_missing_action_value(arg
))
403 argc
= setup_revisions(argc
, argv
, &revs
, NULL
);
405 memset(&info
, 0, sizeof(info
));
410 if (revs
.diffopt
.flags
.quick
)
411 info
.flags
|= REV_LIST_QUIET
;
412 for (i
= 1 ; i
< argc
; i
++) {
413 const char *arg
= argv
[i
];
415 if (!strcmp(arg
, "--header")) {
416 revs
.verbose_header
= 1;
419 if (!strcmp(arg
, "--timestamp")) {
420 info
.show_timestamp
= 1;
423 if (!strcmp(arg
, "--bisect")) {
427 if (!strcmp(arg
, "--bisect-all")) {
430 info
.flags
|= BISECT_SHOW_ALL
;
431 revs
.show_decorations
= 1;
434 if (!strcmp(arg
, "--bisect-vars")) {
436 bisect_show_vars
= 1;
439 if (!strcmp(arg
, "--use-bitmap-index")) {
440 use_bitmap_index
= 1;
443 if (!strcmp(arg
, "--test-bitmap")) {
444 test_bitmap_walk(&revs
);
447 if (skip_prefix(arg
, "--progress=", &arg
)) {
452 if (skip_prefix(arg
, ("--" CL_ARG__FILTER
"="), &arg
)) {
453 parse_list_objects_filter(&filter_options
, arg
);
454 if (filter_options
.choice
&& !revs
.blob_objects
)
455 die(_("object filtering requires --objects"));
456 if (filter_options
.choice
== LOFC_SPARSE_OID
&&
457 !filter_options
.sparse_oid_value
)
458 die(_("invalid sparse value '%s'"),
459 filter_options
.filter_spec
);
462 if (!strcmp(arg
, ("--no-" CL_ARG__FILTER
))) {
463 list_objects_filter_set_no_filter(&filter_options
);
466 if (!strcmp(arg
, "--filter-print-omitted")) {
467 arg_print_omitted
= 1;
471 if (!strcmp(arg
, "--exclude-promisor-objects"))
472 continue; /* already handled above */
473 if (skip_prefix(arg
, "--missing=", &arg
))
474 continue; /* already handled above */
476 usage(rev_list_usage
);
479 if (revs
.commit_format
!= CMIT_FMT_UNSPECIFIED
) {
480 /* The command line has a --pretty */
481 info
.hdr_termination
= '\n';
482 if (revs
.commit_format
== CMIT_FMT_ONELINE
)
483 info
.header_prefix
= "";
485 info
.header_prefix
= "commit ";
487 else if (revs
.verbose_header
)
488 /* Only --header was specified */
489 revs
.commit_format
= CMIT_FMT_RAW
;
491 if ((!revs
.commits
&& reflog_walk_empty(revs
.reflog_info
) &&
492 (!(revs
.tag_objects
|| revs
.tree_objects
|| revs
.blob_objects
) &&
494 !revs
.rev_input_given
) ||
496 usage(rev_list_usage
);
499 die(_("rev-list does not support display of notes"));
501 if (filter_options
.choice
&& use_bitmap_index
)
502 die(_("cannot combine --use-bitmap-index with object filtering"));
504 save_commit_buffer
= (revs
.verbose_header
||
505 revs
.grep_filter
.pattern_list
||
506 revs
.grep_filter
.header_list
);
511 progress
= start_delayed_progress(show_progress
, 0);
513 if (use_bitmap_index
&& !revs
.prune
) {
514 if (revs
.count
&& !revs
.left_right
&& !revs
.cherry_mark
) {
515 uint32_t commit_count
;
516 int max_count
= revs
.max_count
;
517 if (!prepare_bitmap_walk(&revs
)) {
518 count_bitmap_commit_list(&commit_count
, NULL
, NULL
, NULL
);
519 if (max_count
>= 0 && max_count
< commit_count
)
520 commit_count
= max_count
;
521 printf("%d\n", commit_count
);
524 } else if (revs
.max_count
< 0 &&
525 revs
.tag_objects
&& revs
.tree_objects
&& revs
.blob_objects
) {
526 if (!prepare_bitmap_walk(&revs
)) {
527 traverse_bitmap_commit_list(&show_object_fast
);
533 if (prepare_revision_walk(&revs
))
534 die("revision walk setup failed");
535 if (revs
.tree_objects
)
536 mark_edges_uninteresting(&revs
, show_edge
);
541 find_bisection(&revs
.commits
, &reaches
, &all
, bisect_find_all
);
543 if (bisect_show_vars
)
544 return show_bisect_vars(&info
, reaches
, all
);
547 if (arg_print_omitted
)
548 oidset_init(&omitted_objects
, DEFAULT_OIDSET_SIZE
);
549 if (arg_missing_action
== MA_PRINT
)
550 oidset_init(&missing_objects
, DEFAULT_OIDSET_SIZE
);
552 traverse_commit_list_filtered(
553 &filter_options
, &revs
, show_commit
, show_object
, &info
,
554 (arg_print_omitted
? &omitted_objects
: NULL
));
556 if (arg_print_omitted
) {
557 struct oidset_iter iter
;
558 struct object_id
*oid
;
559 oidset_iter_init(&omitted_objects
, &iter
);
560 while ((oid
= oidset_iter_next(&iter
)))
561 printf("~%s\n", oid_to_hex(oid
));
562 oidset_clear(&omitted_objects
);
564 if (arg_missing_action
== MA_PRINT
) {
565 struct oidset_iter iter
;
566 struct object_id
*oid
;
567 oidset_iter_init(&missing_objects
, &iter
);
568 while ((oid
= oidset_iter_next(&iter
)))
569 printf("?%s\n", oid_to_hex(oid
));
570 oidset_clear(&missing_objects
);
573 stop_progress(&progress
);
576 if (revs
.left_right
&& revs
.cherry_mark
)
577 printf("%d\t%d\t%d\n", revs
.count_left
, revs
.count_right
, revs
.count_same
);
578 else if (revs
.left_right
)
579 printf("%d\t%d\n", revs
.count_left
, revs
.count_right
);
580 else if (revs
.cherry_mark
)
581 printf("%d\t%d\n", revs
.count_left
+ revs
.count_right
, revs
.count_same
);
583 printf("%d\n", revs
.count_left
+ revs
.count_right
);