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