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