10 #include "list-objects.h"
15 /* bits #0-15 in revision.h */
17 #define COUNTED (1u<<16)
19 static const char rev_list_usage
[] =
20 "git rev-list [OPTION] <commit-id>... [ -- paths... ]\n"
38 " formatting output:\n"
41 " --objects | --objects-edge\n"
43 " --header | --pretty\n"
44 " --abbrev=nr | --no-abbrev\n"
53 static struct rev_info revs
;
55 static int show_timestamp
;
56 static int hdr_termination
;
57 static const char *header_prefix
;
59 static void finish_commit(struct commit
*commit
);
60 static void show_commit(struct commit
*commit
)
62 graph_show_commit(revs
.graph
);
65 printf("%lu ", commit
->date
);
67 fputs(header_prefix
, stdout
);
70 if (commit
->object
.flags
& BOUNDARY
)
72 else if (commit
->object
.flags
& UNINTERESTING
)
74 else if (revs
.left_right
) {
75 if (commit
->object
.flags
& SYMMETRIC_LEFT
)
81 if (revs
.abbrev_commit
&& revs
.abbrev
)
82 fputs(find_unique_abbrev(commit
->object
.sha1
, revs
.abbrev
),
85 fputs(sha1_to_hex(commit
->object
.sha1
), stdout
);
86 if (revs
.print_parents
) {
87 struct commit_list
*parents
= commit
->parents
;
89 printf(" %s", sha1_to_hex(parents
->item
->object
.sha1
));
90 parents
= parents
->next
;
93 if (revs
.children
.name
) {
94 struct commit_list
*children
;
96 children
= lookup_decoration(&revs
.children
, &commit
->object
);
98 printf(" %s", sha1_to_hex(children
->item
->object
.sha1
));
99 children
= children
->next
;
102 show_decorations(&revs
, commit
);
103 if (revs
.commit_format
== CMIT_FMT_ONELINE
)
108 if (revs
.verbose_header
&& commit
->buffer
) {
109 struct strbuf buf
= STRBUF_INIT
;
110 pretty_print_commit(revs
.commit_format
, commit
,
111 &buf
, revs
.abbrev
, NULL
, NULL
,
115 if (revs
.commit_format
!= CMIT_FMT_ONELINE
)
116 graph_show_oneline(revs
.graph
);
118 graph_show_commit_msg(revs
.graph
, &buf
);
121 * Add a newline after the commit message.
123 * Usually, this newline produces a blank
124 * padding line between entries, in which case
125 * we need to add graph padding on this line.
127 * However, the commit message may not end in a
128 * newline. In this case the newline simply
129 * ends the last line of the commit message,
130 * and we don't need any graph output. (This
131 * always happens with CMIT_FMT_ONELINE, and it
132 * happens with CMIT_FMT_USERFORMAT when the
133 * format doesn't explicitly end in a newline.)
135 if (buf
.len
&& buf
.buf
[buf
.len
- 1] == '\n')
136 graph_show_padding(revs
.graph
);
140 * If the message buffer is empty, just show
141 * the rest of the graph output for this
144 if (graph_show_remainder(revs
.graph
))
149 printf("%s%c", buf
.buf
, hdr_termination
);
151 strbuf_release(&buf
);
153 if (graph_show_remainder(revs
.graph
))
156 maybe_flush_or_die(stdout
, "stdout");
157 finish_commit(commit
);
160 static void finish_commit(struct commit
*commit
)
162 if (commit
->parents
) {
163 free_commit_list(commit
->parents
);
164 commit
->parents
= NULL
;
166 free(commit
->buffer
);
167 commit
->buffer
= NULL
;
170 static void finish_object(struct object_array_entry
*p
)
172 if (p
->item
->type
== OBJ_BLOB
&& !has_sha1_file(p
->item
->sha1
))
173 die("missing blob object '%s'", sha1_to_hex(p
->item
->sha1
));
176 static void show_object(struct object_array_entry
*p
)
178 /* An object with name "foo\n0000000..." can be used to
179 * confuse downstream "git pack-objects" very badly.
181 const char *ep
= strchr(p
->name
, '\n');
185 printf("%s %.*s\n", sha1_to_hex(p
->item
->sha1
),
186 (int) (ep
- p
->name
),
190 printf("%s %s\n", sha1_to_hex(p
->item
->sha1
), p
->name
);
193 static void show_edge(struct commit
*commit
)
195 printf("-%s\n", sha1_to_hex(commit
->object
.sha1
));
199 * This is a truly stupid algorithm, but it's only
200 * used for bisection, and we just don't care enough.
202 * We care just barely enough to avoid recursing for
205 static int count_distance(struct commit_list
*entry
)
210 struct commit
*commit
= entry
->item
;
211 struct commit_list
*p
;
213 if (commit
->object
.flags
& (UNINTERESTING
| COUNTED
))
215 if (!(commit
->object
.flags
& TREESAME
))
217 commit
->object
.flags
|= COUNTED
;
223 nr
+= count_distance(p
);
232 static void clear_distance(struct commit_list
*list
)
235 struct commit
*commit
= list
->item
;
236 commit
->object
.flags
&= ~COUNTED
;
241 #define DEBUG_BISECT 0
243 static inline int weight(struct commit_list
*elem
)
245 return *((int*)(elem
->item
->util
));
248 static inline void weight_set(struct commit_list
*elem
, int weight
)
250 *((int*)(elem
->item
->util
)) = weight
;
253 static int count_interesting_parents(struct commit
*commit
)
255 struct commit_list
*p
;
258 for (count
= 0, p
= commit
->parents
; p
; p
= p
->next
) {
259 if (p
->item
->object
.flags
& UNINTERESTING
)
266 static inline int halfway(struct commit_list
*p
, int nr
)
269 * Don't short-cut something we are not going to return!
271 if (p
->item
->object
.flags
& TREESAME
)
276 * 2 and 3 are halfway of 5.
277 * 3 is halfway of 6 but 2 and 4 are not.
279 switch (2 * weight(p
) - nr
) {
280 case -1: case 0: case 1:
288 #define show_list(a,b,c,d) do { ; } while (0)
290 static void show_list(const char *debug
, int counted
, int nr
,
291 struct commit_list
*list
)
293 struct commit_list
*p
;
295 fprintf(stderr
, "%s (%d/%d)\n", debug
, counted
, nr
);
297 for (p
= list
; p
; p
= p
->next
) {
298 struct commit_list
*pp
;
299 struct commit
*commit
= p
->item
;
300 unsigned flags
= commit
->object
.flags
;
301 enum object_type type
;
303 char *buf
= read_sha1_file(commit
->object
.sha1
, &type
, &size
);
306 fprintf(stderr
, "%c%c%c ",
307 (flags
& TREESAME
) ? ' ' : 'T',
308 (flags
& UNINTERESTING
) ? 'U' : ' ',
309 (flags
& COUNTED
) ? 'C' : ' ');
311 fprintf(stderr
, "%3d", weight(p
));
313 fprintf(stderr
, "---");
314 fprintf(stderr
, " %.*s", 8, sha1_to_hex(commit
->object
.sha1
));
315 for (pp
= commit
->parents
; pp
; pp
= pp
->next
)
316 fprintf(stderr
, " %.*s", 8,
317 sha1_to_hex(pp
->item
->object
.sha1
));
319 sp
= strstr(buf
, "\n\n");
322 for (ep
= sp
; *ep
&& *ep
!= '\n'; ep
++)
324 fprintf(stderr
, " %.*s", (int)(ep
- sp
), sp
);
326 fprintf(stderr
, "\n");
329 #endif /* DEBUG_BISECT */
331 static struct commit_list
*best_bisection(struct commit_list
*list
, int nr
)
333 struct commit_list
*p
, *best
;
334 int best_distance
= -1;
337 for (p
= list
; p
; p
= p
->next
) {
339 unsigned flags
= p
->item
->object
.flags
;
341 if (flags
& TREESAME
)
343 distance
= weight(p
);
344 if (nr
- distance
< distance
)
345 distance
= nr
- distance
;
346 if (distance
> best_distance
) {
348 best_distance
= distance
;
356 struct commit
*commit
;
360 static int compare_commit_dist(const void *a_
, const void *b_
)
362 struct commit_dist
*a
, *b
;
364 a
= (struct commit_dist
*)a_
;
365 b
= (struct commit_dist
*)b_
;
366 if (a
->distance
!= b
->distance
)
367 return b
->distance
- a
->distance
; /* desc sort */
368 return hashcmp(a
->commit
->object
.sha1
, b
->commit
->object
.sha1
);
371 static struct commit_list
*best_bisection_sorted(struct commit_list
*list
, int nr
)
373 struct commit_list
*p
;
374 struct commit_dist
*array
= xcalloc(nr
, sizeof(*array
));
377 for (p
= list
, cnt
= 0; p
; p
= p
->next
) {
379 unsigned flags
= p
->item
->object
.flags
;
381 if (flags
& TREESAME
)
383 distance
= weight(p
);
384 if (nr
- distance
< distance
)
385 distance
= nr
- distance
;
386 array
[cnt
].commit
= p
->item
;
387 array
[cnt
].distance
= distance
;
390 qsort(array
, cnt
, sizeof(*array
), compare_commit_dist
);
391 for (p
= list
, i
= 0; i
< cnt
; i
++) {
392 struct name_decoration
*r
= xmalloc(sizeof(*r
) + 100);
393 struct object
*obj
= &(array
[i
].commit
->object
);
395 sprintf(r
->name
, "dist=%d", array
[i
].distance
);
396 r
->next
= add_decoration(&name_decoration
, obj
, r
);
397 p
->item
= array
[i
].commit
;
407 * zero or positive weight is the number of interesting commits it can
408 * reach, including itself. Especially, weight = 0 means it does not
409 * reach any tree-changing commits (e.g. just above uninteresting one
410 * but traversal is with pathspec).
412 * weight = -1 means it has one parent and its distance is yet to
415 * weight = -2 means it has more than one parent and its distance is
416 * unknown. After running count_distance() first, they will get zero
417 * or positive distance.
419 static struct commit_list
*do_find_bisection(struct commit_list
*list
,
420 int nr
, int *weights
,
424 struct commit_list
*p
;
428 for (n
= 0, p
= list
; p
; p
= p
->next
) {
429 struct commit
*commit
= p
->item
;
430 unsigned flags
= commit
->object
.flags
;
432 p
->item
->util
= &weights
[n
++];
433 switch (count_interesting_parents(commit
)) {
435 if (!(flags
& TREESAME
)) {
438 show_list("bisection 2 count one",
442 * otherwise, it is known not to reach any
443 * tree-changing commit and gets weight 0.
455 show_list("bisection 2 initialize", counted
, nr
, list
);
458 * If you have only one parent in the resulting set
459 * then you can reach one commit more than that parent
460 * can reach. So we do not have to run the expensive
461 * count_distance() for single strand of pearls.
463 * However, if you have more than one parents, you cannot
464 * just add their distance and one for yourself, since
465 * they usually reach the same ancestor and you would
466 * end up counting them twice that way.
468 * So we will first count distance of merges the usual
469 * way, and then fill the blanks using cheaper algorithm.
471 for (p
= list
; p
; p
= p
->next
) {
472 if (p
->item
->object
.flags
& UNINTERESTING
)
476 weight_set(p
, count_distance(p
));
477 clear_distance(list
);
479 /* Does it happen to be at exactly half-way? */
480 if (!find_all
&& halfway(p
, nr
))
485 show_list("bisection 2 count_distance", counted
, nr
, list
);
487 while (counted
< nr
) {
488 for (p
= list
; p
; p
= p
->next
) {
489 struct commit_list
*q
;
490 unsigned flags
= p
->item
->object
.flags
;
494 for (q
= p
->item
->parents
; q
; q
= q
->next
) {
495 if (q
->item
->object
.flags
& UNINTERESTING
)
504 * weight for p is unknown but q is known.
505 * add one for p itself if p is to be counted,
506 * otherwise inherit it from q directly.
508 if (!(flags
& TREESAME
)) {
509 weight_set(p
, weight(q
)+1);
511 show_list("bisection 2 count one",
515 weight_set(p
, weight(q
));
517 /* Does it happen to be at exactly half-way? */
518 if (!find_all
&& halfway(p
, nr
))
523 show_list("bisection 2 counted all", counted
, nr
, list
);
526 return best_bisection(list
, nr
);
528 return best_bisection_sorted(list
, nr
);
531 static struct commit_list
*find_bisection(struct commit_list
*list
,
532 int *reaches
, int *all
,
536 struct commit_list
*p
, *best
, *next
, *last
;
539 show_list("bisection 2 entry", 0, 0, list
);
542 * Count the number of total and tree-changing items on the
543 * list, while reversing the list.
545 for (nr
= on_list
= 0, last
= NULL
, p
= list
;
548 unsigned flags
= p
->item
->object
.flags
;
551 if (flags
& UNINTERESTING
)
555 if (!(flags
& TREESAME
))
560 show_list("bisection 2 sorted", 0, nr
, list
);
563 weights
= xcalloc(on_list
, sizeof(*weights
));
565 /* Do the real work of finding bisection commit. */
566 best
= do_find_bisection(list
, nr
, weights
, find_all
);
570 *reaches
= weight(best
);
576 static inline int log2i(int n
)
580 for (; n
> 1; n
>>= 1)
586 static inline int exp2i(int n
)
592 * Estimate the number of bisect steps left (after the current step)
594 * For any x between 0 included and 2^n excluded, the probability for
595 * n - 1 steps left looks like:
597 * P(2^n + x) == (2^n - x) / (2^n + x)
599 * and P(2^n + x) < 0.5 means 2^n < 3x
601 static int estimate_bisect_steps(int all
)
612 return (e
< 3 * x
) ? n
: n
- 1;
615 int cmd_rev_list(int argc
, const char **argv
, const char *prefix
)
617 struct commit_list
*list
;
619 int read_from_stdin
= 0;
621 int bisect_show_vars
= 0;
622 int bisect_find_all
= 0;
625 git_config(git_default_config
, NULL
);
626 init_revisions(&revs
, prefix
);
628 revs
.commit_format
= CMIT_FMT_UNSPECIFIED
;
629 argc
= setup_revisions(argc
, argv
, &revs
, NULL
);
631 quiet
= DIFF_OPT_TST(&revs
.diffopt
, QUIET
);
632 for (i
= 1 ; i
< argc
; i
++) {
633 const char *arg
= argv
[i
];
635 if (!strcmp(arg
, "--header")) {
636 revs
.verbose_header
= 1;
639 if (!strcmp(arg
, "--timestamp")) {
643 if (!strcmp(arg
, "--bisect")) {
647 if (!strcmp(arg
, "--bisect-all")) {
650 revs
.show_decorations
= 1;
653 if (!strcmp(arg
, "--bisect-vars")) {
655 bisect_show_vars
= 1;
658 if (!strcmp(arg
, "--stdin")) {
659 if (read_from_stdin
++)
660 die("--stdin given twice?");
661 read_revisions_from_stdin(&revs
);
664 usage(rev_list_usage
);
667 if (revs
.commit_format
!= CMIT_FMT_UNSPECIFIED
) {
668 /* The command line has a --pretty */
669 hdr_termination
= '\n';
670 if (revs
.commit_format
== CMIT_FMT_ONELINE
)
673 header_prefix
= "commit ";
675 else if (revs
.verbose_header
)
676 /* Only --header was specified */
677 revs
.commit_format
= CMIT_FMT_RAW
;
682 (!(revs
.tag_objects
||revs
.tree_objects
||revs
.blob_objects
) &&
683 !revs
.pending
.nr
)) ||
685 usage(rev_list_usage
);
687 save_commit_buffer
= revs
.verbose_header
||
688 revs
.grep_filter
.pattern_list
;
692 if (prepare_revision_walk(&revs
))
693 die("revision walk setup failed");
694 if (revs
.tree_objects
)
695 mark_edges_uninteresting(revs
.commits
, &revs
, show_edge
);
698 int reaches
= reaches
, all
= all
;
700 revs
.commits
= find_bisection(revs
.commits
, &reaches
, &all
,
702 if (bisect_show_vars
) {
708 * revs.commits can reach "reaches" commits among
709 * "all" commits. If it is good, then there are
710 * (all-reaches) commits left to be bisected.
711 * On the other hand, if it is bad, then the set
712 * to bisect is "reaches".
713 * A bisect set of size N has (N-1) commits further
714 * to test, as we already know one bad one.
719 strcpy(hex
, sha1_to_hex(revs
.commits
->item
->object
.sha1
));
721 if (bisect_find_all
) {
722 traverse_commit_list(&revs
, show_commit
, show_object
);
726 printf("bisect_rev=%s\n"
737 estimate_bisect_steps(all
));
742 traverse_commit_list(&revs
,
743 quiet
? finish_commit
: show_commit
,
744 quiet
? finish_object
: show_object
);