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