rev-list: call new "filter_skip" function
[git/dscho.git] / builtin-rev-list.c
blob925d64356c1ece431bdc131531e7a8239635dd17
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"
11 static const char rev_list_usage[] =
12 "git rev-list [OPTION] <commit-id>... [ -- paths... ]\n"
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"
19 " --remove-empty\n"
20 " --all\n"
21 " --branches\n"
22 " --tags\n"
23 " --remotes\n"
24 " --stdin\n"
25 " --quiet\n"
26 " ordering output:\n"
27 " --topo-order\n"
28 " --date-order\n"
29 " --reverse\n"
30 " formatting output:\n"
31 " --parents\n"
32 " --children\n"
33 " --objects | --objects-edge\n"
34 " --unpacked\n"
35 " --header | --pretty\n"
36 " --abbrev=nr | --no-abbrev\n"
37 " --abbrev-commit\n"
38 " --left-right\n"
39 " special purpose:\n"
40 " --bisect\n"
41 " --bisect-vars\n"
42 " --bisect-all"
45 static struct rev_info revs;
47 static int show_timestamp;
48 static int hdr_termination;
49 static const char *header_prefix;
51 static void finish_commit(struct commit *commit);
52 static void show_commit(struct commit *commit)
54 graph_show_commit(revs.graph);
56 if (show_timestamp)
57 printf("%lu ", commit->date);
58 if (header_prefix)
59 fputs(header_prefix, stdout);
61 if (!revs.graph) {
62 if (commit->object.flags & BOUNDARY)
63 putchar('-');
64 else if (commit->object.flags & UNINTERESTING)
65 putchar('^');
66 else if (revs.left_right) {
67 if (commit->object.flags & SYMMETRIC_LEFT)
68 putchar('<');
69 else
70 putchar('>');
73 if (revs.abbrev_commit && revs.abbrev)
74 fputs(find_unique_abbrev(commit->object.sha1, revs.abbrev),
75 stdout);
76 else
77 fputs(sha1_to_hex(commit->object.sha1), stdout);
78 if (revs.print_parents) {
79 struct commit_list *parents = commit->parents;
80 while (parents) {
81 printf(" %s", sha1_to_hex(parents->item->object.sha1));
82 parents = parents->next;
85 if (revs.children.name) {
86 struct commit_list *children;
88 children = lookup_decoration(&revs.children, &commit->object);
89 while (children) {
90 printf(" %s", sha1_to_hex(children->item->object.sha1));
91 children = children->next;
94 show_decorations(&revs, commit);
95 if (revs.commit_format == CMIT_FMT_ONELINE)
96 putchar(' ');
97 else
98 putchar('\n');
100 if (revs.verbose_header && commit->buffer) {
101 struct strbuf buf = STRBUF_INIT;
102 pretty_print_commit(revs.commit_format, commit,
103 &buf, revs.abbrev, NULL, NULL,
104 revs.date_mode, 0);
105 if (revs.graph) {
106 if (buf.len) {
107 if (revs.commit_format != CMIT_FMT_ONELINE)
108 graph_show_oneline(revs.graph);
110 graph_show_commit_msg(revs.graph, &buf);
113 * Add a newline after the commit message.
115 * Usually, this newline produces a blank
116 * padding line between entries, in which case
117 * we need to add graph padding on this line.
119 * However, the commit message may not end in a
120 * newline. In this case the newline simply
121 * ends the last line of the commit message,
122 * and we don't need any graph output. (This
123 * always happens with CMIT_FMT_ONELINE, and it
124 * happens with CMIT_FMT_USERFORMAT when the
125 * format doesn't explicitly end in a newline.)
127 if (buf.len && buf.buf[buf.len - 1] == '\n')
128 graph_show_padding(revs.graph);
129 putchar('\n');
130 } else {
132 * If the message buffer is empty, just show
133 * the rest of the graph output for this
134 * commit.
136 if (graph_show_remainder(revs.graph))
137 putchar('\n');
139 } else {
140 if (buf.len)
141 printf("%s%c", buf.buf, hdr_termination);
143 strbuf_release(&buf);
144 } else {
145 if (graph_show_remainder(revs.graph))
146 putchar('\n');
148 maybe_flush_or_die(stdout, "stdout");
149 finish_commit(commit);
152 static void finish_commit(struct commit *commit)
154 if (commit->parents) {
155 free_commit_list(commit->parents);
156 commit->parents = NULL;
158 free(commit->buffer);
159 commit->buffer = NULL;
162 static void finish_object(struct object_array_entry *p)
164 if (p->item->type == OBJ_BLOB && !has_sha1_file(p->item->sha1))
165 die("missing blob object '%s'", sha1_to_hex(p->item->sha1));
168 static void show_object(struct object_array_entry *p)
170 /* An object with name "foo\n0000000..." can be used to
171 * confuse downstream "git pack-objects" very badly.
173 const char *ep = strchr(p->name, '\n');
175 finish_object(p);
176 if (ep) {
177 printf("%s %.*s\n", sha1_to_hex(p->item->sha1),
178 (int) (ep - p->name),
179 p->name);
181 else
182 printf("%s %s\n", sha1_to_hex(p->item->sha1), p->name);
185 static void show_edge(struct commit *commit)
187 printf("-%s\n", sha1_to_hex(commit->object.sha1));
190 static inline int log2i(int n)
192 int log2 = 0;
194 for (; n > 1; n >>= 1)
195 log2++;
197 return log2;
200 static inline int exp2i(int n)
202 return 1 << n;
206 * Estimate the number of bisect steps left (after the current step)
208 * For any x between 0 included and 2^n excluded, the probability for
209 * n - 1 steps left looks like:
211 * P(2^n + x) == (2^n - x) / (2^n + x)
213 * and P(2^n + x) < 0.5 means 2^n < 3x
215 static int estimate_bisect_steps(int all)
217 int n, x, e;
219 if (all < 3)
220 return 0;
222 n = log2i(all);
223 e = exp2i(n);
224 x = all - e;
226 return (e < 3 * x) ? n : n - 1;
229 static void show_tried_revs(struct commit_list *tried)
231 printf("bisect_tried='");
232 for (;tried; tried = tried->next) {
233 char *format = tried->next ? "%s|" : "%s";
234 printf(format, sha1_to_hex(tried->item->object.sha1));
236 printf("'\n");
239 int show_bisect_vars(struct rev_info *revs, int reaches, int all,
240 int show_all, int show_tried)
242 int cnt;
243 char hex[41] = "";
244 struct commit_list *tried;
246 if (!revs->commits && !show_tried)
247 return 1;
249 revs->commits = filter_skipped(revs->commits, &tried, show_all);
252 * revs->commits can reach "reaches" commits among
253 * "all" commits. If it is good, then there are
254 * (all-reaches) commits left to be bisected.
255 * On the other hand, if it is bad, then the set
256 * to bisect is "reaches".
257 * A bisect set of size N has (N-1) commits further
258 * to test, as we already know one bad one.
260 cnt = all - reaches;
261 if (cnt < reaches)
262 cnt = reaches;
264 if (revs->commits)
265 strcpy(hex, sha1_to_hex(revs->commits->item->object.sha1));
267 if (show_all) {
268 traverse_commit_list(revs, show_commit, show_object);
269 printf("------\n");
272 if (show_tried)
273 show_tried_revs(tried);
274 printf("bisect_rev=%s\n"
275 "bisect_nr=%d\n"
276 "bisect_good=%d\n"
277 "bisect_bad=%d\n"
278 "bisect_all=%d\n"
279 "bisect_steps=%d\n",
280 hex,
281 cnt - 1,
282 all - reaches - 1,
283 reaches - 1,
284 all,
285 estimate_bisect_steps(all));
287 return 0;
290 int cmd_rev_list(int argc, const char **argv, const char *prefix)
292 struct commit_list *list;
293 int i;
294 int read_from_stdin = 0;
295 int bisect_list = 0;
296 int bisect_show_vars = 0;
297 int bisect_find_all = 0;
298 int bisect_show_all = 0;
299 int quiet = 0;
301 git_config(git_default_config, NULL);
302 init_revisions(&revs, prefix);
303 revs.abbrev = 0;
304 revs.commit_format = CMIT_FMT_UNSPECIFIED;
305 argc = setup_revisions(argc, argv, &revs, NULL);
307 quiet = DIFF_OPT_TST(&revs.diffopt, QUIET);
308 for (i = 1 ; i < argc; i++) {
309 const char *arg = argv[i];
311 if (!strcmp(arg, "--header")) {
312 revs.verbose_header = 1;
313 continue;
315 if (!strcmp(arg, "--timestamp")) {
316 show_timestamp = 1;
317 continue;
319 if (!strcmp(arg, "--bisect")) {
320 bisect_list = 1;
321 continue;
323 if (!strcmp(arg, "--bisect-all")) {
324 bisect_list = 1;
325 bisect_find_all = 1;
326 bisect_show_all = 1;
327 revs.show_decorations = 1;
328 continue;
330 if (!strcmp(arg, "--bisect-vars")) {
331 bisect_list = 1;
332 bisect_show_vars = 1;
333 continue;
335 if (!strcmp(arg, "--stdin")) {
336 if (read_from_stdin++)
337 die("--stdin given twice?");
338 read_revisions_from_stdin(&revs);
339 continue;
341 usage(rev_list_usage);
344 if (revs.commit_format != CMIT_FMT_UNSPECIFIED) {
345 /* The command line has a --pretty */
346 hdr_termination = '\n';
347 if (revs.commit_format == CMIT_FMT_ONELINE)
348 header_prefix = "";
349 else
350 header_prefix = "commit ";
352 else if (revs.verbose_header)
353 /* Only --header was specified */
354 revs.commit_format = CMIT_FMT_RAW;
356 list = revs.commits;
358 if ((!list &&
359 (!(revs.tag_objects||revs.tree_objects||revs.blob_objects) &&
360 !revs.pending.nr)) ||
361 revs.diff)
362 usage(rev_list_usage);
364 save_commit_buffer = revs.verbose_header ||
365 revs.grep_filter.pattern_list;
366 if (bisect_list)
367 revs.limited = 1;
369 if (prepare_revision_walk(&revs))
370 die("revision walk setup failed");
371 if (revs.tree_objects)
372 mark_edges_uninteresting(revs.commits, &revs, show_edge);
374 if (bisect_list) {
375 int reaches = reaches, all = all;
377 revs.commits = find_bisection(revs.commits, &reaches, &all,
378 bisect_find_all);
380 if (bisect_show_vars)
381 return show_bisect_vars(&revs, reaches, all,
382 bisect_show_all, 0);
385 traverse_commit_list(&revs,
386 quiet ? finish_commit : show_commit,
387 quiet ? finish_object : show_object);
389 return 0;