Simplify and fix --first-parent implementation
[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"
8ecae9b0 9#include "grep.h"
8860fd42 10#include "reflog-walk.h"
d7a17cad 11#include "patch-ids.h"
ae563542 12
cdcefbc9
LT
13volatile show_early_output_fn_t show_early_output;
14
ae563542
LT
15static char *path_name(struct name_path *path, const char *name)
16{
17 struct name_path *p;
18 char *n, *m;
19 int nlen = strlen(name);
20 int len = nlen + 1;
21
22 for (p = path; p; p = p->up) {
23 if (p->elem_len)
24 len += p->elem_len + 1;
25 }
26 n = xmalloc(len);
27 m = n + len - (nlen + 1);
28 strcpy(m, name);
29 for (p = path; p; p = p->up) {
30 if (p->elem_len) {
31 m -= p->elem_len + 1;
32 memcpy(m, p->elem, p->elem_len);
33 m[p->elem_len] = '/';
34 }
35 }
36 return n;
37}
38
1f1e895f
LT
39void add_object(struct object *obj,
40 struct object_array *p,
41 struct name_path *path,
42 const char *name)
ae563542 43{
1f1e895f 44 add_object_array(obj, path_name(path, name), p);
ae563542
LT
45}
46
47static void mark_blob_uninteresting(struct blob *blob)
48{
c1ee9013
MK
49 if (!blob)
50 return;
ae563542
LT
51 if (blob->object.flags & UNINTERESTING)
52 return;
53 blob->object.flags |= UNINTERESTING;
54}
55
56void mark_tree_uninteresting(struct tree *tree)
57{
f75e53ed 58 struct tree_desc desc;
4c068a98 59 struct name_entry entry;
ae563542 60 struct object *obj = &tree->object;
ae563542 61
c1ee9013
MK
62 if (!tree)
63 return;
ae563542
LT
64 if (obj->flags & UNINTERESTING)
65 return;
66 obj->flags |= UNINTERESTING;
67 if (!has_sha1_file(obj->sha1))
68 return;
69 if (parse_tree(tree) < 0)
70 die("bad tree %s", sha1_to_hex(obj->sha1));
f75e53ed 71
6fda5e51 72 init_tree_desc(&desc, tree->buffer, tree->size);
4c068a98 73 while (tree_entry(&desc, &entry)) {
4d1012c3
LT
74 switch (object_type(entry.mode)) {
75 case OBJ_TREE:
4c068a98 76 mark_tree_uninteresting(lookup_tree(entry.sha1));
4d1012c3
LT
77 break;
78 case OBJ_BLOB:
4c068a98 79 mark_blob_uninteresting(lookup_blob(entry.sha1));
4d1012c3
LT
80 break;
81 default:
82 /* Subproject commit - not in this repository */
83 break;
84 }
ae563542 85 }
f75e53ed
LT
86
87 /*
88 * We don't care about the tree any more
89 * after it has been marked uninteresting.
90 */
91 free(tree->buffer);
92 tree->buffer = NULL;
ae563542
LT
93}
94
95void mark_parents_uninteresting(struct commit *commit)
96{
97 struct commit_list *parents = commit->parents;
98
99 while (parents) {
100 struct commit *commit = parents->item;
d2c4af73
MU
101 if (!(commit->object.flags & UNINTERESTING)) {
102 commit->object.flags |= UNINTERESTING;
ae563542 103
d2c4af73
MU
104 /*
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..
111 */
112 if (commit->parents)
113 mark_parents_uninteresting(commit);
114 }
ae563542
LT
115
116 /*
117 * A missing commit is ok iff its parent is marked
118 * uninteresting.
119 *
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.
123 */
124 if (!has_sha1_file(commit->object.sha1))
125 commit->object.parsed = 1;
126 parents = parents->next;
127 }
128}
129
2d93b9fa 130static void add_pending_object_with_mode(struct rev_info *revs, struct object *obj, const char *name, unsigned mode)
ae563542 131{
aa27e461
LT
132 if (revs->no_walk && (obj->flags & UNINTERESTING))
133 die("object ranges do not make sense when not walking revisions");
7b69b873
JS
134 if (revs->reflog_info && obj->type == OBJ_COMMIT &&
135 add_reflog_for_walk(revs->reflog_info,
136 (struct commit *)obj, name))
137 return;
bb6c2fba 138 add_object_array_with_mode(obj, name, &revs->pending, mode);
ae563542
LT
139}
140
2d93b9fa
JH
141void add_pending_object(struct rev_info *revs, struct object *obj, const char *name)
142{
143 add_pending_object_with_mode(revs, obj, name, S_IFINVALID);
144}
145
3384a2df
JH
146void add_head_to_pending(struct rev_info *revs)
147{
148 unsigned char sha1[20];
149 struct object *obj;
150 if (get_sha1("HEAD", sha1))
151 return;
152 obj = parse_object(sha1);
153 if (!obj)
154 return;
155 add_pending_object(revs, obj, "HEAD");
156}
157
cd2bdc53 158static struct object *get_reference(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags)
ae563542
LT
159{
160 struct object *object;
161
162 object = parse_object(sha1);
163 if (!object)
164 die("bad object %s", name);
cd2bdc53
LT
165 object->flags |= flags;
166 return object;
167}
168
169static struct commit *handle_commit(struct rev_info *revs, struct object *object, const char *name)
170{
171 unsigned long flags = object->flags;
ae563542
LT
172
173 /*
174 * Tag object? Look what it points to..
175 */
1974632c 176 while (object->type == OBJ_TAG) {
ae563542 177 struct tag *tag = (struct tag *) object;
cd2bdc53 178 if (revs->tag_objects && !(flags & UNINTERESTING))
ae563542 179 add_pending_object(revs, object, tag->tag);
9684afd9
MK
180 if (!tag->tagged)
181 die("bad tag");
ae563542
LT
182 object = parse_object(tag->tagged->sha1);
183 if (!object)
184 die("bad object %s", sha1_to_hex(tag->tagged->sha1));
185 }
186
187 /*
188 * Commit object? Just return it, we'll do all the complex
189 * reachability crud.
190 */
1974632c 191 if (object->type == OBJ_COMMIT) {
ae563542 192 struct commit *commit = (struct commit *)object;
ae563542
LT
193 if (parse_commit(commit) < 0)
194 die("unable to parse commit %s", name);
d9a83684 195 if (flags & UNINTERESTING) {
4262c1b0 196 commit->object.flags |= UNINTERESTING;
ae563542 197 mark_parents_uninteresting(commit);
d9a83684
LT
198 revs->limited = 1;
199 }
ae563542
LT
200 return commit;
201 }
202
203 /*
204 * Tree object? Either mark it uniniteresting, or add it
205 * to the list of objects to look at later..
206 */
1974632c 207 if (object->type == OBJ_TREE) {
ae563542
LT
208 struct tree *tree = (struct tree *)object;
209 if (!revs->tree_objects)
210 return NULL;
211 if (flags & UNINTERESTING) {
212 mark_tree_uninteresting(tree);
213 return NULL;
214 }
215 add_pending_object(revs, object, "");
216 return NULL;
217 }
218
219 /*
220 * Blob object? You know the drill by now..
221 */
1974632c 222 if (object->type == OBJ_BLOB) {
ae563542
LT
223 struct blob *blob = (struct blob *)object;
224 if (!revs->blob_objects)
225 return NULL;
226 if (flags & UNINTERESTING) {
227 mark_blob_uninteresting(blob);
228 return NULL;
229 }
230 add_pending_object(revs, object, "");
231 return NULL;
232 }
233 die("%s is unknown object", name);
234}
235
a4a88b2b
LT
236static int everybody_uninteresting(struct commit_list *orig)
237{
238 struct commit_list *list = orig;
239 while (list) {
240 struct commit *commit = list->item;
241 list = list->next;
242 if (commit->object.flags & UNINTERESTING)
243 continue;
244 return 0;
245 }
246 return 1;
247}
248
0a4ba7f8
JH
249/*
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.
255 */
8efdc326 256static int tree_difference = REV_TREE_SAME;
a4a88b2b
LT
257
258static 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)
262{
8efdc326 263 int diff = REV_TREE_DIFFERENT;
a4a88b2b
LT
264
265 /*
8efdc326
FK
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).
a4a88b2b
LT
271 */
272 if (addremove == '+') {
273 diff = tree_difference;
8efdc326 274 if (diff != REV_TREE_SAME)
a4a88b2b 275 return;
8efdc326 276 diff = REV_TREE_NEW;
a4a88b2b
LT
277 }
278 tree_difference = diff;
dd47aa31 279 if (tree_difference == REV_TREE_DIFFERENT)
8f67f8ae 280 DIFF_OPT_SET(options, HAS_CHANGES);
a4a88b2b
LT
281}
282
283static 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)
288{
8efdc326 289 tree_difference = REV_TREE_DIFFERENT;
8f67f8ae 290 DIFF_OPT_SET(options, HAS_CHANGES);
a4a88b2b
LT
291}
292
2d93b9fa 293static int rev_compare_tree(struct rev_info *revs, struct tree *t1, struct tree *t2)
a4a88b2b
LT
294{
295 if (!t1)
8efdc326 296 return REV_TREE_NEW;
a4a88b2b 297 if (!t2)
8efdc326
FK
298 return REV_TREE_DIFFERENT;
299 tree_difference = REV_TREE_SAME;
8f67f8ae 300 DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
c4e05b1a 301 if (diff_tree_sha1(t1->object.sha1, t2->object.sha1, "",
cd2bdc53 302 &revs->pruning) < 0)
8efdc326 303 return REV_TREE_DIFFERENT;
a4a88b2b
LT
304 return tree_difference;
305}
306
2d93b9fa 307static int rev_same_tree_as_empty(struct rev_info *revs, struct tree *t1)
a4a88b2b
LT
308{
309 int retval;
310 void *tree;
6fda5e51 311 unsigned long size;
a4a88b2b
LT
312 struct tree_desc empty, real;
313
314 if (!t1)
315 return 0;
316
6fda5e51 317 tree = read_object_with_reference(t1->object.sha1, tree_type, &size, NULL);
a4a88b2b
LT
318 if (!tree)
319 return 0;
6fda5e51
LT
320 init_tree_desc(&real, tree, size);
321 init_tree_desc(&empty, "", 0);
a4a88b2b 322
0a4ba7f8 323 tree_difference = REV_TREE_SAME;
8f67f8ae 324 DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
cd2bdc53 325 retval = diff_tree(&empty, &real, "", &revs->pruning);
a4a88b2b
LT
326 free(tree);
327
0a4ba7f8 328 return retval >= 0 && (tree_difference == REV_TREE_SAME);
a4a88b2b
LT
329}
330
331static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
332{
333 struct commit_list **pp, *parent;
6631c736 334 int tree_changed = 0, tree_same = 0;
a4a88b2b 335
53b2c823
LT
336 /*
337 * If we don't do pruning, everything is interesting
338 */
7dc0fe3b 339 if (!revs->prune)
53b2c823 340 return;
53b2c823 341
a4a88b2b
LT
342 if (!commit->tree)
343 return;
344
345 if (!commit->parents) {
7dc0fe3b
LT
346 if (rev_same_tree_as_empty(revs, commit->tree))
347 commit->object.flags |= TREESAME;
a4a88b2b
LT
348 return;
349 }
350
53b2c823
LT
351 /*
352 * Normal non-merge commit? If we don't want to make the
353 * history dense, we consider it always to be a change..
354 */
7dc0fe3b 355 if (!revs->dense && !commit->parents->next)
53b2c823 356 return;
53b2c823 357
a4a88b2b
LT
358 pp = &commit->parents;
359 while ((parent = *pp) != NULL) {
360 struct commit *p = parent->item;
361
cc0e6c5a
AR
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));
c4e05b1a 366 switch (rev_compare_tree(revs, p->tree, commit->tree)) {
8efdc326 367 case REV_TREE_SAME:
6631c736 368 tree_same = 1;
9202434c 369 if (!revs->simplify_history || (p->object.flags & UNINTERESTING)) {
f3219fbb
JH
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.
375 */
376 pp = &parent->next;
377 continue;
378 }
a4a88b2b
LT
379 parent->next = NULL;
380 commit->parents = parent;
7dc0fe3b 381 commit->object.flags |= TREESAME;
a4a88b2b
LT
382 return;
383
8efdc326
FK
384 case REV_TREE_NEW:
385 if (revs->remove_empty_trees &&
c4e05b1a 386 rev_same_tree_as_empty(revs, p->tree)) {
c348f31a
JH
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
393 * "root" commit.
a41e109c 394 */
cc0e6c5a
AR
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));
c348f31a 399 p->parents = NULL;
a4a88b2b
LT
400 }
401 /* fallthrough */
8efdc326 402 case REV_TREE_DIFFERENT:
f3219fbb 403 tree_changed = 1;
a4a88b2b
LT
404 pp = &parent->next;
405 continue;
406 }
407 die("bad tree compare for commit %s", sha1_to_hex(commit->object.sha1));
408 }
6631c736 409 if (tree_changed && !tree_same)
7dc0fe3b
LT
410 return;
411 commit->object.flags |= TREESAME;
a4a88b2b
LT
412}
413
cc0e6c5a 414static int add_parents_to_list(struct rev_info *revs, struct commit *commit, struct commit_list **list)
a4a88b2b
LT
415{
416 struct commit_list *parent = commit->parents;
577ed5c2 417 unsigned left_flag;
a4a88b2b 418
3381c790 419 if (commit->object.flags & ADDED)
cc0e6c5a 420 return 0;
3381c790
LT
421 commit->object.flags |= ADDED;
422
a4a88b2b
LT
423 /*
424 * If the commit is uninteresting, don't try to
425 * prune parents - we want the maximal uninteresting
426 * set.
427 *
428 * Normally we haven't parsed the parent
429 * yet, so we won't have a parent of a parent
430 * here. However, it may turn out that we've
431 * reached this commit some other way (where it
432 * wasn't uninteresting), in which case we need
433 * to mark its parents recursively too..
434 */
435 if (commit->object.flags & UNINTERESTING) {
436 while (parent) {
437 struct commit *p = parent->item;
438 parent = parent->next;
cc0e6c5a
AR
439 if (parse_commit(p) < 0)
440 return -1;
a4a88b2b
LT
441 p->object.flags |= UNINTERESTING;
442 if (p->parents)
443 mark_parents_uninteresting(p);
444 if (p->object.flags & SEEN)
445 continue;
446 p->object.flags |= SEEN;
447 insert_by_date(p, list);
448 }
cc0e6c5a 449 return 0;
a4a88b2b
LT
450 }
451
452 /*
453 * Ok, the commit wasn't uninteresting. Try to
454 * simplify the commit history and find the parent
455 * that has no differences in the path set if one exists.
456 */
53b2c823 457 try_to_simplify_commit(revs, commit);
a4a88b2b 458
ba1d4505 459 if (revs->no_walk)
cc0e6c5a 460 return 0;
ba1d4505 461
577ed5c2 462 left_flag = (commit->object.flags & SYMMETRIC_LEFT);
0053e902 463
d9c292e8 464 for (parent = commit->parents; parent; parent = parent->next) {
a4a88b2b
LT
465 struct commit *p = parent->item;
466
cc0e6c5a
AR
467 if (parse_commit(p) < 0)
468 return -1;
577ed5c2 469 p->object.flags |= left_flag;
a4a88b2b
LT
470 if (p->object.flags & SEEN)
471 continue;
472 p->object.flags |= SEEN;
d9c292e8
SB
473 insert_by_date(p, list);
474 if(revs->first_parent_only)
475 break;
a4a88b2b 476 }
cc0e6c5a 477 return 0;
a4a88b2b
LT
478}
479
36d56de6 480static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
d7a17cad
JH
481{
482 struct commit_list *p;
483 int left_count = 0, right_count = 0;
484 int left_first;
485 struct patch_ids ids;
486
487 /* First count the commits on the left and on the right */
488 for (p = list; p; p = p->next) {
489 struct commit *commit = p->item;
490 unsigned flags = commit->object.flags;
491 if (flags & BOUNDARY)
492 ;
493 else if (flags & SYMMETRIC_LEFT)
494 left_count++;
495 else
496 right_count++;
497 }
498
499 left_first = left_count < right_count;
500 init_patch_ids(&ids);
36d56de6
JS
501 if (revs->diffopt.nr_paths) {
502 ids.diffopts.nr_paths = revs->diffopt.nr_paths;
503 ids.diffopts.paths = revs->diffopt.paths;
504 ids.diffopts.pathlens = revs->diffopt.pathlens;
505 }
d7a17cad
JH
506
507 /* Compute patch-ids for one side */
508 for (p = list; p; p = p->next) {
509 struct commit *commit = p->item;
510 unsigned flags = commit->object.flags;
511
512 if (flags & BOUNDARY)
513 continue;
514 /*
515 * If we have fewer left, left_first is set and we omit
516 * commits on the right branch in this loop. If we have
517 * fewer right, we skip the left ones.
518 */
519 if (left_first != !!(flags & SYMMETRIC_LEFT))
520 continue;
521 commit->util = add_commit_patch_id(commit, &ids);
522 }
523
524 /* Check the other side */
525 for (p = list; p; p = p->next) {
526 struct commit *commit = p->item;
527 struct patch_id *id;
528 unsigned flags = commit->object.flags;
529
530 if (flags & BOUNDARY)
531 continue;
532 /*
533 * If we have fewer left, left_first is set and we omit
534 * commits on the left branch in this loop.
535 */
536 if (left_first == !!(flags & SYMMETRIC_LEFT))
537 continue;
538
539 /*
540 * Have we seen the same patch id?
541 */
542 id = has_commit_patch_id(commit, &ids);
543 if (!id)
544 continue;
545 id->seen = 1;
546 commit->object.flags |= SHOWN;
547 }
548
549 /* Now check the original side for seen ones */
550 for (p = list; p; p = p->next) {
551 struct commit *commit = p->item;
552 struct patch_id *ent;
553
554 ent = commit->util;
555 if (!ent)
556 continue;
557 if (ent->seen)
558 commit->object.flags |= SHOWN;
559 commit->util = NULL;
560 }
561
562 free_patch_ids(&ids);
563}
564
7d004199
LT
565/* How many extra uninteresting commits we want to see.. */
566#define SLOP 5
567
568static int still_interesting(struct commit_list *src, unsigned long date, int slop)
3131b713 569{
7d004199
LT
570 /*
571 * No source list at all? We're definitely done..
572 */
573 if (!src)
574 return 0;
575
576 /*
577 * Does the destination list contain entries with a date
578 * before the source list? Definitely _not_ done.
579 */
580 if (date < src->item->date)
581 return SLOP;
582
583 /*
584 * Does the source list still have interesting commits in
585 * it? Definitely not done..
586 */
587 if (!everybody_uninteresting(src))
588 return SLOP;
589
590 /* Ok, we're closing in.. */
591 return slop-1;
3131b713
LT
592}
593
cc0e6c5a 594static int limit_list(struct rev_info *revs)
a4a88b2b 595{
7d004199
LT
596 int slop = SLOP;
597 unsigned long date = ~0ul;
a4a88b2b
LT
598 struct commit_list *list = revs->commits;
599 struct commit_list *newlist = NULL;
600 struct commit_list **p = &newlist;
601
602 while (list) {
603 struct commit_list *entry = list;
604 struct commit *commit = list->item;
605 struct object *obj = &commit->object;
cdcefbc9 606 show_early_output_fn_t show;
a4a88b2b
LT
607
608 list = list->next;
609 free(entry);
610
611 if (revs->max_age != -1 && (commit->date < revs->max_age))
612 obj->flags |= UNINTERESTING;
cc0e6c5a
AR
613 if (add_parents_to_list(revs, commit, &list) < 0)
614 return -1;
a4a88b2b
LT
615 if (obj->flags & UNINTERESTING) {
616 mark_parents_uninteresting(commit);
7d004199
LT
617 if (revs->show_all)
618 p = &commit_list_insert(commit, p)->next;
619 slop = still_interesting(list, date, slop);
620 if (slop)
3131b713 621 continue;
7d004199
LT
622 /* If showing all, add the whole pending list to the end */
623 if (revs->show_all)
624 *p = list;
625 break;
a4a88b2b
LT
626 }
627 if (revs->min_age != -1 && (commit->date > revs->min_age))
628 continue;
7d004199 629 date = commit->date;
a4a88b2b 630 p = &commit_list_insert(commit, p)->next;
cdcefbc9
LT
631
632 show = show_early_output;
633 if (!show)
634 continue;
635
636 show(revs, newlist);
637 show_early_output = NULL;
a4a88b2b 638 }
d7a17cad 639 if (revs->cherry_pick)
36d56de6 640 cherry_pick_list(newlist, revs);
d7a17cad 641
a4a88b2b 642 revs->commits = newlist;
cc0e6c5a 643 return 0;
a4a88b2b
LT
644}
645
63049292
JH
646struct all_refs_cb {
647 int all_flags;
71b03b42 648 int warned_bad_reflog;
63049292
JH
649 struct rev_info *all_revs;
650 const char *name_for_errormsg;
651};
ae563542 652
8da19775 653static int handle_one_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
ae563542 654{
63049292
JH
655 struct all_refs_cb *cb = cb_data;
656 struct object *object = get_reference(cb->all_revs, path, sha1,
657 cb->all_flags);
3d1efd8f 658 add_pending_object(cb->all_revs, object, path);
ae563542
LT
659 return 0;
660}
661
a5aa930d
UKK
662static void handle_refs(struct rev_info *revs, unsigned flags,
663 int (*for_each)(each_ref_fn, void *))
ae563542 664{
63049292
JH
665 struct all_refs_cb cb;
666 cb.all_revs = revs;
667 cb.all_flags = flags;
a5aa930d 668 for_each(handle_one_ref, &cb);
63049292
JH
669}
670
71b03b42 671static void handle_one_reflog_commit(unsigned char *sha1, void *cb_data)
63049292
JH
672{
673 struct all_refs_cb *cb = cb_data;
71b03b42
SP
674 if (!is_null_sha1(sha1)) {
675 struct object *o = parse_object(sha1);
676 if (o) {
677 o->flags |= cb->all_flags;
678 add_pending_object(cb->all_revs, o, "");
679 }
680 else if (!cb->warned_bad_reflog) {
46efd2d9 681 warning("reflog of '%s' references pruned commits",
71b03b42
SP
682 cb->name_for_errormsg);
683 cb->warned_bad_reflog = 1;
684 }
63049292 685 }
71b03b42
SP
686}
687
883d60fa
JS
688static int handle_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
689 const char *email, unsigned long timestamp, int tz,
690 const char *message, void *cb_data)
71b03b42
SP
691{
692 handle_one_reflog_commit(osha1, cb_data);
693 handle_one_reflog_commit(nsha1, cb_data);
63049292
JH
694 return 0;
695}
696
697static int handle_one_reflog(const char *path, const unsigned char *sha1, int flag, void *cb_data)
698{
699 struct all_refs_cb *cb = cb_data;
71b03b42 700 cb->warned_bad_reflog = 0;
63049292
JH
701 cb->name_for_errormsg = path;
702 for_each_reflog_ent(path, handle_one_reflog_ent, cb_data);
703 return 0;
704}
705
706static void handle_reflog(struct rev_info *revs, unsigned flags)
707{
708 struct all_refs_cb cb;
709 cb.all_revs = revs;
710 cb.all_flags = flags;
25b51e2c 711 for_each_reflog(handle_one_reflog, &cb);
ae563542
LT
712}
713
ea4a19e1
JH
714static int add_parents_only(struct rev_info *revs, const char *arg, int flags)
715{
716 unsigned char sha1[20];
717 struct object *it;
718 struct commit *commit;
719 struct commit_list *parents;
720
721 if (*arg == '^') {
722 flags ^= UNINTERESTING;
723 arg++;
724 }
725 if (get_sha1(arg, sha1))
726 return 0;
727 while (1) {
728 it = get_reference(revs, arg, sha1, 0);
1974632c 729 if (it->type != OBJ_TAG)
ea4a19e1 730 break;
9684afd9
MK
731 if (!((struct tag*)it)->tagged)
732 return 0;
e702496e 733 hashcpy(sha1, ((struct tag*)it)->tagged->sha1);
ea4a19e1 734 }
1974632c 735 if (it->type != OBJ_COMMIT)
ea4a19e1
JH
736 return 0;
737 commit = (struct commit *)it;
738 for (parents = commit->parents; parents; parents = parents->next) {
739 it = &parents->item->object;
740 it->flags |= flags;
741 add_pending_object(revs, it, arg);
742 }
743 return 1;
744}
745
db6296a5 746void init_revisions(struct rev_info *revs, const char *prefix)
8efdc326
FK
747{
748 memset(revs, 0, sizeof(*revs));
8e8f9987 749
6b9c58f4 750 revs->abbrev = DEFAULT_ABBREV;
8e8f9987 751 revs->ignore_merges = 1;
9202434c 752 revs->simplify_history = 1;
8f67f8ae
PH
753 DIFF_OPT_SET(&revs->pruning, RECURSIVE);
754 DIFF_OPT_SET(&revs->pruning, QUIET);
cd2bdc53
LT
755 revs->pruning.add_remove = file_add_remove;
756 revs->pruning.change = file_change;
8efdc326
FK
757 revs->lifo = 1;
758 revs->dense = 1;
db6296a5 759 revs->prefix = prefix;
8efdc326
FK
760 revs->max_age = -1;
761 revs->min_age = -1;
d5db6c9e 762 revs->skip_count = -1;
8efdc326
FK
763 revs->max_count = -1;
764
cd2bdc53
LT
765 revs->commit_format = CMIT_FMT_DEFAULT;
766
767 diff_setup(&revs->diffopt);
c0cb4a06 768 if (prefix && !revs->diffopt.prefix) {
cd676a51
JH
769 revs->diffopt.prefix = prefix;
770 revs->diffopt.prefix_length = strlen(prefix);
771 }
8efdc326
FK
772}
773
0d2c9d67
RS
774static void add_pending_commit_list(struct rev_info *revs,
775 struct commit_list *commit_list,
776 unsigned int flags)
777{
778 while (commit_list) {
779 struct object *object = &commit_list->item->object;
780 object->flags |= flags;
781 add_pending_object(revs, object, sha1_to_hex(object->sha1));
782 commit_list = commit_list->next;
783 }
784}
785
ae3e5e1e
JH
786static void prepare_show_merge(struct rev_info *revs)
787{
788 struct commit_list *bases;
789 struct commit *head, *other;
790 unsigned char sha1[20];
791 const char **prune = NULL;
792 int i, prune_num = 1; /* counting terminating NULL */
793
794 if (get_sha1("HEAD", sha1) || !(head = lookup_commit(sha1)))
795 die("--merge without HEAD?");
796 if (get_sha1("MERGE_HEAD", sha1) || !(other = lookup_commit(sha1)))
797 die("--merge without MERGE_HEAD?");
798 add_pending_object(revs, &head->object, "HEAD");
799 add_pending_object(revs, &other->object, "MERGE_HEAD");
800 bases = get_merge_bases(head, other, 1);
e82447b1
JH
801 add_pending_commit_list(revs, bases, UNINTERESTING);
802 free_commit_list(bases);
803 head->object.flags |= SYMMETRIC_LEFT;
ae3e5e1e
JH
804
805 if (!active_nr)
806 read_cache();
807 for (i = 0; i < active_nr; i++) {
808 struct cache_entry *ce = active_cache[i];
809 if (!ce_stage(ce))
810 continue;
811 if (ce_path_match(ce, revs->prune_data)) {
812 prune_num++;
813 prune = xrealloc(prune, sizeof(*prune) * prune_num);
814 prune[prune_num-2] = ce->name;
815 prune[prune_num-1] = NULL;
816 }
817 while ((i+1 < active_nr) &&
818 ce_same_name(ce, active_cache[i+1]))
819 i++;
820 }
821 revs->prune_data = prune;
e82447b1 822 revs->limited = 1;
ae3e5e1e
JH
823}
824
5d6f0935
JH
825int handle_revision_arg(const char *arg, struct rev_info *revs,
826 int flags,
827 int cant_be_filename)
828{
bb6c2fba 829 unsigned mode;
5d6f0935
JH
830 char *dotdot;
831 struct object *object;
832 unsigned char sha1[20];
833 int local_flags;
834
835 dotdot = strstr(arg, "..");
836 if (dotdot) {
837 unsigned char from_sha1[20];
838 const char *next = dotdot + 2;
839 const char *this = arg;
840 int symmetric = *next == '.';
841 unsigned int flags_exclude = flags ^ UNINTERESTING;
842
843 *dotdot = 0;
844 next += symmetric;
845
846 if (!*next)
847 next = "HEAD";
848 if (dotdot == arg)
849 this = "HEAD";
850 if (!get_sha1(this, from_sha1) &&
851 !get_sha1(next, sha1)) {
852 struct commit *a, *b;
853 struct commit_list *exclude;
854
855 a = lookup_commit_reference(from_sha1);
856 b = lookup_commit_reference(sha1);
857 if (!a || !b) {
858 die(symmetric ?
859 "Invalid symmetric difference expression %s...%s" :
860 "Invalid revision range %s..%s",
861 arg, next);
862 }
863
864 if (!cant_be_filename) {
865 *dotdot = '.';
866 verify_non_filename(revs->prefix, arg);
867 }
868
869 if (symmetric) {
870 exclude = get_merge_bases(a, b, 1);
871 add_pending_commit_list(revs, exclude,
872 flags_exclude);
873 free_commit_list(exclude);
577ed5c2 874 a->object.flags |= flags | SYMMETRIC_LEFT;
5d6f0935
JH
875 } else
876 a->object.flags |= flags_exclude;
877 b->object.flags |= flags;
878 add_pending_object(revs, &a->object, this);
879 add_pending_object(revs, &b->object, next);
880 return 0;
881 }
882 *dotdot = '.';
883 }
884 dotdot = strstr(arg, "^@");
885 if (dotdot && !dotdot[2]) {
886 *dotdot = 0;
887 if (add_parents_only(revs, arg, flags))
888 return 0;
889 *dotdot = '^';
890 }
62476c8e
JH
891 dotdot = strstr(arg, "^!");
892 if (dotdot && !dotdot[2]) {
893 *dotdot = 0;
894 if (!add_parents_only(revs, arg, flags ^ UNINTERESTING))
895 *dotdot = '^';
896 }
897
5d6f0935
JH
898 local_flags = 0;
899 if (*arg == '^') {
900 local_flags = UNINTERESTING;
901 arg++;
902 }
bb6c2fba 903 if (get_sha1_with_mode(arg, sha1, &mode))
5d6f0935
JH
904 return -1;
905 if (!cant_be_filename)
906 verify_non_filename(revs->prefix, arg);
907 object = get_reference(revs, arg, sha1, flags ^ local_flags);
bb6c2fba 908 add_pending_object_with_mode(revs, object, arg, mode);
5d6f0935
JH
909 return 0;
910}
911
2d10c555 912static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
bd95fcd3 913{
2d10c555 914 if (!revs->grep_filter) {
bd95fcd3
JH
915 struct grep_opt *opt = xcalloc(1, sizeof(*opt));
916 opt->status_only = 1;
917 opt->pattern_tail = &(opt->pattern_list);
918 opt->regflags = REG_NEWLINE;
2d10c555 919 revs->grep_filter = opt;
bd95fcd3 920 }
2d10c555
JH
921 append_grep_pattern(revs->grep_filter, ptn,
922 "command line", 0, what);
923}
924
925static void add_header_grep(struct rev_info *revs, const char *field, const char *pattern)
926{
927 char *pat;
928 const char *prefix;
929 int patlen, fldlen;
bd95fcd3
JH
930
931 fldlen = strlen(field);
932 patlen = strlen(pattern);
a2ed6ae4
LT
933 pat = xmalloc(patlen + fldlen + 10);
934 prefix = ".*";
935 if (*pattern == '^') {
936 prefix = "";
937 pattern++;
938 }
939 sprintf(pat, "^%s %s%s", field, prefix, pattern);
2d10c555 940 add_grep(revs, pat, GREP_PATTERN_HEAD);
bd95fcd3
JH
941}
942
943static void add_message_grep(struct rev_info *revs, const char *pattern)
944{
2d10c555 945 add_grep(revs, pattern, GREP_PATTERN_BODY);
bd95fcd3
JH
946}
947
106d710b
JH
948static void add_ignore_packed(struct rev_info *revs, const char *name)
949{
950 int num = ++revs->num_ignore_packed;
951
952 revs->ignore_packed = xrealloc(revs->ignore_packed,
953 sizeof(const char **) * (num + 1));
954 revs->ignore_packed[num-1] = name;
955 revs->ignore_packed[num] = NULL;
956}
957
ae563542
LT
958/*
959 * Parse revision information, filling in the "rev_info" structure,
960 * and removing the used arguments from the argument list.
961 *
765ac8ec
LT
962 * Returns the number of arguments left that weren't recognized
963 * (which are also moved to the head of the argument list)
ae563542 964 */
a4a88b2b 965int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def)
ae563542 966{
ae3e5e1e 967 int i, flags, seen_dashdash, show_merge;
765ac8ec 968 const char **unrecognized = argv + 1;
ae563542 969 int left = 1;
70d0afba 970 int all_match = 0;
93d496a5 971 int regflags = 0;
dc1c0fff 972 int fixed = 0;
ae563542 973
ae563542
LT
974 /* First, search for "--" */
975 seen_dashdash = 0;
976 for (i = 1; i < argc; i++) {
977 const char *arg = argv[i];
978 if (strcmp(arg, "--"))
979 continue;
980 argv[i] = NULL;
981 argc = i;
a65f2005
JH
982 if (argv[i + 1])
983 revs->prune_data = get_pathspec(revs->prefix, argv + i + 1);
ae563542
LT
984 seen_dashdash = 1;
985 break;
986 }
987
ae3e5e1e 988 flags = show_merge = 0;
ae563542 989 for (i = 1; i < argc; i++) {
ae563542 990 const char *arg = argv[i];
ae563542 991 if (*arg == '-') {
cd2bdc53 992 int opts;
cc44c765 993 if (!prefixcmp(arg, "--max-count=")) {
ae563542
LT
994 revs->max_count = atoi(arg + 12);
995 continue;
996 }
cc44c765 997 if (!prefixcmp(arg, "--skip=")) {
d5db6c9e
JH
998 revs->skip_count = atoi(arg + 7);
999 continue;
1000 }
de5f2bf3 1001 /* accept -<digit>, like traditional "head" */
64bc6e3d
JH
1002 if ((*arg == '-') && isdigit(arg[1])) {
1003 revs->max_count = atoi(arg + 1);
1004 continue;
1005 }
1006 if (!strcmp(arg, "-n")) {
1007 if (argc <= i + 1)
1008 die("-n requires an argument");
1009 revs->max_count = atoi(argv[++i]);
1010 continue;
1011 }
1968d77d 1012 if (!prefixcmp(arg, "-n")) {
64bc6e3d
JH
1013 revs->max_count = atoi(arg + 2);
1014 continue;
1015 }
cc44c765 1016 if (!prefixcmp(arg, "--max-age=")) {
ae563542 1017 revs->max_age = atoi(arg + 10);
ae563542
LT
1018 continue;
1019 }
cc44c765 1020 if (!prefixcmp(arg, "--since=")) {
fd751667 1021 revs->max_age = approxidate(arg + 8);
fd751667
JH
1022 continue;
1023 }
cc44c765 1024 if (!prefixcmp(arg, "--after=")) {
fd751667 1025 revs->max_age = approxidate(arg + 8);
53069686
JH
1026 continue;
1027 }
cc44c765 1028 if (!prefixcmp(arg, "--min-age=")) {
53069686 1029 revs->min_age = atoi(arg + 10);
fd751667
JH
1030 continue;
1031 }
cc44c765 1032 if (!prefixcmp(arg, "--before=")) {
fd751667 1033 revs->min_age = approxidate(arg + 9);
fd751667
JH
1034 continue;
1035 }
cc44c765 1036 if (!prefixcmp(arg, "--until=")) {
fd751667 1037 revs->min_age = approxidate(arg + 8);
fd751667
JH
1038 continue;
1039 }
ae563542 1040 if (!strcmp(arg, "--all")) {
a5aa930d
UKK
1041 handle_refs(revs, flags, for_each_ref);
1042 continue;
1043 }
1044 if (!strcmp(arg, "--branches")) {
1045 handle_refs(revs, flags, for_each_branch_ref);
1046 continue;
1047 }
1048 if (!strcmp(arg, "--tags")) {
1049 handle_refs(revs, flags, for_each_tag_ref);
1050 continue;
1051 }
1052 if (!strcmp(arg, "--remotes")) {
1053 handle_refs(revs, flags, for_each_remote_ref);
ae563542
LT
1054 continue;
1055 }
0053e902
JH
1056 if (!strcmp(arg, "--first-parent")) {
1057 revs->first_parent_only = 1;
1058 continue;
1059 }
63049292
JH
1060 if (!strcmp(arg, "--reflog")) {
1061 handle_reflog(revs, flags);
1062 continue;
1063 }
084ae0a7
JS
1064 if (!strcmp(arg, "-g") ||
1065 !strcmp(arg, "--walk-reflogs")) {
8860fd42
JS
1066 init_reflog_walk(&revs->reflog_info);
1067 continue;
1068 }
ae563542
LT
1069 if (!strcmp(arg, "--not")) {
1070 flags ^= UNINTERESTING;
1071 continue;
1072 }
1073 if (!strcmp(arg, "--default")) {
1074 if (++i >= argc)
1075 die("bad --default argument");
1076 def = argv[i];
1077 continue;
1078 }
ae3e5e1e
JH
1079 if (!strcmp(arg, "--merge")) {
1080 show_merge = 1;
1081 continue;
1082 }
ae563542 1083 if (!strcmp(arg, "--topo-order")) {
a710522b 1084 revs->lifo = 1;
ae563542
LT
1085 revs->topo_order = 1;
1086 continue;
1087 }
1088 if (!strcmp(arg, "--date-order")) {
1089 revs->lifo = 0;
1090 revs->topo_order = 1;
1091 continue;
1092 }
cdcefbc9
LT
1093 if (!prefixcmp(arg, "--early-output")) {
1094 int count = 100;
1095 switch (arg[14]) {
1096 case '=':
1097 count = atoi(arg+15);
1098 /* Fallthrough */
1099 case 0:
1100 revs->topo_order = 1;
1101 revs->early_output = count;
1102 continue;
1103 }
1104 }
7b0c9966
LT
1105 if (!strcmp(arg, "--parents")) {
1106 revs->parents = 1;
1107 continue;
1108 }
ae563542
LT
1109 if (!strcmp(arg, "--dense")) {
1110 revs->dense = 1;
1111 continue;
1112 }
1113 if (!strcmp(arg, "--sparse")) {
1114 revs->dense = 0;
1115 continue;
1116 }
3131b713
LT
1117 if (!strcmp(arg, "--show-all")) {
1118 revs->show_all = 1;
1119 continue;
1120 }
ae563542
LT
1121 if (!strcmp(arg, "--remove-empty")) {
1122 revs->remove_empty_trees = 1;
1123 continue;
1124 }
5cdeae71 1125 if (!strcmp(arg, "--no-merges")) {
765ac8ec
LT
1126 revs->no_merges = 1;
1127 continue;
1128 }
384e99a4
JH
1129 if (!strcmp(arg, "--boundary")) {
1130 revs->boundary = 1;
1131 continue;
1132 }
8dce8235
JH
1133 if (!strcmp(arg, "--left-right")) {
1134 revs->left_right = 1;
74bd9029
JH
1135 continue;
1136 }
d7a17cad
JH
1137 if (!strcmp(arg, "--cherry-pick")) {
1138 revs->cherry_pick = 1;
023756f4 1139 revs->limited = 1;
d7a17cad
JH
1140 continue;
1141 }
ae563542
LT
1142 if (!strcmp(arg, "--objects")) {
1143 revs->tag_objects = 1;
1144 revs->tree_objects = 1;
1145 revs->blob_objects = 1;
1146 continue;
1147 }
1148 if (!strcmp(arg, "--objects-edge")) {
1149 revs->tag_objects = 1;
1150 revs->tree_objects = 1;
1151 revs->blob_objects = 1;
1152 revs->edge_hint = 1;
1153 continue;
1154 }
d9a83684
LT
1155 if (!strcmp(arg, "--unpacked")) {
1156 revs->unpacked = 1;
106d710b
JH
1157 free(revs->ignore_packed);
1158 revs->ignore_packed = NULL;
1159 revs->num_ignore_packed = 0;
1160 continue;
1161 }
cc44c765 1162 if (!prefixcmp(arg, "--unpacked=")) {
106d710b
JH
1163 revs->unpacked = 1;
1164 add_ignore_packed(revs, arg+11);
d9a83684
LT
1165 continue;
1166 }
cd2bdc53
LT
1167 if (!strcmp(arg, "-r")) {
1168 revs->diff = 1;
8f67f8ae 1169 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
cd2bdc53
LT
1170 continue;
1171 }
1172 if (!strcmp(arg, "-t")) {
1173 revs->diff = 1;
8f67f8ae
PH
1174 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1175 DIFF_OPT_SET(&revs->diffopt, TREE_IN_RECURSIVE);
cd2bdc53
LT
1176 continue;
1177 }
1178 if (!strcmp(arg, "-m")) {
1179 revs->ignore_merges = 0;
1180 continue;
1181 }
1182 if (!strcmp(arg, "-c")) {
1183 revs->diff = 1;
0fe7c1de 1184 revs->dense_combined_merges = 0;
cd2bdc53
LT
1185 revs->combine_merges = 1;
1186 continue;
1187 }
1188 if (!strcmp(arg, "--cc")) {
1189 revs->diff = 1;
1190 revs->dense_combined_merges = 1;
1191 revs->combine_merges = 1;
1192 continue;
1193 }
1194 if (!strcmp(arg, "-v")) {
1195 revs->verbose_header = 1;
cd2bdc53
LT
1196 continue;
1197 }
cc44c765 1198 if (!prefixcmp(arg, "--pretty")) {
cd2bdc53 1199 revs->verbose_header = 1;
4da45bef 1200 get_commit_format(arg+8, revs);
cd2bdc53
LT
1201 continue;
1202 }
1203 if (!strcmp(arg, "--root")) {
1204 revs->show_root_diff = 1;
1205 continue;
1206 }
1207 if (!strcmp(arg, "--no-commit-id")) {
1208 revs->no_commit_id = 1;
1209 continue;
1210 }
1211 if (!strcmp(arg, "--always")) {
1212 revs->always_show_header = 1;
1213 continue;
1214 }
1215 if (!strcmp(arg, "--no-abbrev")) {
1216 revs->abbrev = 0;
1217 continue;
1218 }
1219 if (!strcmp(arg, "--abbrev")) {
1220 revs->abbrev = DEFAULT_ABBREV;
1221 continue;
1222 }
cc44c765 1223 if (!prefixcmp(arg, "--abbrev=")) {
508d9e37
LT
1224 revs->abbrev = strtoul(arg + 9, NULL, 10);
1225 if (revs->abbrev < MINIMUM_ABBREV)
1226 revs->abbrev = MINIMUM_ABBREV;
1227 else if (revs->abbrev > 40)
1228 revs->abbrev = 40;
1229 continue;
1230 }
cd2bdc53
LT
1231 if (!strcmp(arg, "--abbrev-commit")) {
1232 revs->abbrev_commit = 1;
1233 continue;
1234 }
1235 if (!strcmp(arg, "--full-diff")) {
1236 revs->diff = 1;
1237 revs->full_diff = 1;
1238 continue;
1239 }
9202434c
LT
1240 if (!strcmp(arg, "--full-history")) {
1241 revs->simplify_history = 0;
1242 continue;
1243 }
3dfb9278 1244 if (!strcmp(arg, "--relative-date")) {
a7b02ccf
JH
1245 revs->date_mode = DATE_RELATIVE;
1246 continue;
1247 }
1248 if (!strncmp(arg, "--date=", 7)) {
856665f8 1249 revs->date_mode = parse_date_format(arg + 7);
3dfb9278
JF
1250 continue;
1251 }
9fa3465d
MC
1252 if (!strcmp(arg, "--log-size")) {
1253 revs->show_log_size = 1;
1254 continue;
1255 }
2d10c555
JH
1256
1257 /*
1258 * Grepping the commit log
1259 */
cc44c765 1260 if (!prefixcmp(arg, "--author=")) {
bd95fcd3
JH
1261 add_header_grep(revs, "author", arg+9);
1262 continue;
1263 }
cc44c765 1264 if (!prefixcmp(arg, "--committer=")) {
bd95fcd3
JH
1265 add_header_grep(revs, "committer", arg+12);
1266 continue;
1267 }
cc44c765 1268 if (!prefixcmp(arg, "--grep=")) {
bd95fcd3
JH
1269 add_message_grep(revs, arg+7);
1270 continue;
1271 }
e5633cbb
JH
1272 if (!strcmp(arg, "--extended-regexp") ||
1273 !strcmp(arg, "-E")) {
93d496a5
PB
1274 regflags |= REG_EXTENDED;
1275 continue;
1276 }
e5633cbb
JH
1277 if (!strcmp(arg, "--regexp-ignore-case") ||
1278 !strcmp(arg, "-i")) {
93d496a5
PB
1279 regflags |= REG_ICASE;
1280 continue;
1281 }
dc1c0fff
JN
1282 if (!strcmp(arg, "--fixed-strings") ||
1283 !strcmp(arg, "-F")) {
1284 fixed = 1;
1285 continue;
1286 }
70d0afba
JH
1287 if (!strcmp(arg, "--all-match")) {
1288 all_match = 1;
1289 continue;
1290 }
cc44c765 1291 if (!prefixcmp(arg, "--encoding=")) {
7cbcf4d5
JH
1292 arg += 11;
1293 if (strcmp(arg, "none"))
567fb65e 1294 git_log_output_encoding = xstrdup(arg);
7cbcf4d5
JH
1295 else
1296 git_log_output_encoding = "";
1297 continue;
1298 }
9c5e66e9
JS
1299 if (!strcmp(arg, "--reverse")) {
1300 revs->reverse ^= 1;
1301 continue;
1302 }
8e64006e
JS
1303 if (!strcmp(arg, "--no-walk")) {
1304 revs->no_walk = 1;
1305 continue;
1306 }
1307 if (!strcmp(arg, "--do-walk")) {
1308 revs->no_walk = 0;
1309 continue;
1310 }
2d10c555 1311
cd2bdc53
LT
1312 opts = diff_opt_parse(&revs->diffopt, argv+i, argc-i);
1313 if (opts > 0) {
cd2bdc53
LT
1314 i += opts - 1;
1315 continue;
1316 }
ae563542
LT
1317 *unrecognized++ = arg;
1318 left++;
1319 continue;
1320 }
ae563542 1321
5d6f0935
JH
1322 if (handle_revision_arg(arg, revs, flags, seen_dashdash)) {
1323 int j;
1324 if (seen_dashdash || *arg == '^')
ae563542
LT
1325 die("bad revision '%s'", arg);
1326
ea92f41f
JH
1327 /* If we didn't have a "--":
1328 * (1) all filenames must exist;
1329 * (2) all rev-args must not be interpretable
1330 * as a valid filename.
1331 * but the latter we have checked in the main loop.
1332 */
e23d0b4a
LT
1333 for (j = i; j < argc; j++)
1334 verify_filename(revs->prefix, argv[j]);
1335
5d6f0935
JH
1336 revs->prune_data = get_pathspec(revs->prefix,
1337 argv + i);
ae563542
LT
1338 break;
1339 }
ae563542 1340 }
5d6f0935 1341
dc1c0fff 1342 if (revs->grep_filter) {
93d496a5 1343 revs->grep_filter->regflags |= regflags;
dc1c0fff
JN
1344 revs->grep_filter->fixed = fixed;
1345 }
93d496a5 1346
ae3e5e1e
JH
1347 if (show_merge)
1348 prepare_show_merge(revs);
1f1e895f 1349 if (def && !revs->pending.nr) {
ae563542 1350 unsigned char sha1[20];
cd2bdc53 1351 struct object *object;
bb6c2fba
MK
1352 unsigned mode;
1353 if (get_sha1_with_mode(def, sha1, &mode))
ae563542 1354 die("bad default revision '%s'", def);
cd2bdc53 1355 object = get_reference(revs, def, sha1, 0);
bb6c2fba 1356 add_pending_object_with_mode(revs, object, def, mode);
ae563542 1357 }
8efdc326 1358
b7bb760d
LT
1359 /* Did the user ask for any diff output? Run the diff! */
1360 if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT)
1361 revs->diff = 1;
1362
0faf2da7
AL
1363 /* Pickaxe, diff-filter and rename following need diffs */
1364 if (revs->diffopt.pickaxe ||
1365 revs->diffopt.filter ||
1366 DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
b7bb760d
LT
1367 revs->diff = 1;
1368
9dad9d2e 1369 if (revs->topo_order)
53069686
JH
1370 revs->limited = 1;
1371
8efdc326 1372 if (revs->prune_data) {
cd2bdc53 1373 diff_tree_setup_paths(revs->prune_data, &revs->pruning);
750f7b66 1374 /* Can't prune commits with rename following: the paths change.. */
8f67f8ae 1375 if (!DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
53b2c823 1376 revs->prune = 1;
cd2bdc53
LT
1377 if (!revs->full_diff)
1378 diff_tree_setup_paths(revs->prune_data, &revs->diffopt);
8efdc326 1379 }
cd2bdc53
LT
1380 if (revs->combine_merges) {
1381 revs->ignore_merges = 0;
0e677e1a 1382 if (revs->dense_combined_merges && !revs->diffopt.output_format)
cd2bdc53
LT
1383 revs->diffopt.output_format = DIFF_FORMAT_PATCH;
1384 }
cd2bdc53 1385 revs->diffopt.abbrev = revs->abbrev;
72ee96c0
JH
1386 if (diff_setup_done(&revs->diffopt) < 0)
1387 die("diff_setup_done failed");
8efdc326 1388
70d0afba
JH
1389 if (revs->grep_filter) {
1390 revs->grep_filter->all_match = all_match;
2d10c555 1391 compile_grep_patterns(revs->grep_filter);
70d0afba 1392 }
bd95fcd3 1393
d56651c0
SP
1394 if (revs->reverse && revs->reflog_info)
1395 die("cannot combine --reverse with --walk-reflogs");
1396
ae563542
LT
1397 return left;
1398}
a4a88b2b 1399
cc0e6c5a 1400int prepare_revision_walk(struct rev_info *revs)
a4a88b2b 1401{
1f1e895f 1402 int nr = revs->pending.nr;
94d23673 1403 struct object_array_entry *e, *list;
cd2bdc53 1404
94d23673 1405 e = list = revs->pending.objects;
1f1e895f
LT
1406 revs->pending.nr = 0;
1407 revs->pending.alloc = 0;
1408 revs->pending.objects = NULL;
1409 while (--nr >= 0) {
94d23673 1410 struct commit *commit = handle_commit(revs, e->item, e->name);
cd2bdc53
LT
1411 if (commit) {
1412 if (!(commit->object.flags & SEEN)) {
1413 commit->object.flags |= SEEN;
1414 insert_by_date(commit, &revs->commits);
1415 }
1416 }
94d23673 1417 e++;
cd2bdc53 1418 }
94d23673 1419 free(list);
cd2bdc53 1420
ba1d4505 1421 if (revs->no_walk)
cc0e6c5a 1422 return 0;
a4a88b2b 1423 if (revs->limited)
cc0e6c5a
AR
1424 if (limit_list(revs) < 0)
1425 return -1;
a4a88b2b 1426 if (revs->topo_order)
23c17d4a 1427 sort_in_topological_order(&revs->commits, revs->lifo);
cc0e6c5a 1428 return 0;
a4a88b2b
LT
1429}
1430
cc0e6c5a
AR
1431enum rewrite_result {
1432 rewrite_one_ok,
1433 rewrite_one_noparents,
1434 rewrite_one_error,
1435};
1436
1437static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)
765ac8ec
LT
1438{
1439 for (;;) {
1440 struct commit *p = *pp;
3381c790 1441 if (!revs->limited)
cc0e6c5a
AR
1442 if (add_parents_to_list(revs, p, &revs->commits) < 0)
1443 return rewrite_one_error;
6631c736 1444 if (p->parents && p->parents->next)
cc0e6c5a 1445 return rewrite_one_ok;
7dc0fe3b
LT
1446 if (p->object.flags & UNINTERESTING)
1447 return rewrite_one_ok;
1448 if (!(p->object.flags & TREESAME))
cc0e6c5a 1449 return rewrite_one_ok;
765ac8ec 1450 if (!p->parents)
cc0e6c5a 1451 return rewrite_one_noparents;
765ac8ec
LT
1452 *pp = p->parents->item;
1453 }
1454}
1455
11d65967
JH
1456static void remove_duplicate_parents(struct commit *commit)
1457{
e1abc69b 1458 struct commit_list **pp, *p;
11d65967
JH
1459
1460 /* Examine existing parents while marking ones we have seen... */
e1abc69b
LT
1461 pp = &commit->parents;
1462 while ((p = *pp) != NULL) {
11d65967 1463 struct commit *parent = p->item;
e1abc69b
LT
1464 if (parent->object.flags & TMP_MARK) {
1465 *pp = p->next;
11d65967 1466 continue;
e1abc69b 1467 }
11d65967 1468 parent->object.flags |= TMP_MARK;
11d65967
JH
1469 pp = &p->next;
1470 }
1471 /* ... and clear the temporary mark */
1472 for (p = commit->parents; p; p = p->next)
1473 p->item->object.flags &= ~TMP_MARK;
1474}
1475
cc0e6c5a 1476static int rewrite_parents(struct rev_info *revs, struct commit *commit)
765ac8ec
LT
1477{
1478 struct commit_list **pp = &commit->parents;
1479 while (*pp) {
1480 struct commit_list *parent = *pp;
cc0e6c5a
AR
1481 switch (rewrite_one(revs, &parent->item)) {
1482 case rewrite_one_ok:
1483 break;
1484 case rewrite_one_noparents:
765ac8ec
LT
1485 *pp = parent->next;
1486 continue;
cc0e6c5a
AR
1487 case rewrite_one_error:
1488 return -1;
765ac8ec
LT
1489 }
1490 pp = &parent->next;
1491 }
11d65967 1492 remove_duplicate_parents(commit);
cc0e6c5a 1493 return 0;
765ac8ec
LT
1494}
1495
8ecae9b0
JH
1496static int commit_match(struct commit *commit, struct rev_info *opt)
1497{
2d10c555 1498 if (!opt->grep_filter)
8ecae9b0 1499 return 1;
2d10c555
JH
1500 return grep_buffer(opt->grep_filter,
1501 NULL, /* we say nothing, not even filename */
1502 commit->buffer, strlen(commit->buffer));
8ecae9b0
JH
1503}
1504
252a7c02
LT
1505enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
1506{
1507 if (commit->object.flags & SHOWN)
1508 return commit_ignore;
1509 if (revs->unpacked && has_sha1_pack(commit->object.sha1, revs->ignore_packed))
1510 return commit_ignore;
3131b713
LT
1511 if (revs->show_all)
1512 return commit_show;
252a7c02
LT
1513 if (commit->object.flags & UNINTERESTING)
1514 return commit_ignore;
1515 if (revs->min_age != -1 && (commit->date > revs->min_age))
1516 return commit_ignore;
1517 if (revs->no_merges && commit->parents && commit->parents->next)
1518 return commit_ignore;
1519 if (!commit_match(commit, revs))
1520 return commit_ignore;
53b2c823 1521 if (revs->prune && revs->dense) {
252a7c02 1522 /* Commit without changes? */
7dc0fe3b 1523 if (commit->object.flags & TREESAME) {
252a7c02
LT
1524 /* drop merges unless we want parenthood */
1525 if (!revs->parents)
1526 return commit_ignore;
1527 /* non-merge - always ignore it */
1528 if (!commit->parents || !commit->parents->next)
1529 return commit_ignore;
1530 }
1531 if (revs->parents && rewrite_parents(revs, commit) < 0)
1532 return commit_error;
1533 }
1534 return commit_show;
1535}
1536
d5db6c9e 1537static struct commit *get_revision_1(struct rev_info *revs)
a4a88b2b 1538{
d5db6c9e 1539 if (!revs->commits)
a4a88b2b 1540 return NULL;
a4a88b2b 1541
765ac8ec 1542 do {
cb115748
LT
1543 struct commit_list *entry = revs->commits;
1544 struct commit *commit = entry->item;
ea5ed3ab 1545
cb115748
LT
1546 revs->commits = entry->next;
1547 free(entry);
2a0925be 1548
8860fd42
JS
1549 if (revs->reflog_info)
1550 fake_reflog_parent(revs->reflog_info, commit);
1551
2a0925be
LT
1552 /*
1553 * If we haven't done the list limiting, we need to look at
be7db6e5
LT
1554 * the parents here. We also need to do the date-based limiting
1555 * that we'd otherwise have done in limit_list().
2a0925be 1556 */
be7db6e5 1557 if (!revs->limited) {
744f4985 1558 if (revs->max_age != -1 &&
86ab4906
JH
1559 (commit->date < revs->max_age))
1560 continue;
cc0e6c5a
AR
1561 if (add_parents_to_list(revs, commit, &revs->commits) < 0)
1562 return NULL;
be7db6e5 1563 }
744f4985 1564
252a7c02
LT
1565 switch (simplify_commit(revs, commit)) {
1566 case commit_ignore:
8ecae9b0 1567 continue;
252a7c02
LT
1568 case commit_error:
1569 return NULL;
1570 default:
1571 return commit;
384e99a4 1572 }
765ac8ec
LT
1573 } while (revs->commits);
1574 return NULL;
1575}
d5db6c9e 1576
86ab4906
JH
1577static void gc_boundary(struct object_array *array)
1578{
1579 unsigned nr = array->nr;
1580 unsigned alloc = array->alloc;
1581 struct object_array_entry *objects = array->objects;
1582
1583 if (alloc <= nr) {
1584 unsigned i, j;
1585 for (i = j = 0; i < nr; i++) {
1586 if (objects[i].item->flags & SHOWN)
1587 continue;
1588 if (i != j)
1589 objects[j] = objects[i];
1590 j++;
1591 }
892ae6bf 1592 for (i = j; i < nr; i++)
86ab4906
JH
1593 objects[i].item = NULL;
1594 array->nr = j;
1595 }
1596}
1597
d5db6c9e
JH
1598struct commit *get_revision(struct rev_info *revs)
1599{
1600 struct commit *c = NULL;
86ab4906
JH
1601 struct commit_list *l;
1602
1603 if (revs->boundary == 2) {
1604 unsigned i;
1605 struct object_array *array = &revs->boundary_commits;
1606 struct object_array_entry *objects = array->objects;
1607 for (i = 0; i < array->nr; i++) {
1608 c = (struct commit *)(objects[i].item);
1609 if (!c)
1610 continue;
1611 if (!(c->object.flags & CHILD_SHOWN))
1612 continue;
1613 if (!(c->object.flags & SHOWN))
1614 break;
9c5e66e9 1615 }
86ab4906 1616 if (array->nr <= i)
9c5e66e9 1617 return NULL;
86ab4906
JH
1618
1619 c->object.flags |= SHOWN | BOUNDARY;
9c5e66e9
JS
1620 return c;
1621 }
1622
86ab4906 1623 if (revs->reverse) {
c33d8593
JH
1624 int limit = -1;
1625
1626 if (0 <= revs->max_count) {
1627 limit = revs->max_count;
1628 if (0 < revs->skip_count)
1629 limit += revs->skip_count;
1630 }
86ab4906 1631 l = NULL;
c33d8593 1632 while ((c = get_revision_1(revs))) {
86ab4906 1633 commit_list_insert(c, &l);
c33d8593
JH
1634 if ((0 < limit) && !--limit)
1635 break;
1636 }
86ab4906
JH
1637 revs->commits = l;
1638 revs->reverse = 0;
c33d8593 1639 revs->max_count = -1;
2b064697 1640 c = NULL;
d5db6c9e
JH
1641 }
1642
86ab4906
JH
1643 /*
1644 * Now pick up what they want to give us
1645 */
8839ac94
JH
1646 c = get_revision_1(revs);
1647 if (c) {
1648 while (0 < revs->skip_count) {
1649 revs->skip_count--;
1650 c = get_revision_1(revs);
1651 if (!c)
1652 break;
1653 }
86ab4906
JH
1654 }
1655
1656 /*
1657 * Check the max_count.
1658 */
d5db6c9e
JH
1659 switch (revs->max_count) {
1660 case -1:
1661 break;
1662 case 0:
86ab4906
JH
1663 c = NULL;
1664 break;
d5db6c9e
JH
1665 default:
1666 revs->max_count--;
1667 }
86ab4906 1668
c33d8593
JH
1669 if (c)
1670 c->object.flags |= SHOWN;
1671
1672 if (!revs->boundary) {
d5db6c9e 1673 return c;
c33d8593 1674 }
86ab4906
JH
1675
1676 if (!c) {
1677 /*
1678 * get_revision_1() runs out the commits, and
1679 * we are done computing the boundaries.
1680 * switch to boundary commits output mode.
1681 */
1682 revs->boundary = 2;
1683 return get_revision(revs);
1684 }
1685
1686 /*
1687 * boundary commits are the commits that are parents of the
1688 * ones we got from get_revision_1() but they themselves are
1689 * not returned from get_revision_1(). Before returning
1690 * 'c', we need to mark its parents that they could be boundaries.
1691 */
1692
1693 for (l = c->parents; l; l = l->next) {
1694 struct object *p;
1695 p = &(l->item->object);
c33d8593 1696 if (p->flags & (CHILD_SHOWN | SHOWN))
86ab4906
JH
1697 continue;
1698 p->flags |= CHILD_SHOWN;
1699 gc_boundary(&revs->boundary_commits);
1700 add_object_array(p, NULL, &revs->boundary_commits);
1701 }
1702
1703 return c;
d5db6c9e 1704}