t/t3415: use && where applicable.
[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
JH
13" limiting output:\n"
14" --max-count=nr\n"
15" --max-age=epoch\n"
16" --min-age=epoch\n"
17" --sparse\n"
18" --no-merges\n"
93b74bca 19" --remove-empty\n"
69e0c256 20" --all\n"
a5aa930d
UKK
21" --branches\n"
22" --tags\n"
23" --remotes\n"
42cabc34 24" --stdin\n"
27350891 25" --quiet\n"
69e0c256 26" ordering output:\n"
69e0c256 27" --topo-order\n"
4c8725f1 28" --date-order\n"
7ccd3667 29" --reverse\n"
69e0c256
JH
30" formatting output:\n"
31" --parents\n"
72276a3e 32" --children\n"
c6496575 33" --objects | --objects-edge\n"
69e0c256
JH
34" --unpacked\n"
35" --header | --pretty\n"
9da5c2f0 36" --abbrev=nr | --no-abbrev\n"
5c51c985 37" --abbrev-commit\n"
b24bace5 38" --left-right\n"
69e0c256 39" special purpose:\n"
457f08a0 40" --bisect\n"
50e62a8e
CC
41" --bisect-vars\n"
42" --bisect-all"
69e0c256 43;
a6f68d47 44
11c211fa
CC
45static void finish_commit(struct commit *commit, void *data);
46static void show_commit(struct commit *commit, void *data)
81f2bb1f 47{
d797257e
CC
48 struct rev_list_info *info = data;
49 struct rev_info *revs = info->revs;
11c211fa
CC
50
51 graph_show_commit(revs->graph);
7fefda5c 52
f69c5018
TR
53 if (revs->count) {
54 if (commit->object.flags & SYMMETRIC_LEFT)
55 revs->count_left++;
56 else
57 revs->count_right++;
58 finish_commit(commit, data);
59 return;
60 }
61
d797257e 62 if (info->show_timestamp)
dc68c4ff 63 printf("%lu ", commit->date);
d797257e
CC
64 if (info->header_prefix)
65 fputs(info->header_prefix, stdout);
7528f27d 66
11c211fa 67 if (!revs->graph) {
7528f27d
AS
68 if (commit->object.flags & BOUNDARY)
69 putchar('-');
70 else if (commit->object.flags & UNINTERESTING)
71 putchar('^');
11c211fa 72 else if (revs->left_right) {
7528f27d
AS
73 if (commit->object.flags & SYMMETRIC_LEFT)
74 putchar('<');
75 else
76 putchar('>');
77 }
577ed5c2 78 }
11c211fa
CC
79 if (revs->abbrev_commit && revs->abbrev)
80 fputs(find_unique_abbrev(commit->object.sha1, revs->abbrev),
7594c4b2 81 stdout);
5c51c985
JH
82 else
83 fputs(sha1_to_hex(commit->object.sha1), stdout);
11c211fa 84 if (revs->print_parents) {
81f2bb1f
LT
85 struct commit_list *parents = commit->parents;
86 while (parents) {
1ed84157 87 printf(" %s", sha1_to_hex(parents->item->object.sha1));
81f2bb1f
LT
88 parents = parents->next;
89 }
90 }
11c211fa 91 if (revs->children.name) {
72276a3e
JH
92 struct commit_list *children;
93
11c211fa 94 children = lookup_decoration(&revs->children, &commit->object);
72276a3e
JH
95 while (children) {
96 printf(" %s", sha1_to_hex(children->item->object.sha1));
97 children = children->next;
98 }
99 }
11c211fa
CC
100 show_decorations(revs, commit);
101 if (revs->commit_format == CMIT_FMT_ONELINE)
d87449c5
JH
102 putchar(' ');
103 else
104 putchar('\n');
105
11c211fa 106 if (revs->verbose_header && commit->buffer) {
f285a2d7 107 struct strbuf buf = STRBUF_INIT;
dd2e794a
TR
108 struct pretty_print_context ctx = {0};
109 ctx.abbrev = revs->abbrev;
110 ctx.date_mode = revs->date_mode;
111 pretty_print_commit(revs->commit_format, commit, &buf, &ctx);
11c211fa 112 if (revs->graph) {
7fefda5c 113 if (buf.len) {
11c211fa
CC
114 if (revs->commit_format != CMIT_FMT_ONELINE)
115 graph_show_oneline(revs->graph);
7fefda5c 116
11c211fa 117 graph_show_commit_msg(revs->graph, &buf);
7fefda5c
AS
118
119 /*
120 * Add a newline after the commit message.
121 *
122 * Usually, this newline produces a blank
123 * padding line between entries, in which case
124 * we need to add graph padding on this line.
125 *
126 * However, the commit message may not end in a
127 * newline. In this case the newline simply
128 * ends the last line of the commit message,
129 * and we don't need any graph output. (This
130 * always happens with CMIT_FMT_ONELINE, and it
131 * happens with CMIT_FMT_USERFORMAT when the
132 * format doesn't explicitly end in a newline.)
133 */
134 if (buf.len && buf.buf[buf.len - 1] == '\n')
11c211fa 135 graph_show_padding(revs->graph);
7fefda5c
AS
136 putchar('\n');
137 } else {
138 /*
139 * If the message buffer is empty, just show
140 * the rest of the graph output for this
141 * commit.
142 */
11c211fa 143 if (graph_show_remainder(revs->graph))
7fefda5c 144 putchar('\n');
1fb5fdd2
EFL
145 if (revs->commit_format == CMIT_FMT_ONELINE)
146 putchar('\n');
7fefda5c
AS
147 }
148 } else {
1fb5fdd2
EFL
149 if (revs->commit_format != CMIT_FMT_USERFORMAT ||
150 buf.len)
d797257e 151 printf("%s%c", buf.buf, info->hdr_termination);
7fefda5c 152 }
674d1727 153 strbuf_release(&buf);
7fefda5c 154 } else {
11c211fa 155 if (graph_show_remainder(revs->graph))
7fefda5c 156 putchar('\n');
7620d39f 157 }
06f59e9f 158 maybe_flush_or_die(stdout, "stdout");
11c211fa 159 finish_commit(commit, data);
27350891
SP
160}
161
11c211fa 162static void finish_commit(struct commit *commit, void *data)
27350891 163{
cb115748
LT
164 if (commit->parents) {
165 free_commit_list(commit->parents);
166 commit->parents = NULL;
167 }
4cac42b1
JH
168 free(commit->buffer);
169 commit->buffer = NULL;
a3437b8c
JS
170}
171
cf2ab916 172static void finish_object(struct object *obj, const struct name_path *path, const char *name)
27350891 173{
8d2dfc49
LT
174 if (obj->type == OBJ_BLOB && !has_sha1_file(obj->sha1))
175 die("missing blob object '%s'", sha1_to_hex(obj->sha1));
27350891
SP
176}
177
cf2ab916 178static void show_object(struct object *obj, const struct name_path *path, const char *component)
9de48752 179{
cf2ab916 180 char *name = path_name(path, component);
c64ed70d 181 /* An object with name "foo\n0000000..." can be used to
f18d244a 182 * confuse downstream "git pack-objects" very badly.
c64ed70d 183 */
8d2dfc49 184 const char *ep = strchr(name, '\n');
b9849a1a 185
cf2ab916 186 finish_object(obj, path, name);
c64ed70d 187 if (ep) {
8d2dfc49
LT
188 printf("%s %.*s\n", sha1_to_hex(obj->sha1),
189 (int) (ep - name),
190 name);
9de48752 191 }
c64ed70d 192 else
8d2dfc49 193 printf("%s %s\n", sha1_to_hex(obj->sha1), name);
cf2ab916 194 free(name);
9de48752
LT
195}
196
8d1d8f83
JH
197static void show_edge(struct commit *commit)
198{
199 printf("-%s\n", sha1_to_hex(commit->object.sha1));
200}
201
9f199b15
CC
202static inline int log2i(int n)
203{
204 int log2 = 0;
205
206 for (; n > 1; n >>= 1)
207 log2++;
208
209 return log2;
210}
211
212static inline int exp2i(int n)
213{
214 return 1 << n;
215}
216
217/*
218 * Estimate the number of bisect steps left (after the current step)
219 *
220 * For any x between 0 included and 2^n excluded, the probability for
221 * n - 1 steps left looks like:
222 *
223 * P(2^n + x) == (2^n - x) / (2^n + x)
224 *
225 * and P(2^n + x) < 0.5 means 2^n < 3x
226 */
1c876546 227int estimate_bisect_steps(int all)
9f199b15
CC
228{
229 int n, x, e;
230
231 if (all < 3)
232 return 0;
233
234 n = log2i(all);
235 e = exp2i(n);
236 x = all - e;
237
238 return (e < 3 * x) ? n : n - 1;
239}
240
280e65cb
CC
241void print_commit_list(struct commit_list *list,
242 const char *format_cur,
243 const char *format_last)
244{
245 for ( ; list; list = list->next) {
246 const char *format = list->next ? format_cur : format_last;
247 printf(format, sha1_to_hex(list->item->object.sha1));
248 }
249}
250
38ef7507 251static void show_tried_revs(struct commit_list *tried)
95188648
CC
252{
253 printf("bisect_tried='");
280e65cb 254 print_commit_list(tried, "%s|", "%s");
38ef7507 255 printf("'\n");
95188648
CC
256}
257
38ef7507 258static void print_var_str(const char *var, const char *val)
280e65cb 259{
38ef7507 260 printf("%s='%s'\n", var, val);
280e65cb
CC
261}
262
38ef7507 263static void print_var_int(const char *var, int val)
280e65cb 264{
38ef7507 265 printf("%s=%d\n", var, val);
280e65cb
CC
266}
267
f1c92c63 268static int show_bisect_vars(struct rev_list_info *info, int reaches, int all)
9996983c 269{
38ef7507 270 int cnt, flags = info->bisect_show_flags;
280e65cb 271 char hex[41] = "";
95188648 272 struct commit_list *tried;
d797257e 273 struct rev_info *revs = info->revs;
9996983c 274
37c4c38d 275 if (!revs->commits && !(flags & BISECT_SHOW_TRIED))
9996983c
CC
276 return 1;
277
9af3589e
CC
278 revs->commits = filter_skipped(revs->commits, &tried,
279 flags & BISECT_SHOW_ALL,
280 NULL, NULL);
95188648 281
9996983c 282 /*
7428d754 283 * revs->commits can reach "reaches" commits among
9996983c
CC
284 * "all" commits. If it is good, then there are
285 * (all-reaches) commits left to be bisected.
286 * On the other hand, if it is bad, then the set
287 * to bisect is "reaches".
288 * A bisect set of size N has (N-1) commits further
289 * to test, as we already know one bad one.
290 */
291 cnt = all - reaches;
292 if (cnt < reaches)
293 cnt = reaches;
6a17fad7 294
95188648
CC
295 if (revs->commits)
296 strcpy(hex, sha1_to_hex(revs->commits->item->object.sha1));
9996983c 297
37c4c38d 298 if (flags & BISECT_SHOW_ALL) {
d797257e 299 traverse_commit_list(revs, show_commit, show_object, info);
9996983c
CC
300 printf("------\n");
301 }
302
37c4c38d 303 if (flags & BISECT_SHOW_TRIED)
38ef7507
CC
304 show_tried_revs(tried);
305
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));
9996983c
CC
312
313 return 0;
314}
315
a633fca0 316int cmd_rev_list(int argc, const char **argv, const char *prefix)
64745109 317{
11c211fa 318 struct rev_info revs;
d797257e 319 struct rev_list_info info;
d9a83684 320 int i;
ff62d732 321 int bisect_list = 0;
457f08a0 322 int bisect_show_vars = 0;
50e62a8e 323 int bisect_find_all = 0;
27350891 324 int quiet = 0;
64745109 325
ef90d6d4 326 git_config(git_default_config, NULL);
a633fca0 327 init_revisions(&revs, prefix);
7337b138 328 revs.abbrev = DEFAULT_ABBREV;
7594c4b2 329 revs.commit_format = CMIT_FMT_UNSPECIFIED;
a4a88b2b 330 argc = setup_revisions(argc, argv, &revs, NULL);
ae563542 331
d797257e
CC
332 memset(&info, 0, sizeof(info));
333 info.revs = &revs;
ad3f9a71
LT
334 if (revs.bisect)
335 bisect_list = 1;
d797257e 336
90b19941 337 quiet = DIFF_OPT_TST(&revs.diffopt, QUICK);
fcfda02b 338 for (i = 1 ; i < argc; i++) {
cf484544 339 const char *arg = argv[i];
fcfda02b 340
a6f68d47 341 if (!strcmp(arg, "--header")) {
7594c4b2 342 revs.verbose_header = 1;
9d97aa64
LT
343 continue;
344 }
dc68c4ff 345 if (!strcmp(arg, "--timestamp")) {
d797257e 346 info.show_timestamp = 1;
dc68c4ff
JH
347 continue;
348 }
8b3a1e05
LT
349 if (!strcmp(arg, "--bisect")) {
350 bisect_list = 1;
351 continue;
352 }
50e62a8e
CC
353 if (!strcmp(arg, "--bisect-all")) {
354 bisect_list = 1;
355 bisect_find_all = 1;
13858e57 356 info.bisect_show_flags = BISECT_SHOW_ALL;
6e46cc0d 357 revs.show_decorations = 1;
50e62a8e
CC
358 continue;
359 }
457f08a0
JH
360 if (!strcmp(arg, "--bisect-vars")) {
361 bisect_list = 1;
362 bisect_show_vars = 1;
363 continue;
364 }
ae563542 365 usage(rev_list_usage);
a6f68d47 366
fcfda02b 367 }
7594c4b2
JH
368 if (revs.commit_format != CMIT_FMT_UNSPECIFIED) {
369 /* The command line has a --pretty */
d797257e 370 info.hdr_termination = '\n';
7594c4b2 371 if (revs.commit_format == CMIT_FMT_ONELINE)
d797257e 372 info.header_prefix = "";
7594c4b2 373 else
d797257e 374 info.header_prefix = "commit ";
7594c4b2 375 }
db89665f
JH
376 else if (revs.verbose_header)
377 /* Only --header was specified */
378 revs.commit_format = CMIT_FMT_RAW;
fcfda02b 379
d797257e 380 if ((!revs.commits &&
8c1f0b44 381 (!(revs.tag_objects||revs.tree_objects||revs.blob_objects) &&
1f1e895f 382 !revs.pending.nr)) ||
8c1f0b44 383 revs.diff)
7b34c2fa
LT
384 usage(rev_list_usage);
385
80235ba7
JH
386 save_commit_buffer = (revs.verbose_header ||
387 revs.grep_filter.pattern_list ||
388 revs.grep_filter.header_list);
4e1dc640
JH
389 if (bisect_list)
390 revs.limited = 1;
9181ca2c 391
3d51e1b5
MK
392 if (prepare_revision_walk(&revs))
393 die("revision walk setup failed");
a4a88b2b 394 if (revs.tree_objects)
8d1d8f83 395 mark_edges_uninteresting(revs.commits, &revs, show_edge);
a4a88b2b 396
457f08a0
JH
397 if (bisect_list) {
398 int reaches = reaches, all = all;
399
50e62a8e
CC
400 revs.commits = find_bisection(revs.commits, &reaches, &all,
401 bisect_find_all);
95188648 402
9996983c 403 if (bisect_show_vars)
13858e57 404 return show_bisect_vars(&info, reaches, all);
457f08a0 405 }
7b34c2fa 406
27350891 407 traverse_commit_list(&revs,
11c211fa
CC
408 quiet ? finish_commit : show_commit,
409 quiet ? finish_object : show_object,
d797257e 410 &info);
8906300f 411
f69c5018
TR
412 if (revs.count) {
413 if (revs.left_right)
414 printf("%d\t%d\n", revs.count_left, revs.count_right);
415 else
416 printf("%d\n", revs.count_left + revs.count_right);
417 }
418
64745109
LT
419 return 0;
420}