Code

rev-list: remove BISECT_SHOW_TRIED flag
[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"
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 ;
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;
55         graph_show_commit(revs->graph);
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         }
68         if (info->show_timestamp)
69                 printf("%lu ", commit->date);
70         if (info->header_prefix)
71                 fputs(info->header_prefix, stdout);
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;
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');
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);
114                                 graph_show_commit_msg(revs->graph, &buf);
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);
161 static void finish_commit(struct commit *commit, void *data)
163         if (commit->parents) {
164                 free_commit_list(commit->parents);
165                 commit->parents = NULL;
166         }
167         free(commit->buffer);
168         commit->buffer = NULL;
171 static void finish_object(struct object *obj,
172                           const struct name_path *path, const char *name,
173                           void *cb_data)
175         if (obj->type == OBJ_BLOB && !has_sha1_file(obj->sha1))
176                 die("missing blob object '%s'", sha1_to_hex(obj->sha1));
179 static void show_object(struct object *obj,
180                         const struct name_path *path, const char *component,
181                         void *cb_data)
183         struct rev_list_info *info = cb_data;
185         finish_object(obj, path, component, cb_data);
186         if (info->revs->verify_objects && !obj->parsed && obj->type != OBJ_COMMIT)
187                 parse_object(obj->sha1);
188         show_object_with_name(stdout, obj, path, component);
191 static void show_edge(struct commit *commit)
193         printf("-%s\n", sha1_to_hex(commit->object.sha1));
196 static inline int log2i(int n)
198         int log2 = 0;
200         for (; n > 1; n >>= 1)
201                 log2++;
203         return log2;
206 static inline int exp2i(int n)
208         return 1 << n;
211 /*
212  * Estimate the number of bisect steps left (after the current step)
213  *
214  * For any x between 0 included and 2^n excluded, the probability for
215  * n - 1 steps left looks like:
216  *
217  * P(2^n + x) == (2^n - x) / (2^n + x)
218  *
219  * and P(2^n + x) < 0.5 means 2^n < 3x
220  */
221 int estimate_bisect_steps(int all)
223         int n, x, e;
225         if (all < 3)
226                 return 0;
228         n = log2i(all);
229         e = exp2i(n);
230         x = all - e;
232         return (e < 3 * x) ? n : n - 1;
235 void print_commit_list(struct commit_list *list,
236                        const char *format_cur,
237                        const char *format_last)
239         for ( ; list; list = list->next) {
240                 const char *format = list->next ? format_cur : format_last;
241                 printf(format, sha1_to_hex(list->item->object.sha1));
242         }
245 static void print_var_str(const char *var, const char *val)
247         printf("%s='%s'\n", var, val);
250 static void print_var_int(const char *var, int val)
252         printf("%s=%d\n", var, val);
255 static int show_bisect_vars(struct rev_list_info *info, int reaches, int all)
257         int cnt, flags = info->bisect_show_flags;
258         char hex[41] = "";
259         struct commit_list *tried;
260         struct rev_info *revs = info->revs;
262         if (!revs->commits)
263                 return 1;
265         revs->commits = filter_skipped(revs->commits, &tried,
266                                        flags & BISECT_SHOW_ALL,
267                                        NULL, NULL);
269         /*
270          * revs->commits can reach "reaches" commits among
271          * "all" commits.  If it is good, then there are
272          * (all-reaches) commits left to be bisected.
273          * On the other hand, if it is bad, then the set
274          * to bisect is "reaches".
275          * A bisect set of size N has (N-1) commits further
276          * to test, as we already know one bad one.
277          */
278         cnt = all - reaches;
279         if (cnt < reaches)
280                 cnt = reaches;
282         if (revs->commits)
283                 strcpy(hex, sha1_to_hex(revs->commits->item->object.sha1));
285         if (flags & BISECT_SHOW_ALL) {
286                 traverse_commit_list(revs, show_commit, show_object, info);
287                 printf("------\n");
288         }
290         print_var_str("bisect_rev", hex);
291         print_var_int("bisect_nr", cnt - 1);
292         print_var_int("bisect_good", all - reaches - 1);
293         print_var_int("bisect_bad", reaches - 1);
294         print_var_int("bisect_all", all);
295         print_var_int("bisect_steps", estimate_bisect_steps(all));
297         return 0;
300 int cmd_rev_list(int argc, const char **argv, const char *prefix)
302         struct rev_info revs;
303         struct rev_list_info info;
304         int i;
305         int bisect_list = 0;
306         int bisect_show_vars = 0;
307         int bisect_find_all = 0;
308         int quiet = 0;
310         git_config(git_default_config, NULL);
311         init_revisions(&revs, prefix);
312         revs.abbrev = DEFAULT_ABBREV;
313         revs.commit_format = CMIT_FMT_UNSPECIFIED;
314         argc = setup_revisions(argc, argv, &revs, NULL);
316         memset(&info, 0, sizeof(info));
317         info.revs = &revs;
318         if (revs.bisect)
319                 bisect_list = 1;
321         quiet = DIFF_OPT_TST(&revs.diffopt, QUICK);
322         for (i = 1 ; i < argc; i++) {
323                 const char *arg = argv[i];
325                 if (!strcmp(arg, "--header")) {
326                         revs.verbose_header = 1;
327                         continue;
328                 }
329                 if (!strcmp(arg, "--timestamp")) {
330                         info.show_timestamp = 1;
331                         continue;
332                 }
333                 if (!strcmp(arg, "--bisect")) {
334                         bisect_list = 1;
335                         continue;
336                 }
337                 if (!strcmp(arg, "--bisect-all")) {
338                         bisect_list = 1;
339                         bisect_find_all = 1;
340                         info.bisect_show_flags = BISECT_SHOW_ALL;
341                         revs.show_decorations = 1;
342                         continue;
343                 }
344                 if (!strcmp(arg, "--bisect-vars")) {
345                         bisect_list = 1;
346                         bisect_show_vars = 1;
347                         continue;
348                 }
349                 usage(rev_list_usage);
351         }
352         if (revs.commit_format != CMIT_FMT_UNSPECIFIED) {
353                 /* The command line has a --pretty  */
354                 info.hdr_termination = '\n';
355                 if (revs.commit_format == CMIT_FMT_ONELINE)
356                         info.header_prefix = "";
357                 else
358                         info.header_prefix = "commit ";
359         }
360         else if (revs.verbose_header)
361                 /* Only --header was specified */
362                 revs.commit_format = CMIT_FMT_RAW;
364         if ((!revs.commits &&
365              (!(revs.tag_objects||revs.tree_objects||revs.blob_objects) &&
366               !revs.pending.nr)) ||
367             revs.diff)
368                 usage(rev_list_usage);
370         save_commit_buffer = (revs.verbose_header ||
371                               revs.grep_filter.pattern_list ||
372                               revs.grep_filter.header_list);
373         if (bisect_list)
374                 revs.limited = 1;
376         if (prepare_revision_walk(&revs))
377                 die("revision walk setup failed");
378         if (revs.tree_objects)
379                 mark_edges_uninteresting(revs.commits, &revs, show_edge);
381         if (bisect_list) {
382                 int reaches = reaches, all = all;
384                 revs.commits = find_bisection(revs.commits, &reaches, &all,
385                                               bisect_find_all);
387                 if (bisect_show_vars)
388                         return show_bisect_vars(&info, reaches, all);
389         }
391         traverse_commit_list(&revs,
392                              quiet ? finish_commit : show_commit,
393                              quiet ? finish_object : show_object,
394                              &info);
396         if (revs.count) {
397                 if (revs.left_right && revs.cherry_mark)
398                         printf("%d\t%d\t%d\n", revs.count_left, revs.count_right, revs.count_same);
399                 else if (revs.left_right)
400                         printf("%d\t%d\n", revs.count_left, revs.count_right);
401                 else if (revs.cherry_mark)
402                         printf("%d\t%d\n", revs.count_left + revs.count_right, revs.count_same);
403                 else
404                         printf("%d\n", revs.count_left + revs.count_right);
405         }
407         return 0;