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