]> git.ipfire.org Git - thirdparty/git.git/blame - revision.c
Fix up rev-list option parsing.
[thirdparty/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
34struct object_list **add_object(struct object *obj,
35 struct object_list **p,
36 struct name_path *path,
37 const char *name)
38{
39 struct object_list *entry = xmalloc(sizeof(*entry));
40 entry->item = obj;
41 entry->next = *p;
42 entry->name = path_name(path, name);
43 *p = entry;
44 return &entry->next;
45}
46
47static void mark_blob_uninteresting(struct blob *blob)
48{
49 if (blob->object.flags & UNINTERESTING)
50 return;
51 blob->object.flags |= UNINTERESTING;
52}
53
54void mark_tree_uninteresting(struct tree *tree)
55{
56 struct object *obj = &tree->object;
57 struct tree_entry_list *entry;
58
59 if (obj->flags & UNINTERESTING)
60 return;
61 obj->flags |= UNINTERESTING;
62 if (!has_sha1_file(obj->sha1))
63 return;
64 if (parse_tree(tree) < 0)
65 die("bad tree %s", sha1_to_hex(obj->sha1));
66 entry = tree->entries;
67 tree->entries = NULL;
68 while (entry) {
69 struct tree_entry_list *next = entry->next;
70 if (entry->directory)
71 mark_tree_uninteresting(entry->item.tree);
72 else
73 mark_blob_uninteresting(entry->item.blob);
74 free(entry);
75 entry = next;
76 }
77}
78
79void mark_parents_uninteresting(struct commit *commit)
80{
81 struct commit_list *parents = commit->parents;
82
83 while (parents) {
84 struct commit *commit = parents->item;
d2c4af73
MU
85 if (!(commit->object.flags & UNINTERESTING)) {
86 commit->object.flags |= UNINTERESTING;
ae563542 87
d2c4af73
MU
88 /*
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..
95 */
96 if (commit->parents)
97 mark_parents_uninteresting(commit);
98 }
ae563542
LT
99
100 /*
101 * A missing commit is ok iff its parent is marked
102 * uninteresting.
103 *
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.
107 */
108 if (!has_sha1_file(commit->object.sha1))
109 commit->object.parsed = 1;
110 parents = parents->next;
111 }
112}
113
114static void add_pending_object(struct rev_info *revs, struct object *obj, const char *name)
115{
116 add_object(obj, &revs->pending_objects, NULL, name);
117}
118
cd2bdc53 119static struct object *get_reference(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags)
ae563542
LT
120{
121 struct object *object;
122
123 object = parse_object(sha1);
124 if (!object)
125 die("bad object %s", name);
cd2bdc53
LT
126 object->flags |= flags;
127 return object;
128}
129
130static struct commit *handle_commit(struct rev_info *revs, struct object *object, const char *name)
131{
132 unsigned long flags = object->flags;
ae563542
LT
133
134 /*
135 * Tag object? Look what it points to..
136 */
137 while (object->type == tag_type) {
138 struct tag *tag = (struct tag *) object;
cd2bdc53 139 if (revs->tag_objects && !(flags & UNINTERESTING))
ae563542
LT
140 add_pending_object(revs, object, tag->tag);
141 object = parse_object(tag->tagged->sha1);
142 if (!object)
143 die("bad object %s", sha1_to_hex(tag->tagged->sha1));
144 }
145
146 /*
147 * Commit object? Just return it, we'll do all the complex
148 * reachability crud.
149 */
150 if (object->type == commit_type) {
151 struct commit *commit = (struct commit *)object;
ae563542
LT
152 if (parse_commit(commit) < 0)
153 die("unable to parse commit %s", name);
d9a83684 154 if (flags & UNINTERESTING) {
ae563542 155 mark_parents_uninteresting(commit);
d9a83684
LT
156 revs->limited = 1;
157 }
ae563542
LT
158 return commit;
159 }
160
161 /*
162 * Tree object? Either mark it uniniteresting, or add it
163 * to the list of objects to look at later..
164 */
165 if (object->type == tree_type) {
166 struct tree *tree = (struct tree *)object;
167 if (!revs->tree_objects)
168 return NULL;
169 if (flags & UNINTERESTING) {
170 mark_tree_uninteresting(tree);
171 return NULL;
172 }
173 add_pending_object(revs, object, "");
174 return NULL;
175 }
176
177 /*
178 * Blob object? You know the drill by now..
179 */
180 if (object->type == blob_type) {
181 struct blob *blob = (struct blob *)object;
182 if (!revs->blob_objects)
183 return NULL;
184 if (flags & UNINTERESTING) {
185 mark_blob_uninteresting(blob);
186 return NULL;
187 }
188 add_pending_object(revs, object, "");
189 return NULL;
190 }
191 die("%s is unknown object", name);
192}
193
a4a88b2b
LT
194static int everybody_uninteresting(struct commit_list *orig)
195{
196 struct commit_list *list = orig;
197 while (list) {
198 struct commit *commit = list->item;
199 list = list->next;
200 if (commit->object.flags & UNINTERESTING)
201 continue;
202 return 0;
203 }
204 return 1;
205}
206
8efdc326 207static int tree_difference = REV_TREE_SAME;
a4a88b2b
LT
208
209static void file_add_remove(struct diff_options *options,
210 int addremove, unsigned mode,
211 const unsigned char *sha1,
212 const char *base, const char *path)
213{
8efdc326 214 int diff = REV_TREE_DIFFERENT;
a4a88b2b
LT
215
216 /*
8efdc326
FK
217 * Is it an add of a new file? It means that the old tree
218 * didn't have it at all, so we will turn "REV_TREE_SAME" ->
219 * "REV_TREE_NEW", but leave any "REV_TREE_DIFFERENT" alone
220 * (and if it already was "REV_TREE_NEW", we'll keep it
221 * "REV_TREE_NEW" of course).
a4a88b2b
LT
222 */
223 if (addremove == '+') {
224 diff = tree_difference;
8efdc326 225 if (diff != REV_TREE_SAME)
a4a88b2b 226 return;
8efdc326 227 diff = REV_TREE_NEW;
a4a88b2b
LT
228 }
229 tree_difference = diff;
230}
231
232static void file_change(struct diff_options *options,
233 unsigned old_mode, unsigned new_mode,
234 const unsigned char *old_sha1,
235 const unsigned char *new_sha1,
236 const char *base, const char *path)
237{
8efdc326 238 tree_difference = REV_TREE_DIFFERENT;
a4a88b2b
LT
239}
240
c4e05b1a 241int rev_compare_tree(struct rev_info *revs, struct tree *t1, struct tree *t2)
a4a88b2b
LT
242{
243 if (!t1)
8efdc326 244 return REV_TREE_NEW;
a4a88b2b 245 if (!t2)
8efdc326
FK
246 return REV_TREE_DIFFERENT;
247 tree_difference = REV_TREE_SAME;
c4e05b1a 248 if (diff_tree_sha1(t1->object.sha1, t2->object.sha1, "",
cd2bdc53 249 &revs->pruning) < 0)
8efdc326 250 return REV_TREE_DIFFERENT;
a4a88b2b
LT
251 return tree_difference;
252}
253
c4e05b1a 254int rev_same_tree_as_empty(struct rev_info *revs, struct tree *t1)
a4a88b2b
LT
255{
256 int retval;
257 void *tree;
258 struct tree_desc empty, real;
259
260 if (!t1)
261 return 0;
262
8e440259 263 tree = read_object_with_reference(t1->object.sha1, tree_type, &real.size, NULL);
a4a88b2b
LT
264 if (!tree)
265 return 0;
266 real.buf = tree;
267
268 empty.buf = "";
269 empty.size = 0;
270
271 tree_difference = 0;
cd2bdc53 272 retval = diff_tree(&empty, &real, "", &revs->pruning);
a4a88b2b
LT
273 free(tree);
274
275 return retval >= 0 && !tree_difference;
276}
277
278static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
279{
280 struct commit_list **pp, *parent;
f3219fbb 281 int tree_changed = 0;
a4a88b2b
LT
282
283 if (!commit->tree)
284 return;
285
286 if (!commit->parents) {
c4e05b1a 287 if (!rev_same_tree_as_empty(revs, commit->tree))
a4a88b2b
LT
288 commit->object.flags |= TREECHANGE;
289 return;
290 }
291
292 pp = &commit->parents;
293 while ((parent = *pp) != NULL) {
294 struct commit *p = parent->item;
295
a4a88b2b 296 parse_commit(p);
c4e05b1a 297 switch (rev_compare_tree(revs, p->tree, commit->tree)) {
8efdc326 298 case REV_TREE_SAME:
f3219fbb
JH
299 if (p->object.flags & UNINTERESTING) {
300 /* Even if a merge with an uninteresting
301 * side branch brought the entire change
302 * we are interested in, we do not want
303 * to lose the other branches of this
304 * merge, so we just keep going.
305 */
306 pp = &parent->next;
307 continue;
308 }
a4a88b2b
LT
309 parent->next = NULL;
310 commit->parents = parent;
311 return;
312
8efdc326
FK
313 case REV_TREE_NEW:
314 if (revs->remove_empty_trees &&
c4e05b1a 315 rev_same_tree_as_empty(revs, p->tree)) {
c348f31a
JH
316 /* We are adding all the specified
317 * paths from this parent, so the
318 * history beyond this parent is not
319 * interesting. Remove its parents
320 * (they are grandparents for us).
321 * IOW, we pretend this parent is a
322 * "root" commit.
a41e109c 323 */
c348f31a
JH
324 parse_commit(p);
325 p->parents = NULL;
a4a88b2b
LT
326 }
327 /* fallthrough */
8efdc326 328 case REV_TREE_DIFFERENT:
f3219fbb 329 tree_changed = 1;
a4a88b2b
LT
330 pp = &parent->next;
331 continue;
332 }
333 die("bad tree compare for commit %s", sha1_to_hex(commit->object.sha1));
334 }
f3219fbb
JH
335 if (tree_changed)
336 commit->object.flags |= TREECHANGE;
a4a88b2b
LT
337}
338
339static void add_parents_to_list(struct rev_info *revs, struct commit *commit, struct commit_list **list)
340{
341 struct commit_list *parent = commit->parents;
342
3381c790
LT
343 if (commit->object.flags & ADDED)
344 return;
345 commit->object.flags |= ADDED;
346
a4a88b2b
LT
347 /*
348 * If the commit is uninteresting, don't try to
349 * prune parents - we want the maximal uninteresting
350 * set.
351 *
352 * Normally we haven't parsed the parent
353 * yet, so we won't have a parent of a parent
354 * here. However, it may turn out that we've
355 * reached this commit some other way (where it
356 * wasn't uninteresting), in which case we need
357 * to mark its parents recursively too..
358 */
359 if (commit->object.flags & UNINTERESTING) {
360 while (parent) {
361 struct commit *p = parent->item;
362 parent = parent->next;
363 parse_commit(p);
364 p->object.flags |= UNINTERESTING;
365 if (p->parents)
366 mark_parents_uninteresting(p);
367 if (p->object.flags & SEEN)
368 continue;
369 p->object.flags |= SEEN;
370 insert_by_date(p, list);
371 }
372 return;
373 }
374
375 /*
376 * Ok, the commit wasn't uninteresting. Try to
377 * simplify the commit history and find the parent
378 * that has no differences in the path set if one exists.
379 */
8efdc326
FK
380 if (revs->prune_fn)
381 revs->prune_fn(revs, commit);
a4a88b2b
LT
382
383 parent = commit->parents;
384 while (parent) {
385 struct commit *p = parent->item;
386
387 parent = parent->next;
388
389 parse_commit(p);
390 if (p->object.flags & SEEN)
391 continue;
392 p->object.flags |= SEEN;
393 insert_by_date(p, list);
394 }
395}
396
397static void limit_list(struct rev_info *revs)
398{
399 struct commit_list *list = revs->commits;
400 struct commit_list *newlist = NULL;
401 struct commit_list **p = &newlist;
402
403 while (list) {
404 struct commit_list *entry = list;
405 struct commit *commit = list->item;
406 struct object *obj = &commit->object;
407
408 list = list->next;
409 free(entry);
410
411 if (revs->max_age != -1 && (commit->date < revs->max_age))
412 obj->flags |= UNINTERESTING;
413 if (revs->unpacked && has_sha1_pack(obj->sha1))
414 obj->flags |= UNINTERESTING;
415 add_parents_to_list(revs, commit, &list);
416 if (obj->flags & UNINTERESTING) {
417 mark_parents_uninteresting(commit);
418 if (everybody_uninteresting(list))
419 break;
420 continue;
421 }
422 if (revs->min_age != -1 && (commit->date > revs->min_age))
423 continue;
424 p = &commit_list_insert(commit, p)->next;
425 }
384e99a4 426 if (revs->boundary) {
4c0fea0f
JH
427 /* mark the ones that are on the result list first */
428 for (list = newlist; list; list = list->next) {
429 struct commit *commit = list->item;
430 commit->object.flags |= TMP_MARK;
431 }
432 for (list = newlist; list; list = list->next) {
384e99a4
JH
433 struct commit *commit = list->item;
434 struct object *obj = &commit->object;
4c0fea0f
JH
435 struct commit_list *parent;
436 if (obj->flags & UNINTERESTING)
384e99a4 437 continue;
4c0fea0f
JH
438 for (parent = commit->parents;
439 parent;
440 parent = parent->next) {
384e99a4 441 struct commit *pcommit = parent->item;
384e99a4
JH
442 if (!(pcommit->object.flags & UNINTERESTING))
443 continue;
444 pcommit->object.flags |= BOUNDARY;
4c0fea0f
JH
445 if (pcommit->object.flags & TMP_MARK)
446 continue;
447 pcommit->object.flags |= TMP_MARK;
384e99a4
JH
448 p = &commit_list_insert(pcommit, p)->next;
449 }
4c0fea0f
JH
450 }
451 for (list = newlist; list; list = list->next) {
452 struct commit *commit = list->item;
453 commit->object.flags &= ~TMP_MARK;
384e99a4
JH
454 }
455 }
a4a88b2b
LT
456 revs->commits = newlist;
457}
458
ae563542
LT
459static int all_flags;
460static struct rev_info *all_revs;
461
462static int handle_one_ref(const char *path, const unsigned char *sha1)
463{
cd2bdc53
LT
464 struct object *object = get_reference(all_revs, path, sha1, all_flags);
465 add_pending_object(all_revs, object, "");
ae563542
LT
466 return 0;
467}
468
469static void handle_all(struct rev_info *revs, unsigned flags)
470{
471 all_revs = revs;
472 all_flags = flags;
473 for_each_ref(handle_one_ref);
474}
475
8efdc326
FK
476void init_revisions(struct rev_info *revs)
477{
8e8f9987
JH
478 unsigned abbrev = revs->abbrev;
479
8efdc326 480 memset(revs, 0, sizeof(*revs));
8e8f9987
JH
481
482 revs->abbrev = abbrev;
483 revs->ignore_merges = 1;
cd2bdc53
LT
484 revs->pruning.recursive = 1;
485 revs->pruning.add_remove = file_add_remove;
486 revs->pruning.change = file_change;
8efdc326
FK
487 revs->lifo = 1;
488 revs->dense = 1;
489 revs->prefix = setup_git_directory();
490 revs->max_age = -1;
491 revs->min_age = -1;
492 revs->max_count = -1;
493
494 revs->prune_fn = NULL;
495 revs->prune_data = NULL;
496
497 revs->topo_setter = topo_sort_default_setter;
498 revs->topo_getter = topo_sort_default_getter;
cd2bdc53
LT
499
500 revs->header_prefix = "";
501 revs->commit_format = CMIT_FMT_DEFAULT;
502
503 diff_setup(&revs->diffopt);
8efdc326
FK
504}
505
ae563542
LT
506/*
507 * Parse revision information, filling in the "rev_info" structure,
508 * and removing the used arguments from the argument list.
509 *
765ac8ec
LT
510 * Returns the number of arguments left that weren't recognized
511 * (which are also moved to the head of the argument list)
ae563542 512 */
a4a88b2b 513int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def)
ae563542
LT
514{
515 int i, flags, seen_dashdash;
765ac8ec 516 const char **unrecognized = argv + 1;
ae563542
LT
517 int left = 1;
518
8efdc326 519 init_revisions(revs);
ae563542
LT
520
521 /* First, search for "--" */
522 seen_dashdash = 0;
523 for (i = 1; i < argc; i++) {
524 const char *arg = argv[i];
525 if (strcmp(arg, "--"))
526 continue;
527 argv[i] = NULL;
528 argc = i;
8efdc326 529 revs->prune_data = get_pathspec(revs->prefix, argv + i + 1);
ae563542
LT
530 seen_dashdash = 1;
531 break;
532 }
533
534 flags = 0;
535 for (i = 1; i < argc; i++) {
cd2bdc53 536 struct object *object;
ae563542
LT
537 const char *arg = argv[i];
538 unsigned char sha1[20];
539 char *dotdot;
540 int local_flags;
541
542 if (*arg == '-') {
cd2bdc53 543 int opts;
ae563542
LT
544 if (!strncmp(arg, "--max-count=", 12)) {
545 revs->max_count = atoi(arg + 12);
546 continue;
547 }
64bc6e3d
JH
548 /* accept -<digit>, like traditilnal "head" */
549 if ((*arg == '-') && isdigit(arg[1])) {
550 revs->max_count = atoi(arg + 1);
551 continue;
552 }
553 if (!strcmp(arg, "-n")) {
554 if (argc <= i + 1)
555 die("-n requires an argument");
556 revs->max_count = atoi(argv[++i]);
557 continue;
558 }
559 if (!strncmp(arg,"-n",2)) {
560 revs->max_count = atoi(arg + 2);
561 continue;
562 }
ae563542
LT
563 if (!strncmp(arg, "--max-age=", 10)) {
564 revs->max_age = atoi(arg + 10);
ae563542
LT
565 continue;
566 }
fd751667
JH
567 if (!strncmp(arg, "--since=", 8)) {
568 revs->max_age = approxidate(arg + 8);
fd751667
JH
569 continue;
570 }
571 if (!strncmp(arg, "--after=", 8)) {
572 revs->max_age = approxidate(arg + 8);
53069686
JH
573 continue;
574 }
575 if (!strncmp(arg, "--min-age=", 10)) {
576 revs->min_age = atoi(arg + 10);
fd751667
JH
577 continue;
578 }
579 if (!strncmp(arg, "--before=", 9)) {
580 revs->min_age = approxidate(arg + 9);
fd751667
JH
581 continue;
582 }
583 if (!strncmp(arg, "--until=", 8)) {
584 revs->min_age = approxidate(arg + 8);
fd751667
JH
585 continue;
586 }
ae563542
LT
587 if (!strcmp(arg, "--all")) {
588 handle_all(revs, flags);
589 continue;
590 }
591 if (!strcmp(arg, "--not")) {
592 flags ^= UNINTERESTING;
593 continue;
594 }
595 if (!strcmp(arg, "--default")) {
596 if (++i >= argc)
597 die("bad --default argument");
598 def = argv[i];
599 continue;
600 }
601 if (!strcmp(arg, "--topo-order")) {
602 revs->topo_order = 1;
603 continue;
604 }
605 if (!strcmp(arg, "--date-order")) {
606 revs->lifo = 0;
607 revs->topo_order = 1;
608 continue;
609 }
7b0c9966
LT
610 if (!strcmp(arg, "--parents")) {
611 revs->parents = 1;
612 continue;
613 }
ae563542
LT
614 if (!strcmp(arg, "--dense")) {
615 revs->dense = 1;
616 continue;
617 }
618 if (!strcmp(arg, "--sparse")) {
619 revs->dense = 0;
620 continue;
621 }
622 if (!strcmp(arg, "--remove-empty")) {
623 revs->remove_empty_trees = 1;
624 continue;
625 }
5cdeae71 626 if (!strcmp(arg, "--no-merges")) {
765ac8ec
LT
627 revs->no_merges = 1;
628 continue;
629 }
384e99a4
JH
630 if (!strcmp(arg, "--boundary")) {
631 revs->boundary = 1;
632 continue;
633 }
ae563542
LT
634 if (!strcmp(arg, "--objects")) {
635 revs->tag_objects = 1;
636 revs->tree_objects = 1;
637 revs->blob_objects = 1;
638 continue;
639 }
640 if (!strcmp(arg, "--objects-edge")) {
641 revs->tag_objects = 1;
642 revs->tree_objects = 1;
643 revs->blob_objects = 1;
644 revs->edge_hint = 1;
645 continue;
646 }
d9a83684
LT
647 if (!strcmp(arg, "--unpacked")) {
648 revs->unpacked = 1;
d9a83684
LT
649 continue;
650 }
cd2bdc53
LT
651 if (!strcmp(arg, "-r")) {
652 revs->diff = 1;
653 revs->diffopt.recursive = 1;
654 continue;
655 }
656 if (!strcmp(arg, "-t")) {
657 revs->diff = 1;
658 revs->diffopt.recursive = 1;
659 revs->diffopt.tree_in_recursive = 1;
660 continue;
661 }
662 if (!strcmp(arg, "-m")) {
663 revs->ignore_merges = 0;
664 continue;
665 }
666 if (!strcmp(arg, "-c")) {
667 revs->diff = 1;
668 revs->combine_merges = 1;
669 continue;
670 }
671 if (!strcmp(arg, "--cc")) {
672 revs->diff = 1;
673 revs->dense_combined_merges = 1;
674 revs->combine_merges = 1;
675 continue;
676 }
677 if (!strcmp(arg, "-v")) {
678 revs->verbose_header = 1;
679 revs->header_prefix = "diff-tree ";
680 continue;
681 }
682 if (!strncmp(arg, "--pretty", 8)) {
683 revs->verbose_header = 1;
684 revs->header_prefix = "diff-tree ";
685 revs->commit_format = get_commit_format(arg+8);
686 continue;
687 }
688 if (!strcmp(arg, "--root")) {
689 revs->show_root_diff = 1;
690 continue;
691 }
692 if (!strcmp(arg, "--no-commit-id")) {
693 revs->no_commit_id = 1;
694 continue;
695 }
696 if (!strcmp(arg, "--always")) {
697 revs->always_show_header = 1;
698 continue;
699 }
700 if (!strcmp(arg, "--no-abbrev")) {
701 revs->abbrev = 0;
702 continue;
703 }
704 if (!strcmp(arg, "--abbrev")) {
705 revs->abbrev = DEFAULT_ABBREV;
706 continue;
707 }
708 if (!strcmp(arg, "--abbrev-commit")) {
709 revs->abbrev_commit = 1;
710 continue;
711 }
712 if (!strcmp(arg, "--full-diff")) {
713 revs->diff = 1;
714 revs->full_diff = 1;
715 continue;
716 }
717 opts = diff_opt_parse(&revs->diffopt, argv+i, argc-i);
718 if (opts > 0) {
719 revs->diff = 1;
720 i += opts - 1;
721 continue;
722 }
ae563542
LT
723 *unrecognized++ = arg;
724 left++;
725 continue;
726 }
727 dotdot = strstr(arg, "..");
728 if (dotdot) {
729 unsigned char from_sha1[20];
0c8b106b
JH
730 const char *next = dotdot + 2;
731 const char *this = arg;
ae563542
LT
732 *dotdot = 0;
733 if (!*next)
0c8b106b 734 next = "HEAD";
ce4a7063 735 if (dotdot == arg)
0c8b106b 736 this = "HEAD";
ce4a7063
JH
737 if (!get_sha1(this, from_sha1) &&
738 !get_sha1(next, sha1)) {
cd2bdc53
LT
739 struct object *exclude;
740 struct object *include;
ae563542 741
cd2bdc53
LT
742 exclude = get_reference(revs, this, from_sha1, flags ^ UNINTERESTING);
743 include = get_reference(revs, next, sha1, flags);
ae563542
LT
744 if (!exclude || !include)
745 die("Invalid revision range %s..%s", arg, next);
cd2bdc53
LT
746 add_pending_object(revs, exclude, this);
747 add_pending_object(revs, include, next);
ae563542
LT
748 continue;
749 }
750 *dotdot = '.';
751 }
752 local_flags = 0;
753 if (*arg == '^') {
754 local_flags = UNINTERESTING;
755 arg++;
756 }
757 if (get_sha1(arg, sha1) < 0) {
758 struct stat st;
759 int j;
760
761 if (seen_dashdash || local_flags)
762 die("bad revision '%s'", arg);
763
764 /* If we didn't have a "--", all filenames must exist */
765 for (j = i; j < argc; j++) {
766 if (lstat(argv[j], &st) < 0)
fb18a2ed 767 die("'%s': %s", argv[j], strerror(errno));
ae563542 768 }
8efdc326 769 revs->prune_data = get_pathspec(revs->prefix, argv + i);
ae563542
LT
770 break;
771 }
cd2bdc53
LT
772 object = get_reference(revs, arg, sha1, flags ^ local_flags);
773 add_pending_object(revs, object, arg);
ae563542 774 }
cd2bdc53 775 if (def && !revs->pending_objects) {
ae563542 776 unsigned char sha1[20];
cd2bdc53 777 struct object *object;
ae563542
LT
778 if (get_sha1(def, sha1) < 0)
779 die("bad default revision '%s'", def);
cd2bdc53
LT
780 object = get_reference(revs, def, sha1, 0);
781 add_pending_object(revs, object, def);
ae563542 782 }
8efdc326 783
bbbc8c3a 784 if (revs->topo_order || revs->unpacked)
53069686
JH
785 revs->limited = 1;
786
8efdc326 787 if (revs->prune_data) {
cd2bdc53 788 diff_tree_setup_paths(revs->prune_data, &revs->pruning);
8efdc326 789 revs->prune_fn = try_to_simplify_commit;
cd2bdc53
LT
790 if (!revs->full_diff)
791 diff_tree_setup_paths(revs->prune_data, &revs->diffopt);
8efdc326 792 }
cd2bdc53
LT
793 if (revs->combine_merges) {
794 revs->ignore_merges = 0;
795 if (revs->dense_combined_merges)
796 revs->diffopt.output_format = DIFF_FORMAT_PATCH;
797 }
798 if (revs->diffopt.output_format == DIFF_FORMAT_PATCH)
799 revs->diffopt.recursive = 1;
800 revs->diffopt.abbrev = revs->abbrev;
801 diff_setup_done(&revs->diffopt);
8efdc326 802
ae563542
LT
803 return left;
804}
a4a88b2b
LT
805
806void prepare_revision_walk(struct rev_info *revs)
807{
cd2bdc53
LT
808 struct object_list *list;
809
810 list = revs->pending_objects;
811 revs->pending_objects = NULL;
812 while (list) {
813 struct commit *commit = handle_commit(revs, list->item, list->name);
814 if (commit) {
815 if (!(commit->object.flags & SEEN)) {
816 commit->object.flags |= SEEN;
817 insert_by_date(commit, &revs->commits);
818 }
819 }
820 list = list->next;
821 }
822
a4a88b2b
LT
823 if (revs->limited)
824 limit_list(revs);
825 if (revs->topo_order)
8efdc326
FK
826 sort_in_topological_order_fn(&revs->commits, revs->lifo,
827 revs->topo_setter,
828 revs->topo_getter);
a4a88b2b
LT
829}
830
3381c790 831static int rewrite_one(struct rev_info *revs, struct commit **pp)
765ac8ec
LT
832{
833 for (;;) {
834 struct commit *p = *pp;
3381c790
LT
835 if (!revs->limited)
836 add_parents_to_list(revs, p, &revs->commits);
765ac8ec
LT
837 if (p->object.flags & (TREECHANGE | UNINTERESTING))
838 return 0;
839 if (!p->parents)
840 return -1;
841 *pp = p->parents->item;
842 }
843}
844
3381c790 845static void rewrite_parents(struct rev_info *revs, struct commit *commit)
765ac8ec
LT
846{
847 struct commit_list **pp = &commit->parents;
848 while (*pp) {
849 struct commit_list *parent = *pp;
3381c790 850 if (rewrite_one(revs, &parent->item) < 0) {
765ac8ec
LT
851 *pp = parent->next;
852 continue;
853 }
854 pp = &parent->next;
855 }
856}
857
a4a88b2b
LT
858struct commit *get_revision(struct rev_info *revs)
859{
765ac8ec 860 struct commit_list *list = revs->commits;
765ac8ec
LT
861
862 if (!list)
a4a88b2b 863 return NULL;
a4a88b2b 864
765ac8ec 865 /* Check the max_count ... */
765ac8ec
LT
866 switch (revs->max_count) {
867 case -1:
868 break;
869 case 0:
870 return NULL;
871 default:
872 revs->max_count--;
873 }
a4a88b2b 874
765ac8ec 875 do {
ea5ed3ab
LT
876 struct commit *commit = revs->commits->item;
877
2a0925be
LT
878 revs->commits = revs->commits->next;
879
880 /*
881 * If we haven't done the list limiting, we need to look at
be7db6e5
LT
882 * the parents here. We also need to do the date-based limiting
883 * that we'd otherwise have done in limit_list().
2a0925be 884 */
be7db6e5 885 if (!revs->limited) {
22c31bf1
JH
886 if ((revs->unpacked &&
887 has_sha1_pack(commit->object.sha1)) ||
888 (revs->max_age != -1 &&
889 (commit->date < revs->max_age)))
be7db6e5 890 continue;
2a0925be 891 add_parents_to_list(revs, commit, &revs->commits);
be7db6e5 892 }
384e99a4 893 if (commit->object.flags & SHOWN)
2a0925be 894 continue;
384e99a4
JH
895 if (!(commit->object.flags & BOUNDARY) &&
896 (commit->object.flags & UNINTERESTING))
2a0925be 897 continue;
765ac8ec 898 if (revs->min_age != -1 && (commit->date > revs->min_age))
2a0925be 899 continue;
384e99a4
JH
900 if (revs->no_merges &&
901 commit->parents && commit->parents->next)
2a0925be 902 continue;
8efdc326 903 if (revs->prune_fn && revs->dense) {
765ac8ec 904 if (!(commit->object.flags & TREECHANGE))
2a0925be
LT
905 continue;
906 if (revs->parents)
3381c790 907 rewrite_parents(revs, commit);
384e99a4 908 }
765ac8ec
LT
909 commit->object.flags |= SHOWN;
910 return commit;
911 } while (revs->commits);
912 return NULL;
913}