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