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