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