![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
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"
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;
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 }
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 }
43 static void mark_blob_uninteresting(struct blob *blob)
44 {
45 if (blob->object.flags & UNINTERESTING)
46 return;
47 blob->object.flags |= UNINTERESTING;
48 }
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;
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));
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 }
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 }
81 void mark_parents_uninteresting(struct commit *commit)
82 {
83 struct commit_list *parents = commit->parents;
85 while (parents) {
86 struct commit *commit = parents->item;
87 if (!(commit->object.flags & UNINTERESTING)) {
88 commit->object.flags |= UNINTERESTING;
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 }
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 }
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 }
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;
125 object = parse_object(sha1);
126 if (!object)
127 die("bad object %s", name);
128 object->flags |= flags;
129 return object;
130 }
132 static struct commit *handle_commit(struct rev_info *revs, struct object *object, const char *name)
133 {
134 unsigned long flags = object->flags;
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 }
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 }
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 }
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 }
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 }
210 static int tree_difference = REV_TREE_SAME;
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;
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 }
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 }
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 }
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;
263 if (!t1)
264 return 0;
266 tree = read_object_with_reference(t1->object.sha1, tree_type, &real.size, NULL);
267 if (!tree)
268 return 0;
269 real.buf = tree;
271 empty.buf = "";
272 empty.size = 0;
274 tree_difference = 0;
275 retval = diff_tree(&empty, &real, "", &revs->pruning);
276 free(tree);
278 return retval >= 0 && !tree_difference;
279 }
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;
286 if (!commit->tree)
287 return;
289 if (!commit->parents) {
290 if (!rev_same_tree_as_empty(revs, commit->tree))
291 commit->object.flags |= TREECHANGE;
292 return;
293 }
295 pp = &commit->parents;
296 while ((parent = *pp) != NULL) {
297 struct commit *p = parent->item;
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;
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 }
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;
348 if (commit->object.flags & ADDED)
349 return;
350 commit->object.flags |= ADDED;
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 }
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);
388 if (revs->no_walk)
389 return;
391 left_flag = (commit->object.flags & SYMMETRIC_LEFT);
392 parent = commit->parents;
393 while (parent) {
394 struct commit *p = parent->item;
396 parent = parent->next;
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 }
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;
413 while (list) {
414 struct commit_list *entry = list;
415 struct commit *commit = list->item;
416 struct object *obj = &commit->object;
418 list = list->next;
419 free(entry);
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 }
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 };
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 }
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 }
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 }
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 }
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 }
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 }
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;
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 }
562 void init_revisions(struct rev_info *revs, const char *prefix)
563 {
564 memset(revs, 0, sizeof(*revs));
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->max_count = -1;
579 revs->prune_fn = NULL;
580 revs->prune_data = NULL;
582 revs->topo_setter = topo_sort_default_setter;
583 revs->topo_getter = topo_sort_default_getter;
585 revs->commit_format = CMIT_FMT_DEFAULT;
587 diff_setup(&revs->diffopt);
588 }
590 static void add_pending_commit_list(struct rev_info *revs,
591 struct commit_list *commit_list,
592 unsigned int flags)
593 {
594 while (commit_list) {
595 struct object *object = &commit_list->item->object;
596 object->flags |= flags;
597 add_pending_object(revs, object, sha1_to_hex(object->sha1));
598 commit_list = commit_list->next;
599 }
600 }
602 static void prepare_show_merge(struct rev_info *revs)
603 {
604 struct commit_list *bases;
605 struct commit *head, *other;
606 unsigned char sha1[20];
607 const char **prune = NULL;
608 int i, prune_num = 1; /* counting terminating NULL */
610 if (get_sha1("HEAD", sha1) || !(head = lookup_commit(sha1)))
611 die("--merge without HEAD?");
612 if (get_sha1("MERGE_HEAD", sha1) || !(other = lookup_commit(sha1)))
613 die("--merge without MERGE_HEAD?");
614 add_pending_object(revs, &head->object, "HEAD");
615 add_pending_object(revs, &other->object, "MERGE_HEAD");
616 bases = get_merge_bases(head, other, 1);
617 while (bases) {
618 struct commit *it = bases->item;
619 struct commit_list *n = bases->next;
620 free(bases);
621 bases = n;
622 it->object.flags |= UNINTERESTING;
623 add_pending_object(revs, &it->object, "(merge-base)");
624 }
626 if (!active_nr)
627 read_cache();
628 for (i = 0; i < active_nr; i++) {
629 struct cache_entry *ce = active_cache[i];
630 if (!ce_stage(ce))
631 continue;
632 if (ce_path_match(ce, revs->prune_data)) {
633 prune_num++;
634 prune = xrealloc(prune, sizeof(*prune) * prune_num);
635 prune[prune_num-2] = ce->name;
636 prune[prune_num-1] = NULL;
637 }
638 while ((i+1 < active_nr) &&
639 ce_same_name(ce, active_cache[i+1]))
640 i++;
641 }
642 revs->prune_data = prune;
643 }
645 int handle_revision_arg(const char *arg, struct rev_info *revs,
646 int flags,
647 int cant_be_filename)
648 {
649 char *dotdot;
650 struct object *object;
651 unsigned char sha1[20];
652 int local_flags;
654 dotdot = strstr(arg, "..");
655 if (dotdot) {
656 unsigned char from_sha1[20];
657 const char *next = dotdot + 2;
658 const char *this = arg;
659 int symmetric = *next == '.';
660 unsigned int flags_exclude = flags ^ UNINTERESTING;
662 *dotdot = 0;
663 next += symmetric;
665 if (!*next)
666 next = "HEAD";
667 if (dotdot == arg)
668 this = "HEAD";
669 if (!get_sha1(this, from_sha1) &&
670 !get_sha1(next, sha1)) {
671 struct commit *a, *b;
672 struct commit_list *exclude;
674 a = lookup_commit_reference(from_sha1);
675 b = lookup_commit_reference(sha1);
676 if (!a || !b) {
677 die(symmetric ?
678 "Invalid symmetric difference expression %s...%s" :
679 "Invalid revision range %s..%s",
680 arg, next);
681 }
683 if (!cant_be_filename) {
684 *dotdot = '.';
685 verify_non_filename(revs->prefix, arg);
686 }
688 if (symmetric) {
689 exclude = get_merge_bases(a, b, 1);
690 add_pending_commit_list(revs, exclude,
691 flags_exclude);
692 free_commit_list(exclude);
693 a->object.flags |= flags | SYMMETRIC_LEFT;
694 } else
695 a->object.flags |= flags_exclude;
696 b->object.flags |= flags;
697 add_pending_object(revs, &a->object, this);
698 add_pending_object(revs, &b->object, next);
699 return 0;
700 }
701 *dotdot = '.';
702 }
703 dotdot = strstr(arg, "^@");
704 if (dotdot && !dotdot[2]) {
705 *dotdot = 0;
706 if (add_parents_only(revs, arg, flags))
707 return 0;
708 *dotdot = '^';
709 }
710 dotdot = strstr(arg, "^!");
711 if (dotdot && !dotdot[2]) {
712 *dotdot = 0;
713 if (!add_parents_only(revs, arg, flags ^ UNINTERESTING))
714 *dotdot = '^';
715 }
717 local_flags = 0;
718 if (*arg == '^') {
719 local_flags = UNINTERESTING;
720 arg++;
721 }
722 if (get_sha1(arg, sha1))
723 return -1;
724 if (!cant_be_filename)
725 verify_non_filename(revs->prefix, arg);
726 object = get_reference(revs, arg, sha1, flags ^ local_flags);
727 add_pending_object(revs, object, arg);
728 return 0;
729 }
731 static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
732 {
733 if (!revs->grep_filter) {
734 struct grep_opt *opt = xcalloc(1, sizeof(*opt));
735 opt->status_only = 1;
736 opt->pattern_tail = &(opt->pattern_list);
737 opt->regflags = REG_NEWLINE;
738 revs->grep_filter = opt;
739 }
740 append_grep_pattern(revs->grep_filter, ptn,
741 "command line", 0, what);
742 }
744 static void add_header_grep(struct rev_info *revs, const char *field, const char *pattern)
745 {
746 char *pat;
747 const char *prefix;
748 int patlen, fldlen;
750 fldlen = strlen(field);
751 patlen = strlen(pattern);
752 pat = xmalloc(patlen + fldlen + 10);
753 prefix = ".*";
754 if (*pattern == '^') {
755 prefix = "";
756 pattern++;
757 }
758 sprintf(pat, "^%s %s%s", field, prefix, pattern);
759 add_grep(revs, pat, GREP_PATTERN_HEAD);
760 }
762 static void add_message_grep(struct rev_info *revs, const char *pattern)
763 {
764 add_grep(revs, pattern, GREP_PATTERN_BODY);
765 }
767 static void add_ignore_packed(struct rev_info *revs, const char *name)
768 {
769 int num = ++revs->num_ignore_packed;
771 revs->ignore_packed = xrealloc(revs->ignore_packed,
772 sizeof(const char **) * (num + 1));
773 revs->ignore_packed[num-1] = name;
774 revs->ignore_packed[num] = NULL;
775 }
777 /*
778 * Parse revision information, filling in the "rev_info" structure,
779 * and removing the used arguments from the argument list.
780 *
781 * Returns the number of arguments left that weren't recognized
782 * (which are also moved to the head of the argument list)
783 */
784 int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def)
785 {
786 int i, flags, seen_dashdash, show_merge;
787 const char **unrecognized = argv + 1;
788 int left = 1;
789 int all_match = 0;
791 /* First, search for "--" */
792 seen_dashdash = 0;
793 for (i = 1; i < argc; i++) {
794 const char *arg = argv[i];
795 if (strcmp(arg, "--"))
796 continue;
797 argv[i] = NULL;
798 argc = i;
799 revs->prune_data = get_pathspec(revs->prefix, argv + i + 1);
800 seen_dashdash = 1;
801 break;
802 }
804 flags = show_merge = 0;
805 for (i = 1; i < argc; i++) {
806 const char *arg = argv[i];
807 if (*arg == '-') {
808 int opts;
809 if (!strncmp(arg, "--max-count=", 12)) {
810 revs->max_count = atoi(arg + 12);
811 continue;
812 }
813 /* accept -<digit>, like traditional "head" */
814 if ((*arg == '-') && isdigit(arg[1])) {
815 revs->max_count = atoi(arg + 1);
816 continue;
817 }
818 if (!strcmp(arg, "-n")) {
819 if (argc <= i + 1)
820 die("-n requires an argument");
821 revs->max_count = atoi(argv[++i]);
822 continue;
823 }
824 if (!strncmp(arg,"-n",2)) {
825 revs->max_count = atoi(arg + 2);
826 continue;
827 }
828 if (!strncmp(arg, "--max-age=", 10)) {
829 revs->max_age = atoi(arg + 10);
830 continue;
831 }
832 if (!strncmp(arg, "--since=", 8)) {
833 revs->max_age = approxidate(arg + 8);
834 continue;
835 }
836 if (!strncmp(arg, "--after=", 8)) {
837 revs->max_age = approxidate(arg + 8);
838 continue;
839 }
840 if (!strncmp(arg, "--min-age=", 10)) {
841 revs->min_age = atoi(arg + 10);
842 continue;
843 }
844 if (!strncmp(arg, "--before=", 9)) {
845 revs->min_age = approxidate(arg + 9);
846 continue;
847 }
848 if (!strncmp(arg, "--until=", 8)) {
849 revs->min_age = approxidate(arg + 8);
850 continue;
851 }
852 if (!strcmp(arg, "--all")) {
853 handle_all(revs, flags);
854 continue;
855 }
856 if (!strcmp(arg, "--reflog")) {
857 handle_reflog(revs, flags);
858 continue;
859 }
860 if (!strcmp(arg, "--not")) {
861 flags ^= UNINTERESTING;
862 continue;
863 }
864 if (!strcmp(arg, "--default")) {
865 if (++i >= argc)
866 die("bad --default argument");
867 def = argv[i];
868 continue;
869 }
870 if (!strcmp(arg, "--merge")) {
871 show_merge = 1;
872 continue;
873 }
874 if (!strcmp(arg, "--topo-order")) {
875 revs->topo_order = 1;
876 continue;
877 }
878 if (!strcmp(arg, "--date-order")) {
879 revs->lifo = 0;
880 revs->topo_order = 1;
881 continue;
882 }
883 if (!strcmp(arg, "--parents")) {
884 revs->parents = 1;
885 continue;
886 }
887 if (!strcmp(arg, "--dense")) {
888 revs->dense = 1;
889 continue;
890 }
891 if (!strcmp(arg, "--sparse")) {
892 revs->dense = 0;
893 continue;
894 }
895 if (!strcmp(arg, "--remove-empty")) {
896 revs->remove_empty_trees = 1;
897 continue;
898 }
899 if (!strcmp(arg, "--no-merges")) {
900 revs->no_merges = 1;
901 continue;
902 }
903 if (!strcmp(arg, "--boundary")) {
904 revs->boundary = 1;
905 continue;
906 }
907 if (!strcmp(arg, "--left-right")) {
908 revs->left_right = 1;
909 continue;
910 }
911 if (!strcmp(arg, "--objects")) {
912 revs->tag_objects = 1;
913 revs->tree_objects = 1;
914 revs->blob_objects = 1;
915 continue;
916 }
917 if (!strcmp(arg, "--objects-edge")) {
918 revs->tag_objects = 1;
919 revs->tree_objects = 1;
920 revs->blob_objects = 1;
921 revs->edge_hint = 1;
922 continue;
923 }
924 if (!strcmp(arg, "--unpacked")) {
925 revs->unpacked = 1;
926 free(revs->ignore_packed);
927 revs->ignore_packed = NULL;
928 revs->num_ignore_packed = 0;
929 continue;
930 }
931 if (!strncmp(arg, "--unpacked=", 11)) {
932 revs->unpacked = 1;
933 add_ignore_packed(revs, arg+11);
934 continue;
935 }
936 if (!strcmp(arg, "-r")) {
937 revs->diff = 1;
938 revs->diffopt.recursive = 1;
939 continue;
940 }
941 if (!strcmp(arg, "-t")) {
942 revs->diff = 1;
943 revs->diffopt.recursive = 1;
944 revs->diffopt.tree_in_recursive = 1;
945 continue;
946 }
947 if (!strcmp(arg, "-m")) {
948 revs->ignore_merges = 0;
949 continue;
950 }
951 if (!strcmp(arg, "-c")) {
952 revs->diff = 1;
953 revs->dense_combined_merges = 0;
954 revs->combine_merges = 1;
955 continue;
956 }
957 if (!strcmp(arg, "--cc")) {
958 revs->diff = 1;
959 revs->dense_combined_merges = 1;
960 revs->combine_merges = 1;
961 continue;
962 }
963 if (!strcmp(arg, "-v")) {
964 revs->verbose_header = 1;
965 continue;
966 }
967 if (!strncmp(arg, "--pretty", 8)) {
968 revs->verbose_header = 1;
969 revs->commit_format = get_commit_format(arg+8);
970 continue;
971 }
972 if (!strcmp(arg, "--root")) {
973 revs->show_root_diff = 1;
974 continue;
975 }
976 if (!strcmp(arg, "--no-commit-id")) {
977 revs->no_commit_id = 1;
978 continue;
979 }
980 if (!strcmp(arg, "--always")) {
981 revs->always_show_header = 1;
982 continue;
983 }
984 if (!strcmp(arg, "--no-abbrev")) {
985 revs->abbrev = 0;
986 continue;
987 }
988 if (!strcmp(arg, "--abbrev")) {
989 revs->abbrev = DEFAULT_ABBREV;
990 continue;
991 }
992 if (!strncmp(arg, "--abbrev=", 9)) {
993 revs->abbrev = strtoul(arg + 9, NULL, 10);
994 if (revs->abbrev < MINIMUM_ABBREV)
995 revs->abbrev = MINIMUM_ABBREV;
996 else if (revs->abbrev > 40)
997 revs->abbrev = 40;
998 continue;
999 }
1000 if (!strcmp(arg, "--abbrev-commit")) {
1001 revs->abbrev_commit = 1;
1002 continue;
1003 }
1004 if (!strcmp(arg, "--full-diff")) {
1005 revs->diff = 1;
1006 revs->full_diff = 1;
1007 continue;
1008 }
1009 if (!strcmp(arg, "--full-history")) {
1010 revs->simplify_history = 0;
1011 continue;
1012 }
1013 if (!strcmp(arg, "--relative-date")) {
1014 revs->relative_date = 1;
1015 continue;
1016 }
1018 /*
1019 * Grepping the commit log
1020 */
1021 if (!strncmp(arg, "--author=", 9)) {
1022 add_header_grep(revs, "author", arg+9);
1023 continue;
1024 }
1025 if (!strncmp(arg, "--committer=", 12)) {
1026 add_header_grep(revs, "committer", arg+12);
1027 continue;
1028 }
1029 if (!strncmp(arg, "--grep=", 7)) {
1030 add_message_grep(revs, arg+7);
1031 continue;
1032 }
1033 if (!strcmp(arg, "--all-match")) {
1034 all_match = 1;
1035 continue;
1036 }
1038 opts = diff_opt_parse(&revs->diffopt, argv+i, argc-i);
1039 if (opts > 0) {
1040 revs->diff = 1;
1041 i += opts - 1;
1042 continue;
1043 }
1044 *unrecognized++ = arg;
1045 left++;
1046 continue;
1047 }
1049 if (handle_revision_arg(arg, revs, flags, seen_dashdash)) {
1050 int j;
1051 if (seen_dashdash || *arg == '^')
1052 die("bad revision '%s'", arg);
1054 /* If we didn't have a "--":
1055 * (1) all filenames must exist;
1056 * (2) all rev-args must not be interpretable
1057 * as a valid filename.
1058 * but the latter we have checked in the main loop.
1059 */
1060 for (j = i; j < argc; j++)
1061 verify_filename(revs->prefix, argv[j]);
1063 revs->prune_data = get_pathspec(revs->prefix,
1064 argv + i);
1065 break;
1066 }
1067 }
1069 if (show_merge)
1070 prepare_show_merge(revs);
1071 if (def && !revs->pending.nr) {
1072 unsigned char sha1[20];
1073 struct object *object;
1074 if (get_sha1(def, sha1))
1075 die("bad default revision '%s'", def);
1076 object = get_reference(revs, def, sha1, 0);
1077 add_pending_object(revs, object, def);
1078 }
1080 if (revs->topo_order)
1081 revs->limited = 1;
1083 if (revs->prune_data) {
1084 diff_tree_setup_paths(revs->prune_data, &revs->pruning);
1085 revs->prune_fn = try_to_simplify_commit;
1086 if (!revs->full_diff)
1087 diff_tree_setup_paths(revs->prune_data, &revs->diffopt);
1088 }
1089 if (revs->combine_merges) {
1090 revs->ignore_merges = 0;
1091 if (revs->dense_combined_merges && !revs->diffopt.output_format)
1092 revs->diffopt.output_format = DIFF_FORMAT_PATCH;
1093 }
1094 revs->diffopt.abbrev = revs->abbrev;
1095 if (diff_setup_done(&revs->diffopt) < 0)
1096 die("diff_setup_done failed");
1098 if (revs->grep_filter) {
1099 revs->grep_filter->all_match = all_match;
1100 compile_grep_patterns(revs->grep_filter);
1101 }
1103 return left;
1104 }
1106 void prepare_revision_walk(struct rev_info *revs)
1107 {
1108 int nr = revs->pending.nr;
1109 struct object_array_entry *list = revs->pending.objects;
1111 revs->pending.nr = 0;
1112 revs->pending.alloc = 0;
1113 revs->pending.objects = NULL;
1114 while (--nr >= 0) {
1115 struct commit *commit = handle_commit(revs, list->item, list->name);
1116 if (commit) {
1117 if (!(commit->object.flags & SEEN)) {
1118 commit->object.flags |= SEEN;
1119 insert_by_date(commit, &revs->commits);
1120 }
1121 }
1122 list++;
1123 }
1125 if (revs->no_walk)
1126 return;
1127 if (revs->limited)
1128 limit_list(revs);
1129 if (revs->topo_order)
1130 sort_in_topological_order_fn(&revs->commits, revs->lifo,
1131 revs->topo_setter,
1132 revs->topo_getter);
1133 }
1135 static int rewrite_one(struct rev_info *revs, struct commit **pp)
1136 {
1137 for (;;) {
1138 struct commit *p = *pp;
1139 if (!revs->limited)
1140 add_parents_to_list(revs, p, &revs->commits);
1141 if (p->parents && p->parents->next)
1142 return 0;
1143 if (p->object.flags & (TREECHANGE | UNINTERESTING))
1144 return 0;
1145 if (!p->parents)
1146 return -1;
1147 *pp = p->parents->item;
1148 }
1149 }
1151 static void rewrite_parents(struct rev_info *revs, struct commit *commit)
1152 {
1153 struct commit_list **pp = &commit->parents;
1154 while (*pp) {
1155 struct commit_list *parent = *pp;
1156 if (rewrite_one(revs, &parent->item) < 0) {
1157 *pp = parent->next;
1158 continue;
1159 }
1160 pp = &parent->next;
1161 }
1162 }
1164 static void mark_boundary_to_show(struct commit *commit)
1165 {
1166 struct commit_list *p = commit->parents;
1167 while (p) {
1168 commit = p->item;
1169 p = p->next;
1170 if (commit->object.flags & BOUNDARY)
1171 commit->object.flags |= BOUNDARY_SHOW;
1172 }
1173 }
1175 static int commit_match(struct commit *commit, struct rev_info *opt)
1176 {
1177 if (!opt->grep_filter)
1178 return 1;
1179 return grep_buffer(opt->grep_filter,
1180 NULL, /* we say nothing, not even filename */
1181 commit->buffer, strlen(commit->buffer));
1182 }
1184 struct commit *get_revision(struct rev_info *revs)
1185 {
1186 struct commit_list *list = revs->commits;
1188 if (!list)
1189 return NULL;
1191 /* Check the max_count ... */
1192 switch (revs->max_count) {
1193 case -1:
1194 break;
1195 case 0:
1196 return NULL;
1197 default:
1198 revs->max_count--;
1199 }
1201 do {
1202 struct commit_list *entry = revs->commits;
1203 struct commit *commit = entry->item;
1205 revs->commits = entry->next;
1206 free(entry);
1208 /*
1209 * If we haven't done the list limiting, we need to look at
1210 * the parents here. We also need to do the date-based limiting
1211 * that we'd otherwise have done in limit_list().
1212 */
1213 if (!revs->limited) {
1214 if (revs->max_age != -1 &&
1215 (commit->date < revs->max_age))
1216 continue;
1217 add_parents_to_list(revs, commit, &revs->commits);
1218 }
1219 if (commit->object.flags & SHOWN)
1220 continue;
1222 if (revs->unpacked && has_sha1_pack(commit->object.sha1,
1223 revs->ignore_packed))
1224 continue;
1226 /* We want to show boundary commits only when their
1227 * children are shown. When path-limiter is in effect,
1228 * rewrite_parents() drops some commits from getting shown,
1229 * and there is no point showing boundary parents that
1230 * are not shown. After rewrite_parents() rewrites the
1231 * parents of a commit that is shown, we mark the boundary
1232 * parents with BOUNDARY_SHOW.
1233 */
1234 if (commit->object.flags & BOUNDARY_SHOW) {
1235 commit->object.flags |= SHOWN;
1236 return commit;
1237 }
1238 if (commit->object.flags & UNINTERESTING)
1239 continue;
1240 if (revs->min_age != -1 && (commit->date > revs->min_age))
1241 continue;
1242 if (revs->no_merges &&
1243 commit->parents && commit->parents->next)
1244 continue;
1245 if (!commit_match(commit, revs))
1246 continue;
1247 if (revs->prune_fn && revs->dense) {
1248 /* Commit without changes? */
1249 if (!(commit->object.flags & TREECHANGE)) {
1250 /* drop merges unless we want parenthood */
1251 if (!revs->parents)
1252 continue;
1253 /* non-merge - always ignore it */
1254 if (!commit->parents || !commit->parents->next)
1255 continue;
1256 }
1257 if (revs->parents)
1258 rewrite_parents(revs, commit);
1259 }
1260 if (revs->boundary)
1261 mark_boundary_to_show(commit);
1262 commit->object.flags |= SHOWN;
1263 return commit;
1264 } while (revs->commits);
1265 return NULL;
1266 }