]>
Commit | Line | Data |
---|---|---|
64745109 | 1 | #include "cache.h" |
36f8d174 | 2 | #include "tag.h" |
64745109 | 3 | #include "commit.h" |
9de48752 LT |
4 | #include "tree.h" |
5 | #include "blob.h" | |
a3437b8c | 6 | #include "epoch.h" |
64745109 | 7 | |
8906300f LT |
8 | #define SEEN (1u << 0) |
9 | #define INTERESTING (1u << 1) | |
8b3a1e05 | 10 | #define COUNTED (1u << 2) |
bce62866 | 11 | #define SHOWN (1u << 3) |
8906300f | 12 | |
a6f68d47 LT |
13 | static const char rev_list_usage[] = |
14 | "usage: git-rev-list [OPTION] commit-id <commit-id>\n" | |
15 | " --max-count=nr\n" | |
16 | " --max-age=epoch\n" | |
17 | " --min-age=epoch\n" | |
12d2a187 LT |
18 | " --bisect\n" |
19 | " --objects\n" | |
20 | " --unpacked\n" | |
9d97aa64 | 21 | " --header\n" |
a3437b8c JS |
22 | " --pretty\n" |
23 | " --merge-order [ --show-breaks ]"; | |
a6f68d47 | 24 | |
12d2a187 | 25 | static int unpacked = 0; |
8b3a1e05 | 26 | static int bisect_list = 0; |
3c90f03d | 27 | static int tag_objects = 0; |
9de48752 LT |
28 | static int tree_objects = 0; |
29 | static int blob_objects = 0; | |
81f2bb1f LT |
30 | static int verbose_header = 0; |
31 | static int show_parents = 0; | |
81f2bb1f LT |
32 | static int hdr_termination = 0; |
33 | static const char *prefix = ""; | |
34 | static unsigned long max_age = -1; | |
35 | static unsigned long min_age = -1; | |
36 | static int max_count = -1; | |
000182ea | 37 | static enum cmit_fmt commit_format = CMIT_FMT_RAW; |
a3437b8c JS |
38 | static int merge_order = 0; |
39 | static int show_breaks = 0; | |
5e749e25 | 40 | static int stop_traversal = 0; |
d2d02a49 | 41 | static int topo_order = 0; |
81f2bb1f LT |
42 | |
43 | static void show_commit(struct commit *commit) | |
44 | { | |
51b1e171 | 45 | commit->object.flags |= SHOWN; |
a3437b8c JS |
46 | if (show_breaks) { |
47 | prefix = "| "; | |
48 | if (commit->object.flags & DISCONTINUITY) { | |
49 | prefix = "^ "; | |
50 | } else if (commit->object.flags & BOUNDARY) { | |
51 | prefix = "= "; | |
52 | } | |
53 | } | |
81f2bb1f LT |
54 | printf("%s%s", prefix, sha1_to_hex(commit->object.sha1)); |
55 | if (show_parents) { | |
56 | struct commit_list *parents = commit->parents; | |
57 | while (parents) { | |
58 | printf(" %s", sha1_to_hex(parents->item->object.sha1)); | |
59 | parents = parents->next; | |
60 | } | |
61 | } | |
62 | putchar('\n'); | |
63 | if (verbose_header) { | |
000182ea LT |
64 | static char pretty_header[16384]; |
65 | pretty_print_commit(commit_format, commit->buffer, ~0, pretty_header, sizeof(pretty_header)); | |
66 | printf("%s%c", pretty_header, hdr_termination); | |
7620d39f LT |
67 | } |
68 | fflush(stdout); | |
a3437b8c JS |
69 | } |
70 | ||
71 | static int filter_commit(struct commit * commit) | |
72 | { | |
d2775a81 | 73 | if (stop_traversal && (commit->object.flags & BOUNDARY)) |
5e749e25 | 74 | return STOP; |
51b1e171 | 75 | if (commit->object.flags & (UNINTERESTING|SHOWN)) |
a3437b8c JS |
76 | return CONTINUE; |
77 | if (min_age != -1 && (commit->date > min_age)) | |
78 | return CONTINUE; | |
5e749e25 | 79 | if (max_age != -1 && (commit->date < max_age)) { |
d2775a81 JS |
80 | stop_traversal=1; |
81 | return merge_order?CONTINUE:STOP; | |
5e749e25 | 82 | } |
a3437b8c JS |
83 | if (max_count != -1 && !max_count--) |
84 | return STOP; | |
a3437b8c JS |
85 | return DO; |
86 | } | |
87 | ||
88 | static int process_commit(struct commit * commit) | |
89 | { | |
90 | int action=filter_commit(commit); | |
91 | ||
92 | if (action == STOP) { | |
93 | return STOP; | |
94 | } | |
95 | ||
96 | if (action == CONTINUE) { | |
97 | return CONTINUE; | |
81f2bb1f | 98 | } |
a3437b8c JS |
99 | |
100 | show_commit(commit); | |
101 | ||
102 | return CONTINUE; | |
81f2bb1f LT |
103 | } |
104 | ||
9ce43d1c | 105 | static struct object_list **add_object(struct object *obj, struct object_list **p, const char *name) |
9de48752 LT |
106 | { |
107 | struct object_list *entry = xmalloc(sizeof(*entry)); | |
108 | entry->item = obj; | |
36f8d174 | 109 | entry->next = *p; |
9ce43d1c | 110 | entry->name = name; |
9de48752 LT |
111 | *p = entry; |
112 | return &entry->next; | |
113 | } | |
114 | ||
9ce43d1c | 115 | static struct object_list **process_blob(struct blob *blob, struct object_list **p, const char *name) |
9de48752 LT |
116 | { |
117 | struct object *obj = &blob->object; | |
118 | ||
119 | if (!blob_objects) | |
120 | return p; | |
121 | if (obj->flags & (UNINTERESTING | SEEN)) | |
122 | return p; | |
123 | obj->flags |= SEEN; | |
9ce43d1c | 124 | return add_object(obj, p, name); |
9de48752 LT |
125 | } |
126 | ||
9ce43d1c | 127 | static struct object_list **process_tree(struct tree *tree, struct object_list **p, const char *name) |
9de48752 LT |
128 | { |
129 | struct object *obj = &tree->object; | |
130 | struct tree_entry_list *entry; | |
131 | ||
132 | if (!tree_objects) | |
133 | return p; | |
134 | if (obj->flags & (UNINTERESTING | SEEN)) | |
135 | return p; | |
136 | if (parse_tree(tree) < 0) | |
137 | die("bad tree object %s", sha1_to_hex(obj->sha1)); | |
138 | obj->flags |= SEEN; | |
9ce43d1c | 139 | p = add_object(obj, p, name); |
9de48752 LT |
140 | for (entry = tree->entries ; entry ; entry = entry->next) { |
141 | if (entry->directory) | |
9ce43d1c | 142 | p = process_tree(entry->item.tree, p, entry->name); |
9de48752 | 143 | else |
9ce43d1c | 144 | p = process_blob(entry->item.blob, p, entry->name); |
9de48752 LT |
145 | } |
146 | return p; | |
147 | } | |
148 | ||
36f8d174 LT |
149 | static struct object_list *pending_objects = NULL; |
150 | ||
81f2bb1f LT |
151 | static void show_commit_list(struct commit_list *list) |
152 | { | |
36f8d174 | 153 | struct object_list *objects = NULL, **p = &objects, *pending; |
81f2bb1f LT |
154 | while (list) { |
155 | struct commit *commit = pop_most_recent_commit(&list, SEEN); | |
156 | ||
9ce43d1c | 157 | p = process_tree(commit->tree, p, ""); |
a3437b8c | 158 | if (process_commit(commit) == STOP) |
81f2bb1f | 159 | break; |
81f2bb1f | 160 | } |
36f8d174 LT |
161 | for (pending = pending_objects; pending; pending = pending->next) { |
162 | struct object *obj = pending->item; | |
163 | const char *name = pending->name; | |
164 | if (obj->flags & (UNINTERESTING | SEEN)) | |
165 | continue; | |
166 | if (obj->type == tag_type) { | |
167 | obj->flags |= SEEN; | |
168 | p = add_object(obj, p, name); | |
169 | continue; | |
170 | } | |
171 | if (obj->type == tree_type) { | |
172 | p = process_tree((struct tree *)obj, p, name); | |
173 | continue; | |
174 | } | |
175 | if (obj->type == blob_type) { | |
176 | p = process_blob((struct blob *)obj, p, name); | |
177 | continue; | |
178 | } | |
179 | die("unknown pending object %s (%s)", sha1_to_hex(obj->sha1), name); | |
180 | } | |
9de48752 | 181 | while (objects) { |
9ce43d1c | 182 | printf("%s %s\n", sha1_to_hex(objects->item->sha1), objects->name); |
9de48752 LT |
183 | objects = objects->next; |
184 | } | |
185 | } | |
186 | ||
187 | static void mark_blob_uninteresting(struct blob *blob) | |
188 | { | |
189 | if (!blob_objects) | |
190 | return; | |
191 | if (blob->object.flags & UNINTERESTING) | |
192 | return; | |
193 | blob->object.flags |= UNINTERESTING; | |
194 | } | |
195 | ||
196 | static void mark_tree_uninteresting(struct tree *tree) | |
197 | { | |
198 | struct object *obj = &tree->object; | |
199 | struct tree_entry_list *entry; | |
200 | ||
201 | if (!tree_objects) | |
202 | return; | |
203 | if (obj->flags & UNINTERESTING) | |
204 | return; | |
205 | obj->flags |= UNINTERESTING; | |
454fbbcd LT |
206 | if (!has_sha1_file(obj->sha1)) |
207 | return; | |
9de48752 LT |
208 | if (parse_tree(tree) < 0) |
209 | die("bad tree %s", sha1_to_hex(obj->sha1)); | |
210 | entry = tree->entries; | |
211 | while (entry) { | |
212 | if (entry->directory) | |
213 | mark_tree_uninteresting(entry->item.tree); | |
214 | else | |
215 | mark_blob_uninteresting(entry->item.blob); | |
216 | entry = entry->next; | |
217 | } | |
81f2bb1f LT |
218 | } |
219 | ||
8906300f LT |
220 | static void mark_parents_uninteresting(struct commit *commit) |
221 | { | |
222 | struct commit_list *parents = commit->parents; | |
223 | ||
9de48752 LT |
224 | if (tree_objects) |
225 | mark_tree_uninteresting(commit->tree); | |
8906300f LT |
226 | while (parents) { |
227 | struct commit *commit = parents->item; | |
228 | commit->object.flags |= UNINTERESTING; | |
454fbbcd LT |
229 | |
230 | /* | |
231 | * A missing commit is ok iff its parent is marked | |
232 | * uninteresting. | |
233 | * | |
234 | * We just mark such a thing parsed, so that when | |
235 | * it is popped next time around, we won't be trying | |
236 | * to parse it and get an error. | |
237 | */ | |
238 | if (!has_sha1_file(commit->object.sha1)) | |
239 | commit->object.parsed = 1; | |
8906300f LT |
240 | parents = parents->next; |
241 | } | |
242 | } | |
243 | ||
4311d328 | 244 | static int everybody_uninteresting(struct commit_list *orig) |
8906300f | 245 | { |
4311d328 | 246 | struct commit_list *list = orig; |
8906300f LT |
247 | while (list) { |
248 | struct commit *commit = list->item; | |
249 | list = list->next; | |
250 | if (commit->object.flags & UNINTERESTING) | |
251 | continue; | |
252 | return 0; | |
253 | } | |
4311d328 LT |
254 | |
255 | /* | |
256 | * Ok, go back and mark all the edge trees uninteresting, | |
257 | * since otherwise we can have situations where a parent | |
258 | * that was marked uninteresting (and we never even had | |
259 | * to look at) had lots of objects that we don't want to | |
260 | * include. | |
261 | * | |
262 | * NOTE! This still doesn't mean that the object list is | |
263 | * "correct", since we may end up listing objects that | |
264 | * even older commits (that we don't list) do actually | |
265 | * reference, but it gets us to a minimal list (or very | |
266 | * close) in practice. | |
267 | */ | |
268 | if (!tree_objects) | |
269 | return 1; | |
270 | ||
271 | while (orig) { | |
272 | struct commit *commit = orig->item; | |
273 | if (!parse_commit(commit) && commit->tree) | |
274 | mark_tree_uninteresting(commit->tree); | |
275 | orig = orig->next; | |
276 | } | |
8906300f LT |
277 | return 1; |
278 | } | |
279 | ||
8b3a1e05 LT |
280 | /* |
281 | * This is a truly stupid algorithm, but it's only | |
282 | * used for bisection, and we just don't care enough. | |
283 | * | |
284 | * We care just barely enough to avoid recursing for | |
285 | * non-merge entries. | |
286 | */ | |
287 | static int count_distance(struct commit_list *entry) | |
288 | { | |
289 | int nr = 0; | |
290 | ||
291 | while (entry) { | |
292 | struct commit *commit = entry->item; | |
293 | struct commit_list *p; | |
294 | ||
295 | if (commit->object.flags & (UNINTERESTING | COUNTED)) | |
296 | break; | |
297 | nr++; | |
298 | commit->object.flags |= COUNTED; | |
299 | p = commit->parents; | |
300 | entry = p; | |
301 | if (p) { | |
302 | p = p->next; | |
303 | while (p) { | |
304 | nr += count_distance(p); | |
305 | p = p->next; | |
306 | } | |
307 | } | |
308 | } | |
309 | return nr; | |
310 | } | |
311 | ||
3d958064 | 312 | static void clear_distance(struct commit_list *list) |
8b3a1e05 LT |
313 | { |
314 | while (list) { | |
315 | struct commit *commit = list->item; | |
316 | commit->object.flags &= ~COUNTED; | |
317 | list = list->next; | |
318 | } | |
319 | } | |
320 | ||
321 | static struct commit_list *find_bisection(struct commit_list *list) | |
322 | { | |
323 | int nr, closest; | |
324 | struct commit_list *p, *best; | |
325 | ||
326 | nr = 0; | |
327 | p = list; | |
328 | while (p) { | |
329 | nr++; | |
330 | p = p->next; | |
331 | } | |
332 | closest = 0; | |
333 | best = list; | |
334 | ||
335 | p = list; | |
336 | while (p) { | |
337 | int distance = count_distance(p); | |
338 | clear_distance(list); | |
339 | if (nr - distance < distance) | |
340 | distance = nr - distance; | |
341 | if (distance > closest) { | |
342 | best = p; | |
343 | closest = distance; | |
344 | } | |
345 | p = p->next; | |
346 | } | |
347 | if (best) | |
348 | best->next = NULL; | |
349 | return best; | |
350 | } | |
351 | ||
6da4016a | 352 | static struct commit_list *limit_list(struct commit_list *list) |
3b42a63c LT |
353 | { |
354 | struct commit_list *newlist = NULL; | |
355 | struct commit_list **p = &newlist; | |
36f8d174 | 356 | while (list) { |
3b42a63c LT |
357 | struct commit *commit = pop_most_recent_commit(&list, SEEN); |
358 | struct object *obj = &commit->object; | |
359 | ||
12d2a187 LT |
360 | if (unpacked && has_sha1_pack(obj->sha1)) |
361 | obj->flags |= UNINTERESTING; | |
337cb3fb | 362 | if (obj->flags & UNINTERESTING) { |
3b42a63c LT |
363 | mark_parents_uninteresting(commit); |
364 | if (everybody_uninteresting(list)) | |
365 | break; | |
366 | continue; | |
367 | } | |
368 | p = &commit_list_insert(commit, p)->next; | |
36f8d174 | 369 | } |
8b3a1e05 LT |
370 | if (bisect_list) |
371 | newlist = find_bisection(newlist); | |
3b42a63c LT |
372 | return newlist; |
373 | } | |
374 | ||
36f8d174 LT |
375 | static void add_pending_object(struct object *obj, const char *name) |
376 | { | |
377 | add_object(obj, &pending_objects, name); | |
378 | } | |
379 | ||
3c90f03d LT |
380 | static struct commit *get_commit_reference(const char *name, unsigned int flags) |
381 | { | |
382 | unsigned char sha1[20]; | |
36f8d174 | 383 | struct object *object; |
3c90f03d LT |
384 | |
385 | if (get_sha1(name, sha1)) | |
386 | usage(rev_list_usage); | |
36f8d174 LT |
387 | object = parse_object(sha1); |
388 | if (!object) | |
389 | die("bad object %s", name); | |
390 | ||
391 | /* | |
392 | * Tag object? Look what it points to.. | |
393 | */ | |
013aab82 | 394 | while (object->type == tag_type) { |
36f8d174 LT |
395 | struct tag *tag = (struct tag *) object; |
396 | object->flags |= flags; | |
397 | if (tag_objects && !(object->flags & UNINTERESTING)) | |
398 | add_pending_object(object, tag->tag); | |
013aab82 | 399 | object = parse_object(tag->tagged->sha1); |
36f8d174 LT |
400 | } |
401 | ||
402 | /* | |
403 | * Commit object? Just return it, we'll do all the complex | |
404 | * reachability crud. | |
405 | */ | |
406 | if (object->type == commit_type) { | |
407 | struct commit *commit = (struct commit *)object; | |
408 | object->flags |= flags; | |
409 | if (parse_commit(commit) < 0) | |
410 | die("unable to parse commit %s", name); | |
454fbbcd LT |
411 | if (flags & UNINTERESTING) |
412 | mark_parents_uninteresting(commit); | |
36f8d174 LT |
413 | return commit; |
414 | } | |
415 | ||
416 | /* | |
417 | * Tree object? Either mark it uniniteresting, or add it | |
418 | * to the list of objects to look at later.. | |
419 | */ | |
420 | if (object->type == tree_type) { | |
421 | struct tree *tree = (struct tree *)object; | |
422 | if (!tree_objects) | |
960bba0d | 423 | return NULL; |
36f8d174 LT |
424 | if (flags & UNINTERESTING) { |
425 | mark_tree_uninteresting(tree); | |
426 | return NULL; | |
427 | } | |
428 | add_pending_object(object, ""); | |
429 | return NULL; | |
430 | } | |
431 | ||
432 | /* | |
433 | * Blob object? You know the drill by now.. | |
434 | */ | |
435 | if (object->type == blob_type) { | |
436 | struct blob *blob = (struct blob *)object; | |
437 | if (!blob_objects) | |
960bba0d | 438 | return NULL; |
36f8d174 LT |
439 | if (flags & UNINTERESTING) { |
440 | mark_blob_uninteresting(blob); | |
441 | return NULL; | |
442 | } | |
443 | add_pending_object(object, ""); | |
444 | return NULL; | |
445 | } | |
446 | die("%s is unknown object", name); | |
3c90f03d LT |
447 | } |
448 | ||
64745109 LT |
449 | int main(int argc, char **argv) |
450 | { | |
64745109 | 451 | struct commit_list *list = NULL; |
337cb3fb | 452 | int i, limited = 0; |
64745109 | 453 | |
fcfda02b | 454 | for (i = 1 ; i < argc; i++) { |
337cb3fb | 455 | int flags; |
fcfda02b | 456 | char *arg = argv[i]; |
337cb3fb | 457 | struct commit *commit; |
fcfda02b KS |
458 | |
459 | if (!strncmp(arg, "--max-count=", 12)) { | |
460 | max_count = atoi(arg + 12); | |
a6f68d47 LT |
461 | continue; |
462 | } | |
463 | if (!strncmp(arg, "--max-age=", 10)) { | |
fcfda02b | 464 | max_age = atoi(arg + 10); |
a6f68d47 LT |
465 | continue; |
466 | } | |
467 | if (!strncmp(arg, "--min-age=", 10)) { | |
fcfda02b | 468 | min_age = atoi(arg + 10); |
a6f68d47 | 469 | continue; |
fcfda02b | 470 | } |
a6f68d47 LT |
471 | if (!strcmp(arg, "--header")) { |
472 | verbose_header = 1; | |
473 | continue; | |
474 | } | |
000182ea LT |
475 | if (!strncmp(arg, "--pretty", 8)) { |
476 | commit_format = get_commit_format(arg+8); | |
9d97aa64 | 477 | verbose_header = 1; |
9d97aa64 LT |
478 | hdr_termination = '\n'; |
479 | prefix = "commit "; | |
480 | continue; | |
481 | } | |
97658004 LT |
482 | if (!strcmp(arg, "--parents")) { |
483 | show_parents = 1; | |
484 | continue; | |
485 | } | |
8b3a1e05 LT |
486 | if (!strcmp(arg, "--bisect")) { |
487 | bisect_list = 1; | |
488 | continue; | |
489 | } | |
9de48752 | 490 | if (!strcmp(arg, "--objects")) { |
3c90f03d | 491 | tag_objects = 1; |
9de48752 LT |
492 | tree_objects = 1; |
493 | blob_objects = 1; | |
494 | continue; | |
495 | } | |
12d2a187 LT |
496 | if (!strcmp(arg, "--unpacked")) { |
497 | unpacked = 1; | |
498 | limited = 1; | |
499 | continue; | |
500 | } | |
12ba7eaf | 501 | if (!strcmp(arg, "--merge-order")) { |
a3437b8c JS |
502 | merge_order = 1; |
503 | continue; | |
504 | } | |
12ba7eaf | 505 | if (!strcmp(arg, "--show-breaks")) { |
a3437b8c JS |
506 | show_breaks = 1; |
507 | continue; | |
508 | } | |
d2d02a49 LT |
509 | if (!strcmp(arg, "--topo-order")) { |
510 | topo_order = 1; | |
e6c3505b | 511 | limited = 1; |
d2d02a49 LT |
512 | continue; |
513 | } | |
a6f68d47 | 514 | |
337cb3fb LT |
515 | flags = 0; |
516 | if (*arg == '^') { | |
517 | flags = UNINTERESTING; | |
518 | arg++; | |
519 | limited = 1; | |
520 | } | |
3c90f03d | 521 | if (show_breaks && !merge_order) |
a6f68d47 | 522 | usage(rev_list_usage); |
3c90f03d LT |
523 | commit = get_commit_reference(arg, flags); |
524 | if (!commit) | |
525 | continue; | |
960cea2d | 526 | if (commit->object.flags & SEEN) |
bce62866 | 527 | continue; |
960cea2d | 528 | commit->object.flags |= SEEN; |
a7336ae5 | 529 | commit_list_insert(commit, &list); |
fcfda02b KS |
530 | } |
531 | ||
a3437b8c | 532 | if (!merge_order) { |
a7336ae5 | 533 | sort_by_date(&list); |
17ebe977 | 534 | if (limited) |
a3437b8c | 535 | list = limit_list(list); |
d2d02a49 LT |
536 | if (topo_order) |
537 | sort_in_topological_order(&list); | |
a3437b8c | 538 | show_commit_list(list); |
a3437b8c | 539 | } else { |
a3437b8c JS |
540 | if (sort_list_in_merge_order(list, &process_commit)) { |
541 | die("merge order sort failed\n"); | |
542 | } | |
a3437b8c | 543 | } |
8906300f | 544 | |
64745109 LT |
545 | return 0; |
546 | } |