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