Merge branch 'maint'
[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
d797257e 53 if (info->show_timestamp)
dc68c4ff 54 printf("%lu ", commit->date);
d797257e
CC
55 if (info->header_prefix)
56 fputs(info->header_prefix, stdout);
7528f27d 57
11c211fa 58 if (!revs->graph) {
7528f27d
AS
59 if (commit->object.flags & BOUNDARY)
60 putchar('-');
61 else if (commit->object.flags & UNINTERESTING)
62 putchar('^');
11c211fa 63 else if (revs->left_right) {
7528f27d
AS
64 if (commit->object.flags & SYMMETRIC_LEFT)
65 putchar('<');
66 else
67 putchar('>');
68 }
577ed5c2 69 }
11c211fa
CC
70 if (revs->abbrev_commit && revs->abbrev)
71 fputs(find_unique_abbrev(commit->object.sha1, revs->abbrev),
7594c4b2 72 stdout);
5c51c985
JH
73 else
74 fputs(sha1_to_hex(commit->object.sha1), stdout);
11c211fa 75 if (revs->print_parents) {
81f2bb1f
LT
76 struct commit_list *parents = commit->parents;
77 while (parents) {
1ed84157 78 printf(" %s", sha1_to_hex(parents->item->object.sha1));
81f2bb1f
LT
79 parents = parents->next;
80 }
81 }
11c211fa 82 if (revs->children.name) {
72276a3e
JH
83 struct commit_list *children;
84
11c211fa 85 children = lookup_decoration(&revs->children, &commit->object);
72276a3e
JH
86 while (children) {
87 printf(" %s", sha1_to_hex(children->item->object.sha1));
88 children = children->next;
89 }
90 }
11c211fa
CC
91 show_decorations(revs, commit);
92 if (revs->commit_format == CMIT_FMT_ONELINE)
d87449c5
JH
93 putchar(' ');
94 else
95 putchar('\n');
96
11c211fa 97 if (revs->verbose_header && commit->buffer) {
f285a2d7 98 struct strbuf buf = STRBUF_INIT;
dd2e794a
TR
99 struct pretty_print_context ctx = {0};
100 ctx.abbrev = revs->abbrev;
101 ctx.date_mode = revs->date_mode;
102 pretty_print_commit(revs->commit_format, commit, &buf, &ctx);
11c211fa 103 if (revs->graph) {
7fefda5c 104 if (buf.len) {
11c211fa
CC
105 if (revs->commit_format != CMIT_FMT_ONELINE)
106 graph_show_oneline(revs->graph);
7fefda5c 107
11c211fa 108 graph_show_commit_msg(revs->graph, &buf);
7fefda5c
AS
109
110 /*
111 * Add a newline after the commit message.
112 *
113 * Usually, this newline produces a blank
114 * padding line between entries, in which case
115 * we need to add graph padding on this line.
116 *
117 * However, the commit message may not end in a
118 * newline. In this case the newline simply
119 * ends the last line of the commit message,
120 * and we don't need any graph output. (This
121 * always happens with CMIT_FMT_ONELINE, and it
122 * happens with CMIT_FMT_USERFORMAT when the
123 * format doesn't explicitly end in a newline.)
124 */
125 if (buf.len && buf.buf[buf.len - 1] == '\n')
11c211fa 126 graph_show_padding(revs->graph);
7fefda5c
AS
127 putchar('\n');
128 } else {
129 /*
130 * If the message buffer is empty, just show
131 * the rest of the graph output for this
132 * commit.
133 */
11c211fa 134 if (graph_show_remainder(revs->graph))
7fefda5c 135 putchar('\n');
1fb5fdd2
EFL
136 if (revs->commit_format == CMIT_FMT_ONELINE)
137 putchar('\n');
7fefda5c
AS
138 }
139 } else {
1fb5fdd2
EFL
140 if (revs->commit_format != CMIT_FMT_USERFORMAT ||
141 buf.len)
d797257e 142 printf("%s%c", buf.buf, info->hdr_termination);
7fefda5c 143 }
674d1727 144 strbuf_release(&buf);
7fefda5c 145 } else {
11c211fa 146 if (graph_show_remainder(revs->graph))
7fefda5c 147 putchar('\n');
7620d39f 148 }
06f59e9f 149 maybe_flush_or_die(stdout, "stdout");
11c211fa 150 finish_commit(commit, data);
27350891
SP
151}
152
11c211fa 153static void finish_commit(struct commit *commit, void *data)
27350891 154{
cb115748
LT
155 if (commit->parents) {
156 free_commit_list(commit->parents);
157 commit->parents = NULL;
158 }
4cac42b1
JH
159 free(commit->buffer);
160 commit->buffer = NULL;
a3437b8c
JS
161}
162
cf2ab916 163static void finish_object(struct object *obj, const struct name_path *path, const char *name)
27350891 164{
8d2dfc49
LT
165 if (obj->type == OBJ_BLOB && !has_sha1_file(obj->sha1))
166 die("missing blob object '%s'", sha1_to_hex(obj->sha1));
27350891
SP
167}
168
cf2ab916 169static void show_object(struct object *obj, const struct name_path *path, const char *component)
9de48752 170{
cf2ab916 171 char *name = path_name(path, component);
c64ed70d 172 /* An object with name "foo\n0000000..." can be used to
f18d244a 173 * confuse downstream "git pack-objects" very badly.
c64ed70d 174 */
8d2dfc49 175 const char *ep = strchr(name, '\n');
b9849a1a 176
cf2ab916 177 finish_object(obj, path, name);
c64ed70d 178 if (ep) {
8d2dfc49
LT
179 printf("%s %.*s\n", sha1_to_hex(obj->sha1),
180 (int) (ep - name),
181 name);
9de48752 182 }
c64ed70d 183 else
8d2dfc49 184 printf("%s %s\n", sha1_to_hex(obj->sha1), name);
cf2ab916 185 free(name);
9de48752
LT
186}
187
8d1d8f83
JH
188static void show_edge(struct commit *commit)
189{
190 printf("-%s\n", sha1_to_hex(commit->object.sha1));
191}
192
9f199b15
CC
193static inline int log2i(int n)
194{
195 int log2 = 0;
196
197 for (; n > 1; n >>= 1)
198 log2++;
199
200 return log2;
201}
202
203static inline int exp2i(int n)
204{
205 return 1 << n;
206}
207
208/*
209 * Estimate the number of bisect steps left (after the current step)
210 *
211 * For any x between 0 included and 2^n excluded, the probability for
212 * n - 1 steps left looks like:
213 *
214 * P(2^n + x) == (2^n - x) / (2^n + x)
215 *
216 * and P(2^n + x) < 0.5 means 2^n < 3x
217 */
1c876546 218int estimate_bisect_steps(int all)
9f199b15
CC
219{
220 int n, x, e;
221
222 if (all < 3)
223 return 0;
224
225 n = log2i(all);
226 e = exp2i(n);
227 x = all - e;
228
229 return (e < 3 * x) ? n : n - 1;
230}
231
280e65cb
CC
232void print_commit_list(struct commit_list *list,
233 const char *format_cur,
234 const char *format_last)
235{
236 for ( ; list; list = list->next) {
237 const char *format = list->next ? format_cur : format_last;
238 printf(format, sha1_to_hex(list->item->object.sha1));
239 }
240}
241
38ef7507 242static void show_tried_revs(struct commit_list *tried)
95188648
CC
243{
244 printf("bisect_tried='");
280e65cb 245 print_commit_list(tried, "%s|", "%s");
38ef7507 246 printf("'\n");
95188648
CC
247}
248
38ef7507 249static void print_var_str(const char *var, const char *val)
280e65cb 250{
38ef7507 251 printf("%s='%s'\n", var, val);
280e65cb
CC
252}
253
38ef7507 254static void print_var_int(const char *var, int val)
280e65cb 255{
38ef7507 256 printf("%s=%d\n", var, val);
280e65cb
CC
257}
258
f1c92c63 259static int show_bisect_vars(struct rev_list_info *info, int reaches, int all)
9996983c 260{
38ef7507 261 int cnt, flags = info->bisect_show_flags;
280e65cb 262 char hex[41] = "";
95188648 263 struct commit_list *tried;
d797257e 264 struct rev_info *revs = info->revs;
9996983c 265
37c4c38d 266 if (!revs->commits && !(flags & BISECT_SHOW_TRIED))
9996983c
CC
267 return 1;
268
9af3589e
CC
269 revs->commits = filter_skipped(revs->commits, &tried,
270 flags & BISECT_SHOW_ALL,
271 NULL, NULL);
95188648 272
9996983c 273 /*
7428d754 274 * revs->commits can reach "reaches" commits among
9996983c
CC
275 * "all" commits. If it is good, then there are
276 * (all-reaches) commits left to be bisected.
277 * On the other hand, if it is bad, then the set
278 * to bisect is "reaches".
279 * A bisect set of size N has (N-1) commits further
280 * to test, as we already know one bad one.
281 */
282 cnt = all - reaches;
283 if (cnt < reaches)
284 cnt = reaches;
6a17fad7 285
95188648
CC
286 if (revs->commits)
287 strcpy(hex, sha1_to_hex(revs->commits->item->object.sha1));
9996983c 288
37c4c38d 289 if (flags & BISECT_SHOW_ALL) {
d797257e 290 traverse_commit_list(revs, show_commit, show_object, info);
9996983c
CC
291 printf("------\n");
292 }
293
37c4c38d 294 if (flags & BISECT_SHOW_TRIED)
38ef7507
CC
295 show_tried_revs(tried);
296
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;
27350891 315 int quiet = 0;
64745109 316
ef90d6d4 317 git_config(git_default_config, NULL);
a633fca0 318 init_revisions(&revs, prefix);
7337b138 319 revs.abbrev = DEFAULT_ABBREV;
7594c4b2 320 revs.commit_format = CMIT_FMT_UNSPECIFIED;
a4a88b2b 321 argc = setup_revisions(argc, argv, &revs, NULL);
ae563542 322
d797257e
CC
323 memset(&info, 0, sizeof(info));
324 info.revs = &revs;
ad3f9a71
LT
325 if (revs.bisect)
326 bisect_list = 1;
d797257e 327
90b19941 328 quiet = DIFF_OPT_TST(&revs.diffopt, QUICK);
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;
13858e57 347 info.bisect_show_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
27350891 398 traverse_commit_list(&revs,
11c211fa
CC
399 quiet ? finish_commit : show_commit,
400 quiet ? finish_object : show_object,
d797257e 401 &info);
8906300f 402
64745109
LT
403 return 0;
404}