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