10 #include "reflog-walk.h"
11 #include "patch-ids.h"
13 volatile show_early_output_fn_t show_early_output;
15 static char *path_name(struct name_path *path, const char *name)
19 int nlen = strlen(name);
22 for (p = path; p; p = p->up) {
24 len += p->elem_len + 1;
27 m = n + len - (nlen + 1);
29 for (p = path; p; p = p->up) {
32 memcpy(m, p->elem, p->elem_len);
39 void add_object(struct object *obj,
40 struct object_array *p,
41 struct name_path *path,
44 add_object_array(obj, path_name(path, name), p);
47 static void mark_blob_uninteresting(struct blob *blob)
51 if (blob->object.flags & UNINTERESTING)
53 blob->object.flags |= UNINTERESTING;
56 void mark_tree_uninteresting(struct tree *tree)
58 struct tree_desc desc;
59 struct name_entry entry;
60 struct object *obj = &tree->object;
64 if (obj->flags & UNINTERESTING)
66 obj->flags |= UNINTERESTING;
67 if (!has_sha1_file(obj->sha1))
69 if (parse_tree(tree) < 0)
70 die("bad tree %s", sha1_to_hex(obj->sha1));
72 init_tree_desc(&desc, tree->buffer, tree->size);
73 while (tree_entry(&desc, &entry)) {
74 switch (object_type(entry.mode)) {
76 mark_tree_uninteresting(lookup_tree(entry.sha1));
79 mark_blob_uninteresting(lookup_blob(entry.sha1));
82 /* Subproject commit - not in this repository */
88 * We don't care about the tree any more
89 * after it has been marked uninteresting.
95 void mark_parents_uninteresting(struct commit *commit)
97 struct commit_list *parents = commit->parents;
100 struct commit *commit = parents->item;
101 if (!(commit->object.flags & UNINTERESTING)) {
102 commit->object.flags |= UNINTERESTING;
105 * Normally we haven't parsed the parent
106 * yet, so we won't have a parent of a parent
107 * here. However, it may turn out that we've
108 * reached this commit some other way (where it
109 * wasn't uninteresting), in which case we need
110 * to mark its parents recursively too..
113 mark_parents_uninteresting(commit);
117 * A missing commit is ok iff its parent is marked
120 * We just mark such a thing parsed, so that when
121 * it is popped next time around, we won't be trying
122 * to parse it and get an error.
124 if (!has_sha1_file(commit->object.sha1))
125 commit->object.parsed = 1;
126 parents = parents->next;
130 static void add_pending_object_with_mode(struct rev_info *revs, struct object *obj, const char *name, unsigned mode)
132 if (revs->no_walk && (obj->flags & UNINTERESTING))
133 die("object ranges do not make sense when not walking revisions");
134 if (revs->reflog_info && obj->type == OBJ_COMMIT &&
135 add_reflog_for_walk(revs->reflog_info,
136 (struct commit *)obj, name))
138 add_object_array_with_mode(obj, name, &revs->pending, mode);
141 void add_pending_object(struct rev_info *revs, struct object *obj, const char *name)
143 add_pending_object_with_mode(revs, obj, name, S_IFINVALID);
146 void add_head_to_pending(struct rev_info *revs)
148 unsigned char sha1[20];
150 if (get_sha1("HEAD", sha1))
152 obj = parse_object(sha1);
155 add_pending_object(revs, obj, "HEAD");
158 static struct object *get_reference(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags)
160 struct object *object;
162 object = parse_object(sha1);
164 die("bad object %s", name);
165 object->flags |= flags;
169 static struct commit *handle_commit(struct rev_info *revs, struct object *object, const char *name)
171 unsigned long flags = object->flags;
174 * Tag object? Look what it points to..
176 while (object->type == OBJ_TAG) {
177 struct tag *tag = (struct tag *) object;
178 if (revs->tag_objects && !(flags & UNINTERESTING))
179 add_pending_object(revs, object, tag->tag);
182 object = parse_object(tag->tagged->sha1);
184 die("bad object %s", sha1_to_hex(tag->tagged->sha1));
188 * Commit object? Just return it, we'll do all the complex
191 if (object->type == OBJ_COMMIT) {
192 struct commit *commit = (struct commit *)object;
193 if (parse_commit(commit) < 0)
194 die("unable to parse commit %s", name);
195 if (flags & UNINTERESTING) {
196 commit->object.flags |= UNINTERESTING;
197 mark_parents_uninteresting(commit);
204 * Tree object? Either mark it uniniteresting, or add it
205 * to the list of objects to look at later..
207 if (object->type == OBJ_TREE) {
208 struct tree *tree = (struct tree *)object;
209 if (!revs->tree_objects)
211 if (flags & UNINTERESTING) {
212 mark_tree_uninteresting(tree);
215 add_pending_object(revs, object, "");
220 * Blob object? You know the drill by now..
222 if (object->type == OBJ_BLOB) {
223 struct blob *blob = (struct blob *)object;
224 if (!revs->blob_objects)
226 if (flags & UNINTERESTING) {
227 mark_blob_uninteresting(blob);
230 add_pending_object(revs, object, "");
233 die("%s is unknown object", name);
236 static int everybody_uninteresting(struct commit_list *orig)
238 struct commit_list *list = orig;
240 struct commit *commit = list->item;
242 if (commit->object.flags & UNINTERESTING)
250 * The goal is to get REV_TREE_NEW as the result only if the
251 * diff consists of all '+' (and no other changes), and
252 * REV_TREE_DIFFERENT otherwise (of course if the trees are
253 * the same we want REV_TREE_SAME). That means that once we
254 * get to REV_TREE_DIFFERENT, we do not have to look any further.
256 static int tree_difference = REV_TREE_SAME;
258 static void file_add_remove(struct diff_options *options,
259 int addremove, unsigned mode,
260 const unsigned char *sha1,
261 const char *base, const char *path)
263 int diff = REV_TREE_DIFFERENT;
266 * Is it an add of a new file? It means that the old tree
267 * didn't have it at all, so we will turn "REV_TREE_SAME" ->
268 * "REV_TREE_NEW", but leave any "REV_TREE_DIFFERENT" alone
269 * (and if it already was "REV_TREE_NEW", we'll keep it
270 * "REV_TREE_NEW" of course).
272 if (addremove == '+') {
273 diff = tree_difference;
274 if (diff != REV_TREE_SAME)
278 tree_difference = diff;
279 if (tree_difference == REV_TREE_DIFFERENT)
280 DIFF_OPT_SET(options, HAS_CHANGES);
283 static void file_change(struct diff_options *options,
284 unsigned old_mode, unsigned new_mode,
285 const unsigned char *old_sha1,
286 const unsigned char *new_sha1,
287 const char *base, const char *path)
289 tree_difference = REV_TREE_DIFFERENT;
290 DIFF_OPT_SET(options, HAS_CHANGES);
293 static int rev_compare_tree(struct rev_info *revs, struct tree *t1, struct tree *t2)
298 return REV_TREE_DIFFERENT;
299 tree_difference = REV_TREE_SAME;
300 DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
301 if (diff_tree_sha1(t1->object.sha1, t2->object.sha1, "",
303 return REV_TREE_DIFFERENT;
304 return tree_difference;
307 static int rev_same_tree_as_empty(struct rev_info *revs, struct tree *t1)
312 struct tree_desc empty, real;
317 tree = read_object_with_reference(t1->object.sha1, tree_type, &size, NULL);
320 init_tree_desc(&real, tree, size);
321 init_tree_desc(&empty, "", 0);
323 tree_difference = REV_TREE_SAME;
324 DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
325 retval = diff_tree(&empty, &real, "", &revs->pruning);
328 return retval >= 0 && (tree_difference == REV_TREE_SAME);
331 static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
333 struct commit_list **pp, *parent;
334 int tree_changed = 0, tree_same = 0;
337 * If we don't do pruning, everything is interesting
345 if (!commit->parents) {
346 if (rev_same_tree_as_empty(revs, commit->tree))
347 commit->object.flags |= TREESAME;
352 * Normal non-merge commit? If we don't want to make the
353 * history dense, we consider it always to be a change..
355 if (!revs->dense && !commit->parents->next)
358 pp = &commit->parents;
359 while ((parent = *pp) != NULL) {
360 struct commit *p = parent->item;
362 if (parse_commit(p) < 0)
363 die("cannot simplify commit %s (because of %s)",
364 sha1_to_hex(commit->object.sha1),
365 sha1_to_hex(p->object.sha1));
366 switch (rev_compare_tree(revs, p->tree, commit->tree)) {
369 if (!revs->simplify_history || (p->object.flags & UNINTERESTING)) {
370 /* Even if a merge with an uninteresting
371 * side branch brought the entire change
372 * we are interested in, we do not want
373 * to lose the other branches of this
374 * merge, so we just keep going.
380 commit->parents = parent;
381 commit->object.flags |= TREESAME;
385 if (revs->remove_empty_trees &&
386 rev_same_tree_as_empty(revs, p->tree)) {
387 /* We are adding all the specified
388 * paths from this parent, so the
389 * history beyond this parent is not
390 * interesting. Remove its parents
391 * (they are grandparents for us).
392 * IOW, we pretend this parent is a
395 if (parse_commit(p) < 0)
396 die("cannot simplify commit %s (invalid %s)",
397 sha1_to_hex(commit->object.sha1),
398 sha1_to_hex(p->object.sha1));
402 case REV_TREE_DIFFERENT:
407 die("bad tree compare for commit %s", sha1_to_hex(commit->object.sha1));
409 if (tree_changed && !tree_same)
411 commit->object.flags |= TREESAME;
414 static int add_parents_to_list(struct rev_info *revs, struct commit *commit, struct commit_list **list)
416 struct commit_list *parent = commit->parents;
420 if (commit->object.flags & ADDED)
422 commit->object.flags |= ADDED;
425 * If the commit is uninteresting, don't try to
426 * prune parents - we want the maximal uninteresting
429 * Normally we haven't parsed the parent
430 * yet, so we won't have a parent of a parent
431 * here. However, it may turn out that we've
432 * reached this commit some other way (where it
433 * wasn't uninteresting), in which case we need
434 * to mark its parents recursively too..
436 if (commit->object.flags & UNINTERESTING) {
438 struct commit *p = parent->item;
439 parent = parent->next;
440 if (parse_commit(p) < 0)
442 p->object.flags |= UNINTERESTING;
444 mark_parents_uninteresting(p);
445 if (p->object.flags & SEEN)
447 p->object.flags |= SEEN;
448 insert_by_date(p, list);
454 * Ok, the commit wasn't uninteresting. Try to
455 * simplify the commit history and find the parent
456 * that has no differences in the path set if one exists.
458 try_to_simplify_commit(revs, commit);
463 left_flag = (commit->object.flags & SYMMETRIC_LEFT);
465 rest = !revs->first_parent_only;
466 for (parent = commit->parents, add = 1; parent; add = rest) {
467 struct commit *p = parent->item;
469 parent = parent->next;
470 if (parse_commit(p) < 0)
472 p->object.flags |= left_flag;
473 if (p->object.flags & SEEN)
475 p->object.flags |= SEEN;
477 insert_by_date(p, list);
482 static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
484 struct commit_list *p;
485 int left_count = 0, right_count = 0;
487 struct patch_ids ids;
489 /* First count the commits on the left and on the right */
490 for (p = list; p; p = p->next) {
491 struct commit *commit = p->item;
492 unsigned flags = commit->object.flags;
493 if (flags & BOUNDARY)
495 else if (flags & SYMMETRIC_LEFT)
501 left_first = left_count < right_count;
502 init_patch_ids(&ids);
503 if (revs->diffopt.nr_paths) {
504 ids.diffopts.nr_paths = revs->diffopt.nr_paths;
505 ids.diffopts.paths = revs->diffopt.paths;
506 ids.diffopts.pathlens = revs->diffopt.pathlens;
509 /* Compute patch-ids for one side */
510 for (p = list; p; p = p->next) {
511 struct commit *commit = p->item;
512 unsigned flags = commit->object.flags;
514 if (flags & BOUNDARY)
517 * If we have fewer left, left_first is set and we omit
518 * commits on the right branch in this loop. If we have
519 * fewer right, we skip the left ones.
521 if (left_first != !!(flags & SYMMETRIC_LEFT))
523 commit->util = add_commit_patch_id(commit, &ids);
526 /* Check the other side */
527 for (p = list; p; p = p->next) {
528 struct commit *commit = p->item;
530 unsigned flags = commit->object.flags;
532 if (flags & BOUNDARY)
535 * If we have fewer left, left_first is set and we omit
536 * commits on the left branch in this loop.
538 if (left_first == !!(flags & SYMMETRIC_LEFT))
542 * Have we seen the same patch id?
544 id = has_commit_patch_id(commit, &ids);
548 commit->object.flags |= SHOWN;
551 /* Now check the original side for seen ones */
552 for (p = list; p; p = p->next) {
553 struct commit *commit = p->item;
554 struct patch_id *ent;
560 commit->object.flags |= SHOWN;
564 free_patch_ids(&ids);
567 static void add_to_list(struct commit_list **p, struct commit *commit, struct commit_list *n)
569 p = &commit_list_insert(commit, p)->next;
573 static int limit_list(struct rev_info *revs)
575 struct commit_list *list = revs->commits;
576 struct commit_list *newlist = NULL;
577 struct commit_list **p = &newlist;
580 struct commit_list *entry = list;
581 struct commit *commit = list->item;
582 struct object *obj = &commit->object;
583 show_early_output_fn_t show;
588 if (revs->max_age != -1 && (commit->date < revs->max_age))
589 obj->flags |= UNINTERESTING;
590 if (add_parents_to_list(revs, commit, &list) < 0)
592 if (obj->flags & UNINTERESTING) {
593 mark_parents_uninteresting(commit);
594 if (everybody_uninteresting(list)) {
596 add_to_list(p, commit, list);
602 if (revs->min_age != -1 && (commit->date > revs->min_age))
604 p = &commit_list_insert(commit, p)->next;
606 show = show_early_output;
611 show_early_output = NULL;
613 if (revs->cherry_pick)
614 cherry_pick_list(newlist, revs);
616 revs->commits = newlist;
622 int warned_bad_reflog;
623 struct rev_info *all_revs;
624 const char *name_for_errormsg;
627 static int handle_one_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
629 struct all_refs_cb *cb = cb_data;
630 struct object *object = get_reference(cb->all_revs, path, sha1,
632 add_pending_object(cb->all_revs, object, path);
636 static void handle_refs(struct rev_info *revs, unsigned flags,
637 int (*for_each)(each_ref_fn, void *))
639 struct all_refs_cb cb;
641 cb.all_flags = flags;
642 for_each(handle_one_ref, &cb);
645 static void handle_one_reflog_commit(unsigned char *sha1, void *cb_data)
647 struct all_refs_cb *cb = cb_data;
648 if (!is_null_sha1(sha1)) {
649 struct object *o = parse_object(sha1);
651 o->flags |= cb->all_flags;
652 add_pending_object(cb->all_revs, o, "");
654 else if (!cb->warned_bad_reflog) {
655 warning("reflog of '%s' references pruned commits",
656 cb->name_for_errormsg);
657 cb->warned_bad_reflog = 1;
662 static int handle_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
663 const char *email, unsigned long timestamp, int tz,
664 const char *message, void *cb_data)
666 handle_one_reflog_commit(osha1, cb_data);
667 handle_one_reflog_commit(nsha1, cb_data);
671 static int handle_one_reflog(const char *path, const unsigned char *sha1, int flag, void *cb_data)
673 struct all_refs_cb *cb = cb_data;
674 cb->warned_bad_reflog = 0;
675 cb->name_for_errormsg = path;
676 for_each_reflog_ent(path, handle_one_reflog_ent, cb_data);
680 static void handle_reflog(struct rev_info *revs, unsigned flags)
682 struct all_refs_cb cb;
684 cb.all_flags = flags;
685 for_each_reflog(handle_one_reflog, &cb);
688 static int add_parents_only(struct rev_info *revs, const char *arg, int flags)
690 unsigned char sha1[20];
692 struct commit *commit;
693 struct commit_list *parents;
696 flags ^= UNINTERESTING;
699 if (get_sha1(arg, sha1))
702 it = get_reference(revs, arg, sha1, 0);
703 if (it->type != OBJ_TAG)
705 if (!((struct tag*)it)->tagged)
707 hashcpy(sha1, ((struct tag*)it)->tagged->sha1);
709 if (it->type != OBJ_COMMIT)
711 commit = (struct commit *)it;
712 for (parents = commit->parents; parents; parents = parents->next) {
713 it = &parents->item->object;
715 add_pending_object(revs, it, arg);
720 void init_revisions(struct rev_info *revs, const char *prefix)
722 memset(revs, 0, sizeof(*revs));
724 revs->abbrev = DEFAULT_ABBREV;
725 revs->ignore_merges = 1;
726 revs->simplify_history = 1;
727 DIFF_OPT_SET(&revs->pruning, RECURSIVE);
728 DIFF_OPT_SET(&revs->pruning, QUIET);
729 revs->pruning.add_remove = file_add_remove;
730 revs->pruning.change = file_change;
733 revs->prefix = prefix;
736 revs->skip_count = -1;
737 revs->max_count = -1;
739 revs->commit_format = CMIT_FMT_DEFAULT;
741 diff_setup(&revs->diffopt);
742 if (prefix && !revs->diffopt.prefix) {
743 revs->diffopt.prefix = prefix;
744 revs->diffopt.prefix_length = strlen(prefix);
748 static void add_pending_commit_list(struct rev_info *revs,
749 struct commit_list *commit_list,
752 while (commit_list) {
753 struct object *object = &commit_list->item->object;
754 object->flags |= flags;
755 add_pending_object(revs, object, sha1_to_hex(object->sha1));
756 commit_list = commit_list->next;
760 static void prepare_show_merge(struct rev_info *revs)
762 struct commit_list *bases;
763 struct commit *head, *other;
764 unsigned char sha1[20];
765 const char **prune = NULL;
766 int i, prune_num = 1; /* counting terminating NULL */
768 if (get_sha1("HEAD", sha1) || !(head = lookup_commit(sha1)))
769 die("--merge without HEAD?");
770 if (get_sha1("MERGE_HEAD", sha1) || !(other = lookup_commit(sha1)))
771 die("--merge without MERGE_HEAD?");
772 add_pending_object(revs, &head->object, "HEAD");
773 add_pending_object(revs, &other->object, "MERGE_HEAD");
774 bases = get_merge_bases(head, other, 1);
776 struct commit *it = bases->item;
777 struct commit_list *n = bases->next;
780 it->object.flags |= UNINTERESTING;
781 add_pending_object(revs, &it->object, "(merge-base)");
786 for (i = 0; i < active_nr; i++) {
787 struct cache_entry *ce = active_cache[i];
790 if (ce_path_match(ce, revs->prune_data)) {
792 prune = xrealloc(prune, sizeof(*prune) * prune_num);
793 prune[prune_num-2] = ce->name;
794 prune[prune_num-1] = NULL;
796 while ((i+1 < active_nr) &&
797 ce_same_name(ce, active_cache[i+1]))
800 revs->prune_data = prune;
803 int handle_revision_arg(const char *arg, struct rev_info *revs,
805 int cant_be_filename)
809 struct object *object;
810 unsigned char sha1[20];
813 dotdot = strstr(arg, "..");
815 unsigned char from_sha1[20];
816 const char *next = dotdot + 2;
817 const char *this = arg;
818 int symmetric = *next == '.';
819 unsigned int flags_exclude = flags ^ UNINTERESTING;
828 if (!get_sha1(this, from_sha1) &&
829 !get_sha1(next, sha1)) {
830 struct commit *a, *b;
831 struct commit_list *exclude;
833 a = lookup_commit_reference(from_sha1);
834 b = lookup_commit_reference(sha1);
837 "Invalid symmetric difference expression %s...%s" :
838 "Invalid revision range %s..%s",
842 if (!cant_be_filename) {
844 verify_non_filename(revs->prefix, arg);
848 exclude = get_merge_bases(a, b, 1);
849 add_pending_commit_list(revs, exclude,
851 free_commit_list(exclude);
852 a->object.flags |= flags | SYMMETRIC_LEFT;
854 a->object.flags |= flags_exclude;
855 b->object.flags |= flags;
856 add_pending_object(revs, &a->object, this);
857 add_pending_object(revs, &b->object, next);
862 dotdot = strstr(arg, "^@");
863 if (dotdot && !dotdot[2]) {
865 if (add_parents_only(revs, arg, flags))
869 dotdot = strstr(arg, "^!");
870 if (dotdot && !dotdot[2]) {
872 if (!add_parents_only(revs, arg, flags ^ UNINTERESTING))
878 local_flags = UNINTERESTING;
881 if (get_sha1_with_mode(arg, sha1, &mode))
883 if (!cant_be_filename)
884 verify_non_filename(revs->prefix, arg);
885 object = get_reference(revs, arg, sha1, flags ^ local_flags);
886 add_pending_object_with_mode(revs, object, arg, mode);
890 static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
892 if (!revs->grep_filter) {
893 struct grep_opt *opt = xcalloc(1, sizeof(*opt));
894 opt->status_only = 1;
895 opt->pattern_tail = &(opt->pattern_list);
896 opt->regflags = REG_NEWLINE;
897 revs->grep_filter = opt;
899 append_grep_pattern(revs->grep_filter, ptn,
900 "command line", 0, what);
903 static void add_header_grep(struct rev_info *revs, const char *field, const char *pattern)
909 fldlen = strlen(field);
910 patlen = strlen(pattern);
911 pat = xmalloc(patlen + fldlen + 10);
913 if (*pattern == '^') {
917 sprintf(pat, "^%s %s%s", field, prefix, pattern);
918 add_grep(revs, pat, GREP_PATTERN_HEAD);
921 static void add_message_grep(struct rev_info *revs, const char *pattern)
923 add_grep(revs, pattern, GREP_PATTERN_BODY);
926 static void add_ignore_packed(struct rev_info *revs, const char *name)
928 int num = ++revs->num_ignore_packed;
930 revs->ignore_packed = xrealloc(revs->ignore_packed,
931 sizeof(const char **) * (num + 1));
932 revs->ignore_packed[num-1] = name;
933 revs->ignore_packed[num] = NULL;
937 * Parse revision information, filling in the "rev_info" structure,
938 * and removing the used arguments from the argument list.
940 * Returns the number of arguments left that weren't recognized
941 * (which are also moved to the head of the argument list)
943 int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def)
945 int i, flags, seen_dashdash, show_merge;
946 const char **unrecognized = argv + 1;
952 /* First, search for "--" */
954 for (i = 1; i < argc; i++) {
955 const char *arg = argv[i];
956 if (strcmp(arg, "--"))
961 revs->prune_data = get_pathspec(revs->prefix, argv + i + 1);
966 flags = show_merge = 0;
967 for (i = 1; i < argc; i++) {
968 const char *arg = argv[i];
971 if (!prefixcmp(arg, "--max-count=")) {
972 revs->max_count = atoi(arg + 12);
975 if (!prefixcmp(arg, "--skip=")) {
976 revs->skip_count = atoi(arg + 7);
979 /* accept -<digit>, like traditional "head" */
980 if ((*arg == '-') && isdigit(arg[1])) {
981 revs->max_count = atoi(arg + 1);
984 if (!strcmp(arg, "-n")) {
986 die("-n requires an argument");
987 revs->max_count = atoi(argv[++i]);
990 if (!prefixcmp(arg, "-n")) {
991 revs->max_count = atoi(arg + 2);
994 if (!prefixcmp(arg, "--max-age=")) {
995 revs->max_age = atoi(arg + 10);
998 if (!prefixcmp(arg, "--since=")) {
999 revs->max_age = approxidate(arg + 8);
1002 if (!prefixcmp(arg, "--after=")) {
1003 revs->max_age = approxidate(arg + 8);
1006 if (!prefixcmp(arg, "--min-age=")) {
1007 revs->min_age = atoi(arg + 10);
1010 if (!prefixcmp(arg, "--before=")) {
1011 revs->min_age = approxidate(arg + 9);
1014 if (!prefixcmp(arg, "--until=")) {
1015 revs->min_age = approxidate(arg + 8);
1018 if (!strcmp(arg, "--all")) {
1019 handle_refs(revs, flags, for_each_ref);
1022 if (!strcmp(arg, "--branches")) {
1023 handle_refs(revs, flags, for_each_branch_ref);
1026 if (!strcmp(arg, "--tags")) {
1027 handle_refs(revs, flags, for_each_tag_ref);
1030 if (!strcmp(arg, "--remotes")) {
1031 handle_refs(revs, flags, for_each_remote_ref);
1034 if (!strcmp(arg, "--first-parent")) {
1035 revs->first_parent_only = 1;
1038 if (!strcmp(arg, "--reflog")) {
1039 handle_reflog(revs, flags);
1042 if (!strcmp(arg, "-g") ||
1043 !strcmp(arg, "--walk-reflogs")) {
1044 init_reflog_walk(&revs->reflog_info);
1047 if (!strcmp(arg, "--not")) {
1048 flags ^= UNINTERESTING;
1051 if (!strcmp(arg, "--default")) {
1053 die("bad --default argument");
1057 if (!strcmp(arg, "--merge")) {
1061 if (!strcmp(arg, "--topo-order")) {
1062 revs->topo_order = 1;
1065 if (!strcmp(arg, "--date-order")) {
1067 revs->topo_order = 1;
1070 if (!prefixcmp(arg, "--early-output")) {
1074 count = atoi(arg+15);
1077 revs->topo_order = 1;
1078 revs->early_output = count;
1082 if (!strcmp(arg, "--parents")) {
1086 if (!strcmp(arg, "--dense")) {
1090 if (!strcmp(arg, "--sparse")) {
1094 if (!strcmp(arg, "--show-all")) {
1098 if (!strcmp(arg, "--remove-empty")) {
1099 revs->remove_empty_trees = 1;
1102 if (!strcmp(arg, "--no-merges")) {
1103 revs->no_merges = 1;
1106 if (!strcmp(arg, "--boundary")) {
1110 if (!strcmp(arg, "--left-right")) {
1111 revs->left_right = 1;
1114 if (!strcmp(arg, "--cherry-pick")) {
1115 revs->cherry_pick = 1;
1119 if (!strcmp(arg, "--objects")) {
1120 revs->tag_objects = 1;
1121 revs->tree_objects = 1;
1122 revs->blob_objects = 1;
1125 if (!strcmp(arg, "--objects-edge")) {
1126 revs->tag_objects = 1;
1127 revs->tree_objects = 1;
1128 revs->blob_objects = 1;
1129 revs->edge_hint = 1;
1132 if (!strcmp(arg, "--unpacked")) {
1134 free(revs->ignore_packed);
1135 revs->ignore_packed = NULL;
1136 revs->num_ignore_packed = 0;
1139 if (!prefixcmp(arg, "--unpacked=")) {
1141 add_ignore_packed(revs, arg+11);
1144 if (!strcmp(arg, "-r")) {
1146 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1149 if (!strcmp(arg, "-t")) {
1151 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1152 DIFF_OPT_SET(&revs->diffopt, TREE_IN_RECURSIVE);
1155 if (!strcmp(arg, "-m")) {
1156 revs->ignore_merges = 0;
1159 if (!strcmp(arg, "-c")) {
1161 revs->dense_combined_merges = 0;
1162 revs->combine_merges = 1;
1165 if (!strcmp(arg, "--cc")) {
1167 revs->dense_combined_merges = 1;
1168 revs->combine_merges = 1;
1171 if (!strcmp(arg, "-v")) {
1172 revs->verbose_header = 1;
1175 if (!prefixcmp(arg, "--pretty")) {
1176 revs->verbose_header = 1;
1177 revs->commit_format = get_commit_format(arg+8);
1180 if (!strcmp(arg, "--root")) {
1181 revs->show_root_diff = 1;
1184 if (!strcmp(arg, "--no-commit-id")) {
1185 revs->no_commit_id = 1;
1188 if (!strcmp(arg, "--always")) {
1189 revs->always_show_header = 1;
1192 if (!strcmp(arg, "--no-abbrev")) {
1196 if (!strcmp(arg, "--abbrev")) {
1197 revs->abbrev = DEFAULT_ABBREV;
1200 if (!prefixcmp(arg, "--abbrev=")) {
1201 revs->abbrev = strtoul(arg + 9, NULL, 10);
1202 if (revs->abbrev < MINIMUM_ABBREV)
1203 revs->abbrev = MINIMUM_ABBREV;
1204 else if (revs->abbrev > 40)
1208 if (!strcmp(arg, "--abbrev-commit")) {
1209 revs->abbrev_commit = 1;
1212 if (!strcmp(arg, "--full-diff")) {
1214 revs->full_diff = 1;
1217 if (!strcmp(arg, "--full-history")) {
1218 revs->simplify_history = 0;
1221 if (!strcmp(arg, "--relative-date")) {
1222 revs->date_mode = DATE_RELATIVE;
1225 if (!strncmp(arg, "--date=", 7)) {
1226 revs->date_mode = parse_date_format(arg + 7);
1229 if (!strcmp(arg, "--log-size")) {
1230 revs->show_log_size = 1;
1235 * Grepping the commit log
1237 if (!prefixcmp(arg, "--author=")) {
1238 add_header_grep(revs, "author", arg+9);
1241 if (!prefixcmp(arg, "--committer=")) {
1242 add_header_grep(revs, "committer", arg+12);
1245 if (!prefixcmp(arg, "--grep=")) {
1246 add_message_grep(revs, arg+7);
1249 if (!strcmp(arg, "--extended-regexp") ||
1250 !strcmp(arg, "-E")) {
1251 regflags |= REG_EXTENDED;
1254 if (!strcmp(arg, "--regexp-ignore-case") ||
1255 !strcmp(arg, "-i")) {
1256 regflags |= REG_ICASE;
1259 if (!strcmp(arg, "--fixed-strings") ||
1260 !strcmp(arg, "-F")) {
1264 if (!strcmp(arg, "--all-match")) {
1268 if (!prefixcmp(arg, "--encoding=")) {
1270 if (strcmp(arg, "none"))
1271 git_log_output_encoding = xstrdup(arg);
1273 git_log_output_encoding = "";
1276 if (!strcmp(arg, "--reverse")) {
1280 if (!strcmp(arg, "--no-walk")) {
1284 if (!strcmp(arg, "--do-walk")) {
1289 opts = diff_opt_parse(&revs->diffopt, argv+i, argc-i);
1294 *unrecognized++ = arg;
1299 if (handle_revision_arg(arg, revs, flags, seen_dashdash)) {
1301 if (seen_dashdash || *arg == '^')
1302 die("bad revision '%s'", arg);
1304 /* If we didn't have a "--":
1305 * (1) all filenames must exist;
1306 * (2) all rev-args must not be interpretable
1307 * as a valid filename.
1308 * but the latter we have checked in the main loop.
1310 for (j = i; j < argc; j++)
1311 verify_filename(revs->prefix, argv[j]);
1313 revs->prune_data = get_pathspec(revs->prefix,
1319 if (revs->grep_filter) {
1320 revs->grep_filter->regflags |= regflags;
1321 revs->grep_filter->fixed = fixed;
1325 prepare_show_merge(revs);
1326 if (def && !revs->pending.nr) {
1327 unsigned char sha1[20];
1328 struct object *object;
1330 if (get_sha1_with_mode(def, sha1, &mode))
1331 die("bad default revision '%s'", def);
1332 object = get_reference(revs, def, sha1, 0);
1333 add_pending_object_with_mode(revs, object, def, mode);
1336 /* Did the user ask for any diff output? Run the diff! */
1337 if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT)
1340 /* Pickaxe, diff-filter and rename following need diffs */
1341 if (revs->diffopt.pickaxe ||
1342 revs->diffopt.filter ||
1343 DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
1346 if (revs->topo_order)
1349 if (revs->prune_data) {
1350 diff_tree_setup_paths(revs->prune_data, &revs->pruning);
1351 /* Can't prune commits with rename following: the paths change.. */
1352 if (!DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
1354 if (!revs->full_diff)
1355 diff_tree_setup_paths(revs->prune_data, &revs->diffopt);
1357 if (revs->combine_merges) {
1358 revs->ignore_merges = 0;
1359 if (revs->dense_combined_merges && !revs->diffopt.output_format)
1360 revs->diffopt.output_format = DIFF_FORMAT_PATCH;
1362 revs->diffopt.abbrev = revs->abbrev;
1363 if (diff_setup_done(&revs->diffopt) < 0)
1364 die("diff_setup_done failed");
1366 if (revs->grep_filter) {
1367 revs->grep_filter->all_match = all_match;
1368 compile_grep_patterns(revs->grep_filter);
1371 if (revs->reverse && revs->reflog_info)
1372 die("cannot combine --reverse with --walk-reflogs");
1377 int prepare_revision_walk(struct rev_info *revs)
1379 int nr = revs->pending.nr;
1380 struct object_array_entry *e, *list;
1382 e = list = revs->pending.objects;
1383 revs->pending.nr = 0;
1384 revs->pending.alloc = 0;
1385 revs->pending.objects = NULL;
1387 struct commit *commit = handle_commit(revs, e->item, e->name);
1389 if (!(commit->object.flags & SEEN)) {
1390 commit->object.flags |= SEEN;
1391 insert_by_date(commit, &revs->commits);
1401 if (limit_list(revs) < 0)
1403 if (revs->topo_order)
1404 sort_in_topological_order(&revs->commits, revs->lifo);
1408 enum rewrite_result {
1410 rewrite_one_noparents,
1414 static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)
1417 struct commit *p = *pp;
1419 if (add_parents_to_list(revs, p, &revs->commits) < 0)
1420 return rewrite_one_error;
1421 if (p->parents && p->parents->next)
1422 return rewrite_one_ok;
1423 if (p->object.flags & UNINTERESTING)
1424 return rewrite_one_ok;
1425 if (!(p->object.flags & TREESAME))
1426 return rewrite_one_ok;
1428 return rewrite_one_noparents;
1429 *pp = p->parents->item;
1433 static void remove_duplicate_parents(struct commit *commit)
1435 struct commit_list **pp, *p;
1437 /* Examine existing parents while marking ones we have seen... */
1438 pp = &commit->parents;
1439 while ((p = *pp) != NULL) {
1440 struct commit *parent = p->item;
1441 if (parent->object.flags & TMP_MARK) {
1445 parent->object.flags |= TMP_MARK;
1448 /* ... and clear the temporary mark */
1449 for (p = commit->parents; p; p = p->next)
1450 p->item->object.flags &= ~TMP_MARK;
1453 static int rewrite_parents(struct rev_info *revs, struct commit *commit)
1455 struct commit_list **pp = &commit->parents;
1457 struct commit_list *parent = *pp;
1458 switch (rewrite_one(revs, &parent->item)) {
1459 case rewrite_one_ok:
1461 case rewrite_one_noparents:
1464 case rewrite_one_error:
1469 remove_duplicate_parents(commit);
1473 static int commit_match(struct commit *commit, struct rev_info *opt)
1475 if (!opt->grep_filter)
1477 return grep_buffer(opt->grep_filter,
1478 NULL, /* we say nothing, not even filename */
1479 commit->buffer, strlen(commit->buffer));
1482 enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
1484 if (commit->object.flags & SHOWN)
1485 return commit_ignore;
1486 if (revs->unpacked && has_sha1_pack(commit->object.sha1, revs->ignore_packed))
1487 return commit_ignore;
1490 if (commit->object.flags & UNINTERESTING)
1491 return commit_ignore;
1492 if (revs->min_age != -1 && (commit->date > revs->min_age))
1493 return commit_ignore;
1494 if (revs->no_merges && commit->parents && commit->parents->next)
1495 return commit_ignore;
1496 if (!commit_match(commit, revs))
1497 return commit_ignore;
1498 if (revs->prune && revs->dense) {
1499 /* Commit without changes? */
1500 if (commit->object.flags & TREESAME) {
1501 /* drop merges unless we want parenthood */
1503 return commit_ignore;
1504 /* non-merge - always ignore it */
1505 if (!commit->parents || !commit->parents->next)
1506 return commit_ignore;
1508 if (revs->parents && rewrite_parents(revs, commit) < 0)
1509 return commit_error;
1514 static struct commit *get_revision_1(struct rev_info *revs)
1520 struct commit_list *entry = revs->commits;
1521 struct commit *commit = entry->item;
1523 revs->commits = entry->next;
1526 if (revs->reflog_info)
1527 fake_reflog_parent(revs->reflog_info, commit);
1530 * If we haven't done the list limiting, we need to look at
1531 * the parents here. We also need to do the date-based limiting
1532 * that we'd otherwise have done in limit_list().
1534 if (!revs->limited) {
1535 if (revs->max_age != -1 &&
1536 (commit->date < revs->max_age))
1538 if (add_parents_to_list(revs, commit, &revs->commits) < 0)
1542 switch (simplify_commit(revs, commit)) {
1550 } while (revs->commits);
1554 static void gc_boundary(struct object_array *array)
1556 unsigned nr = array->nr;
1557 unsigned alloc = array->alloc;
1558 struct object_array_entry *objects = array->objects;
1562 for (i = j = 0; i < nr; i++) {
1563 if (objects[i].item->flags & SHOWN)
1566 objects[j] = objects[i];
1569 for (i = j; i < nr; i++)
1570 objects[i].item = NULL;
1575 struct commit *get_revision(struct rev_info *revs)
1577 struct commit *c = NULL;
1578 struct commit_list *l;
1580 if (revs->boundary == 2) {
1582 struct object_array *array = &revs->boundary_commits;
1583 struct object_array_entry *objects = array->objects;
1584 for (i = 0; i < array->nr; i++) {
1585 c = (struct commit *)(objects[i].item);
1588 if (!(c->object.flags & CHILD_SHOWN))
1590 if (!(c->object.flags & SHOWN))
1596 c->object.flags |= SHOWN | BOUNDARY;
1600 if (revs->reverse) {
1603 if (0 <= revs->max_count) {
1604 limit = revs->max_count;
1605 if (0 < revs->skip_count)
1606 limit += revs->skip_count;
1609 while ((c = get_revision_1(revs))) {
1610 commit_list_insert(c, &l);
1611 if ((0 < limit) && !--limit)
1616 revs->max_count = -1;
1621 * Now pick up what they want to give us
1623 c = get_revision_1(revs);
1625 while (0 < revs->skip_count) {
1627 c = get_revision_1(revs);
1634 * Check the max_count.
1636 switch (revs->max_count) {
1647 c->object.flags |= SHOWN;
1649 if (!revs->boundary) {
1655 * get_revision_1() runs out the commits, and
1656 * we are done computing the boundaries.
1657 * switch to boundary commits output mode.
1660 return get_revision(revs);
1664 * boundary commits are the commits that are parents of the
1665 * ones we got from get_revision_1() but they themselves are
1666 * not returned from get_revision_1(). Before returning
1667 * 'c', we need to mark its parents that they could be boundaries.
1670 for (l = c->parents; l; l = l->next) {
1672 p = &(l->item->object);
1673 if (p->flags & (CHILD_SHOWN | SHOWN))
1675 p->flags |= CHILD_SHOWN;
1676 gc_boundary(&revs->boundary_commits);
1677 add_object_array(p, NULL, &revs->boundary_commits);