10 #include "list-objects.h"
13 /* bits #0-15 in revision.h */
15 #define COUNTED (1u<<16)
17 static const char rev_list_usage[] =
18 "git-rev-list [OPTION] <commit-id>... [ -- paths... ]\n"
31 " formatting output:\n"
33 " --objects | --objects-edge\n"
35 " --header | --pretty\n"
36 " --abbrev=nr | --no-abbrev\n"
44 static struct rev_info revs;
46 static int bisect_list;
47 static int show_timestamp;
48 static int hdr_termination;
49 static const char *header_prefix;
51 static void show_commit(struct commit *commit)
54 printf("%lu ", commit->date);
56 fputs(header_prefix, stdout);
57 if (commit->object.flags & BOUNDARY)
59 else if (revs.left_right) {
60 if (commit->object.flags & SYMMETRIC_LEFT)
65 if (revs.abbrev_commit && revs.abbrev)
66 fputs(find_unique_abbrev(commit->object.sha1, revs.abbrev),
69 fputs(sha1_to_hex(commit->object.sha1), stdout);
71 struct commit_list *parents = commit->parents;
73 printf(" %s", sha1_to_hex(parents->item->object.sha1));
74 parents = parents->next;
77 if (revs.commit_format == CMIT_FMT_ONELINE)
82 if (revs.verbose_header) {
85 pretty_print_commit(revs.commit_format, commit,
86 &buf, revs.abbrev, NULL, NULL, revs.date_mode);
87 printf("%s%c", buf.buf, hdr_termination);
90 maybe_flush_or_die(stdout, "stdout");
91 if (commit->parents) {
92 free_commit_list(commit->parents);
93 commit->parents = NULL;
96 commit->buffer = NULL;
99 static void show_object(struct object_array_entry *p)
101 /* An object with name "foo\n0000000..." can be used to
102 * confuse downstream git-pack-objects very badly.
104 const char *ep = strchr(p->name, '\n');
106 if (p->item->type == OBJ_BLOB && !has_sha1_file(p->item->sha1))
107 die("missing blob object '%s'", sha1_to_hex(p->item->sha1));
110 printf("%s %.*s\n", sha1_to_hex(p->item->sha1),
111 (int) (ep - p->name),
115 printf("%s %s\n", sha1_to_hex(p->item->sha1), p->name);
118 static void show_edge(struct commit *commit)
120 printf("-%s\n", sha1_to_hex(commit->object.sha1));
124 * This is a truly stupid algorithm, but it's only
125 * used for bisection, and we just don't care enough.
127 * We care just barely enough to avoid recursing for
130 static int count_distance(struct commit_list *entry)
135 struct commit *commit = entry->item;
136 struct commit_list *p;
138 if (commit->object.flags & (UNINTERESTING | COUNTED))
140 if (!revs.prune_fn || (commit->object.flags & TREECHANGE))
142 commit->object.flags |= COUNTED;
148 nr += count_distance(p);
157 static void clear_distance(struct commit_list *list)
160 struct commit *commit = list->item;
161 commit->object.flags &= ~COUNTED;
166 #define DEBUG_BISECT 0
168 static inline int weight(struct commit_list *elem)
170 return *((int*)(elem->item->util));
173 static inline void weight_set(struct commit_list *elem, int weight)
175 *((int*)(elem->item->util)) = weight;
178 static int count_interesting_parents(struct commit *commit)
180 struct commit_list *p;
183 for (count = 0, p = commit->parents; p; p = p->next) {
184 if (p->item->object.flags & UNINTERESTING)
191 static inline int halfway(struct commit_list *p, int nr)
194 * Don't short-cut something we are not going to return!
196 if (revs.prune_fn && !(p->item->object.flags & TREECHANGE))
201 * 2 and 3 are halfway of 5.
202 * 3 is halfway of 6 but 2 and 4 are not.
204 switch (2 * weight(p) - nr) {
205 case -1: case 0: case 1:
213 #define show_list(a,b,c,d) do { ; } while (0)
215 static void show_list(const char *debug, int counted, int nr,
216 struct commit_list *list)
218 struct commit_list *p;
220 fprintf(stderr, "%s (%d/%d)\n", debug, counted, nr);
222 for (p = list; p; p = p->next) {
223 struct commit_list *pp;
224 struct commit *commit = p->item;
225 unsigned flags = commit->object.flags;
226 enum object_type type;
228 char *buf = read_sha1_file(commit->object.sha1, &type, &size);
231 fprintf(stderr, "%c%c%c ",
232 (flags & TREECHANGE) ? 'T' : ' ',
233 (flags & UNINTERESTING) ? 'U' : ' ',
234 (flags & COUNTED) ? 'C' : ' ');
236 fprintf(stderr, "%3d", weight(p));
238 fprintf(stderr, "---");
239 fprintf(stderr, " %.*s", 8, sha1_to_hex(commit->object.sha1));
240 for (pp = commit->parents; pp; pp = pp->next)
241 fprintf(stderr, " %.*s", 8,
242 sha1_to_hex(pp->item->object.sha1));
244 sp = strstr(buf, "\n\n");
247 for (ep = sp; *ep && *ep != '\n'; ep++)
249 fprintf(stderr, " %.*s", (int)(ep - sp), sp);
251 fprintf(stderr, "\n");
254 #endif /* DEBUG_BISECT */
256 static struct commit_list *best_bisection(struct commit_list *list, int nr)
258 struct commit_list *p, *best;
259 int best_distance = -1;
262 for (p = list; p; p = p->next) {
264 unsigned flags = p->item->object.flags;
266 if (revs.prune_fn && !(flags & TREECHANGE))
268 distance = weight(p);
269 if (nr - distance < distance)
270 distance = nr - distance;
271 if (distance > best_distance) {
273 best_distance = distance;
281 * zero or positive weight is the number of interesting commits it can
282 * reach, including itself. Especially, weight = 0 means it does not
283 * reach any tree-changing commits (e.g. just above uninteresting one
284 * but traversal is with pathspec).
286 * weight = -1 means it has one parent and its distance is yet to
289 * weight = -2 means it has more than one parent and its distance is
290 * unknown. After running count_distance() first, they will get zero
291 * or positive distance.
293 static struct commit_list *do_find_bisection(struct commit_list *list,
294 int nr, int *weights)
297 struct commit_list *p;
301 for (n = 0, p = list; p; p = p->next) {
302 struct commit *commit = p->item;
303 unsigned flags = commit->object.flags;
305 p->item->util = &weights[n++];
306 switch (count_interesting_parents(commit)) {
308 if (!revs.prune_fn || (flags & TREECHANGE)) {
311 show_list("bisection 2 count one",
315 * otherwise, it is known not to reach any
316 * tree-changing commit and gets weight 0.
328 show_list("bisection 2 initialize", counted, nr, list);
331 * If you have only one parent in the resulting set
332 * then you can reach one commit more than that parent
333 * can reach. So we do not have to run the expensive
334 * count_distance() for single strand of pearls.
336 * However, if you have more than one parents, you cannot
337 * just add their distance and one for yourself, since
338 * they usually reach the same ancestor and you would
339 * end up counting them twice that way.
341 * So we will first count distance of merges the usual
342 * way, and then fill the blanks using cheaper algorithm.
344 for (p = list; p; p = p->next) {
345 if (p->item->object.flags & UNINTERESTING)
349 weight_set(p, count_distance(p));
350 clear_distance(list);
352 /* Does it happen to be at exactly half-way? */
358 show_list("bisection 2 count_distance", counted, nr, list);
360 while (counted < nr) {
361 for (p = list; p; p = p->next) {
362 struct commit_list *q;
363 unsigned flags = p->item->object.flags;
367 for (q = p->item->parents; q; q = q->next) {
368 if (q->item->object.flags & UNINTERESTING)
377 * weight for p is unknown but q is known.
378 * add one for p itself if p is to be counted,
379 * otherwise inherit it from q directly.
381 if (!revs.prune_fn || (flags & TREECHANGE)) {
382 weight_set(p, weight(q)+1);
384 show_list("bisection 2 count one",
388 weight_set(p, weight(q));
390 /* Does it happen to be at exactly half-way? */
396 show_list("bisection 2 counted all", counted, nr, list);
398 /* Then find the best one */
399 return best_bisection(list, nr);
402 static struct commit_list *find_bisection(struct commit_list *list,
403 int *reaches, int *all)
406 struct commit_list *p, *best, *next, *last;
409 show_list("bisection 2 entry", 0, 0, list);
412 * Count the number of total and tree-changing items on the
413 * list, while reversing the list.
415 for (nr = on_list = 0, last = NULL, p = list;
418 unsigned flags = p->item->object.flags;
421 if (flags & UNINTERESTING)
425 if (!revs.prune_fn || (flags & TREECHANGE))
430 show_list("bisection 2 sorted", 0, nr, list);
433 weights = xcalloc(on_list, sizeof(*weights));
435 /* Do the real work of finding bisection commit. */
436 best = do_find_bisection(list, nr, weights);
441 *reaches = weight(best);
447 static void read_revisions_from_stdin(struct rev_info *revs)
451 while (fgets(line, sizeof(line), stdin) != NULL) {
452 int len = strlen(line);
453 if (line[len - 1] == '\n')
458 die("options not supported in --stdin mode");
459 if (handle_revision_arg(line, revs, 0, 1))
460 die("bad revision '%s'", line);
464 int cmd_rev_list(int argc, const char **argv, const char *prefix)
466 struct commit_list *list;
468 int read_from_stdin = 0;
469 int bisect_show_vars = 0;
471 git_config(git_default_config);
472 init_revisions(&revs, prefix);
474 revs.commit_format = CMIT_FMT_UNSPECIFIED;
475 argc = setup_revisions(argc, argv, &revs, NULL);
477 for (i = 1 ; i < argc; i++) {
478 const char *arg = argv[i];
480 if (!strcmp(arg, "--header")) {
481 revs.verbose_header = 1;
484 if (!strcmp(arg, "--timestamp")) {
488 if (!strcmp(arg, "--bisect")) {
492 if (!strcmp(arg, "--bisect-vars")) {
494 bisect_show_vars = 1;
497 if (!strcmp(arg, "--stdin")) {
498 if (read_from_stdin++)
499 die("--stdin given twice?");
500 read_revisions_from_stdin(&revs);
503 usage(rev_list_usage);
506 if (revs.commit_format != CMIT_FMT_UNSPECIFIED) {
507 /* The command line has a --pretty */
508 hdr_termination = '\n';
509 if (revs.commit_format == CMIT_FMT_ONELINE)
512 header_prefix = "commit ";
514 else if (revs.verbose_header)
515 /* Only --header was specified */
516 revs.commit_format = CMIT_FMT_RAW;
521 (!(revs.tag_objects||revs.tree_objects||revs.blob_objects) &&
522 !revs.pending.nr)) ||
524 usage(rev_list_usage);
526 save_commit_buffer = revs.verbose_header || revs.grep_filter;
527 track_object_refs = 0;
531 prepare_revision_walk(&revs);
532 if (revs.tree_objects)
533 mark_edges_uninteresting(revs.commits, &revs, show_edge);
536 int reaches = reaches, all = all;
538 revs.commits = find_bisection(revs.commits, &reaches, &all);
539 if (bisect_show_vars) {
544 * revs.commits can reach "reaches" commits among
545 * "all" commits. If it is good, then there are
546 * (all-reaches) commits left to be bisected.
547 * On the other hand, if it is bad, then the set
548 * to bisect is "reaches".
549 * A bisect set of size N has (N-1) commits further
550 * to test, as we already know one bad one.
555 printf("bisect_rev=%s\n"
560 sha1_to_hex(revs.commits->item->object.sha1),
569 traverse_commit_list(&revs, show_commit, show_object);