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