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"
43 static struct rev_info revs
;
45 static int bisect_list
;
46 static int show_timestamp
;
47 static int hdr_termination
;
48 static const char *header_prefix
;
50 static void show_commit(struct commit
*commit
)
53 printf("%lu ", commit
->date
);
55 fputs(header_prefix
, stdout
);
56 if (commit
->object
.flags
& BOUNDARY
)
58 else if (revs
.left_right
) {
59 if (commit
->object
.flags
& SYMMETRIC_LEFT
)
64 if (revs
.abbrev_commit
&& revs
.abbrev
)
65 fputs(find_unique_abbrev(commit
->object
.sha1
, revs
.abbrev
),
68 fputs(sha1_to_hex(commit
->object
.sha1
), stdout
);
70 struct commit_list
*parents
= commit
->parents
;
72 struct object
*o
= &(parents
->item
->object
);
73 parents
= parents
->next
;
74 if (o
->flags
& TMP_MARK
)
76 printf(" %s", sha1_to_hex(o
->sha1
));
79 /* TMP_MARK is a general purpose flag that can
80 * be used locally, but the user should clean
81 * things up after it is done with them.
83 for (parents
= commit
->parents
;
85 parents
= parents
->next
)
86 parents
->item
->object
.flags
&= ~TMP_MARK
;
88 if (revs
.commit_format
== CMIT_FMT_ONELINE
)
93 if (revs
.verbose_header
) {
94 static char pretty_header
[16384];
95 pretty_print_commit(revs
.commit_format
, commit
, ~0,
96 pretty_header
, sizeof(pretty_header
),
97 revs
.abbrev
, NULL
, NULL
, revs
.relative_date
);
98 printf("%s%c", pretty_header
, hdr_termination
);
101 if (commit
->parents
) {
102 free_commit_list(commit
->parents
);
103 commit
->parents
= NULL
;
105 free(commit
->buffer
);
106 commit
->buffer
= NULL
;
109 static void show_object(struct object_array_entry
*p
)
111 /* An object with name "foo\n0000000..." can be used to
112 * confuse downstream git-pack-objects very badly.
114 const char *ep
= strchr(p
->name
, '\n');
116 printf("%s %.*s\n", sha1_to_hex(p
->item
->sha1
),
117 (int) (ep
- p
->name
),
121 printf("%s %s\n", sha1_to_hex(p
->item
->sha1
), p
->name
);
124 static void show_edge(struct commit
*commit
)
126 printf("-%s\n", sha1_to_hex(commit
->object
.sha1
));
130 * This is a truly stupid algorithm, but it's only
131 * used for bisection, and we just don't care enough.
133 * We care just barely enough to avoid recursing for
136 static int count_distance(struct commit_list
*entry
)
141 struct commit
*commit
= entry
->item
;
142 struct commit_list
*p
;
144 if (commit
->object
.flags
& (UNINTERESTING
| COUNTED
))
146 if (!revs
.prune_fn
|| (commit
->object
.flags
& TREECHANGE
))
148 commit
->object
.flags
|= COUNTED
;
154 nr
+= count_distance(p
);
163 static void clear_distance(struct commit_list
*list
)
166 struct commit
*commit
= list
->item
;
167 commit
->object
.flags
&= ~COUNTED
;
172 static struct commit_list
*find_bisection(struct commit_list
*list
,
173 int *reaches
, int *all
)
176 struct commit_list
*p
, *best
;
181 if (!revs
.prune_fn
|| (p
->item
->object
.flags
& TREECHANGE
))
189 for (p
= list
; p
; p
= p
->next
) {
192 if (revs
.prune_fn
&& !(p
->item
->object
.flags
& TREECHANGE
))
195 distance
= reach
= count_distance(p
);
196 clear_distance(list
);
197 if (nr
- distance
< distance
)
198 distance
= nr
- distance
;
199 if (distance
> closest
) {
210 static inline int commit_interesting(struct commit_list
*elem
)
212 unsigned flags
= elem
->item
->object
.flags
;
213 if (flags
& UNINTERESTING
)
215 return (!revs
.prune_fn
|| (flags
& TREECHANGE
));
218 static inline int weight(struct commit_list
*elem
)
220 return *((int*)(elem
->item
->util
));
223 static inline void weight_set(struct commit_list
*elem
, int weight
)
225 *((int*)(elem
->item
->util
)) = weight
;
228 static int count_interesting_parents(struct commit_list
*elem
)
231 if (!elem
->item
->parents
)
233 for (elem
= elem
->item
->parents
; elem
; elem
= elem
->next
) {
234 if (commit_interesting(elem
))
240 static struct commit_list
*find_bisection_2(struct commit_list
*list
,
241 int *reaches
, int *all
)
243 int n
, nr
, counted
, distance
;
244 struct commit_list
*p
, *best
;
247 for (nr
= 0, p
= list
; p
; p
= p
->next
) {
248 if (commit_interesting(p
))
252 weights
= xcalloc(nr
, sizeof(int*));
255 for (n
= 0, p
= list
; p
; p
= p
->next
) {
256 if (!commit_interesting(p
))
258 if (commit_interesting(p
)) {
260 * positive weight is the number of interesting
261 * commits it can reach, including itself.
262 * weight = 0 means it has one parent and
263 * its distance is unknown.
264 * weight < 0 means it has more than one
265 * parent and its distance is unknown.
267 p
->item
->util
= &weights
[n
++];
268 switch (count_interesting_parents(p
)) {
284 * If you have only one parent in the resulting set
285 * then you can reach one commit more than that parent
286 * can reach. So we do not have to run the expensive
287 * count_distance() for single strand of pearls.
289 * However, if you have more than one parents, you cannot
290 * just add their distance and one for yourself, since
291 * they usually reach the same ancestor and you would
292 * end up counting them twice that way.
294 * So we will first count distance of merges the usual
295 * way, and then fill the blanks using cheaper algorithm.
297 for (p
= list
; p
; p
= p
->next
) {
298 if (!commit_interesting(p
))
303 distance
= count_distance(p
);
305 weight_set(p
, distance
);
307 /* Does it happen to be at exactly half-way? */
309 if (nr
== distance
|| (nr
+1) == distance
) {
311 *reaches
= weight(p
);
318 while (counted
< nr
) {
319 for (p
= list
; p
; p
= p
->next
) {
320 struct commit_list
*q
;
322 if (!commit_interesting(p
) || 0 < weight(p
))
324 for (q
= p
->item
->parents
; q
; q
= q
->next
)
325 if (commit_interesting(q
) && 0 < weight(q
))
329 weight_set(p
, weight(q
)+1);
332 /* Does it happen to be at exactly half-way? */
333 distance
= weight(p
) * 2;
334 if (nr
== distance
|| (nr
+1) == distance
) {
336 *reaches
= weight(p
);
343 /* Then find the best one */
346 for (p
= list
; p
; p
= p
->next
) {
347 if (!commit_interesting(p
))
349 distance
= weight(p
);
350 if (nr
- distance
< distance
)
351 distance
= nr
- distance
;
352 if (distance
> counted
) {
355 *reaches
= weight(p
);
364 static void read_revisions_from_stdin(struct rev_info
*revs
)
368 while (fgets(line
, sizeof(line
), stdin
) != NULL
) {
369 int len
= strlen(line
);
370 if (line
[len
- 1] == '\n')
375 die("options not supported in --stdin mode");
376 if (handle_revision_arg(line
, revs
, 0, 1))
377 die("bad revision '%s'", line
);
381 int cmd_rev_list(int argc
, const char **argv
, const char *prefix
)
383 struct commit_list
*list
;
385 int read_from_stdin
= 0;
386 int bisect_show_vars
= 0;
388 git_config(git_default_config
);
389 init_revisions(&revs
, prefix
);
391 revs
.commit_format
= CMIT_FMT_UNSPECIFIED
;
392 argc
= setup_revisions(argc
, argv
, &revs
, NULL
);
394 for (i
= 1 ; i
< argc
; i
++) {
395 const char *arg
= argv
[i
];
397 if (!strcmp(arg
, "--header")) {
398 revs
.verbose_header
= 1;
401 if (!strcmp(arg
, "--timestamp")) {
405 if (!strcmp(arg
, "--bisect")) {
409 if (!strcmp(arg
, "--bisect-vars")) {
411 bisect_show_vars
= 1;
414 if (!strcmp(arg
, "--stdin")) {
415 if (read_from_stdin
++)
416 die("--stdin given twice?");
417 read_revisions_from_stdin(&revs
);
420 usage(rev_list_usage
);
423 if (revs
.commit_format
!= CMIT_FMT_UNSPECIFIED
) {
424 /* The command line has a --pretty */
425 hdr_termination
= '\n';
426 if (revs
.commit_format
== CMIT_FMT_ONELINE
)
429 header_prefix
= "commit ";
431 else if (revs
.verbose_header
)
432 /* Only --header was specified */
433 revs
.commit_format
= CMIT_FMT_RAW
;
438 (!(revs
.tag_objects
||revs
.tree_objects
||revs
.blob_objects
) &&
439 !revs
.pending
.nr
)) ||
441 usage(rev_list_usage
);
443 save_commit_buffer
= revs
.verbose_header
|| revs
.grep_filter
;
444 track_object_refs
= 0;
448 prepare_revision_walk(&revs
);
449 if (revs
.tree_objects
)
450 mark_edges_uninteresting(revs
.commits
, &revs
, show_edge
);
453 int reaches
= reaches
, all
= all
;
456 revs
.commits
= find_bisection_2(revs
.commits
,
459 revs
.commits
= find_bisection(revs
.commits
,
461 if (bisect_show_vars
) {
466 * revs.commits can reach "reaches" commits among
467 * "all" commits. If it is good, then there are
468 * (all-reaches) commits left to be bisected.
469 * On the other hand, if it is bad, then the set
470 * to bisect is "reaches".
471 * A bisect set of size N has (N-1) commits further
472 * to test, as we already know one bad one.
477 printf("bisect_rev=%s\n"
482 sha1_to_hex(revs
.commits
->item
->object
.sha1
),
491 traverse_commit_list(&revs
, show_commit
, show_object
);