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