rev-list: fix segfault with --{author,committer,grep}
[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;
106d710b
JH
421 if (revs->unpacked &&
422 has_sha1_pack(obj->sha1, revs->ignore_packed))
a4a88b2b
LT
423 obj->flags |= UNINTERESTING;
424 add_parents_to_list(revs, commit, &list);
425 if (obj->flags & UNINTERESTING) {
426 mark_parents_uninteresting(commit);
427 if (everybody_uninteresting(list))
428 break;
429 continue;
430 }
431 if (revs->min_age != -1 && (commit->date > revs->min_age))
432 continue;
433 p = &commit_list_insert(commit, p)->next;
434 }
384e99a4 435 if (revs->boundary) {
4c0fea0f
JH
436 /* mark the ones that are on the result list first */
437 for (list = newlist; list; list = list->next) {
438 struct commit *commit = list->item;
439 commit->object.flags |= TMP_MARK;
440 }
441 for (list = newlist; list; list = list->next) {
384e99a4
JH
442 struct commit *commit = list->item;
443 struct object *obj = &commit->object;
4c0fea0f
JH
444 struct commit_list *parent;
445 if (obj->flags & UNINTERESTING)
384e99a4 446 continue;
4c0fea0f
JH
447 for (parent = commit->parents;
448 parent;
449 parent = parent->next) {
384e99a4 450 struct commit *pcommit = parent->item;
384e99a4
JH
451 if (!(pcommit->object.flags & UNINTERESTING))
452 continue;
453 pcommit->object.flags |= BOUNDARY;
4c0fea0f
JH
454 if (pcommit->object.flags & TMP_MARK)
455 continue;
456 pcommit->object.flags |= TMP_MARK;
384e99a4
JH
457 p = &commit_list_insert(pcommit, p)->next;
458 }
4c0fea0f
JH
459 }
460 for (list = newlist; list; list = list->next) {
461 struct commit *commit = list->item;
462 commit->object.flags &= ~TMP_MARK;
384e99a4
JH
463 }
464 }
a4a88b2b
LT
465 revs->commits = newlist;
466}
467
ae563542
LT
468static int all_flags;
469static struct rev_info *all_revs;
470
471static int handle_one_ref(const char *path, const unsigned char *sha1)
472{
cd2bdc53
LT
473 struct object *object = get_reference(all_revs, path, sha1, all_flags);
474 add_pending_object(all_revs, object, "");
ae563542
LT
475 return 0;
476}
477
478static void handle_all(struct rev_info *revs, unsigned flags)
479{
480 all_revs = revs;
481 all_flags = flags;
482 for_each_ref(handle_one_ref);
483}
484
ea4a19e1
JH
485static int add_parents_only(struct rev_info *revs, const char *arg, int flags)
486{
487 unsigned char sha1[20];
488 struct object *it;
489 struct commit *commit;
490 struct commit_list *parents;
491
492 if (*arg == '^') {
493 flags ^= UNINTERESTING;
494 arg++;
495 }
496 if (get_sha1(arg, sha1))
497 return 0;
498 while (1) {
499 it = get_reference(revs, arg, sha1, 0);
1974632c 500 if (it->type != OBJ_TAG)
ea4a19e1 501 break;
e702496e 502 hashcpy(sha1, ((struct tag*)it)->tagged->sha1);
ea4a19e1 503 }
1974632c 504 if (it->type != OBJ_COMMIT)
ea4a19e1
JH
505 return 0;
506 commit = (struct commit *)it;
507 for (parents = commit->parents; parents; parents = parents->next) {
508 it = &parents->item->object;
509 it->flags |= flags;
510 add_pending_object(revs, it, arg);
511 }
512 return 1;
513}
514
db6296a5 515void init_revisions(struct rev_info *revs, const char *prefix)
8efdc326
FK
516{
517 memset(revs, 0, sizeof(*revs));
8e8f9987 518
6b9c58f4 519 revs->abbrev = DEFAULT_ABBREV;
8e8f9987 520 revs->ignore_merges = 1;
9202434c 521 revs->simplify_history = 1;
cd2bdc53
LT
522 revs->pruning.recursive = 1;
523 revs->pruning.add_remove = file_add_remove;
524 revs->pruning.change = file_change;
8efdc326
FK
525 revs->lifo = 1;
526 revs->dense = 1;
db6296a5 527 revs->prefix = prefix;
8efdc326
FK
528 revs->max_age = -1;
529 revs->min_age = -1;
530 revs->max_count = -1;
531
532 revs->prune_fn = NULL;
533 revs->prune_data = NULL;
534
535 revs->topo_setter = topo_sort_default_setter;
536 revs->topo_getter = topo_sort_default_getter;
cd2bdc53 537
cd2bdc53
LT
538 revs->commit_format = CMIT_FMT_DEFAULT;
539
540 diff_setup(&revs->diffopt);
8efdc326
FK
541}
542
0d2c9d67
RS
543static void add_pending_commit_list(struct rev_info *revs,
544 struct commit_list *commit_list,
545 unsigned int flags)
546{
547 while (commit_list) {
548 struct object *object = &commit_list->item->object;
549 object->flags |= flags;
550 add_pending_object(revs, object, sha1_to_hex(object->sha1));
551 commit_list = commit_list->next;
552 }
553}
554
ae3e5e1e
JH
555static void prepare_show_merge(struct rev_info *revs)
556{
557 struct commit_list *bases;
558 struct commit *head, *other;
559 unsigned char sha1[20];
560 const char **prune = NULL;
561 int i, prune_num = 1; /* counting terminating NULL */
562
563 if (get_sha1("HEAD", sha1) || !(head = lookup_commit(sha1)))
564 die("--merge without HEAD?");
565 if (get_sha1("MERGE_HEAD", sha1) || !(other = lookup_commit(sha1)))
566 die("--merge without MERGE_HEAD?");
567 add_pending_object(revs, &head->object, "HEAD");
568 add_pending_object(revs, &other->object, "MERGE_HEAD");
569 bases = get_merge_bases(head, other, 1);
570 while (bases) {
571 struct commit *it = bases->item;
572 struct commit_list *n = bases->next;
573 free(bases);
574 bases = n;
575 it->object.flags |= UNINTERESTING;
576 add_pending_object(revs, &it->object, "(merge-base)");
577 }
578
579 if (!active_nr)
580 read_cache();
581 for (i = 0; i < active_nr; i++) {
582 struct cache_entry *ce = active_cache[i];
583 if (!ce_stage(ce))
584 continue;
585 if (ce_path_match(ce, revs->prune_data)) {
586 prune_num++;
587 prune = xrealloc(prune, sizeof(*prune) * prune_num);
588 prune[prune_num-2] = ce->name;
589 prune[prune_num-1] = NULL;
590 }
591 while ((i+1 < active_nr) &&
592 ce_same_name(ce, active_cache[i+1]))
593 i++;
594 }
595 revs->prune_data = prune;
596}
597
5d6f0935
JH
598int handle_revision_arg(const char *arg, struct rev_info *revs,
599 int flags,
600 int cant_be_filename)
601{
602 char *dotdot;
603 struct object *object;
604 unsigned char sha1[20];
605 int local_flags;
606
607 dotdot = strstr(arg, "..");
608 if (dotdot) {
609 unsigned char from_sha1[20];
610 const char *next = dotdot + 2;
611 const char *this = arg;
612 int symmetric = *next == '.';
613 unsigned int flags_exclude = flags ^ UNINTERESTING;
614
615 *dotdot = 0;
616 next += symmetric;
617
618 if (!*next)
619 next = "HEAD";
620 if (dotdot == arg)
621 this = "HEAD";
622 if (!get_sha1(this, from_sha1) &&
623 !get_sha1(next, sha1)) {
624 struct commit *a, *b;
625 struct commit_list *exclude;
626
627 a = lookup_commit_reference(from_sha1);
628 b = lookup_commit_reference(sha1);
629 if (!a || !b) {
630 die(symmetric ?
631 "Invalid symmetric difference expression %s...%s" :
632 "Invalid revision range %s..%s",
633 arg, next);
634 }
635
636 if (!cant_be_filename) {
637 *dotdot = '.';
638 verify_non_filename(revs->prefix, arg);
639 }
640
641 if (symmetric) {
642 exclude = get_merge_bases(a, b, 1);
643 add_pending_commit_list(revs, exclude,
644 flags_exclude);
645 free_commit_list(exclude);
646 a->object.flags |= flags;
647 } else
648 a->object.flags |= flags_exclude;
649 b->object.flags |= flags;
650 add_pending_object(revs, &a->object, this);
651 add_pending_object(revs, &b->object, next);
652 return 0;
653 }
654 *dotdot = '.';
655 }
656 dotdot = strstr(arg, "^@");
657 if (dotdot && !dotdot[2]) {
658 *dotdot = 0;
659 if (add_parents_only(revs, arg, flags))
660 return 0;
661 *dotdot = '^';
662 }
663 local_flags = 0;
664 if (*arg == '^') {
665 local_flags = UNINTERESTING;
666 arg++;
667 }
668 if (get_sha1(arg, sha1))
669 return -1;
670 if (!cant_be_filename)
671 verify_non_filename(revs->prefix, arg);
672 object = get_reference(revs, arg, sha1, flags ^ local_flags);
673 add_pending_object(revs, object, arg);
674 return 0;
675}
676
bd95fcd3
JH
677static void add_header_grep(struct rev_info *revs, const char *field, const char *pattern)
678{
679 char *pat;
680 int patlen, fldlen;
681
682 if (!revs->header_filter) {
683 struct grep_opt *opt = xcalloc(1, sizeof(*opt));
684 opt->status_only = 1;
685 opt->pattern_tail = &(opt->pattern_list);
686 opt->regflags = REG_NEWLINE;
687 revs->header_filter = opt;
688 }
689
690 fldlen = strlen(field);
691 patlen = strlen(pattern);
692 pat = xmalloc(patlen + fldlen + 3);
693 sprintf(pat, "^%s %s", field, pattern);
694 append_grep_pattern(revs->header_filter, pat,
695 "command line", 0, GREP_PATTERN);
696}
697
698static void add_message_grep(struct rev_info *revs, const char *pattern)
699{
700 if (!revs->message_filter) {
701 struct grep_opt *opt = xcalloc(1, sizeof(*opt));
702 opt->status_only = 1;
703 opt->pattern_tail = &(opt->pattern_list);
704 opt->regflags = REG_NEWLINE;
705 revs->message_filter = opt;
706 }
707 append_grep_pattern(revs->message_filter, pattern,
708 "command line", 0, GREP_PATTERN);
709}
710
106d710b
JH
711static void add_ignore_packed(struct rev_info *revs, const char *name)
712{
713 int num = ++revs->num_ignore_packed;
714
715 revs->ignore_packed = xrealloc(revs->ignore_packed,
716 sizeof(const char **) * (num + 1));
717 revs->ignore_packed[num-1] = name;
718 revs->ignore_packed[num] = NULL;
719}
720
ae563542
LT
721/*
722 * Parse revision information, filling in the "rev_info" structure,
723 * and removing the used arguments from the argument list.
724 *
765ac8ec
LT
725 * Returns the number of arguments left that weren't recognized
726 * (which are also moved to the head of the argument list)
ae563542 727 */
a4a88b2b 728int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def)
ae563542 729{
ae3e5e1e 730 int i, flags, seen_dashdash, show_merge;
765ac8ec 731 const char **unrecognized = argv + 1;
ae563542
LT
732 int left = 1;
733
ae563542
LT
734 /* First, search for "--" */
735 seen_dashdash = 0;
736 for (i = 1; i < argc; i++) {
737 const char *arg = argv[i];
738 if (strcmp(arg, "--"))
739 continue;
740 argv[i] = NULL;
741 argc = i;
8efdc326 742 revs->prune_data = get_pathspec(revs->prefix, argv + i + 1);
ae563542
LT
743 seen_dashdash = 1;
744 break;
745 }
746
ae3e5e1e 747 flags = show_merge = 0;
ae563542 748 for (i = 1; i < argc; i++) {
ae563542 749 const char *arg = argv[i];
ae563542 750 if (*arg == '-') {
cd2bdc53 751 int opts;
ae563542
LT
752 if (!strncmp(arg, "--max-count=", 12)) {
753 revs->max_count = atoi(arg + 12);
754 continue;
755 }
de5f2bf3 756 /* accept -<digit>, like traditional "head" */
64bc6e3d
JH
757 if ((*arg == '-') && isdigit(arg[1])) {
758 revs->max_count = atoi(arg + 1);
759 continue;
760 }
761 if (!strcmp(arg, "-n")) {
762 if (argc <= i + 1)
763 die("-n requires an argument");
764 revs->max_count = atoi(argv[++i]);
765 continue;
766 }
767 if (!strncmp(arg,"-n",2)) {
768 revs->max_count = atoi(arg + 2);
769 continue;
770 }
ae563542
LT
771 if (!strncmp(arg, "--max-age=", 10)) {
772 revs->max_age = atoi(arg + 10);
ae563542
LT
773 continue;
774 }
fd751667
JH
775 if (!strncmp(arg, "--since=", 8)) {
776 revs->max_age = approxidate(arg + 8);
fd751667
JH
777 continue;
778 }
779 if (!strncmp(arg, "--after=", 8)) {
780 revs->max_age = approxidate(arg + 8);
53069686
JH
781 continue;
782 }
783 if (!strncmp(arg, "--min-age=", 10)) {
784 revs->min_age = atoi(arg + 10);
fd751667
JH
785 continue;
786 }
787 if (!strncmp(arg, "--before=", 9)) {
788 revs->min_age = approxidate(arg + 9);
fd751667
JH
789 continue;
790 }
791 if (!strncmp(arg, "--until=", 8)) {
792 revs->min_age = approxidate(arg + 8);
fd751667
JH
793 continue;
794 }
ae563542
LT
795 if (!strcmp(arg, "--all")) {
796 handle_all(revs, flags);
797 continue;
798 }
799 if (!strcmp(arg, "--not")) {
800 flags ^= UNINTERESTING;
801 continue;
802 }
803 if (!strcmp(arg, "--default")) {
804 if (++i >= argc)
805 die("bad --default argument");
806 def = argv[i];
807 continue;
808 }
ae3e5e1e
JH
809 if (!strcmp(arg, "--merge")) {
810 show_merge = 1;
811 continue;
812 }
ae563542
LT
813 if (!strcmp(arg, "--topo-order")) {
814 revs->topo_order = 1;
815 continue;
816 }
817 if (!strcmp(arg, "--date-order")) {
818 revs->lifo = 0;
819 revs->topo_order = 1;
820 continue;
821 }
7b0c9966
LT
822 if (!strcmp(arg, "--parents")) {
823 revs->parents = 1;
824 continue;
825 }
ae563542
LT
826 if (!strcmp(arg, "--dense")) {
827 revs->dense = 1;
828 continue;
829 }
830 if (!strcmp(arg, "--sparse")) {
831 revs->dense = 0;
832 continue;
833 }
834 if (!strcmp(arg, "--remove-empty")) {
835 revs->remove_empty_trees = 1;
836 continue;
837 }
5cdeae71 838 if (!strcmp(arg, "--no-merges")) {
765ac8ec
LT
839 revs->no_merges = 1;
840 continue;
841 }
384e99a4
JH
842 if (!strcmp(arg, "--boundary")) {
843 revs->boundary = 1;
844 continue;
845 }
ae563542
LT
846 if (!strcmp(arg, "--objects")) {
847 revs->tag_objects = 1;
848 revs->tree_objects = 1;
849 revs->blob_objects = 1;
850 continue;
851 }
852 if (!strcmp(arg, "--objects-edge")) {
853 revs->tag_objects = 1;
854 revs->tree_objects = 1;
855 revs->blob_objects = 1;
856 revs->edge_hint = 1;
857 continue;
858 }
d9a83684
LT
859 if (!strcmp(arg, "--unpacked")) {
860 revs->unpacked = 1;
106d710b
JH
861 free(revs->ignore_packed);
862 revs->ignore_packed = NULL;
863 revs->num_ignore_packed = 0;
864 continue;
865 }
866 if (!strncmp(arg, "--unpacked=", 11)) {
867 revs->unpacked = 1;
868 add_ignore_packed(revs, arg+11);
d9a83684
LT
869 continue;
870 }
cd2bdc53
LT
871 if (!strcmp(arg, "-r")) {
872 revs->diff = 1;
873 revs->diffopt.recursive = 1;
874 continue;
875 }
876 if (!strcmp(arg, "-t")) {
877 revs->diff = 1;
878 revs->diffopt.recursive = 1;
879 revs->diffopt.tree_in_recursive = 1;
880 continue;
881 }
882 if (!strcmp(arg, "-m")) {
883 revs->ignore_merges = 0;
884 continue;
885 }
886 if (!strcmp(arg, "-c")) {
887 revs->diff = 1;
0fe7c1de 888 revs->dense_combined_merges = 0;
cd2bdc53
LT
889 revs->combine_merges = 1;
890 continue;
891 }
892 if (!strcmp(arg, "--cc")) {
893 revs->diff = 1;
894 revs->dense_combined_merges = 1;
895 revs->combine_merges = 1;
896 continue;
897 }
898 if (!strcmp(arg, "-v")) {
899 revs->verbose_header = 1;
cd2bdc53
LT
900 continue;
901 }
902 if (!strncmp(arg, "--pretty", 8)) {
903 revs->verbose_header = 1;
cd2bdc53
LT
904 revs->commit_format = get_commit_format(arg+8);
905 continue;
906 }
907 if (!strcmp(arg, "--root")) {
908 revs->show_root_diff = 1;
909 continue;
910 }
911 if (!strcmp(arg, "--no-commit-id")) {
912 revs->no_commit_id = 1;
913 continue;
914 }
915 if (!strcmp(arg, "--always")) {
916 revs->always_show_header = 1;
917 continue;
918 }
919 if (!strcmp(arg, "--no-abbrev")) {
920 revs->abbrev = 0;
921 continue;
922 }
923 if (!strcmp(arg, "--abbrev")) {
924 revs->abbrev = DEFAULT_ABBREV;
925 continue;
926 }
508d9e37
LT
927 if (!strncmp(arg, "--abbrev=", 9)) {
928 revs->abbrev = strtoul(arg + 9, NULL, 10);
929 if (revs->abbrev < MINIMUM_ABBREV)
930 revs->abbrev = MINIMUM_ABBREV;
931 else if (revs->abbrev > 40)
932 revs->abbrev = 40;
933 continue;
934 }
cd2bdc53
LT
935 if (!strcmp(arg, "--abbrev-commit")) {
936 revs->abbrev_commit = 1;
937 continue;
938 }
939 if (!strcmp(arg, "--full-diff")) {
940 revs->diff = 1;
941 revs->full_diff = 1;
942 continue;
943 }
9202434c
LT
944 if (!strcmp(arg, "--full-history")) {
945 revs->simplify_history = 0;
946 continue;
947 }
3dfb9278
JF
948 if (!strcmp(arg, "--relative-date")) {
949 revs->relative_date = 1;
950 continue;
951 }
bd95fcd3
JH
952 if (!strncmp(arg, "--author=", 9)) {
953 add_header_grep(revs, "author", arg+9);
954 continue;
955 }
956 if (!strncmp(arg, "--committer=", 12)) {
957 add_header_grep(revs, "committer", arg+12);
958 continue;
959 }
960 if (!strncmp(arg, "--grep=", 7)) {
961 add_message_grep(revs, arg+7);
962 continue;
963 }
cd2bdc53
LT
964 opts = diff_opt_parse(&revs->diffopt, argv+i, argc-i);
965 if (opts > 0) {
966 revs->diff = 1;
967 i += opts - 1;
968 continue;
969 }
ae563542
LT
970 *unrecognized++ = arg;
971 left++;
972 continue;
973 }
ae563542 974
5d6f0935
JH
975 if (handle_revision_arg(arg, revs, flags, seen_dashdash)) {
976 int j;
977 if (seen_dashdash || *arg == '^')
ae563542
LT
978 die("bad revision '%s'", arg);
979
ea92f41f
JH
980 /* If we didn't have a "--":
981 * (1) all filenames must exist;
982 * (2) all rev-args must not be interpretable
983 * as a valid filename.
984 * but the latter we have checked in the main loop.
985 */
e23d0b4a
LT
986 for (j = i; j < argc; j++)
987 verify_filename(revs->prefix, argv[j]);
988
5d6f0935
JH
989 revs->prune_data = get_pathspec(revs->prefix,
990 argv + i);
ae563542
LT
991 break;
992 }
ae563542 993 }
5d6f0935 994
ae3e5e1e
JH
995 if (show_merge)
996 prepare_show_merge(revs);
1f1e895f 997 if (def && !revs->pending.nr) {
ae563542 998 unsigned char sha1[20];
cd2bdc53 999 struct object *object;
31fff305 1000 if (get_sha1(def, sha1))
ae563542 1001 die("bad default revision '%s'", def);
cd2bdc53
LT
1002 object = get_reference(revs, def, sha1, 0);
1003 add_pending_object(revs, object, def);
ae563542 1004 }
8efdc326 1005
bbbc8c3a 1006 if (revs->topo_order || revs->unpacked)
53069686
JH
1007 revs->limited = 1;
1008
8efdc326 1009 if (revs->prune_data) {
cd2bdc53 1010 diff_tree_setup_paths(revs->prune_data, &revs->pruning);
8efdc326 1011 revs->prune_fn = try_to_simplify_commit;
cd2bdc53
LT
1012 if (!revs->full_diff)
1013 diff_tree_setup_paths(revs->prune_data, &revs->diffopt);
8efdc326 1014 }
cd2bdc53
LT
1015 if (revs->combine_merges) {
1016 revs->ignore_merges = 0;
0e677e1a 1017 if (revs->dense_combined_merges && !revs->diffopt.output_format)
cd2bdc53
LT
1018 revs->diffopt.output_format = DIFF_FORMAT_PATCH;
1019 }
cd2bdc53 1020 revs->diffopt.abbrev = revs->abbrev;
72ee96c0
JH
1021 if (diff_setup_done(&revs->diffopt) < 0)
1022 die("diff_setup_done failed");
8efdc326 1023
bd95fcd3
JH
1024 if (revs->header_filter)
1025 compile_grep_patterns(revs->header_filter);
1026 if (revs->message_filter)
1027 compile_grep_patterns(revs->message_filter);
1028
ae563542
LT
1029 return left;
1030}
a4a88b2b
LT
1031
1032void prepare_revision_walk(struct rev_info *revs)
1033{
1f1e895f
LT
1034 int nr = revs->pending.nr;
1035 struct object_array_entry *list = revs->pending.objects;
cd2bdc53 1036
1f1e895f
LT
1037 revs->pending.nr = 0;
1038 revs->pending.alloc = 0;
1039 revs->pending.objects = NULL;
1040 while (--nr >= 0) {
cd2bdc53
LT
1041 struct commit *commit = handle_commit(revs, list->item, list->name);
1042 if (commit) {
1043 if (!(commit->object.flags & SEEN)) {
1044 commit->object.flags |= SEEN;
1045 insert_by_date(commit, &revs->commits);
1046 }
1047 }
1f1e895f 1048 list++;
cd2bdc53
LT
1049 }
1050
ba1d4505
LT
1051 if (revs->no_walk)
1052 return;
a4a88b2b
LT
1053 if (revs->limited)
1054 limit_list(revs);
1055 if (revs->topo_order)
8efdc326
FK
1056 sort_in_topological_order_fn(&revs->commits, revs->lifo,
1057 revs->topo_setter,
1058 revs->topo_getter);
a4a88b2b
LT
1059}
1060
3381c790 1061static int rewrite_one(struct rev_info *revs, struct commit **pp)
765ac8ec
LT
1062{
1063 for (;;) {
1064 struct commit *p = *pp;
3381c790
LT
1065 if (!revs->limited)
1066 add_parents_to_list(revs, p, &revs->commits);
6631c736
LT
1067 if (p->parents && p->parents->next)
1068 return 0;
765ac8ec
LT
1069 if (p->object.flags & (TREECHANGE | UNINTERESTING))
1070 return 0;
1071 if (!p->parents)
1072 return -1;
1073 *pp = p->parents->item;
1074 }
1075}
1076
3381c790 1077static void rewrite_parents(struct rev_info *revs, struct commit *commit)
765ac8ec
LT
1078{
1079 struct commit_list **pp = &commit->parents;
1080 while (*pp) {
1081 struct commit_list *parent = *pp;
3381c790 1082 if (rewrite_one(revs, &parent->item) < 0) {
765ac8ec
LT
1083 *pp = parent->next;
1084 continue;
1085 }
1086 pp = &parent->next;
1087 }
1088}
1089
1b65a5aa
JH
1090static void mark_boundary_to_show(struct commit *commit)
1091{
1092 struct commit_list *p = commit->parents;
1093 while (p) {
1094 commit = p->item;
1095 p = p->next;
1096 if (commit->object.flags & BOUNDARY)
1097 commit->object.flags |= BOUNDARY_SHOW;
1098 }
1099}
1100
8ecae9b0
JH
1101static int commit_match(struct commit *commit, struct rev_info *opt)
1102{
bd95fcd3
JH
1103 char *header, *message;
1104 unsigned long header_len, message_len;
1105
8ecae9b0
JH
1106 if (!opt->header_filter && !opt->message_filter)
1107 return 1;
1108
bd95fcd3
JH
1109 header = commit->buffer;
1110 message = strstr(header, "\n\n");
1111 if (message) {
1112 message += 2;
1113 header_len = message - header - 1;
1114 message_len = strlen(message);
1115 }
1116 else {
1117 header_len = strlen(header);
1118 message = header;
1119 message_len = 0;
1120 }
1121
1122 if (opt->header_filter &&
1123 !grep_buffer(opt->header_filter, NULL, header, header_len))
1124 return 0;
1125
1126 if (opt->message_filter &&
1127 !grep_buffer(opt->message_filter, NULL, message, message_len))
1128 return 0;
1129
8ecae9b0
JH
1130 return 1;
1131}
1132
a4a88b2b
LT
1133struct commit *get_revision(struct rev_info *revs)
1134{
765ac8ec 1135 struct commit_list *list = revs->commits;
765ac8ec
LT
1136
1137 if (!list)
a4a88b2b 1138 return NULL;
a4a88b2b 1139
765ac8ec 1140 /* Check the max_count ... */
765ac8ec
LT
1141 switch (revs->max_count) {
1142 case -1:
1143 break;
1144 case 0:
1145 return NULL;
1146 default:
1147 revs->max_count--;
1148 }
a4a88b2b 1149
765ac8ec 1150 do {
cb115748
LT
1151 struct commit_list *entry = revs->commits;
1152 struct commit *commit = entry->item;
ea5ed3ab 1153
cb115748
LT
1154 revs->commits = entry->next;
1155 free(entry);
2a0925be
LT
1156
1157 /*
1158 * If we haven't done the list limiting, we need to look at
be7db6e5
LT
1159 * the parents here. We also need to do the date-based limiting
1160 * that we'd otherwise have done in limit_list().
2a0925be 1161 */
be7db6e5 1162 if (!revs->limited) {
22c31bf1 1163 if ((revs->unpacked &&
106d710b
JH
1164 has_sha1_pack(commit->object.sha1,
1165 revs->ignore_packed)) ||
22c31bf1
JH
1166 (revs->max_age != -1 &&
1167 (commit->date < revs->max_age)))
be7db6e5 1168 continue;
2a0925be 1169 add_parents_to_list(revs, commit, &revs->commits);
be7db6e5 1170 }
384e99a4 1171 if (commit->object.flags & SHOWN)
2a0925be 1172 continue;
1b65a5aa
JH
1173
1174 /* We want to show boundary commits only when their
1175 * children are shown. When path-limiter is in effect,
1176 * rewrite_parents() drops some commits from getting shown,
1177 * and there is no point showing boundary parents that
1178 * are not shown. After rewrite_parents() rewrites the
1179 * parents of a commit that is shown, we mark the boundary
1180 * parents with BOUNDARY_SHOW.
1181 */
1182 if (commit->object.flags & BOUNDARY_SHOW) {
1183 commit->object.flags |= SHOWN;
1184 return commit;
1185 }
1186 if (commit->object.flags & UNINTERESTING)
2a0925be 1187 continue;
765ac8ec 1188 if (revs->min_age != -1 && (commit->date > revs->min_age))
2a0925be 1189 continue;
384e99a4
JH
1190 if (revs->no_merges &&
1191 commit->parents && commit->parents->next)
2a0925be 1192 continue;
8ecae9b0
JH
1193 if (!commit_match(commit, revs))
1194 continue;
8efdc326 1195 if (revs->prune_fn && revs->dense) {
6631c736
LT
1196 /* Commit without changes? */
1197 if (!(commit->object.flags & TREECHANGE)) {
1198 /* drop merges unless we want parenthood */
1199 if (!revs->parents)
1200 continue;
1201 /* non-merge - always ignore it */
02d3dca3 1202 if (!commit->parents || !commit->parents->next)
6631c736
LT
1203 continue;
1204 }
2a0925be 1205 if (revs->parents)
3381c790 1206 rewrite_parents(revs, commit);
384e99a4 1207 }
1b65a5aa
JH
1208 if (revs->boundary)
1209 mark_boundary_to_show(commit);
765ac8ec
LT
1210 commit->object.flags |= SHOWN;
1211 return commit;
1212 } while (revs->commits);
1213 return NULL;
1214}