Continue traversal when rev-list --unpacked finds a packed commit.
[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
JH
9#include <regex.h>
10#include "grep.h"
ae563542
LT
11
12static char *path_name(struct name_path *path, const char *name)
13{
14 struct name_path *p;
15 char *n, *m;
16 int nlen = strlen(name);
17 int len = nlen + 1;
18
19 for (p = path; p; p = p->up) {
20 if (p->elem_len)
21 len += p->elem_len + 1;
22 }
23 n = xmalloc(len);
24 m = n + len - (nlen + 1);
25 strcpy(m, name);
26 for (p = path; p; p = p->up) {
27 if (p->elem_len) {
28 m -= p->elem_len + 1;
29 memcpy(m, p->elem, p->elem_len);
30 m[p->elem_len] = '/';
31 }
32 }
33 return n;
34}
35
1f1e895f
LT
36void add_object(struct object *obj,
37 struct object_array *p,
38 struct name_path *path,
39 const char *name)
ae563542 40{
1f1e895f 41 add_object_array(obj, path_name(path, name), p);
ae563542
LT
42}
43
44static void mark_blob_uninteresting(struct blob *blob)
45{
46 if (blob->object.flags & UNINTERESTING)
47 return;
48 blob->object.flags |= UNINTERESTING;
49}
50
51void mark_tree_uninteresting(struct tree *tree)
52{
f75e53ed 53 struct tree_desc desc;
4c068a98 54 struct name_entry entry;
ae563542 55 struct object *obj = &tree->object;
ae563542
LT
56
57 if (obj->flags & UNINTERESTING)
58 return;
59 obj->flags |= UNINTERESTING;
60 if (!has_sha1_file(obj->sha1))
61 return;
62 if (parse_tree(tree) < 0)
63 die("bad tree %s", sha1_to_hex(obj->sha1));
f75e53ed
LT
64
65 desc.buf = tree->buffer;
66 desc.size = 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
82void 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
1f1e895f 117void add_pending_object(struct rev_info *revs, struct object *obj, const char *name)
ae563542 118{
1f1e895f 119 add_object_array(obj, name, &revs->pending);
ae563542
LT
120}
121
cd2bdc53 122static struct object *get_reference(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags)
ae563542
LT
123{
124 struct object *object;
125
126 object = parse_object(sha1);
127 if (!object)
128 die("bad object %s", name);
cd2bdc53
LT
129 object->flags |= flags;
130 return object;
131}
132
133static struct commit *handle_commit(struct rev_info *revs, struct object *object, const char *name)
134{
135 unsigned long flags = object->flags;
ae563542
LT
136
137 /*
138 * Tag object? Look what it points to..
139 */
1974632c 140 while (object->type == OBJ_TAG) {
ae563542 141 struct tag *tag = (struct tag *) object;
cd2bdc53 142 if (revs->tag_objects && !(flags & UNINTERESTING))
ae563542
LT
143 add_pending_object(revs, object, tag->tag);
144 object = parse_object(tag->tagged->sha1);
145 if (!object)
146 die("bad object %s", sha1_to_hex(tag->tagged->sha1));
147 }
148
149 /*
150 * Commit object? Just return it, we'll do all the complex
151 * reachability crud.
152 */
1974632c 153 if (object->type == OBJ_COMMIT) {
ae563542 154 struct commit *commit = (struct commit *)object;
ae563542
LT
155 if (parse_commit(commit) < 0)
156 die("unable to parse commit %s", name);
d9a83684 157 if (flags & UNINTERESTING) {
4262c1b0 158 commit->object.flags |= UNINTERESTING;
ae563542 159 mark_parents_uninteresting(commit);
d9a83684
LT
160 revs->limited = 1;
161 }
ae563542
LT
162 return commit;
163 }
164
165 /*
166 * Tree object? Either mark it uniniteresting, or add it
167 * to the list of objects to look at later..
168 */
1974632c 169 if (object->type == OBJ_TREE) {
ae563542
LT
170 struct tree *tree = (struct tree *)object;
171 if (!revs->tree_objects)
172 return NULL;
173 if (flags & UNINTERESTING) {
174 mark_tree_uninteresting(tree);
175 return NULL;
176 }
177 add_pending_object(revs, object, "");
178 return NULL;
179 }
180
181 /*
182 * Blob object? You know the drill by now..
183 */
1974632c 184 if (object->type == OBJ_BLOB) {
ae563542
LT
185 struct blob *blob = (struct blob *)object;
186 if (!revs->blob_objects)
187 return NULL;
188 if (flags & UNINTERESTING) {
189 mark_blob_uninteresting(blob);
190 return NULL;
191 }
192 add_pending_object(revs, object, "");
193 return NULL;
194 }
195 die("%s is unknown object", name);
196}
197
a4a88b2b
LT
198static int everybody_uninteresting(struct commit_list *orig)
199{
200 struct commit_list *list = orig;
201 while (list) {
202 struct commit *commit = list->item;
203 list = list->next;
204 if (commit->object.flags & UNINTERESTING)
205 continue;
206 return 0;
207 }
208 return 1;
209}
210
8efdc326 211static int tree_difference = REV_TREE_SAME;
a4a88b2b
LT
212
213static void file_add_remove(struct diff_options *options,
214 int addremove, unsigned mode,
215 const unsigned char *sha1,
216 const char *base, const char *path)
217{
8efdc326 218 int diff = REV_TREE_DIFFERENT;
a4a88b2b
LT
219
220 /*
8efdc326
FK
221 * Is it an add of a new file? It means that the old tree
222 * didn't have it at all, so we will turn "REV_TREE_SAME" ->
223 * "REV_TREE_NEW", but leave any "REV_TREE_DIFFERENT" alone
224 * (and if it already was "REV_TREE_NEW", we'll keep it
225 * "REV_TREE_NEW" of course).
a4a88b2b
LT
226 */
227 if (addremove == '+') {
228 diff = tree_difference;
8efdc326 229 if (diff != REV_TREE_SAME)
a4a88b2b 230 return;
8efdc326 231 diff = REV_TREE_NEW;
a4a88b2b
LT
232 }
233 tree_difference = diff;
234}
235
236static void file_change(struct diff_options *options,
237 unsigned old_mode, unsigned new_mode,
238 const unsigned char *old_sha1,
239 const unsigned char *new_sha1,
240 const char *base, const char *path)
241{
8efdc326 242 tree_difference = REV_TREE_DIFFERENT;
a4a88b2b
LT
243}
244
c4e05b1a 245int rev_compare_tree(struct rev_info *revs, struct tree *t1, struct tree *t2)
a4a88b2b
LT
246{
247 if (!t1)
8efdc326 248 return REV_TREE_NEW;
a4a88b2b 249 if (!t2)
8efdc326
FK
250 return REV_TREE_DIFFERENT;
251 tree_difference = REV_TREE_SAME;
c4e05b1a 252 if (diff_tree_sha1(t1->object.sha1, t2->object.sha1, "",
cd2bdc53 253 &revs->pruning) < 0)
8efdc326 254 return REV_TREE_DIFFERENT;
a4a88b2b
LT
255 return tree_difference;
256}
257
c4e05b1a 258int rev_same_tree_as_empty(struct rev_info *revs, struct tree *t1)
a4a88b2b
LT
259{
260 int retval;
261 void *tree;
262 struct tree_desc empty, real;
263
264 if (!t1)
265 return 0;
266
8e440259 267 tree = read_object_with_reference(t1->object.sha1, tree_type, &real.size, NULL);
a4a88b2b
LT
268 if (!tree)
269 return 0;
270 real.buf = tree;
271
272 empty.buf = "";
273 empty.size = 0;
274
275 tree_difference = 0;
cd2bdc53 276 retval = diff_tree(&empty, &real, "", &revs->pruning);
a4a88b2b
LT
277 free(tree);
278
279 return retval >= 0 && !tree_difference;
280}
281
282static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
283{
284 struct commit_list **pp, *parent;
6631c736 285 int tree_changed = 0, tree_same = 0;
a4a88b2b
LT
286
287 if (!commit->tree)
288 return;
289
290 if (!commit->parents) {
c4e05b1a 291 if (!rev_same_tree_as_empty(revs, commit->tree))
a4a88b2b
LT
292 commit->object.flags |= TREECHANGE;
293 return;
294 }
295
296 pp = &commit->parents;
297 while ((parent = *pp) != NULL) {
298 struct commit *p = parent->item;
299
a4a88b2b 300 parse_commit(p);
c4e05b1a 301 switch (rev_compare_tree(revs, p->tree, commit->tree)) {
8efdc326 302 case REV_TREE_SAME:
6631c736 303 tree_same = 1;
9202434c 304 if (!revs->simplify_history || (p->object.flags & UNINTERESTING)) {
f3219fbb
JH
305 /* Even if a merge with an uninteresting
306 * side branch brought the entire change
307 * we are interested in, we do not want
308 * to lose the other branches of this
309 * merge, so we just keep going.
310 */
311 pp = &parent->next;
312 continue;
313 }
a4a88b2b
LT
314 parent->next = NULL;
315 commit->parents = parent;
316 return;
317
8efdc326
FK
318 case REV_TREE_NEW:
319 if (revs->remove_empty_trees &&
c4e05b1a 320 rev_same_tree_as_empty(revs, p->tree)) {
c348f31a
JH
321 /* We are adding all the specified
322 * paths from this parent, so the
323 * history beyond this parent is not
324 * interesting. Remove its parents
325 * (they are grandparents for us).
326 * IOW, we pretend this parent is a
327 * "root" commit.
a41e109c 328 */
c348f31a
JH
329 parse_commit(p);
330 p->parents = NULL;
a4a88b2b
LT
331 }
332 /* fallthrough */
8efdc326 333 case REV_TREE_DIFFERENT:
f3219fbb 334 tree_changed = 1;
a4a88b2b
LT
335 pp = &parent->next;
336 continue;
337 }
338 die("bad tree compare for commit %s", sha1_to_hex(commit->object.sha1));
339 }
6631c736 340 if (tree_changed && !tree_same)
f3219fbb 341 commit->object.flags |= TREECHANGE;
a4a88b2b
LT
342}
343
344static void add_parents_to_list(struct rev_info *revs, struct commit *commit, struct commit_list **list)
345{
346 struct commit_list *parent = commit->parents;
347
3381c790
LT
348 if (commit->object.flags & ADDED)
349 return;
350 commit->object.flags |= ADDED;
351
a4a88b2b
LT
352 /*
353 * If the commit is uninteresting, don't try to
354 * prune parents - we want the maximal uninteresting
355 * set.
356 *
357 * Normally we haven't parsed the parent
358 * yet, so we won't have a parent of a parent
359 * here. However, it may turn out that we've
360 * reached this commit some other way (where it
361 * wasn't uninteresting), in which case we need
362 * to mark its parents recursively too..
363 */
364 if (commit->object.flags & UNINTERESTING) {
365 while (parent) {
366 struct commit *p = parent->item;
367 parent = parent->next;
368 parse_commit(p);
369 p->object.flags |= UNINTERESTING;
370 if (p->parents)
371 mark_parents_uninteresting(p);
372 if (p->object.flags & SEEN)
373 continue;
374 p->object.flags |= SEEN;
375 insert_by_date(p, list);
376 }
377 return;
378 }
379
380 /*
381 * Ok, the commit wasn't uninteresting. Try to
382 * simplify the commit history and find the parent
383 * that has no differences in the path set if one exists.
384 */
8efdc326
FK
385 if (revs->prune_fn)
386 revs->prune_fn(revs, commit);
a4a88b2b 387
ba1d4505
LT
388 if (revs->no_walk)
389 return;
390
a4a88b2b
LT
391 parent = commit->parents;
392 while (parent) {
393 struct commit *p = parent->item;
394
395 parent = parent->next;
396
397 parse_commit(p);
398 if (p->object.flags & SEEN)
399 continue;
400 p->object.flags |= SEEN;
401 insert_by_date(p, list);
402 }
403}
404
405static void limit_list(struct rev_info *revs)
406{
407 struct commit_list *list = revs->commits;
408 struct commit_list *newlist = NULL;
409 struct commit_list **p = &newlist;
410
411 while (list) {
412 struct commit_list *entry = list;
413 struct commit *commit = list->item;
414 struct object *obj = &commit->object;
415
416 list = list->next;
417 free(entry);
418
419 if (revs->max_age != -1 && (commit->date < revs->max_age))
420 obj->flags |= UNINTERESTING;
a4a88b2b
LT
421 add_parents_to_list(revs, commit, &list);
422 if (obj->flags & UNINTERESTING) {
423 mark_parents_uninteresting(commit);
424 if (everybody_uninteresting(list))
425 break;
426 continue;
427 }
428 if (revs->min_age != -1 && (commit->date > revs->min_age))
429 continue;
430 p = &commit_list_insert(commit, p)->next;
431 }
384e99a4 432 if (revs->boundary) {
4c0fea0f
JH
433 /* mark the ones that are on the result list first */
434 for (list = newlist; list; list = list->next) {
435 struct commit *commit = list->item;
436 commit->object.flags |= TMP_MARK;
437 }
438 for (list = newlist; list; list = list->next) {
384e99a4
JH
439 struct commit *commit = list->item;
440 struct object *obj = &commit->object;
4c0fea0f
JH
441 struct commit_list *parent;
442 if (obj->flags & UNINTERESTING)
384e99a4 443 continue;
4c0fea0f
JH
444 for (parent = commit->parents;
445 parent;
446 parent = parent->next) {
384e99a4 447 struct commit *pcommit = parent->item;
384e99a4
JH
448 if (!(pcommit->object.flags & UNINTERESTING))
449 continue;
450 pcommit->object.flags |= BOUNDARY;
4c0fea0f
JH
451 if (pcommit->object.flags & TMP_MARK)
452 continue;
453 pcommit->object.flags |= TMP_MARK;
384e99a4
JH
454 p = &commit_list_insert(pcommit, p)->next;
455 }
4c0fea0f
JH
456 }
457 for (list = newlist; list; list = list->next) {
458 struct commit *commit = list->item;
459 commit->object.flags &= ~TMP_MARK;
384e99a4
JH
460 }
461 }
a4a88b2b
LT
462 revs->commits = newlist;
463}
464
ae563542
LT
465static int all_flags;
466static struct rev_info *all_revs;
467
468static int handle_one_ref(const char *path, const unsigned char *sha1)
469{
cd2bdc53
LT
470 struct object *object = get_reference(all_revs, path, sha1, all_flags);
471 add_pending_object(all_revs, object, "");
ae563542
LT
472 return 0;
473}
474
475static void handle_all(struct rev_info *revs, unsigned flags)
476{
477 all_revs = revs;
478 all_flags = flags;
479 for_each_ref(handle_one_ref);
480}
481
ea4a19e1
JH
482static int add_parents_only(struct rev_info *revs, const char *arg, int flags)
483{
484 unsigned char sha1[20];
485 struct object *it;
486 struct commit *commit;
487 struct commit_list *parents;
488
489 if (*arg == '^') {
490 flags ^= UNINTERESTING;
491 arg++;
492 }
493 if (get_sha1(arg, sha1))
494 return 0;
495 while (1) {
496 it = get_reference(revs, arg, sha1, 0);
1974632c 497 if (it->type != OBJ_TAG)
ea4a19e1 498 break;
e702496e 499 hashcpy(sha1, ((struct tag*)it)->tagged->sha1);
ea4a19e1 500 }
1974632c 501 if (it->type != OBJ_COMMIT)
ea4a19e1
JH
502 return 0;
503 commit = (struct commit *)it;
504 for (parents = commit->parents; parents; parents = parents->next) {
505 it = &parents->item->object;
506 it->flags |= flags;
507 add_pending_object(revs, it, arg);
508 }
509 return 1;
510}
511
db6296a5 512void init_revisions(struct rev_info *revs, const char *prefix)
8efdc326
FK
513{
514 memset(revs, 0, sizeof(*revs));
8e8f9987 515
6b9c58f4 516 revs->abbrev = DEFAULT_ABBREV;
8e8f9987 517 revs->ignore_merges = 1;
9202434c 518 revs->simplify_history = 1;
cd2bdc53
LT
519 revs->pruning.recursive = 1;
520 revs->pruning.add_remove = file_add_remove;
521 revs->pruning.change = file_change;
8efdc326
FK
522 revs->lifo = 1;
523 revs->dense = 1;
db6296a5 524 revs->prefix = prefix;
8efdc326
FK
525 revs->max_age = -1;
526 revs->min_age = -1;
527 revs->max_count = -1;
528
529 revs->prune_fn = NULL;
530 revs->prune_data = NULL;
531
532 revs->topo_setter = topo_sort_default_setter;
533 revs->topo_getter = topo_sort_default_getter;
cd2bdc53 534
cd2bdc53
LT
535 revs->commit_format = CMIT_FMT_DEFAULT;
536
537 diff_setup(&revs->diffopt);
8efdc326
FK
538}
539
0d2c9d67
RS
540static void add_pending_commit_list(struct rev_info *revs,
541 struct commit_list *commit_list,
542 unsigned int flags)
543{
544 while (commit_list) {
545 struct object *object = &commit_list->item->object;
546 object->flags |= flags;
547 add_pending_object(revs, object, sha1_to_hex(object->sha1));
548 commit_list = commit_list->next;
549 }
550}
551
ae3e5e1e
JH
552static void prepare_show_merge(struct rev_info *revs)
553{
554 struct commit_list *bases;
555 struct commit *head, *other;
556 unsigned char sha1[20];
557 const char **prune = NULL;
558 int i, prune_num = 1; /* counting terminating NULL */
559
560 if (get_sha1("HEAD", sha1) || !(head = lookup_commit(sha1)))
561 die("--merge without HEAD?");
562 if (get_sha1("MERGE_HEAD", sha1) || !(other = lookup_commit(sha1)))
563 die("--merge without MERGE_HEAD?");
564 add_pending_object(revs, &head->object, "HEAD");
565 add_pending_object(revs, &other->object, "MERGE_HEAD");
566 bases = get_merge_bases(head, other, 1);
567 while (bases) {
568 struct commit *it = bases->item;
569 struct commit_list *n = bases->next;
570 free(bases);
571 bases = n;
572 it->object.flags |= UNINTERESTING;
573 add_pending_object(revs, &it->object, "(merge-base)");
574 }
575
576 if (!active_nr)
577 read_cache();
578 for (i = 0; i < active_nr; i++) {
579 struct cache_entry *ce = active_cache[i];
580 if (!ce_stage(ce))
581 continue;
582 if (ce_path_match(ce, revs->prune_data)) {
583 prune_num++;
584 prune = xrealloc(prune, sizeof(*prune) * prune_num);
585 prune[prune_num-2] = ce->name;
586 prune[prune_num-1] = NULL;
587 }
588 while ((i+1 < active_nr) &&
589 ce_same_name(ce, active_cache[i+1]))
590 i++;
591 }
592 revs->prune_data = prune;
593}
594
5d6f0935
JH
595int handle_revision_arg(const char *arg, struct rev_info *revs,
596 int flags,
597 int cant_be_filename)
598{
599 char *dotdot;
600 struct object *object;
601 unsigned char sha1[20];
602 int local_flags;
603
604 dotdot = strstr(arg, "..");
605 if (dotdot) {
606 unsigned char from_sha1[20];
607 const char *next = dotdot + 2;
608 const char *this = arg;
609 int symmetric = *next == '.';
610 unsigned int flags_exclude = flags ^ UNINTERESTING;
611
612 *dotdot = 0;
613 next += symmetric;
614
615 if (!*next)
616 next = "HEAD";
617 if (dotdot == arg)
618 this = "HEAD";
619 if (!get_sha1(this, from_sha1) &&
620 !get_sha1(next, sha1)) {
621 struct commit *a, *b;
622 struct commit_list *exclude;
623
624 a = lookup_commit_reference(from_sha1);
625 b = lookup_commit_reference(sha1);
626 if (!a || !b) {
627 die(symmetric ?
628 "Invalid symmetric difference expression %s...%s" :
629 "Invalid revision range %s..%s",
630 arg, next);
631 }
632
633 if (!cant_be_filename) {
634 *dotdot = '.';
635 verify_non_filename(revs->prefix, arg);
636 }
637
638 if (symmetric) {
639 exclude = get_merge_bases(a, b, 1);
640 add_pending_commit_list(revs, exclude,
641 flags_exclude);
642 free_commit_list(exclude);
643 a->object.flags |= flags;
644 } else
645 a->object.flags |= flags_exclude;
646 b->object.flags |= flags;
647 add_pending_object(revs, &a->object, this);
648 add_pending_object(revs, &b->object, next);
649 return 0;
650 }
651 *dotdot = '.';
652 }
653 dotdot = strstr(arg, "^@");
654 if (dotdot && !dotdot[2]) {
655 *dotdot = 0;
656 if (add_parents_only(revs, arg, flags))
657 return 0;
658 *dotdot = '^';
659 }
660 local_flags = 0;
661 if (*arg == '^') {
662 local_flags = UNINTERESTING;
663 arg++;
664 }
665 if (get_sha1(arg, sha1))
666 return -1;
667 if (!cant_be_filename)
668 verify_non_filename(revs->prefix, arg);
669 object = get_reference(revs, arg, sha1, flags ^ local_flags);
670 add_pending_object(revs, object, arg);
671 return 0;
672}
673
2d10c555 674static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
bd95fcd3 675{
2d10c555 676 if (!revs->grep_filter) {
bd95fcd3
JH
677 struct grep_opt *opt = xcalloc(1, sizeof(*opt));
678 opt->status_only = 1;
679 opt->pattern_tail = &(opt->pattern_list);
680 opt->regflags = REG_NEWLINE;
2d10c555 681 revs->grep_filter = opt;
bd95fcd3 682 }
2d10c555
JH
683 append_grep_pattern(revs->grep_filter, ptn,
684 "command line", 0, what);
685}
686
687static void add_header_grep(struct rev_info *revs, const char *field, const char *pattern)
688{
689 char *pat;
690 const char *prefix;
691 int patlen, fldlen;
bd95fcd3
JH
692
693 fldlen = strlen(field);
694 patlen = strlen(pattern);
a2ed6ae4
LT
695 pat = xmalloc(patlen + fldlen + 10);
696 prefix = ".*";
697 if (*pattern == '^') {
698 prefix = "";
699 pattern++;
700 }
701 sprintf(pat, "^%s %s%s", field, prefix, pattern);
2d10c555 702 add_grep(revs, pat, GREP_PATTERN_HEAD);
bd95fcd3
JH
703}
704
705static void add_message_grep(struct rev_info *revs, const char *pattern)
706{
2d10c555 707 add_grep(revs, pattern, GREP_PATTERN_BODY);
bd95fcd3
JH
708}
709
106d710b
JH
710static void add_ignore_packed(struct rev_info *revs, const char *name)
711{
712 int num = ++revs->num_ignore_packed;
713
714 revs->ignore_packed = xrealloc(revs->ignore_packed,
715 sizeof(const char **) * (num + 1));
716 revs->ignore_packed[num-1] = name;
717 revs->ignore_packed[num] = NULL;
718}
719
ae563542
LT
720/*
721 * Parse revision information, filling in the "rev_info" structure,
722 * and removing the used arguments from the argument list.
723 *
765ac8ec
LT
724 * Returns the number of arguments left that weren't recognized
725 * (which are also moved to the head of the argument list)
ae563542 726 */
a4a88b2b 727int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def)
ae563542 728{
ae3e5e1e 729 int i, flags, seen_dashdash, show_merge;
765ac8ec 730 const char **unrecognized = argv + 1;
ae563542
LT
731 int left = 1;
732
ae563542
LT
733 /* First, search for "--" */
734 seen_dashdash = 0;
735 for (i = 1; i < argc; i++) {
736 const char *arg = argv[i];
737 if (strcmp(arg, "--"))
738 continue;
739 argv[i] = NULL;
740 argc = i;
8efdc326 741 revs->prune_data = get_pathspec(revs->prefix, argv + i + 1);
ae563542
LT
742 seen_dashdash = 1;
743 break;
744 }
745
ae3e5e1e 746 flags = show_merge = 0;
ae563542 747 for (i = 1; i < argc; i++) {
ae563542 748 const char *arg = argv[i];
ae563542 749 if (*arg == '-') {
cd2bdc53 750 int opts;
ae563542
LT
751 if (!strncmp(arg, "--max-count=", 12)) {
752 revs->max_count = atoi(arg + 12);
753 continue;
754 }
de5f2bf3 755 /* accept -<digit>, like traditional "head" */
64bc6e3d
JH
756 if ((*arg == '-') && isdigit(arg[1])) {
757 revs->max_count = atoi(arg + 1);
758 continue;
759 }
760 if (!strcmp(arg, "-n")) {
761 if (argc <= i + 1)
762 die("-n requires an argument");
763 revs->max_count = atoi(argv[++i]);
764 continue;
765 }
766 if (!strncmp(arg,"-n",2)) {
767 revs->max_count = atoi(arg + 2);
768 continue;
769 }
ae563542
LT
770 if (!strncmp(arg, "--max-age=", 10)) {
771 revs->max_age = atoi(arg + 10);
ae563542
LT
772 continue;
773 }
fd751667
JH
774 if (!strncmp(arg, "--since=", 8)) {
775 revs->max_age = approxidate(arg + 8);
fd751667
JH
776 continue;
777 }
778 if (!strncmp(arg, "--after=", 8)) {
779 revs->max_age = approxidate(arg + 8);
53069686
JH
780 continue;
781 }
782 if (!strncmp(arg, "--min-age=", 10)) {
783 revs->min_age = atoi(arg + 10);
fd751667
JH
784 continue;
785 }
786 if (!strncmp(arg, "--before=", 9)) {
787 revs->min_age = approxidate(arg + 9);
fd751667
JH
788 continue;
789 }
790 if (!strncmp(arg, "--until=", 8)) {
791 revs->min_age = approxidate(arg + 8);
fd751667
JH
792 continue;
793 }
ae563542
LT
794 if (!strcmp(arg, "--all")) {
795 handle_all(revs, flags);
796 continue;
797 }
798 if (!strcmp(arg, "--not")) {
799 flags ^= UNINTERESTING;
800 continue;
801 }
802 if (!strcmp(arg, "--default")) {
803 if (++i >= argc)
804 die("bad --default argument");
805 def = argv[i];
806 continue;
807 }
ae3e5e1e
JH
808 if (!strcmp(arg, "--merge")) {
809 show_merge = 1;
810 continue;
811 }
ae563542
LT
812 if (!strcmp(arg, "--topo-order")) {
813 revs->topo_order = 1;
814 continue;
815 }
816 if (!strcmp(arg, "--date-order")) {
817 revs->lifo = 0;
818 revs->topo_order = 1;
819 continue;
820 }
7b0c9966
LT
821 if (!strcmp(arg, "--parents")) {
822 revs->parents = 1;
823 continue;
824 }
ae563542
LT
825 if (!strcmp(arg, "--dense")) {
826 revs->dense = 1;
827 continue;
828 }
829 if (!strcmp(arg, "--sparse")) {
830 revs->dense = 0;
831 continue;
832 }
833 if (!strcmp(arg, "--remove-empty")) {
834 revs->remove_empty_trees = 1;
835 continue;
836 }
5cdeae71 837 if (!strcmp(arg, "--no-merges")) {
765ac8ec
LT
838 revs->no_merges = 1;
839 continue;
840 }
384e99a4
JH
841 if (!strcmp(arg, "--boundary")) {
842 revs->boundary = 1;
843 continue;
844 }
ae563542
LT
845 if (!strcmp(arg, "--objects")) {
846 revs->tag_objects = 1;
847 revs->tree_objects = 1;
848 revs->blob_objects = 1;
849 continue;
850 }
851 if (!strcmp(arg, "--objects-edge")) {
852 revs->tag_objects = 1;
853 revs->tree_objects = 1;
854 revs->blob_objects = 1;
855 revs->edge_hint = 1;
856 continue;
857 }
d9a83684
LT
858 if (!strcmp(arg, "--unpacked")) {
859 revs->unpacked = 1;
106d710b
JH
860 free(revs->ignore_packed);
861 revs->ignore_packed = NULL;
862 revs->num_ignore_packed = 0;
863 continue;
864 }
865 if (!strncmp(arg, "--unpacked=", 11)) {
866 revs->unpacked = 1;
867 add_ignore_packed(revs, arg+11);
d9a83684
LT
868 continue;
869 }
cd2bdc53
LT
870 if (!strcmp(arg, "-r")) {
871 revs->diff = 1;
872 revs->diffopt.recursive = 1;
873 continue;
874 }
875 if (!strcmp(arg, "-t")) {
876 revs->diff = 1;
877 revs->diffopt.recursive = 1;
878 revs->diffopt.tree_in_recursive = 1;
879 continue;
880 }
881 if (!strcmp(arg, "-m")) {
882 revs->ignore_merges = 0;
883 continue;
884 }
885 if (!strcmp(arg, "-c")) {
886 revs->diff = 1;
0fe7c1de 887 revs->dense_combined_merges = 0;
cd2bdc53
LT
888 revs->combine_merges = 1;
889 continue;
890 }
891 if (!strcmp(arg, "--cc")) {
892 revs->diff = 1;
893 revs->dense_combined_merges = 1;
894 revs->combine_merges = 1;
895 continue;
896 }
897 if (!strcmp(arg, "-v")) {
898 revs->verbose_header = 1;
cd2bdc53
LT
899 continue;
900 }
901 if (!strncmp(arg, "--pretty", 8)) {
902 revs->verbose_header = 1;
cd2bdc53
LT
903 revs->commit_format = get_commit_format(arg+8);
904 continue;
905 }
906 if (!strcmp(arg, "--root")) {
907 revs->show_root_diff = 1;
908 continue;
909 }
910 if (!strcmp(arg, "--no-commit-id")) {
911 revs->no_commit_id = 1;
912 continue;
913 }
914 if (!strcmp(arg, "--always")) {
915 revs->always_show_header = 1;
916 continue;
917 }
918 if (!strcmp(arg, "--no-abbrev")) {
919 revs->abbrev = 0;
920 continue;
921 }
922 if (!strcmp(arg, "--abbrev")) {
923 revs->abbrev = DEFAULT_ABBREV;
924 continue;
925 }
508d9e37
LT
926 if (!strncmp(arg, "--abbrev=", 9)) {
927 revs->abbrev = strtoul(arg + 9, NULL, 10);
928 if (revs->abbrev < MINIMUM_ABBREV)
929 revs->abbrev = MINIMUM_ABBREV;
930 else if (revs->abbrev > 40)
931 revs->abbrev = 40;
932 continue;
933 }
cd2bdc53
LT
934 if (!strcmp(arg, "--abbrev-commit")) {
935 revs->abbrev_commit = 1;
936 continue;
937 }
938 if (!strcmp(arg, "--full-diff")) {
939 revs->diff = 1;
940 revs->full_diff = 1;
941 continue;
942 }
9202434c
LT
943 if (!strcmp(arg, "--full-history")) {
944 revs->simplify_history = 0;
945 continue;
946 }
3dfb9278
JF
947 if (!strcmp(arg, "--relative-date")) {
948 revs->relative_date = 1;
949 continue;
950 }
2d10c555
JH
951
952 /*
953 * Grepping the commit log
954 */
bd95fcd3
JH
955 if (!strncmp(arg, "--author=", 9)) {
956 add_header_grep(revs, "author", arg+9);
957 continue;
958 }
959 if (!strncmp(arg, "--committer=", 12)) {
960 add_header_grep(revs, "committer", arg+12);
961 continue;
962 }
963 if (!strncmp(arg, "--grep=", 7)) {
964 add_message_grep(revs, arg+7);
965 continue;
966 }
2d10c555 967
cd2bdc53
LT
968 opts = diff_opt_parse(&revs->diffopt, argv+i, argc-i);
969 if (opts > 0) {
970 revs->diff = 1;
971 i += opts - 1;
972 continue;
973 }
ae563542
LT
974 *unrecognized++ = arg;
975 left++;
976 continue;
977 }
ae563542 978
5d6f0935
JH
979 if (handle_revision_arg(arg, revs, flags, seen_dashdash)) {
980 int j;
981 if (seen_dashdash || *arg == '^')
ae563542
LT
982 die("bad revision '%s'", arg);
983
ea92f41f
JH
984 /* If we didn't have a "--":
985 * (1) all filenames must exist;
986 * (2) all rev-args must not be interpretable
987 * as a valid filename.
988 * but the latter we have checked in the main loop.
989 */
e23d0b4a
LT
990 for (j = i; j < argc; j++)
991 verify_filename(revs->prefix, argv[j]);
992
5d6f0935
JH
993 revs->prune_data = get_pathspec(revs->prefix,
994 argv + i);
ae563542
LT
995 break;
996 }
ae563542 997 }
5d6f0935 998
ae3e5e1e
JH
999 if (show_merge)
1000 prepare_show_merge(revs);
1f1e895f 1001 if (def && !revs->pending.nr) {
ae563542 1002 unsigned char sha1[20];
cd2bdc53 1003 struct object *object;
31fff305 1004 if (get_sha1(def, sha1))
ae563542 1005 die("bad default revision '%s'", def);
cd2bdc53
LT
1006 object = get_reference(revs, def, sha1, 0);
1007 add_pending_object(revs, object, def);
ae563542 1008 }
8efdc326 1009
bbbc8c3a 1010 if (revs->topo_order || revs->unpacked)
53069686
JH
1011 revs->limited = 1;
1012
8efdc326 1013 if (revs->prune_data) {
cd2bdc53 1014 diff_tree_setup_paths(revs->prune_data, &revs->pruning);
8efdc326 1015 revs->prune_fn = try_to_simplify_commit;
cd2bdc53
LT
1016 if (!revs->full_diff)
1017 diff_tree_setup_paths(revs->prune_data, &revs->diffopt);
8efdc326 1018 }
cd2bdc53
LT
1019 if (revs->combine_merges) {
1020 revs->ignore_merges = 0;
0e677e1a 1021 if (revs->dense_combined_merges && !revs->diffopt.output_format)
cd2bdc53
LT
1022 revs->diffopt.output_format = DIFF_FORMAT_PATCH;
1023 }
cd2bdc53 1024 revs->diffopt.abbrev = revs->abbrev;
72ee96c0
JH
1025 if (diff_setup_done(&revs->diffopt) < 0)
1026 die("diff_setup_done failed");
8efdc326 1027
2d10c555
JH
1028 if (revs->grep_filter)
1029 compile_grep_patterns(revs->grep_filter);
bd95fcd3 1030
ae563542
LT
1031 return left;
1032}
a4a88b2b
LT
1033
1034void prepare_revision_walk(struct rev_info *revs)
1035{
1f1e895f
LT
1036 int nr = revs->pending.nr;
1037 struct object_array_entry *list = revs->pending.objects;
cd2bdc53 1038
1f1e895f
LT
1039 revs->pending.nr = 0;
1040 revs->pending.alloc = 0;
1041 revs->pending.objects = NULL;
1042 while (--nr >= 0) {
cd2bdc53
LT
1043 struct commit *commit = handle_commit(revs, list->item, list->name);
1044 if (commit) {
1045 if (!(commit->object.flags & SEEN)) {
1046 commit->object.flags |= SEEN;
1047 insert_by_date(commit, &revs->commits);
1048 }
1049 }
1f1e895f 1050 list++;
cd2bdc53
LT
1051 }
1052
ba1d4505
LT
1053 if (revs->no_walk)
1054 return;
a4a88b2b
LT
1055 if (revs->limited)
1056 limit_list(revs);
1057 if (revs->topo_order)
8efdc326
FK
1058 sort_in_topological_order_fn(&revs->commits, revs->lifo,
1059 revs->topo_setter,
1060 revs->topo_getter);
a4a88b2b
LT
1061}
1062
3381c790 1063static int rewrite_one(struct rev_info *revs, struct commit **pp)
765ac8ec
LT
1064{
1065 for (;;) {
1066 struct commit *p = *pp;
3381c790
LT
1067 if (!revs->limited)
1068 add_parents_to_list(revs, p, &revs->commits);
6631c736
LT
1069 if (p->parents && p->parents->next)
1070 return 0;
765ac8ec
LT
1071 if (p->object.flags & (TREECHANGE | UNINTERESTING))
1072 return 0;
1073 if (!p->parents)
1074 return -1;
1075 *pp = p->parents->item;
1076 }
1077}
1078
3381c790 1079static void rewrite_parents(struct rev_info *revs, struct commit *commit)
765ac8ec
LT
1080{
1081 struct commit_list **pp = &commit->parents;
1082 while (*pp) {
1083 struct commit_list *parent = *pp;
3381c790 1084 if (rewrite_one(revs, &parent->item) < 0) {
765ac8ec
LT
1085 *pp = parent->next;
1086 continue;
1087 }
1088 pp = &parent->next;
1089 }
1090}
1091
1b65a5aa
JH
1092static void mark_boundary_to_show(struct commit *commit)
1093{
1094 struct commit_list *p = commit->parents;
1095 while (p) {
1096 commit = p->item;
1097 p = p->next;
1098 if (commit->object.flags & BOUNDARY)
1099 commit->object.flags |= BOUNDARY_SHOW;
1100 }
1101}
1102
8ecae9b0
JH
1103static int commit_match(struct commit *commit, struct rev_info *opt)
1104{
2d10c555 1105 if (!opt->grep_filter)
8ecae9b0 1106 return 1;
2d10c555
JH
1107 return grep_buffer(opt->grep_filter,
1108 NULL, /* we say nothing, not even filename */
1109 commit->buffer, strlen(commit->buffer));
8ecae9b0
JH
1110}
1111
a4a88b2b
LT
1112struct commit *get_revision(struct rev_info *revs)
1113{
765ac8ec 1114 struct commit_list *list = revs->commits;
765ac8ec
LT
1115
1116 if (!list)
a4a88b2b 1117 return NULL;
a4a88b2b 1118
765ac8ec 1119 /* Check the max_count ... */
765ac8ec
LT
1120 switch (revs->max_count) {
1121 case -1:
1122 break;
1123 case 0:
1124 return NULL;
1125 default:
1126 revs->max_count--;
1127 }
a4a88b2b 1128
765ac8ec 1129 do {
cb115748
LT
1130 struct commit_list *entry = revs->commits;
1131 struct commit *commit = entry->item;
ea5ed3ab 1132
cb115748
LT
1133 revs->commits = entry->next;
1134 free(entry);
2a0925be
LT
1135
1136 /*
1137 * If we haven't done the list limiting, we need to look at
be7db6e5
LT
1138 * the parents here. We also need to do the date-based limiting
1139 * that we'd otherwise have done in limit_list().
2a0925be 1140 */
be7db6e5 1141 if (!revs->limited) {
744f4985
JH
1142 if (revs->max_age != -1 &&
1143 (commit->date < revs->max_age))
be7db6e5 1144 continue;
2a0925be 1145 add_parents_to_list(revs, commit, &revs->commits);
be7db6e5 1146 }
384e99a4 1147 if (commit->object.flags & SHOWN)
2a0925be 1148 continue;
1b65a5aa 1149
744f4985
JH
1150 if (revs->unpacked && has_sha1_pack(commit->object.sha1,
1151 revs->ignore_packed))
1152 continue;
1153
1b65a5aa
JH
1154 /* We want to show boundary commits only when their
1155 * children are shown. When path-limiter is in effect,
1156 * rewrite_parents() drops some commits from getting shown,
1157 * and there is no point showing boundary parents that
1158 * are not shown. After rewrite_parents() rewrites the
1159 * parents of a commit that is shown, we mark the boundary
1160 * parents with BOUNDARY_SHOW.
1161 */
1162 if (commit->object.flags & BOUNDARY_SHOW) {
1163 commit->object.flags |= SHOWN;
1164 return commit;
1165 }
1166 if (commit->object.flags & UNINTERESTING)
2a0925be 1167 continue;
765ac8ec 1168 if (revs->min_age != -1 && (commit->date > revs->min_age))
2a0925be 1169 continue;
384e99a4
JH
1170 if (revs->no_merges &&
1171 commit->parents && commit->parents->next)
2a0925be 1172 continue;
8ecae9b0
JH
1173 if (!commit_match(commit, revs))
1174 continue;
8efdc326 1175 if (revs->prune_fn && revs->dense) {
6631c736
LT
1176 /* Commit without changes? */
1177 if (!(commit->object.flags & TREECHANGE)) {
1178 /* drop merges unless we want parenthood */
1179 if (!revs->parents)
1180 continue;
1181 /* non-merge - always ignore it */
02d3dca3 1182 if (!commit->parents || !commit->parents->next)
6631c736
LT
1183 continue;
1184 }
2a0925be 1185 if (revs->parents)
3381c790 1186 rewrite_parents(revs, commit);
384e99a4 1187 }
1b65a5aa
JH
1188 if (revs->boundary)
1189 mark_boundary_to_show(commit);
765ac8ec
LT
1190 commit->object.flags |= SHOWN;
1191 return commit;
1192 } while (revs->commits);
1193 return NULL;
1194}