10 static char *path_name(struct name_path *path, const char *name)
14 int nlen = strlen(name);
17 for (p = path; p; p = p->up) {
19 len += p->elem_len + 1;
22 m = n + len - (nlen + 1);
24 for (p = path; p; p = p->up) {
27 memcpy(m, p->elem, p->elem_len);
34 struct object_list **add_object(struct object *obj,
35 struct object_list **p,
36 struct name_path *path,
39 struct object_list *entry = xmalloc(sizeof(*entry));
42 entry->name = path_name(path, name);
47 static void mark_blob_uninteresting(struct blob *blob)
49 if (blob->object.flags & UNINTERESTING)
51 blob->object.flags |= UNINTERESTING;
54 void mark_tree_uninteresting(struct tree *tree)
56 struct object *obj = &tree->object;
57 struct tree_entry_list *entry;
59 if (obj->flags & UNINTERESTING)
61 obj->flags |= UNINTERESTING;
62 if (!has_sha1_file(obj->sha1))
64 if (parse_tree(tree) < 0)
65 die("bad tree %s", sha1_to_hex(obj->sha1));
66 entry = tree->entries;
69 struct tree_entry_list *next = entry->next;
71 mark_tree_uninteresting(entry->item.tree);
73 mark_blob_uninteresting(entry->item.blob);
79 void mark_parents_uninteresting(struct commit *commit)
81 struct commit_list *parents = commit->parents;
84 struct commit *commit = parents->item;
85 if (!(commit->object.flags & UNINTERESTING)) {
86 commit->object.flags |= UNINTERESTING;
89 * Normally we haven't parsed the parent
90 * yet, so we won't have a parent of a parent
91 * here. However, it may turn out that we've
92 * reached this commit some other way (where it
93 * wasn't uninteresting), in which case we need
94 * to mark its parents recursively too..
97 mark_parents_uninteresting(commit);
101 * A missing commit is ok iff its parent is marked
104 * We just mark such a thing parsed, so that when
105 * it is popped next time around, we won't be trying
106 * to parse it and get an error.
108 if (!has_sha1_file(commit->object.sha1))
109 commit->object.parsed = 1;
110 parents = parents->next;
114 static void add_pending_object(struct rev_info *revs, struct object *obj, const char *name)
116 add_object(obj, &revs->pending_objects, NULL, name);
119 static struct commit *get_commit_reference(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags)
121 struct object *object;
123 object = parse_object(sha1);
125 die("bad object %s", name);
128 * Tag object? Look what it points to..
130 while (object->type == tag_type) {
131 struct tag *tag = (struct tag *) object;
132 object->flags |= flags;
133 if (revs->tag_objects && !(object->flags & UNINTERESTING))
134 add_pending_object(revs, object, tag->tag);
135 object = parse_object(tag->tagged->sha1);
137 die("bad object %s", sha1_to_hex(tag->tagged->sha1));
141 * Commit object? Just return it, we'll do all the complex
144 if (object->type == commit_type) {
145 struct commit *commit = (struct commit *)object;
146 object->flags |= flags;
147 if (parse_commit(commit) < 0)
148 die("unable to parse commit %s", name);
149 if (flags & UNINTERESTING) {
150 mark_parents_uninteresting(commit);
157 * Tree object? Either mark it uniniteresting, or add it
158 * to the list of objects to look at later..
160 if (object->type == tree_type) {
161 struct tree *tree = (struct tree *)object;
162 if (!revs->tree_objects)
164 if (flags & UNINTERESTING) {
165 mark_tree_uninteresting(tree);
168 add_pending_object(revs, object, "");
173 * Blob object? You know the drill by now..
175 if (object->type == blob_type) {
176 struct blob *blob = (struct blob *)object;
177 if (!revs->blob_objects)
179 if (flags & UNINTERESTING) {
180 mark_blob_uninteresting(blob);
183 add_pending_object(revs, object, "");
186 die("%s is unknown object", name);
189 static int everybody_uninteresting(struct commit_list *orig)
191 struct commit_list *list = orig;
193 struct commit *commit = list->item;
195 if (commit->object.flags & UNINTERESTING)
204 #define TREE_DIFFERENT 2
205 static int tree_difference = TREE_SAME;
207 static void file_add_remove(struct diff_options *options,
208 int addremove, unsigned mode,
209 const unsigned char *sha1,
210 const char *base, const char *path)
212 int diff = TREE_DIFFERENT;
215 * Is it an add of a new file? It means that
216 * the old tree didn't have it at all, so we
217 * will turn "TREE_SAME" -> "TREE_NEW", but
218 * leave any "TREE_DIFFERENT" alone (and if
219 * it already was "TREE_NEW", we'll keep it
220 * "TREE_NEW" of course).
222 if (addremove == '+') {
223 diff = tree_difference;
224 if (diff != TREE_SAME)
228 tree_difference = diff;
231 static void file_change(struct diff_options *options,
232 unsigned old_mode, unsigned new_mode,
233 const unsigned char *old_sha1,
234 const unsigned char *new_sha1,
235 const char *base, const char *path)
237 tree_difference = TREE_DIFFERENT;
240 static struct diff_options diff_opt = {
242 .add_remove = file_add_remove,
243 .change = file_change,
246 static int compare_tree(struct tree *t1, struct tree *t2)
251 return TREE_DIFFERENT;
252 tree_difference = TREE_SAME;
253 if (diff_tree_sha1(t1->object.sha1, t2->object.sha1, "", &diff_opt) < 0)
254 return TREE_DIFFERENT;
255 return tree_difference;
258 static int same_tree_as_empty(struct tree *t1)
262 struct tree_desc empty, real;
267 tree = read_object_with_reference(t1->object.sha1, "tree", &real.size, NULL);
276 retval = diff_tree(&empty, &real, "", &diff_opt);
279 return retval >= 0 && !tree_difference;
282 static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
284 struct commit_list **pp, *parent;
285 int tree_changed = 0;
290 if (!commit->parents) {
291 if (!same_tree_as_empty(commit->tree))
292 commit->object.flags |= TREECHANGE;
296 pp = &commit->parents;
297 while ((parent = *pp) != NULL) {
298 struct commit *p = parent->item;
301 switch (compare_tree(p->tree, commit->tree)) {
303 if (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.
314 commit->parents = parent;
318 if (revs->remove_empty_trees && same_tree_as_empty(p->tree)) {
328 die("bad tree compare for commit %s", sha1_to_hex(commit->object.sha1));
331 commit->object.flags |= TREECHANGE;
334 static void add_parents_to_list(struct rev_info *revs, struct commit *commit, struct commit_list **list)
336 struct commit_list *parent = commit->parents;
339 * If the commit is uninteresting, don't try to
340 * prune parents - we want the maximal uninteresting
343 * Normally we haven't parsed the parent
344 * yet, so we won't have a parent of a parent
345 * here. However, it may turn out that we've
346 * reached this commit some other way (where it
347 * wasn't uninteresting), in which case we need
348 * to mark its parents recursively too..
350 if (commit->object.flags & UNINTERESTING) {
352 struct commit *p = parent->item;
353 parent = parent->next;
355 p->object.flags |= UNINTERESTING;
357 mark_parents_uninteresting(p);
358 if (p->object.flags & SEEN)
360 p->object.flags |= SEEN;
361 insert_by_date(p, list);
367 * Ok, the commit wasn't uninteresting. Try to
368 * simplify the commit history and find the parent
369 * that has no differences in the path set if one exists.
372 try_to_simplify_commit(revs, commit);
374 parent = commit->parents;
376 struct commit *p = parent->item;
378 parent = parent->next;
381 if (p->object.flags & SEEN)
383 p->object.flags |= SEEN;
384 insert_by_date(p, list);
388 static void limit_list(struct rev_info *revs)
390 struct commit_list *list = revs->commits;
391 struct commit_list *newlist = NULL;
392 struct commit_list **p = &newlist;
395 diff_tree_setup_paths(revs->paths);
398 struct commit_list *entry = list;
399 struct commit *commit = list->item;
400 struct object *obj = &commit->object;
405 if (revs->max_age != -1 && (commit->date < revs->max_age))
406 obj->flags |= UNINTERESTING;
407 if (revs->unpacked && has_sha1_pack(obj->sha1))
408 obj->flags |= UNINTERESTING;
409 add_parents_to_list(revs, commit, &list);
410 if (obj->flags & UNINTERESTING) {
411 mark_parents_uninteresting(commit);
412 if (everybody_uninteresting(list))
416 if (revs->min_age != -1 && (commit->date > revs->min_age))
418 p = &commit_list_insert(commit, p)->next;
420 revs->commits = newlist;
423 static void add_one_commit(struct commit *commit, struct rev_info *revs)
425 if (!commit || (commit->object.flags & SEEN))
427 commit->object.flags |= SEEN;
428 commit_list_insert(commit, &revs->commits);
431 static int all_flags;
432 static struct rev_info *all_revs;
434 static int handle_one_ref(const char *path, const unsigned char *sha1)
436 struct commit *commit = get_commit_reference(all_revs, path, sha1, all_flags);
437 add_one_commit(commit, all_revs);
441 static void handle_all(struct rev_info *revs, unsigned flags)
445 for_each_ref(handle_one_ref);
449 * Parse revision information, filling in the "rev_info" structure,
450 * and removing the used arguments from the argument list.
452 * Returns the number of arguments left that weren't recognized
453 * (which are also moved to the head of the argument list)
455 int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def)
457 int i, flags, seen_dashdash;
458 const char **unrecognized = argv + 1;
461 memset(revs, 0, sizeof(*revs));
464 revs->prefix = setup_git_directory();
467 revs->max_count = -1;
469 /* First, search for "--" */
471 for (i = 1; i < argc; i++) {
472 const char *arg = argv[i];
473 if (strcmp(arg, "--"))
477 revs->paths = get_pathspec(revs->prefix, argv + i + 1);
483 for (i = 1; i < argc; i++) {
484 struct commit *commit;
485 const char *arg = argv[i];
486 unsigned char sha1[20];
491 if (!strncmp(arg, "--max-count=", 12)) {
492 revs->max_count = atoi(arg + 12);
495 /* accept -<digit>, like traditilnal "head" */
496 if ((*arg == '-') && isdigit(arg[1])) {
497 revs->max_count = atoi(arg + 1);
500 if (!strcmp(arg, "-n")) {
502 die("-n requires an argument");
503 revs->max_count = atoi(argv[++i]);
506 if (!strncmp(arg,"-n",2)) {
507 revs->max_count = atoi(arg + 2);
510 if (!strncmp(arg, "--max-age=", 10)) {
511 revs->max_age = atoi(arg + 10);
515 if (!strncmp(arg, "--min-age=", 10)) {
516 revs->min_age = atoi(arg + 10);
520 if (!strncmp(arg, "--since=", 8)) {
521 revs->max_age = approxidate(arg + 8);
525 if (!strncmp(arg, "--after=", 8)) {
526 revs->max_age = approxidate(arg + 8);
530 if (!strncmp(arg, "--before=", 9)) {
531 revs->min_age = approxidate(arg + 9);
535 if (!strncmp(arg, "--until=", 8)) {
536 revs->min_age = approxidate(arg + 8);
540 if (!strcmp(arg, "--all")) {
541 handle_all(revs, flags);
544 if (!strcmp(arg, "--not")) {
545 flags ^= UNINTERESTING;
548 if (!strcmp(arg, "--default")) {
550 die("bad --default argument");
554 if (!strcmp(arg, "--topo-order")) {
555 revs->topo_order = 1;
559 if (!strcmp(arg, "--date-order")) {
561 revs->topo_order = 1;
565 if (!strcmp(arg, "--dense")) {
569 if (!strcmp(arg, "--sparse")) {
573 if (!strcmp(arg, "--remove-empty")) {
574 revs->remove_empty_trees = 1;
577 if (!strncmp(arg, "--no-merges", 11)) {
581 if (!strcmp(arg, "--objects")) {
582 revs->tag_objects = 1;
583 revs->tree_objects = 1;
584 revs->blob_objects = 1;
587 if (!strcmp(arg, "--objects-edge")) {
588 revs->tag_objects = 1;
589 revs->tree_objects = 1;
590 revs->blob_objects = 1;
594 if (!strcmp(arg, "--unpacked")) {
599 *unrecognized++ = arg;
603 dotdot = strstr(arg, "..");
605 unsigned char from_sha1[20];
606 char *next = dotdot + 2;
610 if (!get_sha1(arg, from_sha1) && !get_sha1(next, sha1)) {
611 struct commit *exclude;
612 struct commit *include;
614 exclude = get_commit_reference(revs, arg, from_sha1, flags ^ UNINTERESTING);
615 include = get_commit_reference(revs, next, sha1, flags);
616 if (!exclude || !include)
617 die("Invalid revision range %s..%s", arg, next);
618 add_one_commit(exclude, revs);
619 add_one_commit(include, revs);
626 local_flags = UNINTERESTING;
629 if (get_sha1(arg, sha1) < 0) {
633 if (seen_dashdash || local_flags)
634 die("bad revision '%s'", arg);
636 /* If we didn't have a "--", all filenames must exist */
637 for (j = i; j < argc; j++) {
638 if (lstat(argv[j], &st) < 0)
639 die("'%s': %s", arg, strerror(errno));
641 revs->paths = get_pathspec(revs->prefix, argv + i);
644 commit = get_commit_reference(revs, arg, sha1, flags ^ local_flags);
645 add_one_commit(commit, revs);
647 if (def && !revs->commits) {
648 unsigned char sha1[20];
649 struct commit *commit;
650 if (get_sha1(def, sha1) < 0)
651 die("bad default revision '%s'", def);
652 commit = get_commit_reference(revs, def, sha1, 0);
653 add_one_commit(commit, revs);
660 void prepare_revision_walk(struct rev_info *revs)
662 sort_by_date(&revs->commits);
665 if (revs->topo_order)
666 sort_in_topological_order(&revs->commits, revs->lifo);
669 static int rewrite_one(struct commit **pp)
672 struct commit *p = *pp;
673 if (p->object.flags & (TREECHANGE | UNINTERESTING))
677 *pp = p->parents->item;
681 static void rewrite_parents(struct commit *commit)
683 struct commit_list **pp = &commit->parents;
685 struct commit_list *parent = *pp;
686 if (rewrite_one(&parent->item) < 0) {
694 struct commit *get_revision(struct rev_info *revs)
696 struct commit_list *list = revs->commits;
701 /* Check the max_count ... */
702 switch (revs->max_count) {
712 struct commit *commit = revs->commits->item;
714 if (commit->object.flags & (UNINTERESTING|SHOWN))
716 if (revs->min_age != -1 && (commit->date > revs->min_age))
718 if (revs->max_age != -1 && (commit->date < revs->max_age))
720 if (revs->no_merges && commit->parents && commit->parents->next)
722 if (revs->paths && revs->dense) {
723 if (!(commit->object.flags & TREECHANGE))
725 rewrite_parents(commit);
729 pop_most_recent_commit(&revs->commits, SEEN);
730 commit->object.flags |= SHOWN;
733 pop_most_recent_commit(&revs->commits, SEEN);
734 } while (revs->commits);