pack-objects: use bitmaps when packing objects
[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;
f026c756 112 ctx.date_mode_explicit = revs->date_mode_explicit;
6bf13944 113 ctx.fmt = revs->commit_format;
ecaee805 114 ctx.output_encoding = get_log_output_encoding();
6bf13944 115 pretty_print_commit(&ctx, commit, &buf);
11c211fa 116 if (revs->graph) {
7fefda5c 117 if (buf.len) {
11c211fa
CC
118 if (revs->commit_format != CMIT_FMT_ONELINE)
119 graph_show_oneline(revs->graph);
7fefda5c 120
11c211fa 121 graph_show_commit_msg(revs->graph, &buf);
7fefda5c
AS
122
123 /*
124 * Add a newline after the commit message.
125 *
126 * Usually, this newline produces a blank
127 * padding line between entries, in which case
128 * we need to add graph padding on this line.
129 *
130 * However, the commit message may not end in a
131 * newline. In this case the newline simply
132 * ends the last line of the commit message,
133 * and we don't need any graph output. (This
134 * always happens with CMIT_FMT_ONELINE, and it
135 * happens with CMIT_FMT_USERFORMAT when the
136 * format doesn't explicitly end in a newline.)
137 */
138 if (buf.len && buf.buf[buf.len - 1] == '\n')
11c211fa 139 graph_show_padding(revs->graph);
7fefda5c
AS
140 putchar('\n');
141 } else {
142 /*
143 * If the message buffer is empty, just show
144 * the rest of the graph output for this
145 * commit.
146 */
11c211fa 147 if (graph_show_remainder(revs->graph))
7fefda5c 148 putchar('\n');
1fb5fdd2
EFL
149 if (revs->commit_format == CMIT_FMT_ONELINE)
150 putchar('\n');
7fefda5c
AS
151 }
152 } else {
1fb5fdd2 153 if (revs->commit_format != CMIT_FMT_USERFORMAT ||
9130ac9f
JK
154 buf.len) {
155 fwrite(buf.buf, 1, buf.len, stdout);
156 putchar(info->hdr_termination);
157 }
7fefda5c 158 }
674d1727 159 strbuf_release(&buf);
7fefda5c 160 } else {
11c211fa 161 if (graph_show_remainder(revs->graph))
7fefda5c 162 putchar('\n');
7620d39f 163 }
06f59e9f 164 maybe_flush_or_die(stdout, "stdout");
11c211fa 165 finish_commit(commit, data);
27350891
SP
166}
167
11c211fa 168static void finish_commit(struct commit *commit, void *data)
27350891 169{
cb115748
LT
170 if (commit->parents) {
171 free_commit_list(commit->parents);
172 commit->parents = NULL;
173 }
4cac42b1
JH
174 free(commit->buffer);
175 commit->buffer = NULL;
a3437b8c
JS
176}
177
49473672
JH
178static void finish_object(struct object *obj,
179 const struct name_path *path, const char *name,
180 void *cb_data)
27350891 181{
98993722 182 struct rev_list_info *info = cb_data;
8d2dfc49
LT
183 if (obj->type == OBJ_BLOB && !has_sha1_file(obj->sha1))
184 die("missing blob object '%s'", sha1_to_hex(obj->sha1));
98993722
NTND
185 if (info->revs->verify_objects && !obj->parsed && obj->type != OBJ_COMMIT)
186 parse_object(obj->sha1);
27350891
SP
187}
188
49473672
JH
189static void show_object(struct object *obj,
190 const struct name_path *path, const char *component,
191 void *cb_data)
9de48752 192{
cb8da705 193 struct rev_list_info *info = cb_data;
49473672 194 finish_object(obj, path, component, cb_data);
98993722
NTND
195 if (info->flags & REV_LIST_QUIET)
196 return;
91f17516 197 show_object_with_name(stdout, obj, path, component);
9de48752
LT
198}
199
8d1d8f83
JH
200static void show_edge(struct commit *commit)
201{
202 printf("-%s\n", sha1_to_hex(commit->object.sha1));
203}
204
38ef7507 205static void print_var_str(const char *var, const char *val)
280e65cb 206{
38ef7507 207 printf("%s='%s'\n", var, val);
280e65cb
CC
208}
209
38ef7507 210static void print_var_int(const char *var, int val)
280e65cb 211{
38ef7507 212 printf("%s=%d\n", var, val);
280e65cb
CC
213}
214
f1c92c63 215static int show_bisect_vars(struct rev_list_info *info, int reaches, int all)
9996983c 216{
98993722 217 int cnt, flags = info->flags;
280e65cb 218 char hex[41] = "";
95188648 219 struct commit_list *tried;
d797257e 220 struct rev_info *revs = info->revs;
9996983c 221
8ba8fe04 222 if (!revs->commits)
9996983c
CC
223 return 1;
224
9af3589e
CC
225 revs->commits = filter_skipped(revs->commits, &tried,
226 flags & BISECT_SHOW_ALL,
227 NULL, NULL);
95188648 228
9996983c 229 /*
7428d754 230 * revs->commits can reach "reaches" commits among
9996983c
CC
231 * "all" commits. If it is good, then there are
232 * (all-reaches) commits left to be bisected.
233 * On the other hand, if it is bad, then the set
234 * to bisect is "reaches".
235 * A bisect set of size N has (N-1) commits further
236 * to test, as we already know one bad one.
237 */
238 cnt = all - reaches;
239 if (cnt < reaches)
240 cnt = reaches;
6a17fad7 241
95188648
CC
242 if (revs->commits)
243 strcpy(hex, sha1_to_hex(revs->commits->item->object.sha1));
9996983c 244
37c4c38d 245 if (flags & BISECT_SHOW_ALL) {
d797257e 246 traverse_commit_list(revs, show_commit, show_object, info);
9996983c
CC
247 printf("------\n");
248 }
249
38ef7507
CC
250 print_var_str("bisect_rev", hex);
251 print_var_int("bisect_nr", cnt - 1);
252 print_var_int("bisect_good", all - reaches - 1);
253 print_var_int("bisect_bad", reaches - 1);
254 print_var_int("bisect_all", all);
255 print_var_int("bisect_steps", estimate_bisect_steps(all));
9996983c
CC
256
257 return 0;
258}
259
a633fca0 260int cmd_rev_list(int argc, const char **argv, const char *prefix)
64745109 261{
11c211fa 262 struct rev_info revs;
d797257e 263 struct rev_list_info info;
d9a83684 264 int i;
ff62d732 265 int bisect_list = 0;
457f08a0 266 int bisect_show_vars = 0;
50e62a8e 267 int bisect_find_all = 0;
64745109 268
ef90d6d4 269 git_config(git_default_config, NULL);
a633fca0 270 init_revisions(&revs, prefix);
7337b138 271 revs.abbrev = DEFAULT_ABBREV;
7594c4b2 272 revs.commit_format = CMIT_FMT_UNSPECIFIED;
a4a88b2b 273 argc = setup_revisions(argc, argv, &revs, NULL);
ae563542 274
d797257e
CC
275 memset(&info, 0, sizeof(info));
276 info.revs = &revs;
ad3f9a71
LT
277 if (revs.bisect)
278 bisect_list = 1;
d797257e 279
98993722
NTND
280 if (DIFF_OPT_TST(&revs.diffopt, QUICK))
281 info.flags |= REV_LIST_QUIET;
fcfda02b 282 for (i = 1 ; i < argc; i++) {
cf484544 283 const char *arg = argv[i];
fcfda02b 284
a6f68d47 285 if (!strcmp(arg, "--header")) {
7594c4b2 286 revs.verbose_header = 1;
9d97aa64
LT
287 continue;
288 }
dc68c4ff 289 if (!strcmp(arg, "--timestamp")) {
d797257e 290 info.show_timestamp = 1;
dc68c4ff
JH
291 continue;
292 }
8b3a1e05
LT
293 if (!strcmp(arg, "--bisect")) {
294 bisect_list = 1;
295 continue;
296 }
50e62a8e
CC
297 if (!strcmp(arg, "--bisect-all")) {
298 bisect_list = 1;
299 bisect_find_all = 1;
98993722 300 info.flags |= BISECT_SHOW_ALL;
6e46cc0d 301 revs.show_decorations = 1;
50e62a8e
CC
302 continue;
303 }
457f08a0
JH
304 if (!strcmp(arg, "--bisect-vars")) {
305 bisect_list = 1;
306 bisect_show_vars = 1;
307 continue;
308 }
ae563542 309 usage(rev_list_usage);
a6f68d47 310
fcfda02b 311 }
7594c4b2
JH
312 if (revs.commit_format != CMIT_FMT_UNSPECIFIED) {
313 /* The command line has a --pretty */
d797257e 314 info.hdr_termination = '\n';
7594c4b2 315 if (revs.commit_format == CMIT_FMT_ONELINE)
d797257e 316 info.header_prefix = "";
7594c4b2 317 else
d797257e 318 info.header_prefix = "commit ";
7594c4b2 319 }
db89665f
JH
320 else if (revs.verbose_header)
321 /* Only --header was specified */
322 revs.commit_format = CMIT_FMT_RAW;
fcfda02b 323
d797257e 324 if ((!revs.commits &&
8c1f0b44 325 (!(revs.tag_objects||revs.tree_objects||revs.blob_objects) &&
1f1e895f 326 !revs.pending.nr)) ||
8c1f0b44 327 revs.diff)
7b34c2fa
LT
328 usage(rev_list_usage);
329
80235ba7
JH
330 save_commit_buffer = (revs.verbose_header ||
331 revs.grep_filter.pattern_list ||
332 revs.grep_filter.header_list);
4e1dc640
JH
333 if (bisect_list)
334 revs.limited = 1;
9181ca2c 335
3d51e1b5
MK
336 if (prepare_revision_walk(&revs))
337 die("revision walk setup failed");
a4a88b2b 338 if (revs.tree_objects)
e76a5fb4 339 mark_edges_uninteresting(&revs, show_edge);
a4a88b2b 340
457f08a0
JH
341 if (bisect_list) {
342 int reaches = reaches, all = all;
343
50e62a8e
CC
344 revs.commits = find_bisection(revs.commits, &reaches, &all,
345 bisect_find_all);
95188648 346
9996983c 347 if (bisect_show_vars)
13858e57 348 return show_bisect_vars(&info, reaches, all);
457f08a0 349 }
7b34c2fa 350
98993722 351 traverse_commit_list(&revs, show_commit, show_object, &info);
8906300f 352
f69c5018 353 if (revs.count) {
b388e14b
MG
354 if (revs.left_right && revs.cherry_mark)
355 printf("%d\t%d\t%d\n", revs.count_left, revs.count_right, revs.count_same);
356 else if (revs.left_right)
f69c5018 357 printf("%d\t%d\n", revs.count_left, revs.count_right);
b388e14b
MG
358 else if (revs.cherry_mark)
359 printf("%d\t%d\n", revs.count_left + revs.count_right, revs.count_same);
f69c5018
TR
360 else
361 printf("%d\n", revs.count_left + revs.count_right);
362 }
363
64745109
LT
364 return 0;
365}