]>
Commit | Line | Data |
---|---|---|
ae563542 LT |
1 | #include "cache.h" |
2 | #include "tag.h" | |
3 | #include "blob.h" | |
4 | #include "tree.h" | |
5 | #include "commit.h" | |
a4a88b2b | 6 | #include "diff.h" |
ae563542 LT |
7 | #include "refs.h" |
8 | #include "revision.h" | |
7fefda5c | 9 | #include "graph.h" |
8ecae9b0 | 10 | #include "grep.h" |
8860fd42 | 11 | #include "reflog-walk.h" |
d7a17cad | 12 | #include "patch-ids.h" |
f35f5603 | 13 | #include "decorate.h" |
78892e32 | 14 | #include "log-tree.h" |
894a9d33 | 15 | #include "string-list.h" |
ae563542 | 16 | |
cdcefbc9 LT |
17 | volatile show_early_output_fn_t show_early_output; |
18 | ||
cf2ab916 | 19 | char *path_name(const struct name_path *path, const char *name) |
ae563542 | 20 | { |
cf2ab916 | 21 | const struct name_path *p; |
ae563542 LT |
22 | char *n, *m; |
23 | int nlen = strlen(name); | |
24 | int len = nlen + 1; | |
25 | ||
26 | for (p = path; p; p = p->up) { | |
27 | if (p->elem_len) | |
28 | len += p->elem_len + 1; | |
29 | } | |
30 | n = xmalloc(len); | |
31 | m = n + len - (nlen + 1); | |
32 | strcpy(m, name); | |
33 | for (p = path; p; p = p->up) { | |
34 | if (p->elem_len) { | |
35 | m -= p->elem_len + 1; | |
36 | memcpy(m, p->elem, p->elem_len); | |
37 | m[p->elem_len] = '/'; | |
38 | } | |
39 | } | |
40 | return n; | |
41 | } | |
42 | ||
1f1e895f LT |
43 | void add_object(struct object *obj, |
44 | struct object_array *p, | |
45 | struct name_path *path, | |
46 | const char *name) | |
ae563542 | 47 | { |
1f1e895f | 48 | add_object_array(obj, path_name(path, name), p); |
ae563542 LT |
49 | } |
50 | ||
51 | static void mark_blob_uninteresting(struct blob *blob) | |
52 | { | |
c1ee9013 MK |
53 | if (!blob) |
54 | return; | |
ae563542 LT |
55 | if (blob->object.flags & UNINTERESTING) |
56 | return; | |
57 | blob->object.flags |= UNINTERESTING; | |
58 | } | |
59 | ||
60 | void mark_tree_uninteresting(struct tree *tree) | |
61 | { | |
f75e53ed | 62 | struct tree_desc desc; |
4c068a98 | 63 | struct name_entry entry; |
ae563542 | 64 | struct object *obj = &tree->object; |
ae563542 | 65 | |
c1ee9013 MK |
66 | if (!tree) |
67 | return; | |
ae563542 LT |
68 | if (obj->flags & UNINTERESTING) |
69 | return; | |
70 | obj->flags |= UNINTERESTING; | |
71 | if (!has_sha1_file(obj->sha1)) | |
72 | return; | |
73 | if (parse_tree(tree) < 0) | |
74 | die("bad tree %s", sha1_to_hex(obj->sha1)); | |
f75e53ed | 75 | |
6fda5e51 | 76 | init_tree_desc(&desc, tree->buffer, tree->size); |
4c068a98 | 77 | while (tree_entry(&desc, &entry)) { |
4d1012c3 LT |
78 | switch (object_type(entry.mode)) { |
79 | case OBJ_TREE: | |
4c068a98 | 80 | mark_tree_uninteresting(lookup_tree(entry.sha1)); |
4d1012c3 LT |
81 | break; |
82 | case OBJ_BLOB: | |
4c068a98 | 83 | mark_blob_uninteresting(lookup_blob(entry.sha1)); |
4d1012c3 LT |
84 | break; |
85 | default: | |
86 | /* Subproject commit - not in this repository */ | |
87 | break; | |
88 | } | |
ae563542 | 89 | } |
f75e53ed LT |
90 | |
91 | /* | |
92 | * We don't care about the tree any more | |
93 | * after it has been marked uninteresting. | |
94 | */ | |
95 | free(tree->buffer); | |
96 | tree->buffer = NULL; | |
ae563542 LT |
97 | } |
98 | ||
99 | void mark_parents_uninteresting(struct commit *commit) | |
100 | { | |
101 | struct commit_list *parents = commit->parents; | |
102 | ||
103 | while (parents) { | |
104 | struct commit *commit = parents->item; | |
d2c4af73 MU |
105 | if (!(commit->object.flags & UNINTERESTING)) { |
106 | commit->object.flags |= UNINTERESTING; | |
ae563542 | 107 | |
d2c4af73 MU |
108 | /* |
109 | * Normally we haven't parsed the parent | |
110 | * yet, so we won't have a parent of a parent | |
111 | * here. However, it may turn out that we've | |
112 | * reached this commit some other way (where it | |
113 | * wasn't uninteresting), in which case we need | |
114 | * to mark its parents recursively too.. | |
115 | */ | |
116 | if (commit->parents) | |
117 | mark_parents_uninteresting(commit); | |
118 | } | |
ae563542 LT |
119 | |
120 | /* | |
121 | * A missing commit is ok iff its parent is marked | |
122 | * uninteresting. | |
123 | * | |
124 | * We just mark such a thing parsed, so that when | |
125 | * it is popped next time around, we won't be trying | |
126 | * to parse it and get an error. | |
127 | */ | |
128 | if (!has_sha1_file(commit->object.sha1)) | |
129 | commit->object.parsed = 1; | |
130 | parents = parents->next; | |
131 | } | |
132 | } | |
133 | ||
2d93b9fa | 134 | static void add_pending_object_with_mode(struct rev_info *revs, struct object *obj, const char *name, unsigned mode) |
ae563542 | 135 | { |
aa27e461 | 136 | if (revs->no_walk && (obj->flags & UNINTERESTING)) |
f222abde | 137 | revs->no_walk = 0; |
105e4733 JH |
138 | if (revs->reflog_info && obj->type == OBJ_COMMIT) { |
139 | struct strbuf buf = STRBUF_INIT; | |
140 | int len = interpret_branch_name(name, &buf); | |
141 | int st; | |
142 | ||
143 | if (0 < len && name[len] && buf.len) | |
144 | strbuf_addstr(&buf, name + len); | |
145 | st = add_reflog_for_walk(revs->reflog_info, | |
146 | (struct commit *)obj, | |
147 | buf.buf[0] ? buf.buf: name); | |
148 | strbuf_release(&buf); | |
149 | if (st) | |
150 | return; | |
151 | } | |
bb6c2fba | 152 | add_object_array_with_mode(obj, name, &revs->pending, mode); |
ae563542 LT |
153 | } |
154 | ||
2d93b9fa JH |
155 | void add_pending_object(struct rev_info *revs, struct object *obj, const char *name) |
156 | { | |
157 | add_pending_object_with_mode(revs, obj, name, S_IFINVALID); | |
158 | } | |
159 | ||
3384a2df JH |
160 | void add_head_to_pending(struct rev_info *revs) |
161 | { | |
162 | unsigned char sha1[20]; | |
163 | struct object *obj; | |
164 | if (get_sha1("HEAD", sha1)) | |
165 | return; | |
166 | obj = parse_object(sha1); | |
167 | if (!obj) | |
168 | return; | |
169 | add_pending_object(revs, obj, "HEAD"); | |
170 | } | |
171 | ||
cd2bdc53 | 172 | static struct object *get_reference(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags) |
ae563542 LT |
173 | { |
174 | struct object *object; | |
175 | ||
176 | object = parse_object(sha1); | |
177 | if (!object) | |
178 | die("bad object %s", name); | |
cd2bdc53 LT |
179 | object->flags |= flags; |
180 | return object; | |
181 | } | |
182 | ||
183 | static struct commit *handle_commit(struct rev_info *revs, struct object *object, const char *name) | |
184 | { | |
185 | unsigned long flags = object->flags; | |
ae563542 LT |
186 | |
187 | /* | |
188 | * Tag object? Look what it points to.. | |
189 | */ | |
1974632c | 190 | while (object->type == OBJ_TAG) { |
ae563542 | 191 | struct tag *tag = (struct tag *) object; |
cd2bdc53 | 192 | if (revs->tag_objects && !(flags & UNINTERESTING)) |
ae563542 | 193 | add_pending_object(revs, object, tag->tag); |
9684afd9 MK |
194 | if (!tag->tagged) |
195 | die("bad tag"); | |
ae563542 | 196 | object = parse_object(tag->tagged->sha1); |
aeeae1b7 JH |
197 | if (!object) { |
198 | if (flags & UNINTERESTING) | |
199 | return NULL; | |
ae563542 | 200 | die("bad object %s", sha1_to_hex(tag->tagged->sha1)); |
aeeae1b7 | 201 | } |
ae563542 LT |
202 | } |
203 | ||
204 | /* | |
205 | * Commit object? Just return it, we'll do all the complex | |
206 | * reachability crud. | |
207 | */ | |
1974632c | 208 | if (object->type == OBJ_COMMIT) { |
ae563542 | 209 | struct commit *commit = (struct commit *)object; |
ae563542 LT |
210 | if (parse_commit(commit) < 0) |
211 | die("unable to parse commit %s", name); | |
d9a83684 | 212 | if (flags & UNINTERESTING) { |
4262c1b0 | 213 | commit->object.flags |= UNINTERESTING; |
ae563542 | 214 | mark_parents_uninteresting(commit); |
d9a83684 LT |
215 | revs->limited = 1; |
216 | } | |
0f3a290b LT |
217 | if (revs->show_source && !commit->util) |
218 | commit->util = (void *) name; | |
ae563542 LT |
219 | return commit; |
220 | } | |
221 | ||
222 | /* | |
3ea3c215 | 223 | * Tree object? Either mark it uninteresting, or add it |
ae563542 LT |
224 | * to the list of objects to look at later.. |
225 | */ | |
1974632c | 226 | if (object->type == OBJ_TREE) { |
ae563542 LT |
227 | struct tree *tree = (struct tree *)object; |
228 | if (!revs->tree_objects) | |
229 | return NULL; | |
230 | if (flags & UNINTERESTING) { | |
231 | mark_tree_uninteresting(tree); | |
232 | return NULL; | |
233 | } | |
234 | add_pending_object(revs, object, ""); | |
235 | return NULL; | |
236 | } | |
237 | ||
238 | /* | |
239 | * Blob object? You know the drill by now.. | |
240 | */ | |
1974632c | 241 | if (object->type == OBJ_BLOB) { |
ae563542 LT |
242 | struct blob *blob = (struct blob *)object; |
243 | if (!revs->blob_objects) | |
244 | return NULL; | |
245 | if (flags & UNINTERESTING) { | |
246 | mark_blob_uninteresting(blob); | |
247 | return NULL; | |
248 | } | |
249 | add_pending_object(revs, object, ""); | |
250 | return NULL; | |
251 | } | |
252 | die("%s is unknown object", name); | |
253 | } | |
254 | ||
a4a88b2b LT |
255 | static int everybody_uninteresting(struct commit_list *orig) |
256 | { | |
257 | struct commit_list *list = orig; | |
258 | while (list) { | |
259 | struct commit *commit = list->item; | |
260 | list = list->next; | |
261 | if (commit->object.flags & UNINTERESTING) | |
262 | continue; | |
263 | return 0; | |
264 | } | |
265 | return 1; | |
266 | } | |
267 | ||
0a4ba7f8 JH |
268 | /* |
269 | * The goal is to get REV_TREE_NEW as the result only if the | |
ceff8e7a LT |
270 | * diff consists of all '+' (and no other changes), REV_TREE_OLD |
271 | * if the whole diff is removal of old data, and otherwise | |
272 | * REV_TREE_DIFFERENT (of course if the trees are the same we | |
273 | * want REV_TREE_SAME). | |
274 | * That means that once we get to REV_TREE_DIFFERENT, we do not | |
275 | * have to look any further. | |
0a4ba7f8 | 276 | */ |
8efdc326 | 277 | static int tree_difference = REV_TREE_SAME; |
a4a88b2b LT |
278 | |
279 | static void file_add_remove(struct diff_options *options, | |
280 | int addremove, unsigned mode, | |
281 | const unsigned char *sha1, | |
e3d42c47 | 282 | const char *fullpath, unsigned dirty_submodule) |
a4a88b2b | 283 | { |
ceff8e7a | 284 | int diff = addremove == '+' ? REV_TREE_NEW : REV_TREE_OLD; |
a4a88b2b | 285 | |
ceff8e7a | 286 | tree_difference |= diff; |
dd47aa31 | 287 | if (tree_difference == REV_TREE_DIFFERENT) |
8f67f8ae | 288 | DIFF_OPT_SET(options, HAS_CHANGES); |
a4a88b2b LT |
289 | } |
290 | ||
291 | static void file_change(struct diff_options *options, | |
292 | unsigned old_mode, unsigned new_mode, | |
293 | const unsigned char *old_sha1, | |
294 | const unsigned char *new_sha1, | |
e3d42c47 JL |
295 | const char *fullpath, |
296 | unsigned old_dirty_submodule, unsigned new_dirty_submodule) | |
a4a88b2b | 297 | { |
8efdc326 | 298 | tree_difference = REV_TREE_DIFFERENT; |
8f67f8ae | 299 | DIFF_OPT_SET(options, HAS_CHANGES); |
a4a88b2b LT |
300 | } |
301 | ||
3a5e8608 | 302 | static int rev_compare_tree(struct rev_info *revs, struct commit *parent, struct commit *commit) |
a4a88b2b | 303 | { |
3a5e8608 LT |
304 | struct tree *t1 = parent->tree; |
305 | struct tree *t2 = commit->tree; | |
306 | ||
a4a88b2b | 307 | if (!t1) |
8efdc326 | 308 | return REV_TREE_NEW; |
ceff8e7a LT |
309 | if (!t2) |
310 | return REV_TREE_OLD; | |
78892e32 LT |
311 | |
312 | if (revs->simplify_by_decoration) { | |
313 | /* | |
314 | * If we are simplifying by decoration, then the commit | |
315 | * is worth showing if it has a tag pointing at it. | |
316 | */ | |
317 | if (lookup_decoration(&name_decoration, &commit->object)) | |
318 | return REV_TREE_DIFFERENT; | |
319 | /* | |
320 | * A commit that is not pointed by a tag is uninteresting | |
321 | * if we are not limited by path. This means that you will | |
322 | * see the usual "commits that touch the paths" plus any | |
323 | * tagged commit by specifying both --simplify-by-decoration | |
324 | * and pathspec. | |
325 | */ | |
326 | if (!revs->prune_data) | |
327 | return REV_TREE_SAME; | |
328 | } | |
ceff8e7a | 329 | |
8efdc326 | 330 | tree_difference = REV_TREE_SAME; |
8f67f8ae | 331 | DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES); |
c4e05b1a | 332 | if (diff_tree_sha1(t1->object.sha1, t2->object.sha1, "", |
cd2bdc53 | 333 | &revs->pruning) < 0) |
8efdc326 | 334 | return REV_TREE_DIFFERENT; |
a4a88b2b LT |
335 | return tree_difference; |
336 | } | |
337 | ||
3a5e8608 | 338 | static int rev_same_tree_as_empty(struct rev_info *revs, struct commit *commit) |
a4a88b2b LT |
339 | { |
340 | int retval; | |
341 | void *tree; | |
6fda5e51 | 342 | unsigned long size; |
a4a88b2b | 343 | struct tree_desc empty, real; |
3a5e8608 | 344 | struct tree *t1 = commit->tree; |
a4a88b2b LT |
345 | |
346 | if (!t1) | |
347 | return 0; | |
348 | ||
6fda5e51 | 349 | tree = read_object_with_reference(t1->object.sha1, tree_type, &size, NULL); |
a4a88b2b LT |
350 | if (!tree) |
351 | return 0; | |
6fda5e51 LT |
352 | init_tree_desc(&real, tree, size); |
353 | init_tree_desc(&empty, "", 0); | |
a4a88b2b | 354 | |
0a4ba7f8 | 355 | tree_difference = REV_TREE_SAME; |
8f67f8ae | 356 | DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES); |
cd2bdc53 | 357 | retval = diff_tree(&empty, &real, "", &revs->pruning); |
a4a88b2b LT |
358 | free(tree); |
359 | ||
0a4ba7f8 | 360 | return retval >= 0 && (tree_difference == REV_TREE_SAME); |
a4a88b2b LT |
361 | } |
362 | ||
363 | static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit) | |
364 | { | |
365 | struct commit_list **pp, *parent; | |
6631c736 | 366 | int tree_changed = 0, tree_same = 0; |
a4a88b2b | 367 | |
53b2c823 LT |
368 | /* |
369 | * If we don't do pruning, everything is interesting | |
370 | */ | |
7dc0fe3b | 371 | if (!revs->prune) |
53b2c823 | 372 | return; |
53b2c823 | 373 | |
a4a88b2b LT |
374 | if (!commit->tree) |
375 | return; | |
376 | ||
377 | if (!commit->parents) { | |
3a5e8608 | 378 | if (rev_same_tree_as_empty(revs, commit)) |
7dc0fe3b | 379 | commit->object.flags |= TREESAME; |
a4a88b2b LT |
380 | return; |
381 | } | |
382 | ||
53b2c823 LT |
383 | /* |
384 | * Normal non-merge commit? If we don't want to make the | |
385 | * history dense, we consider it always to be a change.. | |
386 | */ | |
7dc0fe3b | 387 | if (!revs->dense && !commit->parents->next) |
53b2c823 | 388 | return; |
53b2c823 | 389 | |
a4a88b2b LT |
390 | pp = &commit->parents; |
391 | while ((parent = *pp) != NULL) { | |
392 | struct commit *p = parent->item; | |
393 | ||
cc0e6c5a AR |
394 | if (parse_commit(p) < 0) |
395 | die("cannot simplify commit %s (because of %s)", | |
396 | sha1_to_hex(commit->object.sha1), | |
397 | sha1_to_hex(p->object.sha1)); | |
3a5e8608 | 398 | switch (rev_compare_tree(revs, p, commit)) { |
8efdc326 | 399 | case REV_TREE_SAME: |
6631c736 | 400 | tree_same = 1; |
9202434c | 401 | if (!revs->simplify_history || (p->object.flags & UNINTERESTING)) { |
f3219fbb JH |
402 | /* Even if a merge with an uninteresting |
403 | * side branch brought the entire change | |
404 | * we are interested in, we do not want | |
405 | * to lose the other branches of this | |
406 | * merge, so we just keep going. | |
407 | */ | |
408 | pp = &parent->next; | |
409 | continue; | |
410 | } | |
a4a88b2b LT |
411 | parent->next = NULL; |
412 | commit->parents = parent; | |
7dc0fe3b | 413 | commit->object.flags |= TREESAME; |
a4a88b2b LT |
414 | return; |
415 | ||
8efdc326 FK |
416 | case REV_TREE_NEW: |
417 | if (revs->remove_empty_trees && | |
3a5e8608 | 418 | rev_same_tree_as_empty(revs, p)) { |
c348f31a JH |
419 | /* We are adding all the specified |
420 | * paths from this parent, so the | |
421 | * history beyond this parent is not | |
422 | * interesting. Remove its parents | |
423 | * (they are grandparents for us). | |
424 | * IOW, we pretend this parent is a | |
425 | * "root" commit. | |
a41e109c | 426 | */ |
cc0e6c5a AR |
427 | if (parse_commit(p) < 0) |
428 | die("cannot simplify commit %s (invalid %s)", | |
429 | sha1_to_hex(commit->object.sha1), | |
430 | sha1_to_hex(p->object.sha1)); | |
c348f31a | 431 | p->parents = NULL; |
a4a88b2b LT |
432 | } |
433 | /* fallthrough */ | |
ceff8e7a | 434 | case REV_TREE_OLD: |
8efdc326 | 435 | case REV_TREE_DIFFERENT: |
f3219fbb | 436 | tree_changed = 1; |
a4a88b2b LT |
437 | pp = &parent->next; |
438 | continue; | |
439 | } | |
440 | die("bad tree compare for commit %s", sha1_to_hex(commit->object.sha1)); | |
441 | } | |
6631c736 | 442 | if (tree_changed && !tree_same) |
7dc0fe3b LT |
443 | return; |
444 | commit->object.flags |= TREESAME; | |
a4a88b2b LT |
445 | } |
446 | ||
fce87ae5 AG |
447 | static void insert_by_date_cached(struct commit *p, struct commit_list **head, |
448 | struct commit_list *cached_base, struct commit_list **cache) | |
449 | { | |
450 | struct commit_list *new_entry; | |
451 | ||
452 | if (cached_base && p->date < cached_base->item->date) | |
453 | new_entry = insert_by_date(p, &cached_base->next); | |
454 | else | |
455 | new_entry = insert_by_date(p, head); | |
456 | ||
457 | if (cache && (!*cache || p->date < (*cache)->item->date)) | |
458 | *cache = new_entry; | |
459 | } | |
460 | ||
461 | static int add_parents_to_list(struct rev_info *revs, struct commit *commit, | |
462 | struct commit_list **list, struct commit_list **cache_ptr) | |
a4a88b2b LT |
463 | { |
464 | struct commit_list *parent = commit->parents; | |
577ed5c2 | 465 | unsigned left_flag; |
fce87ae5 | 466 | struct commit_list *cached_base = cache_ptr ? *cache_ptr : NULL; |
a4a88b2b | 467 | |
3381c790 | 468 | if (commit->object.flags & ADDED) |
cc0e6c5a | 469 | return 0; |
3381c790 LT |
470 | commit->object.flags |= ADDED; |
471 | ||
a4a88b2b LT |
472 | /* |
473 | * If the commit is uninteresting, don't try to | |
474 | * prune parents - we want the maximal uninteresting | |
475 | * set. | |
476 | * | |
477 | * Normally we haven't parsed the parent | |
478 | * yet, so we won't have a parent of a parent | |
479 | * here. However, it may turn out that we've | |
480 | * reached this commit some other way (where it | |
481 | * wasn't uninteresting), in which case we need | |
482 | * to mark its parents recursively too.. | |
483 | */ | |
484 | if (commit->object.flags & UNINTERESTING) { | |
485 | while (parent) { | |
486 | struct commit *p = parent->item; | |
487 | parent = parent->next; | |
aeeae1b7 JH |
488 | if (p) |
489 | p->object.flags |= UNINTERESTING; | |
cc0e6c5a | 490 | if (parse_commit(p) < 0) |
aeeae1b7 | 491 | continue; |
a4a88b2b LT |
492 | if (p->parents) |
493 | mark_parents_uninteresting(p); | |
494 | if (p->object.flags & SEEN) | |
495 | continue; | |
496 | p->object.flags |= SEEN; | |
fce87ae5 | 497 | insert_by_date_cached(p, list, cached_base, cache_ptr); |
a4a88b2b | 498 | } |
cc0e6c5a | 499 | return 0; |
a4a88b2b LT |
500 | } |
501 | ||
502 | /* | |
503 | * Ok, the commit wasn't uninteresting. Try to | |
504 | * simplify the commit history and find the parent | |
505 | * that has no differences in the path set if one exists. | |
506 | */ | |
53b2c823 | 507 | try_to_simplify_commit(revs, commit); |
a4a88b2b | 508 | |
ba1d4505 | 509 | if (revs->no_walk) |
cc0e6c5a | 510 | return 0; |
ba1d4505 | 511 | |
577ed5c2 | 512 | left_flag = (commit->object.flags & SYMMETRIC_LEFT); |
0053e902 | 513 | |
d9c292e8 | 514 | for (parent = commit->parents; parent; parent = parent->next) { |
a4a88b2b LT |
515 | struct commit *p = parent->item; |
516 | ||
cc0e6c5a AR |
517 | if (parse_commit(p) < 0) |
518 | return -1; | |
0f3a290b LT |
519 | if (revs->show_source && !p->util) |
520 | p->util = commit->util; | |
577ed5c2 | 521 | p->object.flags |= left_flag; |
ad1012eb LH |
522 | if (!(p->object.flags & SEEN)) { |
523 | p->object.flags |= SEEN; | |
fce87ae5 | 524 | insert_by_date_cached(p, list, cached_base, cache_ptr); |
ad1012eb | 525 | } |
60d30b02 | 526 | if (revs->first_parent_only) |
d9c292e8 | 527 | break; |
a4a88b2b | 528 | } |
cc0e6c5a | 529 | return 0; |
a4a88b2b LT |
530 | } |
531 | ||
36d56de6 | 532 | static void cherry_pick_list(struct commit_list *list, struct rev_info *revs) |
d7a17cad JH |
533 | { |
534 | struct commit_list *p; | |
535 | int left_count = 0, right_count = 0; | |
536 | int left_first; | |
537 | struct patch_ids ids; | |
538 | ||
539 | /* First count the commits on the left and on the right */ | |
540 | for (p = list; p; p = p->next) { | |
541 | struct commit *commit = p->item; | |
542 | unsigned flags = commit->object.flags; | |
543 | if (flags & BOUNDARY) | |
544 | ; | |
545 | else if (flags & SYMMETRIC_LEFT) | |
546 | left_count++; | |
547 | else | |
548 | right_count++; | |
549 | } | |
550 | ||
36c07975 TR |
551 | if (!left_count || !right_count) |
552 | return; | |
553 | ||
d7a17cad JH |
554 | left_first = left_count < right_count; |
555 | init_patch_ids(&ids); | |
36d56de6 JS |
556 | if (revs->diffopt.nr_paths) { |
557 | ids.diffopts.nr_paths = revs->diffopt.nr_paths; | |
558 | ids.diffopts.paths = revs->diffopt.paths; | |
559 | ids.diffopts.pathlens = revs->diffopt.pathlens; | |
560 | } | |
d7a17cad JH |
561 | |
562 | /* Compute patch-ids for one side */ | |
563 | for (p = list; p; p = p->next) { | |
564 | struct commit *commit = p->item; | |
565 | unsigned flags = commit->object.flags; | |
566 | ||
567 | if (flags & BOUNDARY) | |
568 | continue; | |
569 | /* | |
570 | * If we have fewer left, left_first is set and we omit | |
571 | * commits on the right branch in this loop. If we have | |
572 | * fewer right, we skip the left ones. | |
573 | */ | |
574 | if (left_first != !!(flags & SYMMETRIC_LEFT)) | |
575 | continue; | |
576 | commit->util = add_commit_patch_id(commit, &ids); | |
577 | } | |
578 | ||
579 | /* Check the other side */ | |
580 | for (p = list; p; p = p->next) { | |
581 | struct commit *commit = p->item; | |
582 | struct patch_id *id; | |
583 | unsigned flags = commit->object.flags; | |
584 | ||
585 | if (flags & BOUNDARY) | |
586 | continue; | |
587 | /* | |
588 | * If we have fewer left, left_first is set and we omit | |
589 | * commits on the left branch in this loop. | |
590 | */ | |
591 | if (left_first == !!(flags & SYMMETRIC_LEFT)) | |
592 | continue; | |
593 | ||
594 | /* | |
595 | * Have we seen the same patch id? | |
596 | */ | |
597 | id = has_commit_patch_id(commit, &ids); | |
598 | if (!id) | |
599 | continue; | |
600 | id->seen = 1; | |
601 | commit->object.flags |= SHOWN; | |
602 | } | |
603 | ||
604 | /* Now check the original side for seen ones */ | |
605 | for (p = list; p; p = p->next) { | |
606 | struct commit *commit = p->item; | |
607 | struct patch_id *ent; | |
608 | ||
609 | ent = commit->util; | |
610 | if (!ent) | |
611 | continue; | |
612 | if (ent->seen) | |
613 | commit->object.flags |= SHOWN; | |
614 | commit->util = NULL; | |
615 | } | |
616 | ||
617 | free_patch_ids(&ids); | |
618 | } | |
619 | ||
7d004199 LT |
620 | /* How many extra uninteresting commits we want to see.. */ |
621 | #define SLOP 5 | |
622 | ||
623 | static int still_interesting(struct commit_list *src, unsigned long date, int slop) | |
3131b713 | 624 | { |
7d004199 LT |
625 | /* |
626 | * No source list at all? We're definitely done.. | |
627 | */ | |
628 | if (!src) | |
629 | return 0; | |
630 | ||
631 | /* | |
632 | * Does the destination list contain entries with a date | |
633 | * before the source list? Definitely _not_ done. | |
634 | */ | |
635 | if (date < src->item->date) | |
636 | return SLOP; | |
637 | ||
638 | /* | |
639 | * Does the source list still have interesting commits in | |
640 | * it? Definitely not done.. | |
641 | */ | |
642 | if (!everybody_uninteresting(src)) | |
643 | return SLOP; | |
644 | ||
645 | /* Ok, we're closing in.. */ | |
646 | return slop-1; | |
3131b713 LT |
647 | } |
648 | ||
cc0e6c5a | 649 | static int limit_list(struct rev_info *revs) |
a4a88b2b | 650 | { |
7d004199 LT |
651 | int slop = SLOP; |
652 | unsigned long date = ~0ul; | |
a4a88b2b LT |
653 | struct commit_list *list = revs->commits; |
654 | struct commit_list *newlist = NULL; | |
655 | struct commit_list **p = &newlist; | |
656 | ||
657 | while (list) { | |
658 | struct commit_list *entry = list; | |
659 | struct commit *commit = list->item; | |
660 | struct object *obj = &commit->object; | |
cdcefbc9 | 661 | show_early_output_fn_t show; |
a4a88b2b LT |
662 | |
663 | list = list->next; | |
664 | free(entry); | |
665 | ||
666 | if (revs->max_age != -1 && (commit->date < revs->max_age)) | |
667 | obj->flags |= UNINTERESTING; | |
fce87ae5 | 668 | if (add_parents_to_list(revs, commit, &list, NULL) < 0) |
cc0e6c5a | 669 | return -1; |
a4a88b2b LT |
670 | if (obj->flags & UNINTERESTING) { |
671 | mark_parents_uninteresting(commit); | |
7d004199 LT |
672 | if (revs->show_all) |
673 | p = &commit_list_insert(commit, p)->next; | |
674 | slop = still_interesting(list, date, slop); | |
675 | if (slop) | |
3131b713 | 676 | continue; |
7d004199 LT |
677 | /* If showing all, add the whole pending list to the end */ |
678 | if (revs->show_all) | |
679 | *p = list; | |
680 | break; | |
a4a88b2b LT |
681 | } |
682 | if (revs->min_age != -1 && (commit->date > revs->min_age)) | |
683 | continue; | |
7d004199 | 684 | date = commit->date; |
a4a88b2b | 685 | p = &commit_list_insert(commit, p)->next; |
cdcefbc9 LT |
686 | |
687 | show = show_early_output; | |
688 | if (!show) | |
689 | continue; | |
690 | ||
691 | show(revs, newlist); | |
692 | show_early_output = NULL; | |
a4a88b2b | 693 | } |
d7a17cad | 694 | if (revs->cherry_pick) |
36d56de6 | 695 | cherry_pick_list(newlist, revs); |
d7a17cad | 696 | |
a4a88b2b | 697 | revs->commits = newlist; |
cc0e6c5a | 698 | return 0; |
a4a88b2b LT |
699 | } |
700 | ||
63049292 JH |
701 | struct all_refs_cb { |
702 | int all_flags; | |
71b03b42 | 703 | int warned_bad_reflog; |
63049292 JH |
704 | struct rev_info *all_revs; |
705 | const char *name_for_errormsg; | |
706 | }; | |
ae563542 | 707 | |
8da19775 | 708 | static int handle_one_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data) |
ae563542 | 709 | { |
63049292 JH |
710 | struct all_refs_cb *cb = cb_data; |
711 | struct object *object = get_reference(cb->all_revs, path, sha1, | |
712 | cb->all_flags); | |
3d1efd8f | 713 | add_pending_object(cb->all_revs, object, path); |
ae563542 LT |
714 | return 0; |
715 | } | |
716 | ||
d08bae7e IL |
717 | static void init_all_refs_cb(struct all_refs_cb *cb, struct rev_info *revs, |
718 | unsigned flags) | |
719 | { | |
720 | cb->all_revs = revs; | |
721 | cb->all_flags = flags; | |
722 | } | |
723 | ||
a5aa930d UKK |
724 | static void handle_refs(struct rev_info *revs, unsigned flags, |
725 | int (*for_each)(each_ref_fn, void *)) | |
ae563542 | 726 | { |
63049292 | 727 | struct all_refs_cb cb; |
d08bae7e | 728 | init_all_refs_cb(&cb, revs, flags); |
a5aa930d | 729 | for_each(handle_one_ref, &cb); |
63049292 JH |
730 | } |
731 | ||
71b03b42 | 732 | static void handle_one_reflog_commit(unsigned char *sha1, void *cb_data) |
63049292 JH |
733 | { |
734 | struct all_refs_cb *cb = cb_data; | |
71b03b42 SP |
735 | if (!is_null_sha1(sha1)) { |
736 | struct object *o = parse_object(sha1); | |
737 | if (o) { | |
738 | o->flags |= cb->all_flags; | |
739 | add_pending_object(cb->all_revs, o, ""); | |
740 | } | |
741 | else if (!cb->warned_bad_reflog) { | |
46efd2d9 | 742 | warning("reflog of '%s' references pruned commits", |
71b03b42 SP |
743 | cb->name_for_errormsg); |
744 | cb->warned_bad_reflog = 1; | |
745 | } | |
63049292 | 746 | } |
71b03b42 SP |
747 | } |
748 | ||
883d60fa JS |
749 | static int handle_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1, |
750 | const char *email, unsigned long timestamp, int tz, | |
751 | const char *message, void *cb_data) | |
71b03b42 SP |
752 | { |
753 | handle_one_reflog_commit(osha1, cb_data); | |
754 | handle_one_reflog_commit(nsha1, cb_data); | |
63049292 JH |
755 | return 0; |
756 | } | |
757 | ||
758 | static int handle_one_reflog(const char *path, const unsigned char *sha1, int flag, void *cb_data) | |
759 | { | |
760 | struct all_refs_cb *cb = cb_data; | |
71b03b42 | 761 | cb->warned_bad_reflog = 0; |
63049292 JH |
762 | cb->name_for_errormsg = path; |
763 | for_each_reflog_ent(path, handle_one_reflog_ent, cb_data); | |
764 | return 0; | |
765 | } | |
766 | ||
767 | static void handle_reflog(struct rev_info *revs, unsigned flags) | |
768 | { | |
769 | struct all_refs_cb cb; | |
770 | cb.all_revs = revs; | |
771 | cb.all_flags = flags; | |
25b51e2c | 772 | for_each_reflog(handle_one_reflog, &cb); |
ae563542 LT |
773 | } |
774 | ||
ea4a19e1 JH |
775 | static int add_parents_only(struct rev_info *revs, const char *arg, int flags) |
776 | { | |
777 | unsigned char sha1[20]; | |
778 | struct object *it; | |
779 | struct commit *commit; | |
780 | struct commit_list *parents; | |
781 | ||
782 | if (*arg == '^') { | |
783 | flags ^= UNINTERESTING; | |
784 | arg++; | |
785 | } | |
786 | if (get_sha1(arg, sha1)) | |
787 | return 0; | |
788 | while (1) { | |
789 | it = get_reference(revs, arg, sha1, 0); | |
1974632c | 790 | if (it->type != OBJ_TAG) |
ea4a19e1 | 791 | break; |
9684afd9 MK |
792 | if (!((struct tag*)it)->tagged) |
793 | return 0; | |
e702496e | 794 | hashcpy(sha1, ((struct tag*)it)->tagged->sha1); |
ea4a19e1 | 795 | } |
1974632c | 796 | if (it->type != OBJ_COMMIT) |
ea4a19e1 JH |
797 | return 0; |
798 | commit = (struct commit *)it; | |
799 | for (parents = commit->parents; parents; parents = parents->next) { | |
800 | it = &parents->item->object; | |
801 | it->flags |= flags; | |
802 | add_pending_object(revs, it, arg); | |
803 | } | |
804 | return 1; | |
805 | } | |
806 | ||
db6296a5 | 807 | void init_revisions(struct rev_info *revs, const char *prefix) |
8efdc326 FK |
808 | { |
809 | memset(revs, 0, sizeof(*revs)); | |
8e8f9987 | 810 | |
6b9c58f4 | 811 | revs->abbrev = DEFAULT_ABBREV; |
8e8f9987 | 812 | revs->ignore_merges = 1; |
9202434c | 813 | revs->simplify_history = 1; |
8f67f8ae | 814 | DIFF_OPT_SET(&revs->pruning, RECURSIVE); |
90b19941 | 815 | DIFF_OPT_SET(&revs->pruning, QUICK); |
cd2bdc53 LT |
816 | revs->pruning.add_remove = file_add_remove; |
817 | revs->pruning.change = file_change; | |
8efdc326 FK |
818 | revs->lifo = 1; |
819 | revs->dense = 1; | |
db6296a5 | 820 | revs->prefix = prefix; |
8efdc326 FK |
821 | revs->max_age = -1; |
822 | revs->min_age = -1; | |
d5db6c9e | 823 | revs->skip_count = -1; |
8efdc326 FK |
824 | revs->max_count = -1; |
825 | ||
cd2bdc53 LT |
826 | revs->commit_format = CMIT_FMT_DEFAULT; |
827 | ||
0843acfd JK |
828 | revs->grep_filter.status_only = 1; |
829 | revs->grep_filter.pattern_tail = &(revs->grep_filter.pattern_list); | |
80235ba7 | 830 | revs->grep_filter.header_tail = &(revs->grep_filter.header_list); |
0843acfd JK |
831 | revs->grep_filter.regflags = REG_NEWLINE; |
832 | ||
cd2bdc53 | 833 | diff_setup(&revs->diffopt); |
c0cb4a06 | 834 | if (prefix && !revs->diffopt.prefix) { |
cd676a51 JH |
835 | revs->diffopt.prefix = prefix; |
836 | revs->diffopt.prefix_length = strlen(prefix); | |
837 | } | |
8efdc326 FK |
838 | } |
839 | ||
0d2c9d67 RS |
840 | static void add_pending_commit_list(struct rev_info *revs, |
841 | struct commit_list *commit_list, | |
842 | unsigned int flags) | |
843 | { | |
844 | while (commit_list) { | |
845 | struct object *object = &commit_list->item->object; | |
846 | object->flags |= flags; | |
847 | add_pending_object(revs, object, sha1_to_hex(object->sha1)); | |
848 | commit_list = commit_list->next; | |
849 | } | |
850 | } | |
851 | ||
ae3e5e1e JH |
852 | static void prepare_show_merge(struct rev_info *revs) |
853 | { | |
854 | struct commit_list *bases; | |
855 | struct commit *head, *other; | |
856 | unsigned char sha1[20]; | |
857 | const char **prune = NULL; | |
858 | int i, prune_num = 1; /* counting terminating NULL */ | |
859 | ||
860 | if (get_sha1("HEAD", sha1) || !(head = lookup_commit(sha1))) | |
861 | die("--merge without HEAD?"); | |
862 | if (get_sha1("MERGE_HEAD", sha1) || !(other = lookup_commit(sha1))) | |
863 | die("--merge without MERGE_HEAD?"); | |
864 | add_pending_object(revs, &head->object, "HEAD"); | |
865 | add_pending_object(revs, &other->object, "MERGE_HEAD"); | |
866 | bases = get_merge_bases(head, other, 1); | |
e82447b1 JH |
867 | add_pending_commit_list(revs, bases, UNINTERESTING); |
868 | free_commit_list(bases); | |
869 | head->object.flags |= SYMMETRIC_LEFT; | |
ae3e5e1e JH |
870 | |
871 | if (!active_nr) | |
872 | read_cache(); | |
873 | for (i = 0; i < active_nr; i++) { | |
874 | struct cache_entry *ce = active_cache[i]; | |
875 | if (!ce_stage(ce)) | |
876 | continue; | |
877 | if (ce_path_match(ce, revs->prune_data)) { | |
878 | prune_num++; | |
879 | prune = xrealloc(prune, sizeof(*prune) * prune_num); | |
880 | prune[prune_num-2] = ce->name; | |
881 | prune[prune_num-1] = NULL; | |
882 | } | |
883 | while ((i+1 < active_nr) && | |
884 | ce_same_name(ce, active_cache[i+1])) | |
885 | i++; | |
886 | } | |
887 | revs->prune_data = prune; | |
e82447b1 | 888 | revs->limited = 1; |
ae3e5e1e JH |
889 | } |
890 | ||
5d6f0935 JH |
891 | int handle_revision_arg(const char *arg, struct rev_info *revs, |
892 | int flags, | |
893 | int cant_be_filename) | |
894 | { | |
bb6c2fba | 895 | unsigned mode; |
5d6f0935 JH |
896 | char *dotdot; |
897 | struct object *object; | |
898 | unsigned char sha1[20]; | |
899 | int local_flags; | |
900 | ||
901 | dotdot = strstr(arg, ".."); | |
902 | if (dotdot) { | |
903 | unsigned char from_sha1[20]; | |
904 | const char *next = dotdot + 2; | |
905 | const char *this = arg; | |
906 | int symmetric = *next == '.'; | |
907 | unsigned int flags_exclude = flags ^ UNINTERESTING; | |
908 | ||
909 | *dotdot = 0; | |
910 | next += symmetric; | |
911 | ||
912 | if (!*next) | |
913 | next = "HEAD"; | |
914 | if (dotdot == arg) | |
915 | this = "HEAD"; | |
916 | if (!get_sha1(this, from_sha1) && | |
917 | !get_sha1(next, sha1)) { | |
918 | struct commit *a, *b; | |
919 | struct commit_list *exclude; | |
920 | ||
921 | a = lookup_commit_reference(from_sha1); | |
922 | b = lookup_commit_reference(sha1); | |
923 | if (!a || !b) { | |
924 | die(symmetric ? | |
925 | "Invalid symmetric difference expression %s...%s" : | |
926 | "Invalid revision range %s..%s", | |
927 | arg, next); | |
928 | } | |
929 | ||
930 | if (!cant_be_filename) { | |
931 | *dotdot = '.'; | |
932 | verify_non_filename(revs->prefix, arg); | |
933 | } | |
934 | ||
935 | if (symmetric) { | |
936 | exclude = get_merge_bases(a, b, 1); | |
937 | add_pending_commit_list(revs, exclude, | |
938 | flags_exclude); | |
939 | free_commit_list(exclude); | |
577ed5c2 | 940 | a->object.flags |= flags | SYMMETRIC_LEFT; |
5d6f0935 JH |
941 | } else |
942 | a->object.flags |= flags_exclude; | |
943 | b->object.flags |= flags; | |
944 | add_pending_object(revs, &a->object, this); | |
945 | add_pending_object(revs, &b->object, next); | |
946 | return 0; | |
947 | } | |
948 | *dotdot = '.'; | |
949 | } | |
950 | dotdot = strstr(arg, "^@"); | |
951 | if (dotdot && !dotdot[2]) { | |
952 | *dotdot = 0; | |
953 | if (add_parents_only(revs, arg, flags)) | |
954 | return 0; | |
955 | *dotdot = '^'; | |
956 | } | |
62476c8e JH |
957 | dotdot = strstr(arg, "^!"); |
958 | if (dotdot && !dotdot[2]) { | |
959 | *dotdot = 0; | |
960 | if (!add_parents_only(revs, arg, flags ^ UNINTERESTING)) | |
961 | *dotdot = '^'; | |
962 | } | |
963 | ||
5d6f0935 JH |
964 | local_flags = 0; |
965 | if (*arg == '^') { | |
966 | local_flags = UNINTERESTING; | |
967 | arg++; | |
968 | } | |
bb6c2fba | 969 | if (get_sha1_with_mode(arg, sha1, &mode)) |
5d6f0935 JH |
970 | return -1; |
971 | if (!cant_be_filename) | |
972 | verify_non_filename(revs->prefix, arg); | |
973 | object = get_reference(revs, arg, sha1, flags ^ local_flags); | |
bb6c2fba | 974 | add_pending_object_with_mode(revs, object, arg, mode); |
5d6f0935 JH |
975 | return 0; |
976 | } | |
977 | ||
60da8b15 | 978 | static void read_pathspec_from_stdin(struct rev_info *revs, struct strbuf *sb, const char ***prune_data) |
1fc561d1 | 979 | { |
60da8b15 JH |
980 | const char **prune = *prune_data; |
981 | int prune_nr; | |
982 | int prune_alloc; | |
1fc561d1 | 983 | |
60da8b15 JH |
984 | /* count existing ones */ |
985 | if (!prune) | |
986 | prune_nr = 0; | |
987 | else | |
988 | for (prune_nr = 0; prune[prune_nr]; prune_nr++) | |
989 | ; | |
990 | prune_alloc = prune_nr; /* not really, but we do not know */ | |
991 | ||
992 | while (strbuf_getwholeline(sb, stdin, '\n') != EOF) { | |
993 | int len = sb->len; | |
994 | if (len && sb->buf[len - 1] == '\n') | |
995 | sb->buf[--len] = '\0'; | |
996 | ALLOC_GROW(prune, prune_nr+1, prune_alloc); | |
997 | prune[prune_nr++] = xstrdup(sb->buf); | |
998 | } | |
999 | if (prune) { | |
1000 | ALLOC_GROW(prune, prune_nr+1, prune_alloc); | |
1001 | prune[prune_nr] = NULL; | |
1002 | } | |
1003 | *prune_data = prune; | |
1004 | } | |
1005 | ||
1006 | static void read_revisions_from_stdin(struct rev_info *revs, const char ***prune) | |
1fc561d1 | 1007 | { |
63d564b3 | 1008 | struct strbuf sb; |
60da8b15 | 1009 | int seen_dashdash = 0; |
1fc561d1 | 1010 | |
63d564b3 JH |
1011 | strbuf_init(&sb, 1000); |
1012 | while (strbuf_getwholeline(&sb, stdin, '\n') != EOF) { | |
1013 | int len = sb.len; | |
1014 | if (len && sb.buf[len - 1] == '\n') | |
1015 | sb.buf[--len] = '\0'; | |
1fc561d1 AB |
1016 | if (!len) |
1017 | break; | |
60da8b15 JH |
1018 | if (sb.buf[0] == '-') { |
1019 | if (len == 2 && sb.buf[1] == '-') { | |
1020 | seen_dashdash = 1; | |
1021 | break; | |
1022 | } | |
1fc561d1 | 1023 | die("options not supported in --stdin mode"); |
60da8b15 | 1024 | } |
63d564b3 JH |
1025 | if (handle_revision_arg(sb.buf, revs, 0, 1)) |
1026 | die("bad revision '%s'", sb.buf); | |
1fc561d1 | 1027 | } |
60da8b15 JH |
1028 | if (seen_dashdash) |
1029 | read_pathspec_from_stdin(revs, &sb, prune); | |
63d564b3 | 1030 | strbuf_release(&sb); |
1fc561d1 AB |
1031 | } |
1032 | ||
2d10c555 | 1033 | static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what) |
bd95fcd3 | 1034 | { |
0843acfd | 1035 | append_grep_pattern(&revs->grep_filter, ptn, "command line", 0, what); |
2d10c555 JH |
1036 | } |
1037 | ||
a4d7d2c6 | 1038 | static void add_header_grep(struct rev_info *revs, enum grep_header_field field, const char *pattern) |
2d10c555 | 1039 | { |
a4d7d2c6 | 1040 | append_header_grep_pattern(&revs->grep_filter, field, pattern); |
bd95fcd3 JH |
1041 | } |
1042 | ||
1043 | static void add_message_grep(struct rev_info *revs, const char *pattern) | |
1044 | { | |
2d10c555 | 1045 | add_grep(revs, pattern, GREP_PATTERN_BODY); |
bd95fcd3 JH |
1046 | } |
1047 | ||
6b61ec05 PH |
1048 | static int handle_revision_opt(struct rev_info *revs, int argc, const char **argv, |
1049 | int *unkc, const char **unkv) | |
02e54220 PH |
1050 | { |
1051 | const char *arg = argv[0]; | |
1052 | ||
1053 | /* pseudo revision arguments */ | |
1054 | if (!strcmp(arg, "--all") || !strcmp(arg, "--branches") || | |
1055 | !strcmp(arg, "--tags") || !strcmp(arg, "--remotes") || | |
1056 | !strcmp(arg, "--reflog") || !strcmp(arg, "--not") || | |
ad3f9a71 LT |
1057 | !strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk") || |
1058 | !strcmp(arg, "--bisect")) | |
02e54220 PH |
1059 | { |
1060 | unkv[(*unkc)++] = arg; | |
0fe8c138 | 1061 | return 1; |
02e54220 PH |
1062 | } |
1063 | ||
1064 | if (!prefixcmp(arg, "--max-count=")) { | |
1065 | revs->max_count = atoi(arg + 12); | |
1066 | } else if (!prefixcmp(arg, "--skip=")) { | |
1067 | revs->skip_count = atoi(arg + 7); | |
1068 | } else if ((*arg == '-') && isdigit(arg[1])) { | |
1069 | /* accept -<digit>, like traditional "head" */ | |
1070 | revs->max_count = atoi(arg + 1); | |
1071 | } else if (!strcmp(arg, "-n")) { | |
1072 | if (argc <= 1) | |
1073 | return error("-n requires an argument"); | |
1074 | revs->max_count = atoi(argv[1]); | |
1075 | return 2; | |
1076 | } else if (!prefixcmp(arg, "-n")) { | |
1077 | revs->max_count = atoi(arg + 2); | |
1078 | } else if (!prefixcmp(arg, "--max-age=")) { | |
1079 | revs->max_age = atoi(arg + 10); | |
1080 | } else if (!prefixcmp(arg, "--since=")) { | |
1081 | revs->max_age = approxidate(arg + 8); | |
1082 | } else if (!prefixcmp(arg, "--after=")) { | |
1083 | revs->max_age = approxidate(arg + 8); | |
1084 | } else if (!prefixcmp(arg, "--min-age=")) { | |
1085 | revs->min_age = atoi(arg + 10); | |
1086 | } else if (!prefixcmp(arg, "--before=")) { | |
1087 | revs->min_age = approxidate(arg + 9); | |
1088 | } else if (!prefixcmp(arg, "--until=")) { | |
1089 | revs->min_age = approxidate(arg + 8); | |
1090 | } else if (!strcmp(arg, "--first-parent")) { | |
1091 | revs->first_parent_only = 1; | |
1092 | } else if (!strcmp(arg, "-g") || !strcmp(arg, "--walk-reflogs")) { | |
1093 | init_reflog_walk(&revs->reflog_info); | |
1094 | } else if (!strcmp(arg, "--default")) { | |
1095 | if (argc <= 1) | |
1096 | return error("bad --default argument"); | |
1097 | revs->def = argv[1]; | |
1098 | return 2; | |
1099 | } else if (!strcmp(arg, "--merge")) { | |
1100 | revs->show_merge = 1; | |
1101 | } else if (!strcmp(arg, "--topo-order")) { | |
1102 | revs->lifo = 1; | |
1103 | revs->topo_order = 1; | |
6546b593 JH |
1104 | } else if (!strcmp(arg, "--simplify-merges")) { |
1105 | revs->simplify_merges = 1; | |
1106 | revs->rewrite_parents = 1; | |
1107 | revs->simplify_history = 0; | |
1108 | revs->limited = 1; | |
78892e32 LT |
1109 | } else if (!strcmp(arg, "--simplify-by-decoration")) { |
1110 | revs->simplify_merges = 1; | |
1111 | revs->rewrite_parents = 1; | |
1112 | revs->simplify_history = 0; | |
1113 | revs->simplify_by_decoration = 1; | |
1114 | revs->limited = 1; | |
1115 | revs->prune = 1; | |
33e7018c | 1116 | load_ref_decorations(DECORATE_SHORT_REFS); |
02e54220 PH |
1117 | } else if (!strcmp(arg, "--date-order")) { |
1118 | revs->lifo = 0; | |
1119 | revs->topo_order = 1; | |
1120 | } else if (!prefixcmp(arg, "--early-output")) { | |
1121 | int count = 100; | |
1122 | switch (arg[14]) { | |
1123 | case '=': | |
1124 | count = atoi(arg+15); | |
1125 | /* Fallthrough */ | |
1126 | case 0: | |
1127 | revs->topo_order = 1; | |
1128 | revs->early_output = count; | |
1129 | } | |
1130 | } else if (!strcmp(arg, "--parents")) { | |
1131 | revs->rewrite_parents = 1; | |
1132 | revs->print_parents = 1; | |
1133 | } else if (!strcmp(arg, "--dense")) { | |
1134 | revs->dense = 1; | |
1135 | } else if (!strcmp(arg, "--sparse")) { | |
1136 | revs->dense = 0; | |
1137 | } else if (!strcmp(arg, "--show-all")) { | |
1138 | revs->show_all = 1; | |
1139 | } else if (!strcmp(arg, "--remove-empty")) { | |
1140 | revs->remove_empty_trees = 1; | |
b8e8db28 LT |
1141 | } else if (!strcmp(arg, "--merges")) { |
1142 | revs->merges_only = 1; | |
02e54220 PH |
1143 | } else if (!strcmp(arg, "--no-merges")) { |
1144 | revs->no_merges = 1; | |
1145 | } else if (!strcmp(arg, "--boundary")) { | |
1146 | revs->boundary = 1; | |
1147 | } else if (!strcmp(arg, "--left-right")) { | |
1148 | revs->left_right = 1; | |
1149 | } else if (!strcmp(arg, "--cherry-pick")) { | |
1150 | revs->cherry_pick = 1; | |
1151 | revs->limited = 1; | |
1152 | } else if (!strcmp(arg, "--objects")) { | |
1153 | revs->tag_objects = 1; | |
1154 | revs->tree_objects = 1; | |
1155 | revs->blob_objects = 1; | |
1156 | } else if (!strcmp(arg, "--objects-edge")) { | |
1157 | revs->tag_objects = 1; | |
1158 | revs->tree_objects = 1; | |
1159 | revs->blob_objects = 1; | |
1160 | revs->edge_hint = 1; | |
1161 | } else if (!strcmp(arg, "--unpacked")) { | |
1162 | revs->unpacked = 1; | |
03a9683d JH |
1163 | } else if (!prefixcmp(arg, "--unpacked=")) { |
1164 | die("--unpacked=<packfile> no longer supported."); | |
02e54220 PH |
1165 | } else if (!strcmp(arg, "-r")) { |
1166 | revs->diff = 1; | |
1167 | DIFF_OPT_SET(&revs->diffopt, RECURSIVE); | |
1168 | } else if (!strcmp(arg, "-t")) { | |
1169 | revs->diff = 1; | |
1170 | DIFF_OPT_SET(&revs->diffopt, RECURSIVE); | |
1171 | DIFF_OPT_SET(&revs->diffopt, TREE_IN_RECURSIVE); | |
1172 | } else if (!strcmp(arg, "-m")) { | |
1173 | revs->ignore_merges = 0; | |
1174 | } else if (!strcmp(arg, "-c")) { | |
1175 | revs->diff = 1; | |
1176 | revs->dense_combined_merges = 0; | |
1177 | revs->combine_merges = 1; | |
1178 | } else if (!strcmp(arg, "--cc")) { | |
1179 | revs->diff = 1; | |
1180 | revs->dense_combined_merges = 1; | |
1181 | revs->combine_merges = 1; | |
1182 | } else if (!strcmp(arg, "-v")) { | |
1183 | revs->verbose_header = 1; | |
1184 | } else if (!strcmp(arg, "--pretty")) { | |
1185 | revs->verbose_header = 1; | |
66b2ed09 | 1186 | revs->pretty_given = 1; |
02e54220 | 1187 | get_commit_format(arg+8, revs); |
3a4c1a5e | 1188 | } else if (!prefixcmp(arg, "--pretty=") || !prefixcmp(arg, "--format=")) { |
02e54220 | 1189 | revs->verbose_header = 1; |
66b2ed09 | 1190 | revs->pretty_given = 1; |
02e54220 | 1191 | get_commit_format(arg+9, revs); |
66b2ed09 JH |
1192 | } else if (!strcmp(arg, "--show-notes")) { |
1193 | revs->show_notes = 1; | |
1194 | revs->show_notes_given = 1; | |
894a9d33 TR |
1195 | } else if (!prefixcmp(arg, "--show-notes=")) { |
1196 | struct strbuf buf = STRBUF_INIT; | |
1197 | revs->show_notes = 1; | |
1198 | revs->show_notes_given = 1; | |
1199 | if (!revs->notes_opt.extra_notes_refs) | |
1200 | revs->notes_opt.extra_notes_refs = xcalloc(1, sizeof(struct string_list)); | |
1201 | if (!prefixcmp(arg+13, "refs/")) | |
1202 | /* happy */; | |
1203 | else if (!prefixcmp(arg+13, "notes/")) | |
1204 | strbuf_addstr(&buf, "refs/"); | |
1205 | else | |
1206 | strbuf_addstr(&buf, "refs/notes/"); | |
1207 | strbuf_addstr(&buf, arg+13); | |
1208 | string_list_append(strbuf_detach(&buf, NULL), | |
1209 | revs->notes_opt.extra_notes_refs); | |
66b2ed09 JH |
1210 | } else if (!strcmp(arg, "--no-notes")) { |
1211 | revs->show_notes = 0; | |
1212 | revs->show_notes_given = 1; | |
894a9d33 TR |
1213 | } else if (!strcmp(arg, "--standard-notes")) { |
1214 | revs->show_notes_given = 1; | |
1215 | revs->notes_opt.suppress_default_notes = 0; | |
1216 | } else if (!strcmp(arg, "--no-standard-notes")) { | |
1217 | revs->notes_opt.suppress_default_notes = 1; | |
de84accc NS |
1218 | } else if (!strcmp(arg, "--oneline")) { |
1219 | revs->verbose_header = 1; | |
1220 | get_commit_format("oneline", revs); | |
7dccadf3 | 1221 | revs->pretty_given = 1; |
de84accc | 1222 | revs->abbrev_commit = 1; |
02e54220 PH |
1223 | } else if (!strcmp(arg, "--graph")) { |
1224 | revs->topo_order = 1; | |
1225 | revs->rewrite_parents = 1; | |
1226 | revs->graph = graph_init(revs); | |
1227 | } else if (!strcmp(arg, "--root")) { | |
1228 | revs->show_root_diff = 1; | |
1229 | } else if (!strcmp(arg, "--no-commit-id")) { | |
1230 | revs->no_commit_id = 1; | |
1231 | } else if (!strcmp(arg, "--always")) { | |
1232 | revs->always_show_header = 1; | |
1233 | } else if (!strcmp(arg, "--no-abbrev")) { | |
1234 | revs->abbrev = 0; | |
1235 | } else if (!strcmp(arg, "--abbrev")) { | |
1236 | revs->abbrev = DEFAULT_ABBREV; | |
1237 | } else if (!prefixcmp(arg, "--abbrev=")) { | |
1238 | revs->abbrev = strtoul(arg + 9, NULL, 10); | |
1239 | if (revs->abbrev < MINIMUM_ABBREV) | |
1240 | revs->abbrev = MINIMUM_ABBREV; | |
1241 | else if (revs->abbrev > 40) | |
1242 | revs->abbrev = 40; | |
1243 | } else if (!strcmp(arg, "--abbrev-commit")) { | |
1244 | revs->abbrev_commit = 1; | |
1245 | } else if (!strcmp(arg, "--full-diff")) { | |
1246 | revs->diff = 1; | |
1247 | revs->full_diff = 1; | |
1248 | } else if (!strcmp(arg, "--full-history")) { | |
1249 | revs->simplify_history = 0; | |
1250 | } else if (!strcmp(arg, "--relative-date")) { | |
1251 | revs->date_mode = DATE_RELATIVE; | |
f4ea32f0 | 1252 | revs->date_mode_explicit = 1; |
02e54220 PH |
1253 | } else if (!strncmp(arg, "--date=", 7)) { |
1254 | revs->date_mode = parse_date_format(arg + 7); | |
f4ea32f0 | 1255 | revs->date_mode_explicit = 1; |
02e54220 PH |
1256 | } else if (!strcmp(arg, "--log-size")) { |
1257 | revs->show_log_size = 1; | |
1258 | } | |
1259 | /* | |
1260 | * Grepping the commit log | |
1261 | */ | |
1262 | else if (!prefixcmp(arg, "--author=")) { | |
a4d7d2c6 | 1263 | add_header_grep(revs, GREP_HEADER_AUTHOR, arg+9); |
02e54220 | 1264 | } else if (!prefixcmp(arg, "--committer=")) { |
a4d7d2c6 | 1265 | add_header_grep(revs, GREP_HEADER_COMMITTER, arg+12); |
02e54220 PH |
1266 | } else if (!prefixcmp(arg, "--grep=")) { |
1267 | add_message_grep(revs, arg+7); | |
1268 | } else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) { | |
0843acfd | 1269 | revs->grep_filter.regflags |= REG_EXTENDED; |
02e54220 | 1270 | } else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) { |
0843acfd | 1271 | revs->grep_filter.regflags |= REG_ICASE; |
02e54220 | 1272 | } else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) { |
0843acfd | 1273 | revs->grep_filter.fixed = 1; |
02e54220 | 1274 | } else if (!strcmp(arg, "--all-match")) { |
0843acfd | 1275 | revs->grep_filter.all_match = 1; |
02e54220 PH |
1276 | } else if (!prefixcmp(arg, "--encoding=")) { |
1277 | arg += 11; | |
1278 | if (strcmp(arg, "none")) | |
1279 | git_log_output_encoding = xstrdup(arg); | |
1280 | else | |
1281 | git_log_output_encoding = ""; | |
1282 | } else if (!strcmp(arg, "--reverse")) { | |
1283 | revs->reverse ^= 1; | |
1284 | } else if (!strcmp(arg, "--children")) { | |
1285 | revs->children.name = "children"; | |
1286 | revs->limited = 1; | |
1287 | } else { | |
1288 | int opts = diff_opt_parse(&revs->diffopt, argv, argc); | |
1289 | if (!opts) | |
1290 | unkv[(*unkc)++] = arg; | |
1291 | return opts; | |
1292 | } | |
1293 | ||
1294 | return 1; | |
1295 | } | |
1296 | ||
6b61ec05 PH |
1297 | void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx, |
1298 | const struct option *options, | |
1299 | const char * const usagestr[]) | |
1300 | { | |
1301 | int n = handle_revision_opt(revs, ctx->argc, ctx->argv, | |
1302 | &ctx->cpidx, ctx->out); | |
1303 | if (n <= 0) { | |
1304 | error("unknown option `%s'", ctx->argv[0]); | |
1305 | usage_with_options(usagestr, options); | |
1306 | } | |
1307 | ctx->argv += n; | |
1308 | ctx->argc -= n; | |
1309 | } | |
1310 | ||
ad3f9a71 LT |
1311 | static int for_each_bad_bisect_ref(each_ref_fn fn, void *cb_data) |
1312 | { | |
1313 | return for_each_ref_in("refs/bisect/bad", fn, cb_data); | |
1314 | } | |
1315 | ||
1316 | static int for_each_good_bisect_ref(each_ref_fn fn, void *cb_data) | |
1317 | { | |
1318 | return for_each_ref_in("refs/bisect/good", fn, cb_data); | |
1319 | } | |
1320 | ||
60da8b15 JH |
1321 | static void append_prune_data(const char ***prune_data, const char **av) |
1322 | { | |
1323 | const char **prune = *prune_data; | |
1324 | int prune_nr; | |
1325 | int prune_alloc; | |
1326 | ||
1327 | if (!prune) { | |
1328 | *prune_data = av; | |
1329 | return; | |
1330 | } | |
1331 | ||
1332 | /* count existing ones */ | |
1333 | for (prune_nr = 0; prune[prune_nr]; prune_nr++) | |
1334 | ; | |
1335 | prune_alloc = prune_nr; /* not really, but we do not know */ | |
1336 | ||
1337 | while (*av) { | |
1338 | ALLOC_GROW(prune, prune_nr+1, prune_alloc); | |
1339 | prune[prune_nr++] = *av; | |
1340 | av++; | |
1341 | } | |
1342 | if (prune) { | |
1343 | ALLOC_GROW(prune, prune_nr+1, prune_alloc); | |
1344 | prune[prune_nr] = NULL; | |
1345 | } | |
1346 | *prune_data = prune; | |
1347 | } | |
1348 | ||
ae563542 LT |
1349 | /* |
1350 | * Parse revision information, filling in the "rev_info" structure, | |
1351 | * and removing the used arguments from the argument list. | |
1352 | * | |
765ac8ec LT |
1353 | * Returns the number of arguments left that weren't recognized |
1354 | * (which are also moved to the head of the argument list) | |
ae563542 | 1355 | */ |
32962c9b | 1356 | int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *opt) |
ae563542 | 1357 | { |
8fcaca3f | 1358 | int i, flags, left, seen_dashdash, read_from_stdin, got_rev_arg = 0; |
5486ef0e | 1359 | const char **prune_data = NULL; |
ae563542 | 1360 | |
ae563542 LT |
1361 | /* First, search for "--" */ |
1362 | seen_dashdash = 0; | |
1363 | for (i = 1; i < argc; i++) { | |
1364 | const char *arg = argv[i]; | |
1365 | if (strcmp(arg, "--")) | |
1366 | continue; | |
1367 | argv[i] = NULL; | |
1368 | argc = i; | |
a65f2005 | 1369 | if (argv[i + 1]) |
5486ef0e | 1370 | prune_data = argv + i + 1; |
ae563542 LT |
1371 | seen_dashdash = 1; |
1372 | break; | |
1373 | } | |
1374 | ||
02e54220 PH |
1375 | /* Second, deal with arguments and options */ |
1376 | flags = 0; | |
8b3dce56 | 1377 | read_from_stdin = 0; |
02e54220 | 1378 | for (left = i = 1; i < argc; i++) { |
ae563542 | 1379 | const char *arg = argv[i]; |
ae563542 | 1380 | if (*arg == '-') { |
cd2bdc53 | 1381 | int opts; |
02e54220 | 1382 | |
ae563542 | 1383 | if (!strcmp(arg, "--all")) { |
a5aa930d | 1384 | handle_refs(revs, flags, for_each_ref); |
f0298cf1 | 1385 | handle_refs(revs, flags, head_ref); |
a5aa930d UKK |
1386 | continue; |
1387 | } | |
1388 | if (!strcmp(arg, "--branches")) { | |
1389 | handle_refs(revs, flags, for_each_branch_ref); | |
1390 | continue; | |
1391 | } | |
ad3f9a71 LT |
1392 | if (!strcmp(arg, "--bisect")) { |
1393 | handle_refs(revs, flags, for_each_bad_bisect_ref); | |
1394 | handle_refs(revs, flags ^ UNINTERESTING, for_each_good_bisect_ref); | |
1395 | revs->bisect = 1; | |
1396 | continue; | |
1397 | } | |
a5aa930d UKK |
1398 | if (!strcmp(arg, "--tags")) { |
1399 | handle_refs(revs, flags, for_each_tag_ref); | |
1400 | continue; | |
1401 | } | |
1402 | if (!strcmp(arg, "--remotes")) { | |
1403 | handle_refs(revs, flags, for_each_remote_ref); | |
ae563542 LT |
1404 | continue; |
1405 | } | |
d08bae7e IL |
1406 | if (!prefixcmp(arg, "--glob=")) { |
1407 | struct all_refs_cb cb; | |
1408 | init_all_refs_cb(&cb, revs, flags); | |
1409 | for_each_glob_ref(handle_one_ref, arg + 7, &cb); | |
1410 | continue; | |
1411 | } | |
b09fe971 IL |
1412 | if (!prefixcmp(arg, "--branches=")) { |
1413 | struct all_refs_cb cb; | |
1414 | init_all_refs_cb(&cb, revs, flags); | |
1415 | for_each_glob_ref_in(handle_one_ref, arg + 11, "refs/heads/", &cb); | |
1416 | continue; | |
1417 | } | |
1418 | if (!prefixcmp(arg, "--tags=")) { | |
1419 | struct all_refs_cb cb; | |
1420 | init_all_refs_cb(&cb, revs, flags); | |
1421 | for_each_glob_ref_in(handle_one_ref, arg + 7, "refs/tags/", &cb); | |
1422 | continue; | |
1423 | } | |
1424 | if (!prefixcmp(arg, "--remotes=")) { | |
1425 | struct all_refs_cb cb; | |
1426 | init_all_refs_cb(&cb, revs, flags); | |
1427 | for_each_glob_ref_in(handle_one_ref, arg + 10, "refs/remotes/", &cb); | |
1428 | continue; | |
1429 | } | |
63049292 JH |
1430 | if (!strcmp(arg, "--reflog")) { |
1431 | handle_reflog(revs, flags); | |
1432 | continue; | |
1433 | } | |
ae563542 LT |
1434 | if (!strcmp(arg, "--not")) { |
1435 | flags ^= UNINTERESTING; | |
1436 | continue; | |
1437 | } | |
8e64006e JS |
1438 | if (!strcmp(arg, "--no-walk")) { |
1439 | revs->no_walk = 1; | |
1440 | continue; | |
1441 | } | |
1442 | if (!strcmp(arg, "--do-walk")) { | |
1443 | revs->no_walk = 0; | |
1444 | continue; | |
1445 | } | |
8b3dce56 JH |
1446 | if (!strcmp(arg, "--stdin")) { |
1447 | if (revs->disable_stdin) { | |
1448 | argv[left++] = arg; | |
1449 | continue; | |
1450 | } | |
1451 | if (read_from_stdin++) | |
1452 | die("--stdin given twice?"); | |
60da8b15 | 1453 | read_revisions_from_stdin(revs, &prune_data); |
8b3dce56 JH |
1454 | continue; |
1455 | } | |
2d10c555 | 1456 | |
02e54220 | 1457 | opts = handle_revision_opt(revs, argc - i, argv + i, &left, argv); |
cd2bdc53 | 1458 | if (opts > 0) { |
cd2bdc53 LT |
1459 | i += opts - 1; |
1460 | continue; | |
1461 | } | |
02e54220 PH |
1462 | if (opts < 0) |
1463 | exit(128); | |
ae563542 LT |
1464 | continue; |
1465 | } | |
ae563542 | 1466 | |
5d6f0935 JH |
1467 | if (handle_revision_arg(arg, revs, flags, seen_dashdash)) { |
1468 | int j; | |
1469 | if (seen_dashdash || *arg == '^') | |
ae563542 LT |
1470 | die("bad revision '%s'", arg); |
1471 | ||
ea92f41f JH |
1472 | /* If we didn't have a "--": |
1473 | * (1) all filenames must exist; | |
1474 | * (2) all rev-args must not be interpretable | |
1475 | * as a valid filename. | |
1476 | * but the latter we have checked in the main loop. | |
1477 | */ | |
e23d0b4a LT |
1478 | for (j = i; j < argc; j++) |
1479 | verify_filename(revs->prefix, argv[j]); | |
1480 | ||
60da8b15 | 1481 | append_prune_data(&prune_data, argv + i); |
ae563542 LT |
1482 | break; |
1483 | } | |
8fcaca3f DO |
1484 | else |
1485 | got_rev_arg = 1; | |
ae563542 | 1486 | } |
5d6f0935 | 1487 | |
5486ef0e JH |
1488 | if (prune_data) |
1489 | revs->prune_data = get_pathspec(revs->prefix, prune_data); | |
1490 | ||
02e54220 | 1491 | if (revs->def == NULL) |
32962c9b | 1492 | revs->def = opt ? opt->def : NULL; |
b4490059 JH |
1493 | if (opt && opt->tweak) |
1494 | opt->tweak(revs, opt); | |
02e54220 | 1495 | if (revs->show_merge) |
ae3e5e1e | 1496 | prepare_show_merge(revs); |
8fcaca3f | 1497 | if (revs->def && !revs->pending.nr && !got_rev_arg) { |
ae563542 | 1498 | unsigned char sha1[20]; |
cd2bdc53 | 1499 | struct object *object; |
bb6c2fba | 1500 | unsigned mode; |
02e54220 PH |
1501 | if (get_sha1_with_mode(revs->def, sha1, &mode)) |
1502 | die("bad default revision '%s'", revs->def); | |
1503 | object = get_reference(revs, revs->def, sha1, 0); | |
1504 | add_pending_object_with_mode(revs, object, revs->def, mode); | |
ae563542 | 1505 | } |
8efdc326 | 1506 | |
b7bb760d LT |
1507 | /* Did the user ask for any diff output? Run the diff! */ |
1508 | if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT) | |
1509 | revs->diff = 1; | |
1510 | ||
0faf2da7 AL |
1511 | /* Pickaxe, diff-filter and rename following need diffs */ |
1512 | if (revs->diffopt.pickaxe || | |
1513 | revs->diffopt.filter || | |
1514 | DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES)) | |
b7bb760d LT |
1515 | revs->diff = 1; |
1516 | ||
9dad9d2e | 1517 | if (revs->topo_order) |
53069686 JH |
1518 | revs->limited = 1; |
1519 | ||
8efdc326 | 1520 | if (revs->prune_data) { |
cd2bdc53 | 1521 | diff_tree_setup_paths(revs->prune_data, &revs->pruning); |
750f7b66 | 1522 | /* Can't prune commits with rename following: the paths change.. */ |
8f67f8ae | 1523 | if (!DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES)) |
53b2c823 | 1524 | revs->prune = 1; |
cd2bdc53 LT |
1525 | if (!revs->full_diff) |
1526 | diff_tree_setup_paths(revs->prune_data, &revs->diffopt); | |
8efdc326 | 1527 | } |
b4490059 | 1528 | if (revs->combine_merges) |
cd2bdc53 | 1529 | revs->ignore_merges = 0; |
cd2bdc53 | 1530 | revs->diffopt.abbrev = revs->abbrev; |
72ee96c0 JH |
1531 | if (diff_setup_done(&revs->diffopt) < 0) |
1532 | die("diff_setup_done failed"); | |
8efdc326 | 1533 | |
0843acfd | 1534 | compile_grep_patterns(&revs->grep_filter); |
bd95fcd3 | 1535 | |
d56651c0 SP |
1536 | if (revs->reverse && revs->reflog_info) |
1537 | die("cannot combine --reverse with --walk-reflogs"); | |
8bb65883 | 1538 | if (revs->rewrite_parents && revs->children.name) |
f35f5603 | 1539 | die("cannot combine --parents and --children"); |
d56651c0 | 1540 | |
7fefda5c AS |
1541 | /* |
1542 | * Limitations on the graph functionality | |
1543 | */ | |
1544 | if (revs->reverse && revs->graph) | |
1545 | die("cannot combine --reverse with --graph"); | |
1546 | ||
1547 | if (revs->reflog_info && revs->graph) | |
1548 | die("cannot combine --walk-reflogs with --graph"); | |
1549 | ||
ae563542 LT |
1550 | return left; |
1551 | } | |
a4a88b2b | 1552 | |
f35f5603 JH |
1553 | static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child) |
1554 | { | |
1555 | struct commit_list *l = xcalloc(1, sizeof(*l)); | |
1556 | ||
1557 | l->item = child; | |
1558 | l->next = add_decoration(&revs->children, &parent->object, l); | |
1559 | } | |
1560 | ||
6546b593 JH |
1561 | static int remove_duplicate_parents(struct commit *commit) |
1562 | { | |
1563 | struct commit_list **pp, *p; | |
1564 | int surviving_parents; | |
1565 | ||
1566 | /* Examine existing parents while marking ones we have seen... */ | |
1567 | pp = &commit->parents; | |
1568 | while ((p = *pp) != NULL) { | |
1569 | struct commit *parent = p->item; | |
1570 | if (parent->object.flags & TMP_MARK) { | |
1571 | *pp = p->next; | |
1572 | continue; | |
1573 | } | |
1574 | parent->object.flags |= TMP_MARK; | |
1575 | pp = &p->next; | |
1576 | } | |
1577 | /* count them while clearing the temporary mark */ | |
1578 | surviving_parents = 0; | |
1579 | for (p = commit->parents; p; p = p->next) { | |
1580 | p->item->object.flags &= ~TMP_MARK; | |
1581 | surviving_parents++; | |
1582 | } | |
1583 | return surviving_parents; | |
1584 | } | |
1585 | ||
faf0156b JH |
1586 | struct merge_simplify_state { |
1587 | struct commit *simplified; | |
1588 | }; | |
1589 | ||
1590 | static struct merge_simplify_state *locate_simplify_state(struct rev_info *revs, struct commit *commit) | |
1591 | { | |
1592 | struct merge_simplify_state *st; | |
1593 | ||
1594 | st = lookup_decoration(&revs->merge_simplification, &commit->object); | |
1595 | if (!st) { | |
1596 | st = xcalloc(1, sizeof(*st)); | |
1597 | add_decoration(&revs->merge_simplification, &commit->object, st); | |
1598 | } | |
1599 | return st; | |
1600 | } | |
1601 | ||
1602 | static struct commit_list **simplify_one(struct rev_info *revs, struct commit *commit, struct commit_list **tail) | |
6546b593 JH |
1603 | { |
1604 | struct commit_list *p; | |
faf0156b | 1605 | struct merge_simplify_state *st, *pst; |
6546b593 JH |
1606 | int cnt; |
1607 | ||
faf0156b JH |
1608 | st = locate_simplify_state(revs, commit); |
1609 | ||
6546b593 | 1610 | /* |
6546b593 JH |
1611 | * Have we handled this one? |
1612 | */ | |
faf0156b | 1613 | if (st->simplified) |
6546b593 JH |
1614 | return tail; |
1615 | ||
1616 | /* | |
1617 | * An UNINTERESTING commit simplifies to itself, so does a | |
1618 | * root commit. We do not rewrite parents of such commit | |
1619 | * anyway. | |
1620 | */ | |
1621 | if ((commit->object.flags & UNINTERESTING) || !commit->parents) { | |
faf0156b | 1622 | st->simplified = commit; |
6546b593 JH |
1623 | return tail; |
1624 | } | |
1625 | ||
1626 | /* | |
1627 | * Do we know what commit all of our parents should be rewritten to? | |
1628 | * Otherwise we are not ready to rewrite this one yet. | |
1629 | */ | |
1630 | for (cnt = 0, p = commit->parents; p; p = p->next) { | |
faf0156b JH |
1631 | pst = locate_simplify_state(revs, p->item); |
1632 | if (!pst->simplified) { | |
6546b593 JH |
1633 | tail = &commit_list_insert(p->item, tail)->next; |
1634 | cnt++; | |
1635 | } | |
1636 | } | |
53030f8d JH |
1637 | if (cnt) { |
1638 | tail = &commit_list_insert(commit, tail)->next; | |
6546b593 | 1639 | return tail; |
53030f8d | 1640 | } |
6546b593 JH |
1641 | |
1642 | /* | |
1643 | * Rewrite our list of parents. | |
1644 | */ | |
faf0156b JH |
1645 | for (p = commit->parents; p; p = p->next) { |
1646 | pst = locate_simplify_state(revs, p->item); | |
1647 | p->item = pst->simplified; | |
1648 | } | |
6546b593 JH |
1649 | cnt = remove_duplicate_parents(commit); |
1650 | ||
1651 | /* | |
1652 | * It is possible that we are a merge and one side branch | |
1653 | * does not have any commit that touches the given paths; | |
1654 | * in such a case, the immediate parents will be rewritten | |
1655 | * to different commits. | |
1656 | * | |
1657 | * o----X X: the commit we are looking at; | |
1658 | * / / o: a commit that touches the paths; | |
1659 | * ---o----' | |
1660 | * | |
1661 | * Further reduce the parents by removing redundant parents. | |
1662 | */ | |
1663 | if (1 < cnt) { | |
1664 | struct commit_list *h = reduce_heads(commit->parents); | |
1665 | cnt = commit_list_count(h); | |
1666 | free_commit_list(commit->parents); | |
1667 | commit->parents = h; | |
1668 | } | |
1669 | ||
1670 | /* | |
1671 | * A commit simplifies to itself if it is a root, if it is | |
1672 | * UNINTERESTING, if it touches the given paths, or if it is a | |
1673 | * merge and its parents simplifies to more than one commits | |
1674 | * (the first two cases are already handled at the beginning of | |
1675 | * this function). | |
1676 | * | |
1677 | * Otherwise, it simplifies to what its sole parent simplifies to. | |
1678 | */ | |
1679 | if (!cnt || | |
1680 | (commit->object.flags & UNINTERESTING) || | |
1681 | !(commit->object.flags & TREESAME) || | |
1682 | (1 < cnt)) | |
faf0156b JH |
1683 | st->simplified = commit; |
1684 | else { | |
1685 | pst = locate_simplify_state(revs, commit->parents->item); | |
1686 | st->simplified = pst->simplified; | |
1687 | } | |
6546b593 JH |
1688 | return tail; |
1689 | } | |
1690 | ||
1691 | static void simplify_merges(struct rev_info *revs) | |
1692 | { | |
1693 | struct commit_list *list; | |
1694 | struct commit_list *yet_to_do, **tail; | |
1695 | ||
5eac739e JH |
1696 | if (!revs->topo_order) |
1697 | sort_in_topological_order(&revs->commits, revs->lifo); | |
1698 | if (!revs->prune) | |
1699 | return; | |
65347030 | 1700 | |
6546b593 JH |
1701 | /* feed the list reversed */ |
1702 | yet_to_do = NULL; | |
1703 | for (list = revs->commits; list; list = list->next) | |
1704 | commit_list_insert(list->item, &yet_to_do); | |
1705 | while (yet_to_do) { | |
1706 | list = yet_to_do; | |
1707 | yet_to_do = NULL; | |
1708 | tail = &yet_to_do; | |
1709 | while (list) { | |
1710 | struct commit *commit = list->item; | |
1711 | struct commit_list *next = list->next; | |
1712 | free(list); | |
1713 | list = next; | |
faf0156b | 1714 | tail = simplify_one(revs, commit, tail); |
6546b593 JH |
1715 | } |
1716 | } | |
1717 | ||
1718 | /* clean up the result, removing the simplified ones */ | |
1719 | list = revs->commits; | |
1720 | revs->commits = NULL; | |
1721 | tail = &revs->commits; | |
1722 | while (list) { | |
1723 | struct commit *commit = list->item; | |
1724 | struct commit_list *next = list->next; | |
faf0156b | 1725 | struct merge_simplify_state *st; |
6546b593 JH |
1726 | free(list); |
1727 | list = next; | |
faf0156b JH |
1728 | st = locate_simplify_state(revs, commit); |
1729 | if (st->simplified == commit) | |
6546b593 JH |
1730 | tail = &commit_list_insert(commit, tail)->next; |
1731 | } | |
6546b593 JH |
1732 | } |
1733 | ||
f35f5603 JH |
1734 | static void set_children(struct rev_info *revs) |
1735 | { | |
1736 | struct commit_list *l; | |
1737 | for (l = revs->commits; l; l = l->next) { | |
1738 | struct commit *commit = l->item; | |
1739 | struct commit_list *p; | |
1740 | ||
1741 | for (p = commit->parents; p; p = p->next) | |
1742 | add_child(revs, p->item, commit); | |
1743 | } | |
1744 | } | |
1745 | ||
cc0e6c5a | 1746 | int prepare_revision_walk(struct rev_info *revs) |
a4a88b2b | 1747 | { |
1f1e895f | 1748 | int nr = revs->pending.nr; |
94d23673 | 1749 | struct object_array_entry *e, *list; |
cd2bdc53 | 1750 | |
94d23673 | 1751 | e = list = revs->pending.objects; |
1f1e895f LT |
1752 | revs->pending.nr = 0; |
1753 | revs->pending.alloc = 0; | |
1754 | revs->pending.objects = NULL; | |
1755 | while (--nr >= 0) { | |
94d23673 | 1756 | struct commit *commit = handle_commit(revs, e->item, e->name); |
cd2bdc53 LT |
1757 | if (commit) { |
1758 | if (!(commit->object.flags & SEEN)) { | |
1759 | commit->object.flags |= SEEN; | |
1760 | insert_by_date(commit, &revs->commits); | |
1761 | } | |
1762 | } | |
94d23673 | 1763 | e++; |
cd2bdc53 | 1764 | } |
94d23673 | 1765 | free(list); |
cd2bdc53 | 1766 | |
ba1d4505 | 1767 | if (revs->no_walk) |
cc0e6c5a | 1768 | return 0; |
a4a88b2b | 1769 | if (revs->limited) |
cc0e6c5a AR |
1770 | if (limit_list(revs) < 0) |
1771 | return -1; | |
a4a88b2b | 1772 | if (revs->topo_order) |
23c17d4a | 1773 | sort_in_topological_order(&revs->commits, revs->lifo); |
6546b593 JH |
1774 | if (revs->simplify_merges) |
1775 | simplify_merges(revs); | |
f35f5603 JH |
1776 | if (revs->children.name) |
1777 | set_children(revs); | |
cc0e6c5a | 1778 | return 0; |
a4a88b2b LT |
1779 | } |
1780 | ||
cc0e6c5a AR |
1781 | enum rewrite_result { |
1782 | rewrite_one_ok, | |
1783 | rewrite_one_noparents, | |
1784 | rewrite_one_error, | |
1785 | }; | |
1786 | ||
1787 | static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp) | |
765ac8ec | 1788 | { |
fce87ae5 AG |
1789 | struct commit_list *cache = NULL; |
1790 | ||
765ac8ec LT |
1791 | for (;;) { |
1792 | struct commit *p = *pp; | |
3381c790 | 1793 | if (!revs->limited) |
fce87ae5 | 1794 | if (add_parents_to_list(revs, p, &revs->commits, &cache) < 0) |
cc0e6c5a | 1795 | return rewrite_one_error; |
6631c736 | 1796 | if (p->parents && p->parents->next) |
cc0e6c5a | 1797 | return rewrite_one_ok; |
7dc0fe3b LT |
1798 | if (p->object.flags & UNINTERESTING) |
1799 | return rewrite_one_ok; | |
1800 | if (!(p->object.flags & TREESAME)) | |
cc0e6c5a | 1801 | return rewrite_one_ok; |
765ac8ec | 1802 | if (!p->parents) |
cc0e6c5a | 1803 | return rewrite_one_noparents; |
765ac8ec LT |
1804 | *pp = p->parents->item; |
1805 | } | |
1806 | } | |
1807 | ||
cc0e6c5a | 1808 | static int rewrite_parents(struct rev_info *revs, struct commit *commit) |
765ac8ec LT |
1809 | { |
1810 | struct commit_list **pp = &commit->parents; | |
1811 | while (*pp) { | |
1812 | struct commit_list *parent = *pp; | |
cc0e6c5a AR |
1813 | switch (rewrite_one(revs, &parent->item)) { |
1814 | case rewrite_one_ok: | |
1815 | break; | |
1816 | case rewrite_one_noparents: | |
765ac8ec LT |
1817 | *pp = parent->next; |
1818 | continue; | |
cc0e6c5a AR |
1819 | case rewrite_one_error: |
1820 | return -1; | |
765ac8ec LT |
1821 | } |
1822 | pp = &parent->next; | |
1823 | } | |
11d65967 | 1824 | remove_duplicate_parents(commit); |
cc0e6c5a | 1825 | return 0; |
765ac8ec LT |
1826 | } |
1827 | ||
8ecae9b0 JH |
1828 | static int commit_match(struct commit *commit, struct rev_info *opt) |
1829 | { | |
80235ba7 | 1830 | if (!opt->grep_filter.pattern_list && !opt->grep_filter.header_list) |
8ecae9b0 | 1831 | return 1; |
0843acfd | 1832 | return grep_buffer(&opt->grep_filter, |
2d10c555 JH |
1833 | NULL, /* we say nothing, not even filename */ |
1834 | commit->buffer, strlen(commit->buffer)); | |
8ecae9b0 JH |
1835 | } |
1836 | ||
f35f5603 JH |
1837 | static inline int want_ancestry(struct rev_info *revs) |
1838 | { | |
8bb65883 | 1839 | return (revs->rewrite_parents || revs->children.name); |
f35f5603 JH |
1840 | } |
1841 | ||
beb5af43 | 1842 | enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit) |
252a7c02 LT |
1843 | { |
1844 | if (commit->object.flags & SHOWN) | |
1845 | return commit_ignore; | |
4d6acb70 | 1846 | if (revs->unpacked && has_sha1_pack(commit->object.sha1)) |
252a7c02 | 1847 | return commit_ignore; |
3131b713 LT |
1848 | if (revs->show_all) |
1849 | return commit_show; | |
252a7c02 LT |
1850 | if (commit->object.flags & UNINTERESTING) |
1851 | return commit_ignore; | |
1852 | if (revs->min_age != -1 && (commit->date > revs->min_age)) | |
1853 | return commit_ignore; | |
1854 | if (revs->no_merges && commit->parents && commit->parents->next) | |
1855 | return commit_ignore; | |
b8e8db28 LT |
1856 | if (revs->merges_only && !(commit->parents && commit->parents->next)) |
1857 | return commit_ignore; | |
252a7c02 LT |
1858 | if (!commit_match(commit, revs)) |
1859 | return commit_ignore; | |
53b2c823 | 1860 | if (revs->prune && revs->dense) { |
252a7c02 | 1861 | /* Commit without changes? */ |
7dc0fe3b | 1862 | if (commit->object.flags & TREESAME) { |
252a7c02 | 1863 | /* drop merges unless we want parenthood */ |
f35f5603 | 1864 | if (!want_ancestry(revs)) |
252a7c02 LT |
1865 | return commit_ignore; |
1866 | /* non-merge - always ignore it */ | |
1867 | if (!commit->parents || !commit->parents->next) | |
1868 | return commit_ignore; | |
1869 | } | |
252a7c02 LT |
1870 | } |
1871 | return commit_show; | |
1872 | } | |
1873 | ||
beb5af43 AS |
1874 | enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit) |
1875 | { | |
1876 | enum commit_action action = get_commit_action(revs, commit); | |
1877 | ||
1878 | if (action == commit_show && | |
1879 | !revs->show_all && | |
1880 | revs->prune && revs->dense && want_ancestry(revs)) { | |
1881 | if (rewrite_parents(revs, commit) < 0) | |
1882 | return commit_error; | |
1883 | } | |
1884 | return action; | |
1885 | } | |
1886 | ||
d5db6c9e | 1887 | static struct commit *get_revision_1(struct rev_info *revs) |
a4a88b2b | 1888 | { |
d5db6c9e | 1889 | if (!revs->commits) |
a4a88b2b | 1890 | return NULL; |
a4a88b2b | 1891 | |
765ac8ec | 1892 | do { |
cb115748 LT |
1893 | struct commit_list *entry = revs->commits; |
1894 | struct commit *commit = entry->item; | |
ea5ed3ab | 1895 | |
cb115748 LT |
1896 | revs->commits = entry->next; |
1897 | free(entry); | |
2a0925be | 1898 | |
8860fd42 JS |
1899 | if (revs->reflog_info) |
1900 | fake_reflog_parent(revs->reflog_info, commit); | |
1901 | ||
2a0925be LT |
1902 | /* |
1903 | * If we haven't done the list limiting, we need to look at | |
be7db6e5 LT |
1904 | * the parents here. We also need to do the date-based limiting |
1905 | * that we'd otherwise have done in limit_list(). | |
2a0925be | 1906 | */ |
be7db6e5 | 1907 | if (!revs->limited) { |
744f4985 | 1908 | if (revs->max_age != -1 && |
86ab4906 JH |
1909 | (commit->date < revs->max_age)) |
1910 | continue; | |
fce87ae5 | 1911 | if (add_parents_to_list(revs, commit, &revs->commits, NULL) < 0) |
ed62089c JH |
1912 | die("Failed to traverse parents of commit %s", |
1913 | sha1_to_hex(commit->object.sha1)); | |
be7db6e5 | 1914 | } |
744f4985 | 1915 | |
252a7c02 LT |
1916 | switch (simplify_commit(revs, commit)) { |
1917 | case commit_ignore: | |
8ecae9b0 | 1918 | continue; |
252a7c02 | 1919 | case commit_error: |
ed62089c JH |
1920 | die("Failed to simplify parents of commit %s", |
1921 | sha1_to_hex(commit->object.sha1)); | |
252a7c02 LT |
1922 | default: |
1923 | return commit; | |
384e99a4 | 1924 | } |
765ac8ec LT |
1925 | } while (revs->commits); |
1926 | return NULL; | |
1927 | } | |
d5db6c9e | 1928 | |
86ab4906 JH |
1929 | static void gc_boundary(struct object_array *array) |
1930 | { | |
1931 | unsigned nr = array->nr; | |
1932 | unsigned alloc = array->alloc; | |
1933 | struct object_array_entry *objects = array->objects; | |
1934 | ||
1935 | if (alloc <= nr) { | |
1936 | unsigned i, j; | |
1937 | for (i = j = 0; i < nr; i++) { | |
1938 | if (objects[i].item->flags & SHOWN) | |
1939 | continue; | |
1940 | if (i != j) | |
1941 | objects[j] = objects[i]; | |
1942 | j++; | |
1943 | } | |
892ae6bf | 1944 | for (i = j; i < nr; i++) |
86ab4906 JH |
1945 | objects[i].item = NULL; |
1946 | array->nr = j; | |
1947 | } | |
1948 | } | |
1949 | ||
4603ec0f AS |
1950 | static void create_boundary_commit_list(struct rev_info *revs) |
1951 | { | |
1952 | unsigned i; | |
1953 | struct commit *c; | |
1954 | struct object_array *array = &revs->boundary_commits; | |
1955 | struct object_array_entry *objects = array->objects; | |
1956 | ||
1957 | /* | |
1958 | * If revs->commits is non-NULL at this point, an error occurred in | |
1959 | * get_revision_1(). Ignore the error and continue printing the | |
1960 | * boundary commits anyway. (This is what the code has always | |
1961 | * done.) | |
1962 | */ | |
1963 | if (revs->commits) { | |
1964 | free_commit_list(revs->commits); | |
1965 | revs->commits = NULL; | |
1966 | } | |
1967 | ||
1968 | /* | |
1969 | * Put all of the actual boundary commits from revs->boundary_commits | |
1970 | * into revs->commits | |
1971 | */ | |
1972 | for (i = 0; i < array->nr; i++) { | |
1973 | c = (struct commit *)(objects[i].item); | |
1974 | if (!c) | |
1975 | continue; | |
1976 | if (!(c->object.flags & CHILD_SHOWN)) | |
1977 | continue; | |
1978 | if (c->object.flags & (SHOWN | BOUNDARY)) | |
1979 | continue; | |
1980 | c->object.flags |= BOUNDARY; | |
1981 | commit_list_insert(c, &revs->commits); | |
1982 | } | |
1983 | ||
1984 | /* | |
1985 | * If revs->topo_order is set, sort the boundary commits | |
1986 | * in topological order | |
1987 | */ | |
1988 | sort_in_topological_order(&revs->commits, revs->lifo); | |
1989 | } | |
1990 | ||
7fefda5c | 1991 | static struct commit *get_revision_internal(struct rev_info *revs) |
d5db6c9e JH |
1992 | { |
1993 | struct commit *c = NULL; | |
86ab4906 JH |
1994 | struct commit_list *l; |
1995 | ||
1996 | if (revs->boundary == 2) { | |
4603ec0f AS |
1997 | /* |
1998 | * All of the normal commits have already been returned, | |
1999 | * and we are now returning boundary commits. | |
2000 | * create_boundary_commit_list() has populated | |
2001 | * revs->commits with the remaining commits to return. | |
2002 | */ | |
2003 | c = pop_commit(&revs->commits); | |
2004 | if (c) | |
2005 | c->object.flags |= SHOWN; | |
9c5e66e9 JS |
2006 | return c; |
2007 | } | |
2008 | ||
86ab4906 JH |
2009 | /* |
2010 | * Now pick up what they want to give us | |
2011 | */ | |
8839ac94 JH |
2012 | c = get_revision_1(revs); |
2013 | if (c) { | |
2014 | while (0 < revs->skip_count) { | |
2015 | revs->skip_count--; | |
2016 | c = get_revision_1(revs); | |
2017 | if (!c) | |
2018 | break; | |
2019 | } | |
86ab4906 JH |
2020 | } |
2021 | ||
2022 | /* | |
2023 | * Check the max_count. | |
2024 | */ | |
d5db6c9e JH |
2025 | switch (revs->max_count) { |
2026 | case -1: | |
2027 | break; | |
2028 | case 0: | |
86ab4906 JH |
2029 | c = NULL; |
2030 | break; | |
d5db6c9e JH |
2031 | default: |
2032 | revs->max_count--; | |
2033 | } | |
86ab4906 | 2034 | |
c33d8593 JH |
2035 | if (c) |
2036 | c->object.flags |= SHOWN; | |
2037 | ||
2038 | if (!revs->boundary) { | |
d5db6c9e | 2039 | return c; |
c33d8593 | 2040 | } |
86ab4906 JH |
2041 | |
2042 | if (!c) { | |
2043 | /* | |
2044 | * get_revision_1() runs out the commits, and | |
2045 | * we are done computing the boundaries. | |
2046 | * switch to boundary commits output mode. | |
2047 | */ | |
2048 | revs->boundary = 2; | |
4603ec0f AS |
2049 | |
2050 | /* | |
2051 | * Update revs->commits to contain the list of | |
2052 | * boundary commits. | |
2053 | */ | |
2054 | create_boundary_commit_list(revs); | |
2055 | ||
3c68d67b | 2056 | return get_revision_internal(revs); |
86ab4906 JH |
2057 | } |
2058 | ||
2059 | /* | |
2060 | * boundary commits are the commits that are parents of the | |
2061 | * ones we got from get_revision_1() but they themselves are | |
2062 | * not returned from get_revision_1(). Before returning | |
2063 | * 'c', we need to mark its parents that they could be boundaries. | |
2064 | */ | |
2065 | ||
2066 | for (l = c->parents; l; l = l->next) { | |
2067 | struct object *p; | |
2068 | p = &(l->item->object); | |
c33d8593 | 2069 | if (p->flags & (CHILD_SHOWN | SHOWN)) |
86ab4906 JH |
2070 | continue; |
2071 | p->flags |= CHILD_SHOWN; | |
2072 | gc_boundary(&revs->boundary_commits); | |
2073 | add_object_array(p, NULL, &revs->boundary_commits); | |
2074 | } | |
2075 | ||
2076 | return c; | |
d5db6c9e | 2077 | } |
7fefda5c AS |
2078 | |
2079 | struct commit *get_revision(struct rev_info *revs) | |
2080 | { | |
498bcd31 TR |
2081 | struct commit *c; |
2082 | struct commit_list *reversed; | |
2083 | ||
2084 | if (revs->reverse) { | |
2085 | reversed = NULL; | |
2086 | while ((c = get_revision_internal(revs))) { | |
2087 | commit_list_insert(c, &reversed); | |
2088 | } | |
2089 | revs->commits = reversed; | |
2090 | revs->reverse = 0; | |
2091 | revs->reverse_output_stage = 1; | |
2092 | } | |
2093 | ||
2094 | if (revs->reverse_output_stage) | |
2095 | return pop_commit(&revs->commits); | |
2096 | ||
2097 | c = get_revision_internal(revs); | |
7fefda5c AS |
2098 | if (c && revs->graph) |
2099 | graph_update(revs->graph, c); | |
2100 | return c; | |
2101 | } |