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
) {
84 unsigned long buflen
= 0;
85 pretty_print_commit(revs
.commit_format
, commit
, ~0,
87 revs
.abbrev
, NULL
, NULL
, revs
.date_mode
);
88 printf("%s%c", buf
, hdr_termination
);
91 maybe_flush_or_die(stdout
, "stdout");
92 if (commit
->parents
) {
93 free_commit_list(commit
->parents
);
94 commit
->parents
= NULL
;
97 commit
->buffer
= NULL
;
100 static void show_object(struct object_array_entry
*p
)
102 /* An object with name "foo\n0000000..." can be used to
103 * confuse downstream git-pack-objects very badly.
105 const char *ep
= strchr(p
->name
, '\n');
107 if (p
->item
->type
== OBJ_BLOB
&& !has_sha1_file(p
->item
->sha1
))
108 die("missing blob object '%s'", sha1_to_hex(p
->item
->sha1
));
111 printf("%s %.*s\n", sha1_to_hex(p
->item
->sha1
),
112 (int) (ep
- p
->name
),
116 printf("%s %s\n", sha1_to_hex(p
->item
->sha1
), p
->name
);
119 static void show_edge(struct commit
*commit
)
121 printf("-%s\n", sha1_to_hex(commit
->object
.sha1
));
125 * This is a truly stupid algorithm, but it's only
126 * used for bisection, and we just don't care enough.
128 * We care just barely enough to avoid recursing for
131 static int count_distance(struct commit_list
*entry
)
136 struct commit
*commit
= entry
->item
;
137 struct commit_list
*p
;
139 if (commit
->object
.flags
& (UNINTERESTING
| COUNTED
))
141 if (!revs
.prune_fn
|| (commit
->object
.flags
& TREECHANGE
))
143 commit
->object
.flags
|= COUNTED
;
149 nr
+= count_distance(p
);
158 static void clear_distance(struct commit_list
*list
)
161 struct commit
*commit
= list
->item
;
162 commit
->object
.flags
&= ~COUNTED
;
167 #define DEBUG_BISECT 0
169 static inline int weight(struct commit_list
*elem
)
171 return *((int*)(elem
->item
->util
));
174 static inline void weight_set(struct commit_list
*elem
, int weight
)
176 *((int*)(elem
->item
->util
)) = weight
;
179 static int count_interesting_parents(struct commit
*commit
)
181 struct commit_list
*p
;
184 for (count
= 0, p
= commit
->parents
; p
; p
= p
->next
) {
185 if (p
->item
->object
.flags
& UNINTERESTING
)
192 static inline int halfway(struct commit_list
*p
, int distance
, int nr
)
195 * Don't short-cut something we are not going to return!
197 if (revs
.prune_fn
&& !(p
->item
->object
.flags
& TREECHANGE
))
202 * 2 and 3 are halfway of 5.
203 * 3 is halfway of 6 but 2 and 4 are not.
206 switch (distance
- nr
) {
207 case -1: case 0: case 1:
215 #define show_list(a,b,c,d) do { ; } while (0)
217 static void show_list(const char *debug
, int counted
, int nr
,
218 struct commit_list
*list
)
220 struct commit_list
*p
;
222 fprintf(stderr
, "%s (%d/%d)\n", debug
, counted
, nr
);
224 for (p
= list
; p
; p
= p
->next
) {
225 struct commit_list
*pp
;
226 struct commit
*commit
= p
->item
;
227 unsigned flags
= commit
->object
.flags
;
228 enum object_type type
;
230 char *buf
= read_sha1_file(commit
->object
.sha1
, &type
, &size
);
233 fprintf(stderr
, "%c%c%c ",
234 (flags
& TREECHANGE
) ? 'T' : ' ',
235 (flags
& UNINTERESTING
) ? 'U' : ' ',
236 (flags
& COUNTED
) ? 'C' : ' ');
238 fprintf(stderr
, "%3d", weight(p
));
240 fprintf(stderr
, "---");
241 fprintf(stderr
, " %.*s", 8, sha1_to_hex(commit
->object
.sha1
));
242 for (pp
= commit
->parents
; pp
; pp
= pp
->next
)
243 fprintf(stderr
, " %.*s", 8,
244 sha1_to_hex(pp
->item
->object
.sha1
));
246 sp
= strstr(buf
, "\n\n");
249 for (ep
= sp
; *ep
&& *ep
!= '\n'; ep
++)
251 fprintf(stderr
, " %.*s", (int)(ep
- sp
), sp
);
253 fprintf(stderr
, "\n");
256 #endif /* DEBUG_BISECT */
258 static struct commit_list
*best_bisection(struct commit_list
*list
, int nr
)
260 struct commit_list
*p
, *best
;
261 int best_distance
= -1;
264 for (p
= list
; p
; p
= p
->next
) {
266 unsigned flags
= p
->item
->object
.flags
;
268 if (revs
.prune_fn
&& !(flags
& TREECHANGE
))
270 distance
= weight(p
);
271 if (nr
- distance
< distance
)
272 distance
= nr
- distance
;
273 if (distance
> best_distance
) {
275 best_distance
= distance
;
283 * zero or positive weight is the number of interesting commits it can
284 * reach, including itself. Especially, weight = 0 means it does not
285 * reach any tree-changing commits (e.g. just above uninteresting one
286 * but traversal is with pathspec).
288 * weight = -1 means it has one parent and its distance is yet to
291 * weight = -2 means it has more than one parent and its distance is
292 * unknown. After running count_distance() first, they will get zero
293 * or positive distance.
295 static struct commit_list
*do_find_bisection(struct commit_list
*list
,
296 int nr
, int *weights
)
298 int n
, counted
, distance
;
299 struct commit_list
*p
;
303 for (n
= 0, p
= list
; p
; p
= p
->next
) {
304 struct commit
*commit
= p
->item
;
305 unsigned flags
= commit
->object
.flags
;
307 p
->item
->util
= &weights
[n
++];
308 switch (count_interesting_parents(commit
)) {
310 if (!revs
.prune_fn
|| (flags
& TREECHANGE
)) {
313 show_list("bisection 2 count one",
317 * otherwise, it is known not to reach any
318 * tree-changing commit and gets weight 0.
330 show_list("bisection 2 initialize", counted
, nr
, list
);
333 * If you have only one parent in the resulting set
334 * then you can reach one commit more than that parent
335 * can reach. So we do not have to run the expensive
336 * count_distance() for single strand of pearls.
338 * However, if you have more than one parents, you cannot
339 * just add their distance and one for yourself, since
340 * they usually reach the same ancestor and you would
341 * end up counting them twice that way.
343 * So we will first count distance of merges the usual
344 * way, and then fill the blanks using cheaper algorithm.
346 for (p
= list
; p
; p
= p
->next
) {
347 if (p
->item
->object
.flags
& UNINTERESTING
)
352 distance
= count_distance(p
);
353 clear_distance(list
);
354 weight_set(p
, distance
);
356 /* Does it happen to be at exactly half-way? */
357 if (halfway(p
, distance
, nr
))
362 show_list("bisection 2 count_distance", counted
, nr
, list
);
364 while (counted
< nr
) {
365 for (p
= list
; p
; p
= p
->next
) {
366 struct commit_list
*q
;
367 unsigned flags
= p
->item
->object
.flags
;
371 for (q
= p
->item
->parents
; q
; q
= q
->next
) {
372 if (q
->item
->object
.flags
& UNINTERESTING
)
381 * weight for p is unknown but q is known.
382 * add one for p itself if p is to be counted,
383 * otherwise inherit it from q directly.
385 if (!revs
.prune_fn
|| (flags
& TREECHANGE
)) {
386 weight_set(p
, weight(q
)+1);
388 show_list("bisection 2 count one",
392 weight_set(p
, weight(q
));
394 /* Does it happen to be at exactly half-way? */
395 distance
= weight(p
);
396 if (halfway(p
, distance
, nr
))
401 show_list("bisection 2 counted all", counted
, nr
, list
);
403 /* Then find the best one */
404 return best_bisection(list
, nr
);
407 static struct commit_list
*find_bisection(struct commit_list
*list
,
408 int *reaches
, int *all
)
411 struct commit_list
*p
, *best
, *next
, *last
;
414 show_list("bisection 2 entry", 0, 0, list
);
417 * Count the number of total and tree-changing items on the
418 * list, while reversing the list.
420 for (nr
= on_list
= 0, last
= NULL
, p
= list
;
423 unsigned flags
= p
->item
->object
.flags
;
426 if (flags
& UNINTERESTING
)
430 if (!revs
.prune_fn
|| (flags
& TREECHANGE
))
435 show_list("bisection 2 sorted", 0, nr
, list
);
438 weights
= xcalloc(on_list
, sizeof(*weights
));
440 /* Do the real work of finding bisection commit. */
441 best
= do_find_bisection(list
, nr
, weights
);
446 *reaches
= weight(best
);
452 static void read_revisions_from_stdin(struct rev_info
*revs
)
456 while (fgets(line
, sizeof(line
), stdin
) != NULL
) {
457 int len
= strlen(line
);
458 if (line
[len
- 1] == '\n')
463 die("options not supported in --stdin mode");
464 if (handle_revision_arg(line
, revs
, 0, 1))
465 die("bad revision '%s'", line
);
469 int cmd_rev_list(int argc
, const char **argv
, const char *prefix
)
471 struct commit_list
*list
;
473 int read_from_stdin
= 0;
474 int bisect_show_vars
= 0;
476 git_config(git_default_config
);
477 init_revisions(&revs
, prefix
);
479 revs
.commit_format
= CMIT_FMT_UNSPECIFIED
;
480 argc
= setup_revisions(argc
, argv
, &revs
, NULL
);
482 for (i
= 1 ; i
< argc
; i
++) {
483 const char *arg
= argv
[i
];
485 if (!strcmp(arg
, "--header")) {
486 revs
.verbose_header
= 1;
489 if (!strcmp(arg
, "--timestamp")) {
493 if (!strcmp(arg
, "--bisect")) {
497 if (!strcmp(arg
, "--bisect-vars")) {
499 bisect_show_vars
= 1;
502 if (!strcmp(arg
, "--stdin")) {
503 if (read_from_stdin
++)
504 die("--stdin given twice?");
505 read_revisions_from_stdin(&revs
);
508 usage(rev_list_usage
);
511 if (revs
.commit_format
!= CMIT_FMT_UNSPECIFIED
) {
512 /* The command line has a --pretty */
513 hdr_termination
= '\n';
514 if (revs
.commit_format
== CMIT_FMT_ONELINE
)
517 header_prefix
= "commit ";
519 else if (revs
.verbose_header
)
520 /* Only --header was specified */
521 revs
.commit_format
= CMIT_FMT_RAW
;
526 (!(revs
.tag_objects
||revs
.tree_objects
||revs
.blob_objects
) &&
527 !revs
.pending
.nr
)) ||
529 usage(rev_list_usage
);
531 save_commit_buffer
= revs
.verbose_header
|| revs
.grep_filter
;
532 track_object_refs
= 0;
536 prepare_revision_walk(&revs
);
537 if (revs
.tree_objects
)
538 mark_edges_uninteresting(revs
.commits
, &revs
, show_edge
);
541 int reaches
= reaches
, all
= all
;
543 revs
.commits
= find_bisection(revs
.commits
, &reaches
, &all
);
544 if (bisect_show_vars
) {
549 * revs.commits can reach "reaches" commits among
550 * "all" commits. If it is good, then there are
551 * (all-reaches) commits left to be bisected.
552 * On the other hand, if it is bad, then the set
553 * to bisect is "reaches".
554 * A bisect set of size N has (N-1) commits further
555 * to test, as we already know one bad one.
560 printf("bisect_rev=%s\n"
565 sha1_to_hex(revs
.commits
->item
->object
.sha1
),
574 traverse_commit_list(&revs
, show_commit
, show_object
);