Merge branch 'jc/blame' (early part) into HEAD
[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,
263 const char *base, const char *path)
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,
289 const char *base, const char *path)
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
cc0e6c5a 416static int add_parents_to_list(struct rev_info *revs, struct commit *commit, struct commit_list **list)
a4a88b2b
LT
417{
418 struct commit_list *parent = commit->parents;
577ed5c2 419 unsigned left_flag;
a4a88b2b 420
3381c790 421 if (commit->object.flags & ADDED)
cc0e6c5a 422 return 0;
3381c790
LT
423 commit->object.flags |= ADDED;
424
a4a88b2b
LT
425 /*
426 * If the commit is uninteresting, don't try to
427 * prune parents - we want the maximal uninteresting
428 * set.
429 *
430 * Normally we haven't parsed the parent
431 * yet, so we won't have a parent of a parent
432 * here. However, it may turn out that we've
433 * reached this commit some other way (where it
434 * wasn't uninteresting), in which case we need
435 * to mark its parents recursively too..
436 */
437 if (commit->object.flags & UNINTERESTING) {
438 while (parent) {
439 struct commit *p = parent->item;
440 parent = parent->next;
cc0e6c5a
AR
441 if (parse_commit(p) < 0)
442 return -1;
a4a88b2b
LT
443 p->object.flags |= UNINTERESTING;
444 if (p->parents)
445 mark_parents_uninteresting(p);
446 if (p->object.flags & SEEN)
447 continue;
448 p->object.flags |= SEEN;
449 insert_by_date(p, list);
450 }
cc0e6c5a 451 return 0;
a4a88b2b
LT
452 }
453
454 /*
455 * Ok, the commit wasn't uninteresting. Try to
456 * simplify the commit history and find the parent
457 * that has no differences in the path set if one exists.
458 */
53b2c823 459 try_to_simplify_commit(revs, commit);
a4a88b2b 460
ba1d4505 461 if (revs->no_walk)
cc0e6c5a 462 return 0;
ba1d4505 463
577ed5c2 464 left_flag = (commit->object.flags & SYMMETRIC_LEFT);
0053e902 465
d9c292e8 466 for (parent = commit->parents; parent; parent = parent->next) {
a4a88b2b
LT
467 struct commit *p = parent->item;
468
cc0e6c5a
AR
469 if (parse_commit(p) < 0)
470 return -1;
577ed5c2 471 p->object.flags |= left_flag;
ad1012eb
LH
472 if (!(p->object.flags & SEEN)) {
473 p->object.flags |= SEEN;
0053e902 474 insert_by_date(p, list);
ad1012eb 475 }
d9c292e8
SB
476 if(revs->first_parent_only)
477 break;
a4a88b2b 478 }
cc0e6c5a 479 return 0;
a4a88b2b
LT
480}
481
36d56de6 482static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
d7a17cad
JH
483{
484 struct commit_list *p;
485 int left_count = 0, right_count = 0;
486 int left_first;
487 struct patch_ids ids;
488
489 /* First count the commits on the left and on the right */
490 for (p = list; p; p = p->next) {
491 struct commit *commit = p->item;
492 unsigned flags = commit->object.flags;
493 if (flags & BOUNDARY)
494 ;
495 else if (flags & SYMMETRIC_LEFT)
496 left_count++;
497 else
498 right_count++;
499 }
500
501 left_first = left_count < right_count;
502 init_patch_ids(&ids);
36d56de6
JS
503 if (revs->diffopt.nr_paths) {
504 ids.diffopts.nr_paths = revs->diffopt.nr_paths;
505 ids.diffopts.paths = revs->diffopt.paths;
506 ids.diffopts.pathlens = revs->diffopt.pathlens;
507 }
d7a17cad
JH
508
509 /* Compute patch-ids for one side */
510 for (p = list; p; p = p->next) {
511 struct commit *commit = p->item;
512 unsigned flags = commit->object.flags;
513
514 if (flags & BOUNDARY)
515 continue;
516 /*
517 * If we have fewer left, left_first is set and we omit
518 * commits on the right branch in this loop. If we have
519 * fewer right, we skip the left ones.
520 */
521 if (left_first != !!(flags & SYMMETRIC_LEFT))
522 continue;
523 commit->util = add_commit_patch_id(commit, &ids);
524 }
525
526 /* Check the other side */
527 for (p = list; p; p = p->next) {
528 struct commit *commit = p->item;
529 struct patch_id *id;
530 unsigned flags = commit->object.flags;
531
532 if (flags & BOUNDARY)
533 continue;
534 /*
535 * If we have fewer left, left_first is set and we omit
536 * commits on the left branch in this loop.
537 */
538 if (left_first == !!(flags & SYMMETRIC_LEFT))
539 continue;
540
541 /*
542 * Have we seen the same patch id?
543 */
544 id = has_commit_patch_id(commit, &ids);
545 if (!id)
546 continue;
547 id->seen = 1;
548 commit->object.flags |= SHOWN;
549 }
550
551 /* Now check the original side for seen ones */
552 for (p = list; p; p = p->next) {
553 struct commit *commit = p->item;
554 struct patch_id *ent;
555
556 ent = commit->util;
557 if (!ent)
558 continue;
559 if (ent->seen)
560 commit->object.flags |= SHOWN;
561 commit->util = NULL;
562 }
563
564 free_patch_ids(&ids);
565}
566
7d004199
LT
567/* How many extra uninteresting commits we want to see.. */
568#define SLOP 5
569
570static int still_interesting(struct commit_list *src, unsigned long date, int slop)
3131b713 571{
7d004199
LT
572 /*
573 * No source list at all? We're definitely done..
574 */
575 if (!src)
576 return 0;
577
578 /*
579 * Does the destination list contain entries with a date
580 * before the source list? Definitely _not_ done.
581 */
582 if (date < src->item->date)
583 return SLOP;
584
585 /*
586 * Does the source list still have interesting commits in
587 * it? Definitely not done..
588 */
589 if (!everybody_uninteresting(src))
590 return SLOP;
591
592 /* Ok, we're closing in.. */
593 return slop-1;
3131b713
LT
594}
595
cc0e6c5a 596static int limit_list(struct rev_info *revs)
a4a88b2b 597{
7d004199
LT
598 int slop = SLOP;
599 unsigned long date = ~0ul;
a4a88b2b
LT
600 struct commit_list *list = revs->commits;
601 struct commit_list *newlist = NULL;
602 struct commit_list **p = &newlist;
603
604 while (list) {
605 struct commit_list *entry = list;
606 struct commit *commit = list->item;
607 struct object *obj = &commit->object;
cdcefbc9 608 show_early_output_fn_t show;
a4a88b2b
LT
609
610 list = list->next;
611 free(entry);
612
613 if (revs->max_age != -1 && (commit->date < revs->max_age))
614 obj->flags |= UNINTERESTING;
cc0e6c5a
AR
615 if (add_parents_to_list(revs, commit, &list) < 0)
616 return -1;
a4a88b2b
LT
617 if (obj->flags & UNINTERESTING) {
618 mark_parents_uninteresting(commit);
7d004199
LT
619 if (revs->show_all)
620 p = &commit_list_insert(commit, p)->next;
621 slop = still_interesting(list, date, slop);
622 if (slop)
3131b713 623 continue;
7d004199
LT
624 /* If showing all, add the whole pending list to the end */
625 if (revs->show_all)
626 *p = list;
627 break;
a4a88b2b
LT
628 }
629 if (revs->min_age != -1 && (commit->date > revs->min_age))
630 continue;
7d004199 631 date = commit->date;
a4a88b2b 632 p = &commit_list_insert(commit, p)->next;
cdcefbc9
LT
633
634 show = show_early_output;
635 if (!show)
636 continue;
637
638 show(revs, newlist);
639 show_early_output = NULL;
a4a88b2b 640 }
d7a17cad 641 if (revs->cherry_pick)
36d56de6 642 cherry_pick_list(newlist, revs);
d7a17cad 643
a4a88b2b 644 revs->commits = newlist;
cc0e6c5a 645 return 0;
a4a88b2b
LT
646}
647
63049292
JH
648struct all_refs_cb {
649 int all_flags;
71b03b42 650 int warned_bad_reflog;
63049292
JH
651 struct rev_info *all_revs;
652 const char *name_for_errormsg;
653};
ae563542 654
8da19775 655static int handle_one_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
ae563542 656{
63049292
JH
657 struct all_refs_cb *cb = cb_data;
658 struct object *object = get_reference(cb->all_revs, path, sha1,
659 cb->all_flags);
3d1efd8f 660 add_pending_object(cb->all_revs, object, path);
ae563542
LT
661 return 0;
662}
663
a5aa930d
UKK
664static void handle_refs(struct rev_info *revs, unsigned flags,
665 int (*for_each)(each_ref_fn, void *))
ae563542 666{
63049292
JH
667 struct all_refs_cb cb;
668 cb.all_revs = revs;
669 cb.all_flags = flags;
a5aa930d 670 for_each(handle_one_ref, &cb);
63049292
JH
671}
672
71b03b42 673static void handle_one_reflog_commit(unsigned char *sha1, void *cb_data)
63049292
JH
674{
675 struct all_refs_cb *cb = cb_data;
71b03b42
SP
676 if (!is_null_sha1(sha1)) {
677 struct object *o = parse_object(sha1);
678 if (o) {
679 o->flags |= cb->all_flags;
680 add_pending_object(cb->all_revs, o, "");
681 }
682 else if (!cb->warned_bad_reflog) {
46efd2d9 683 warning("reflog of '%s' references pruned commits",
71b03b42
SP
684 cb->name_for_errormsg);
685 cb->warned_bad_reflog = 1;
686 }
63049292 687 }
71b03b42
SP
688}
689
883d60fa
JS
690static int handle_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
691 const char *email, unsigned long timestamp, int tz,
692 const char *message, void *cb_data)
71b03b42
SP
693{
694 handle_one_reflog_commit(osha1, cb_data);
695 handle_one_reflog_commit(nsha1, cb_data);
63049292
JH
696 return 0;
697}
698
699static int handle_one_reflog(const char *path, const unsigned char *sha1, int flag, void *cb_data)
700{
701 struct all_refs_cb *cb = cb_data;
71b03b42 702 cb->warned_bad_reflog = 0;
63049292
JH
703 cb->name_for_errormsg = path;
704 for_each_reflog_ent(path, handle_one_reflog_ent, cb_data);
705 return 0;
706}
707
708static void handle_reflog(struct rev_info *revs, unsigned flags)
709{
710 struct all_refs_cb cb;
711 cb.all_revs = revs;
712 cb.all_flags = flags;
25b51e2c 713 for_each_reflog(handle_one_reflog, &cb);
ae563542
LT
714}
715
ea4a19e1
JH
716static int add_parents_only(struct rev_info *revs, const char *arg, int flags)
717{
718 unsigned char sha1[20];
719 struct object *it;
720 struct commit *commit;
721 struct commit_list *parents;
722
723 if (*arg == '^') {
724 flags ^= UNINTERESTING;
725 arg++;
726 }
727 if (get_sha1(arg, sha1))
728 return 0;
729 while (1) {
730 it = get_reference(revs, arg, sha1, 0);
1974632c 731 if (it->type != OBJ_TAG)
ea4a19e1 732 break;
9684afd9
MK
733 if (!((struct tag*)it)->tagged)
734 return 0;
e702496e 735 hashcpy(sha1, ((struct tag*)it)->tagged->sha1);
ea4a19e1 736 }
1974632c 737 if (it->type != OBJ_COMMIT)
ea4a19e1
JH
738 return 0;
739 commit = (struct commit *)it;
740 for (parents = commit->parents; parents; parents = parents->next) {
741 it = &parents->item->object;
742 it->flags |= flags;
743 add_pending_object(revs, it, arg);
744 }
745 return 1;
746}
747
db6296a5 748void init_revisions(struct rev_info *revs, const char *prefix)
8efdc326
FK
749{
750 memset(revs, 0, sizeof(*revs));
8e8f9987 751
6b9c58f4 752 revs->abbrev = DEFAULT_ABBREV;
8e8f9987 753 revs->ignore_merges = 1;
9202434c 754 revs->simplify_history = 1;
8f67f8ae
PH
755 DIFF_OPT_SET(&revs->pruning, RECURSIVE);
756 DIFF_OPT_SET(&revs->pruning, QUIET);
cd2bdc53
LT
757 revs->pruning.add_remove = file_add_remove;
758 revs->pruning.change = file_change;
8efdc326
FK
759 revs->lifo = 1;
760 revs->dense = 1;
db6296a5 761 revs->prefix = prefix;
8efdc326
FK
762 revs->max_age = -1;
763 revs->min_age = -1;
d5db6c9e 764 revs->skip_count = -1;
8efdc326
FK
765 revs->max_count = -1;
766
cd2bdc53
LT
767 revs->commit_format = CMIT_FMT_DEFAULT;
768
769 diff_setup(&revs->diffopt);
c0cb4a06 770 if (prefix && !revs->diffopt.prefix) {
cd676a51
JH
771 revs->diffopt.prefix = prefix;
772 revs->diffopt.prefix_length = strlen(prefix);
773 }
8efdc326
FK
774}
775
0d2c9d67
RS
776static void add_pending_commit_list(struct rev_info *revs,
777 struct commit_list *commit_list,
778 unsigned int flags)
779{
780 while (commit_list) {
781 struct object *object = &commit_list->item->object;
782 object->flags |= flags;
783 add_pending_object(revs, object, sha1_to_hex(object->sha1));
784 commit_list = commit_list->next;
785 }
786}
787
ae3e5e1e
JH
788static void prepare_show_merge(struct rev_info *revs)
789{
790 struct commit_list *bases;
791 struct commit *head, *other;
792 unsigned char sha1[20];
793 const char **prune = NULL;
794 int i, prune_num = 1; /* counting terminating NULL */
795
796 if (get_sha1("HEAD", sha1) || !(head = lookup_commit(sha1)))
797 die("--merge without HEAD?");
798 if (get_sha1("MERGE_HEAD", sha1) || !(other = lookup_commit(sha1)))
799 die("--merge without MERGE_HEAD?");
800 add_pending_object(revs, &head->object, "HEAD");
801 add_pending_object(revs, &other->object, "MERGE_HEAD");
802 bases = get_merge_bases(head, other, 1);
e82447b1
JH
803 add_pending_commit_list(revs, bases, UNINTERESTING);
804 free_commit_list(bases);
805 head->object.flags |= SYMMETRIC_LEFT;
ae3e5e1e
JH
806
807 if (!active_nr)
808 read_cache();
809 for (i = 0; i < active_nr; i++) {
810 struct cache_entry *ce = active_cache[i];
811 if (!ce_stage(ce))
812 continue;
813 if (ce_path_match(ce, revs->prune_data)) {
814 prune_num++;
815 prune = xrealloc(prune, sizeof(*prune) * prune_num);
816 prune[prune_num-2] = ce->name;
817 prune[prune_num-1] = NULL;
818 }
819 while ((i+1 < active_nr) &&
820 ce_same_name(ce, active_cache[i+1]))
821 i++;
822 }
823 revs->prune_data = prune;
e82447b1 824 revs->limited = 1;
ae3e5e1e
JH
825}
826
5d6f0935
JH
827int handle_revision_arg(const char *arg, struct rev_info *revs,
828 int flags,
829 int cant_be_filename)
830{
bb6c2fba 831 unsigned mode;
5d6f0935
JH
832 char *dotdot;
833 struct object *object;
834 unsigned char sha1[20];
835 int local_flags;
836
837 dotdot = strstr(arg, "..");
838 if (dotdot) {
839 unsigned char from_sha1[20];
840 const char *next = dotdot + 2;
841 const char *this = arg;
842 int symmetric = *next == '.';
843 unsigned int flags_exclude = flags ^ UNINTERESTING;
844
845 *dotdot = 0;
846 next += symmetric;
847
848 if (!*next)
849 next = "HEAD";
850 if (dotdot == arg)
851 this = "HEAD";
852 if (!get_sha1(this, from_sha1) &&
853 !get_sha1(next, sha1)) {
854 struct commit *a, *b;
855 struct commit_list *exclude;
856
857 a = lookup_commit_reference(from_sha1);
858 b = lookup_commit_reference(sha1);
859 if (!a || !b) {
860 die(symmetric ?
861 "Invalid symmetric difference expression %s...%s" :
862 "Invalid revision range %s..%s",
863 arg, next);
864 }
865
866 if (!cant_be_filename) {
867 *dotdot = '.';
868 verify_non_filename(revs->prefix, arg);
869 }
870
871 if (symmetric) {
872 exclude = get_merge_bases(a, b, 1);
873 add_pending_commit_list(revs, exclude,
874 flags_exclude);
875 free_commit_list(exclude);
577ed5c2 876 a->object.flags |= flags | SYMMETRIC_LEFT;
5d6f0935
JH
877 } else
878 a->object.flags |= flags_exclude;
879 b->object.flags |= flags;
880 add_pending_object(revs, &a->object, this);
881 add_pending_object(revs, &b->object, next);
882 return 0;
883 }
884 *dotdot = '.';
885 }
886 dotdot = strstr(arg, "^@");
887 if (dotdot && !dotdot[2]) {
888 *dotdot = 0;
889 if (add_parents_only(revs, arg, flags))
890 return 0;
891 *dotdot = '^';
892 }
62476c8e
JH
893 dotdot = strstr(arg, "^!");
894 if (dotdot && !dotdot[2]) {
895 *dotdot = 0;
896 if (!add_parents_only(revs, arg, flags ^ UNINTERESTING))
897 *dotdot = '^';
898 }
899
5d6f0935
JH
900 local_flags = 0;
901 if (*arg == '^') {
902 local_flags = UNINTERESTING;
903 arg++;
904 }
bb6c2fba 905 if (get_sha1_with_mode(arg, sha1, &mode))
5d6f0935
JH
906 return -1;
907 if (!cant_be_filename)
908 verify_non_filename(revs->prefix, arg);
909 object = get_reference(revs, arg, sha1, flags ^ local_flags);
bb6c2fba 910 add_pending_object_with_mode(revs, object, arg, mode);
5d6f0935
JH
911 return 0;
912}
913
2d10c555 914static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
bd95fcd3 915{
2d10c555 916 if (!revs->grep_filter) {
bd95fcd3
JH
917 struct grep_opt *opt = xcalloc(1, sizeof(*opt));
918 opt->status_only = 1;
919 opt->pattern_tail = &(opt->pattern_list);
920 opt->regflags = REG_NEWLINE;
2d10c555 921 revs->grep_filter = opt;
bd95fcd3 922 }
2d10c555
JH
923 append_grep_pattern(revs->grep_filter, ptn,
924 "command line", 0, what);
925}
926
927static void add_header_grep(struct rev_info *revs, const char *field, const char *pattern)
928{
929 char *pat;
930 const char *prefix;
931 int patlen, fldlen;
bd95fcd3
JH
932
933 fldlen = strlen(field);
934 patlen = strlen(pattern);
a2ed6ae4
LT
935 pat = xmalloc(patlen + fldlen + 10);
936 prefix = ".*";
937 if (*pattern == '^') {
938 prefix = "";
939 pattern++;
940 }
941 sprintf(pat, "^%s %s%s", field, prefix, pattern);
2d10c555 942 add_grep(revs, pat, GREP_PATTERN_HEAD);
bd95fcd3
JH
943}
944
945static void add_message_grep(struct rev_info *revs, const char *pattern)
946{
2d10c555 947 add_grep(revs, pattern, GREP_PATTERN_BODY);
bd95fcd3
JH
948}
949
106d710b
JH
950static void add_ignore_packed(struct rev_info *revs, const char *name)
951{
952 int num = ++revs->num_ignore_packed;
953
954 revs->ignore_packed = xrealloc(revs->ignore_packed,
955 sizeof(const char **) * (num + 1));
956 revs->ignore_packed[num-1] = name;
957 revs->ignore_packed[num] = NULL;
958}
959
ae563542
LT
960/*
961 * Parse revision information, filling in the "rev_info" structure,
962 * and removing the used arguments from the argument list.
963 *
765ac8ec
LT
964 * Returns the number of arguments left that weren't recognized
965 * (which are also moved to the head of the argument list)
ae563542 966 */
a4a88b2b 967int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def)
ae563542 968{
ae3e5e1e 969 int i, flags, seen_dashdash, show_merge;
765ac8ec 970 const char **unrecognized = argv + 1;
ae563542 971 int left = 1;
70d0afba 972 int all_match = 0;
93d496a5 973 int regflags = 0;
dc1c0fff 974 int fixed = 0;
ae563542 975
ae563542
LT
976 /* First, search for "--" */
977 seen_dashdash = 0;
978 for (i = 1; i < argc; i++) {
979 const char *arg = argv[i];
980 if (strcmp(arg, "--"))
981 continue;
982 argv[i] = NULL;
983 argc = i;
a65f2005
JH
984 if (argv[i + 1])
985 revs->prune_data = get_pathspec(revs->prefix, argv + i + 1);
ae563542
LT
986 seen_dashdash = 1;
987 break;
988 }
989
ae3e5e1e 990 flags = show_merge = 0;
ae563542 991 for (i = 1; i < argc; i++) {
ae563542 992 const char *arg = argv[i];
ae563542 993 if (*arg == '-') {
cd2bdc53 994 int opts;
cc44c765 995 if (!prefixcmp(arg, "--max-count=")) {
ae563542
LT
996 revs->max_count = atoi(arg + 12);
997 continue;
998 }
cc44c765 999 if (!prefixcmp(arg, "--skip=")) {
d5db6c9e
JH
1000 revs->skip_count = atoi(arg + 7);
1001 continue;
1002 }
de5f2bf3 1003 /* accept -<digit>, like traditional "head" */
64bc6e3d
JH
1004 if ((*arg == '-') && isdigit(arg[1])) {
1005 revs->max_count = atoi(arg + 1);
1006 continue;
1007 }
1008 if (!strcmp(arg, "-n")) {
1009 if (argc <= i + 1)
1010 die("-n requires an argument");
1011 revs->max_count = atoi(argv[++i]);
1012 continue;
1013 }
1968d77d 1014 if (!prefixcmp(arg, "-n")) {
64bc6e3d
JH
1015 revs->max_count = atoi(arg + 2);
1016 continue;
1017 }
cc44c765 1018 if (!prefixcmp(arg, "--max-age=")) {
ae563542 1019 revs->max_age = atoi(arg + 10);
ae563542
LT
1020 continue;
1021 }
cc44c765 1022 if (!prefixcmp(arg, "--since=")) {
fd751667 1023 revs->max_age = approxidate(arg + 8);
fd751667
JH
1024 continue;
1025 }
cc44c765 1026 if (!prefixcmp(arg, "--after=")) {
fd751667 1027 revs->max_age = approxidate(arg + 8);
53069686
JH
1028 continue;
1029 }
cc44c765 1030 if (!prefixcmp(arg, "--min-age=")) {
53069686 1031 revs->min_age = atoi(arg + 10);
fd751667
JH
1032 continue;
1033 }
cc44c765 1034 if (!prefixcmp(arg, "--before=")) {
fd751667 1035 revs->min_age = approxidate(arg + 9);
fd751667
JH
1036 continue;
1037 }
cc44c765 1038 if (!prefixcmp(arg, "--until=")) {
fd751667 1039 revs->min_age = approxidate(arg + 8);
fd751667
JH
1040 continue;
1041 }
ae563542 1042 if (!strcmp(arg, "--all")) {
a5aa930d
UKK
1043 handle_refs(revs, flags, for_each_ref);
1044 continue;
1045 }
1046 if (!strcmp(arg, "--branches")) {
1047 handle_refs(revs, flags, for_each_branch_ref);
1048 continue;
1049 }
1050 if (!strcmp(arg, "--tags")) {
1051 handle_refs(revs, flags, for_each_tag_ref);
1052 continue;
1053 }
1054 if (!strcmp(arg, "--remotes")) {
1055 handle_refs(revs, flags, for_each_remote_ref);
ae563542
LT
1056 continue;
1057 }
0053e902
JH
1058 if (!strcmp(arg, "--first-parent")) {
1059 revs->first_parent_only = 1;
1060 continue;
1061 }
63049292
JH
1062 if (!strcmp(arg, "--reflog")) {
1063 handle_reflog(revs, flags);
1064 continue;
1065 }
084ae0a7
JS
1066 if (!strcmp(arg, "-g") ||
1067 !strcmp(arg, "--walk-reflogs")) {
8860fd42
JS
1068 init_reflog_walk(&revs->reflog_info);
1069 continue;
1070 }
ae563542
LT
1071 if (!strcmp(arg, "--not")) {
1072 flags ^= UNINTERESTING;
1073 continue;
1074 }
1075 if (!strcmp(arg, "--default")) {
1076 if (++i >= argc)
1077 die("bad --default argument");
1078 def = argv[i];
1079 continue;
1080 }
ae3e5e1e
JH
1081 if (!strcmp(arg, "--merge")) {
1082 show_merge = 1;
1083 continue;
1084 }
ae563542 1085 if (!strcmp(arg, "--topo-order")) {
a710522b 1086 revs->lifo = 1;
ae563542
LT
1087 revs->topo_order = 1;
1088 continue;
1089 }
1090 if (!strcmp(arg, "--date-order")) {
1091 revs->lifo = 0;
1092 revs->topo_order = 1;
1093 continue;
1094 }
cdcefbc9
LT
1095 if (!prefixcmp(arg, "--early-output")) {
1096 int count = 100;
1097 switch (arg[14]) {
1098 case '=':
1099 count = atoi(arg+15);
1100 /* Fallthrough */
1101 case 0:
1102 revs->topo_order = 1;
1103 revs->early_output = count;
1104 continue;
1105 }
1106 }
7b0c9966 1107 if (!strcmp(arg, "--parents")) {
885cf808
AS
1108 revs->rewrite_parents = 1;
1109 revs->print_parents = 1;
7b0c9966
LT
1110 continue;
1111 }
ae563542
LT
1112 if (!strcmp(arg, "--dense")) {
1113 revs->dense = 1;
1114 continue;
1115 }
1116 if (!strcmp(arg, "--sparse")) {
1117 revs->dense = 0;
1118 continue;
1119 }
3131b713
LT
1120 if (!strcmp(arg, "--show-all")) {
1121 revs->show_all = 1;
1122 continue;
1123 }
ae563542
LT
1124 if (!strcmp(arg, "--remove-empty")) {
1125 revs->remove_empty_trees = 1;
1126 continue;
1127 }
5cdeae71 1128 if (!strcmp(arg, "--no-merges")) {
765ac8ec
LT
1129 revs->no_merges = 1;
1130 continue;
1131 }
384e99a4
JH
1132 if (!strcmp(arg, "--boundary")) {
1133 revs->boundary = 1;
1134 continue;
1135 }
8dce8235
JH
1136 if (!strcmp(arg, "--left-right")) {
1137 revs->left_right = 1;
74bd9029
JH
1138 continue;
1139 }
d7a17cad
JH
1140 if (!strcmp(arg, "--cherry-pick")) {
1141 revs->cherry_pick = 1;
023756f4 1142 revs->limited = 1;
d7a17cad
JH
1143 continue;
1144 }
ae563542
LT
1145 if (!strcmp(arg, "--objects")) {
1146 revs->tag_objects = 1;
1147 revs->tree_objects = 1;
1148 revs->blob_objects = 1;
1149 continue;
1150 }
1151 if (!strcmp(arg, "--objects-edge")) {
1152 revs->tag_objects = 1;
1153 revs->tree_objects = 1;
1154 revs->blob_objects = 1;
1155 revs->edge_hint = 1;
1156 continue;
1157 }
d9a83684
LT
1158 if (!strcmp(arg, "--unpacked")) {
1159 revs->unpacked = 1;
106d710b
JH
1160 free(revs->ignore_packed);
1161 revs->ignore_packed = NULL;
1162 revs->num_ignore_packed = 0;
1163 continue;
1164 }
cc44c765 1165 if (!prefixcmp(arg, "--unpacked=")) {
106d710b
JH
1166 revs->unpacked = 1;
1167 add_ignore_packed(revs, arg+11);
d9a83684
LT
1168 continue;
1169 }
cd2bdc53
LT
1170 if (!strcmp(arg, "-r")) {
1171 revs->diff = 1;
8f67f8ae 1172 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
cd2bdc53
LT
1173 continue;
1174 }
1175 if (!strcmp(arg, "-t")) {
1176 revs->diff = 1;
8f67f8ae
PH
1177 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1178 DIFF_OPT_SET(&revs->diffopt, TREE_IN_RECURSIVE);
cd2bdc53
LT
1179 continue;
1180 }
1181 if (!strcmp(arg, "-m")) {
1182 revs->ignore_merges = 0;
1183 continue;
1184 }
1185 if (!strcmp(arg, "-c")) {
1186 revs->diff = 1;
0fe7c1de 1187 revs->dense_combined_merges = 0;
cd2bdc53
LT
1188 revs->combine_merges = 1;
1189 continue;
1190 }
1191 if (!strcmp(arg, "--cc")) {
1192 revs->diff = 1;
1193 revs->dense_combined_merges = 1;
1194 revs->combine_merges = 1;
1195 continue;
1196 }
1197 if (!strcmp(arg, "-v")) {
1198 revs->verbose_header = 1;
cd2bdc53
LT
1199 continue;
1200 }
48ded916 1201 if (!strcmp(arg, "--pretty")) {
cd2bdc53 1202 revs->verbose_header = 1;
4da45bef 1203 get_commit_format(arg+8, revs);
cd2bdc53
LT
1204 continue;
1205 }
48ded916
JH
1206 if (!prefixcmp(arg, "--pretty=")) {
1207 revs->verbose_header = 1;
1208 get_commit_format(arg+9, revs);
1209 continue;
1210 }
37869f40 1211 if (!strcmp(arg, "--graph")) {
7fefda5c
AS
1212 revs->topo_order = 1;
1213 revs->rewrite_parents = 1;
7528f27d 1214 revs->graph = graph_init(revs);
7fefda5c
AS
1215 continue;
1216 }
cd2bdc53
LT
1217 if (!strcmp(arg, "--root")) {
1218 revs->show_root_diff = 1;
1219 continue;
1220 }
1221 if (!strcmp(arg, "--no-commit-id")) {
1222 revs->no_commit_id = 1;
1223 continue;
1224 }
1225 if (!strcmp(arg, "--always")) {
1226 revs->always_show_header = 1;
1227 continue;
1228 }
1229 if (!strcmp(arg, "--no-abbrev")) {
1230 revs->abbrev = 0;
1231 continue;
1232 }
1233 if (!strcmp(arg, "--abbrev")) {
1234 revs->abbrev = DEFAULT_ABBREV;
1235 continue;
1236 }
cc44c765 1237 if (!prefixcmp(arg, "--abbrev=")) {
508d9e37
LT
1238 revs->abbrev = strtoul(arg + 9, NULL, 10);
1239 if (revs->abbrev < MINIMUM_ABBREV)
1240 revs->abbrev = MINIMUM_ABBREV;
1241 else if (revs->abbrev > 40)
1242 revs->abbrev = 40;
1243 continue;
1244 }
cd2bdc53
LT
1245 if (!strcmp(arg, "--abbrev-commit")) {
1246 revs->abbrev_commit = 1;
1247 continue;
1248 }
1249 if (!strcmp(arg, "--full-diff")) {
1250 revs->diff = 1;
1251 revs->full_diff = 1;
1252 continue;
1253 }
9202434c
LT
1254 if (!strcmp(arg, "--full-history")) {
1255 revs->simplify_history = 0;
1256 continue;
1257 }
3dfb9278 1258 if (!strcmp(arg, "--relative-date")) {
a7b02ccf
JH
1259 revs->date_mode = DATE_RELATIVE;
1260 continue;
1261 }
1262 if (!strncmp(arg, "--date=", 7)) {
856665f8 1263 revs->date_mode = parse_date_format(arg + 7);
3dfb9278
JF
1264 continue;
1265 }
9fa3465d
MC
1266 if (!strcmp(arg, "--log-size")) {
1267 revs->show_log_size = 1;
1268 continue;
1269 }
2d10c555
JH
1270
1271 /*
1272 * Grepping the commit log
1273 */
cc44c765 1274 if (!prefixcmp(arg, "--author=")) {
bd95fcd3
JH
1275 add_header_grep(revs, "author", arg+9);
1276 continue;
1277 }
cc44c765 1278 if (!prefixcmp(arg, "--committer=")) {
bd95fcd3
JH
1279 add_header_grep(revs, "committer", arg+12);
1280 continue;
1281 }
cc44c765 1282 if (!prefixcmp(arg, "--grep=")) {
bd95fcd3
JH
1283 add_message_grep(revs, arg+7);
1284 continue;
1285 }
e5633cbb
JH
1286 if (!strcmp(arg, "--extended-regexp") ||
1287 !strcmp(arg, "-E")) {
93d496a5
PB
1288 regflags |= REG_EXTENDED;
1289 continue;
1290 }
e5633cbb
JH
1291 if (!strcmp(arg, "--regexp-ignore-case") ||
1292 !strcmp(arg, "-i")) {
93d496a5
PB
1293 regflags |= REG_ICASE;
1294 continue;
1295 }
dc1c0fff
JN
1296 if (!strcmp(arg, "--fixed-strings") ||
1297 !strcmp(arg, "-F")) {
1298 fixed = 1;
1299 continue;
1300 }
70d0afba
JH
1301 if (!strcmp(arg, "--all-match")) {
1302 all_match = 1;
1303 continue;
1304 }
cc44c765 1305 if (!prefixcmp(arg, "--encoding=")) {
7cbcf4d5
JH
1306 arg += 11;
1307 if (strcmp(arg, "none"))
567fb65e 1308 git_log_output_encoding = xstrdup(arg);
7cbcf4d5
JH
1309 else
1310 git_log_output_encoding = "";
1311 continue;
1312 }
9c5e66e9
JS
1313 if (!strcmp(arg, "--reverse")) {
1314 revs->reverse ^= 1;
1315 continue;
1316 }
8e64006e
JS
1317 if (!strcmp(arg, "--no-walk")) {
1318 revs->no_walk = 1;
1319 continue;
1320 }
1321 if (!strcmp(arg, "--do-walk")) {
1322 revs->no_walk = 0;
1323 continue;
1324 }
f35f5603
JH
1325 if (!strcmp(arg, "--children")) {
1326 revs->children.name = "children";
1327 revs->limited = 1;
1328 continue;
1329 }
2d10c555 1330
cd2bdc53
LT
1331 opts = diff_opt_parse(&revs->diffopt, argv+i, argc-i);
1332 if (opts > 0) {
cd2bdc53
LT
1333 i += opts - 1;
1334 continue;
1335 }
ae563542
LT
1336 *unrecognized++ = arg;
1337 left++;
1338 continue;
1339 }
ae563542 1340
5d6f0935
JH
1341 if (handle_revision_arg(arg, revs, flags, seen_dashdash)) {
1342 int j;
1343 if (seen_dashdash || *arg == '^')
ae563542
LT
1344 die("bad revision '%s'", arg);
1345
ea92f41f
JH
1346 /* If we didn't have a "--":
1347 * (1) all filenames must exist;
1348 * (2) all rev-args must not be interpretable
1349 * as a valid filename.
1350 * but the latter we have checked in the main loop.
1351 */
e23d0b4a
LT
1352 for (j = i; j < argc; j++)
1353 verify_filename(revs->prefix, argv[j]);
1354
5d6f0935
JH
1355 revs->prune_data = get_pathspec(revs->prefix,
1356 argv + i);
ae563542
LT
1357 break;
1358 }
ae563542 1359 }
5d6f0935 1360
dc1c0fff 1361 if (revs->grep_filter) {
93d496a5 1362 revs->grep_filter->regflags |= regflags;
dc1c0fff
JN
1363 revs->grep_filter->fixed = fixed;
1364 }
93d496a5 1365
ae3e5e1e
JH
1366 if (show_merge)
1367 prepare_show_merge(revs);
1f1e895f 1368 if (def && !revs->pending.nr) {
ae563542 1369 unsigned char sha1[20];
cd2bdc53 1370 struct object *object;
bb6c2fba
MK
1371 unsigned mode;
1372 if (get_sha1_with_mode(def, sha1, &mode))
ae563542 1373 die("bad default revision '%s'", def);
cd2bdc53 1374 object = get_reference(revs, def, sha1, 0);
bb6c2fba 1375 add_pending_object_with_mode(revs, object, def, mode);
ae563542 1376 }
8efdc326 1377
b7bb760d
LT
1378 /* Did the user ask for any diff output? Run the diff! */
1379 if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT)
1380 revs->diff = 1;
1381
0faf2da7
AL
1382 /* Pickaxe, diff-filter and rename following need diffs */
1383 if (revs->diffopt.pickaxe ||
1384 revs->diffopt.filter ||
1385 DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
b7bb760d
LT
1386 revs->diff = 1;
1387
9dad9d2e 1388 if (revs->topo_order)
53069686
JH
1389 revs->limited = 1;
1390
8efdc326 1391 if (revs->prune_data) {
cd2bdc53 1392 diff_tree_setup_paths(revs->prune_data, &revs->pruning);
750f7b66 1393 /* Can't prune commits with rename following: the paths change.. */
8f67f8ae 1394 if (!DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
53b2c823 1395 revs->prune = 1;
cd2bdc53
LT
1396 if (!revs->full_diff)
1397 diff_tree_setup_paths(revs->prune_data, &revs->diffopt);
8efdc326 1398 }
cd2bdc53
LT
1399 if (revs->combine_merges) {
1400 revs->ignore_merges = 0;
0e677e1a 1401 if (revs->dense_combined_merges && !revs->diffopt.output_format)
cd2bdc53
LT
1402 revs->diffopt.output_format = DIFF_FORMAT_PATCH;
1403 }
cd2bdc53 1404 revs->diffopt.abbrev = revs->abbrev;
72ee96c0
JH
1405 if (diff_setup_done(&revs->diffopt) < 0)
1406 die("diff_setup_done failed");
8efdc326 1407
70d0afba
JH
1408 if (revs->grep_filter) {
1409 revs->grep_filter->all_match = all_match;
2d10c555 1410 compile_grep_patterns(revs->grep_filter);
70d0afba 1411 }
bd95fcd3 1412
d56651c0
SP
1413 if (revs->reverse && revs->reflog_info)
1414 die("cannot combine --reverse with --walk-reflogs");
8bb65883 1415 if (revs->rewrite_parents && revs->children.name)
f35f5603 1416 die("cannot combine --parents and --children");
d56651c0 1417
7fefda5c
AS
1418 /*
1419 * Limitations on the graph functionality
1420 */
1421 if (revs->reverse && revs->graph)
1422 die("cannot combine --reverse with --graph");
1423
1424 if (revs->reflog_info && revs->graph)
1425 die("cannot combine --walk-reflogs with --graph");
1426
ae563542
LT
1427 return left;
1428}
a4a88b2b 1429
f35f5603
JH
1430static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child)
1431{
1432 struct commit_list *l = xcalloc(1, sizeof(*l));
1433
1434 l->item = child;
1435 l->next = add_decoration(&revs->children, &parent->object, l);
1436}
1437
1438static void set_children(struct rev_info *revs)
1439{
1440 struct commit_list *l;
1441 for (l = revs->commits; l; l = l->next) {
1442 struct commit *commit = l->item;
1443 struct commit_list *p;
1444
1445 for (p = commit->parents; p; p = p->next)
1446 add_child(revs, p->item, commit);
1447 }
1448}
1449
cc0e6c5a 1450int prepare_revision_walk(struct rev_info *revs)
a4a88b2b 1451{
1f1e895f 1452 int nr = revs->pending.nr;
94d23673 1453 struct object_array_entry *e, *list;
cd2bdc53 1454
94d23673 1455 e = list = revs->pending.objects;
1f1e895f
LT
1456 revs->pending.nr = 0;
1457 revs->pending.alloc = 0;
1458 revs->pending.objects = NULL;
1459 while (--nr >= 0) {
94d23673 1460 struct commit *commit = handle_commit(revs, e->item, e->name);
cd2bdc53
LT
1461 if (commit) {
1462 if (!(commit->object.flags & SEEN)) {
1463 commit->object.flags |= SEEN;
1464 insert_by_date(commit, &revs->commits);
1465 }
1466 }
94d23673 1467 e++;
cd2bdc53 1468 }
94d23673 1469 free(list);
cd2bdc53 1470
ba1d4505 1471 if (revs->no_walk)
cc0e6c5a 1472 return 0;
a4a88b2b 1473 if (revs->limited)
cc0e6c5a
AR
1474 if (limit_list(revs) < 0)
1475 return -1;
a4a88b2b 1476 if (revs->topo_order)
23c17d4a 1477 sort_in_topological_order(&revs->commits, revs->lifo);
f35f5603
JH
1478 if (revs->children.name)
1479 set_children(revs);
cc0e6c5a 1480 return 0;
a4a88b2b
LT
1481}
1482
cc0e6c5a
AR
1483enum rewrite_result {
1484 rewrite_one_ok,
1485 rewrite_one_noparents,
1486 rewrite_one_error,
1487};
1488
1489static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)
765ac8ec
LT
1490{
1491 for (;;) {
1492 struct commit *p = *pp;
3381c790 1493 if (!revs->limited)
cc0e6c5a
AR
1494 if (add_parents_to_list(revs, p, &revs->commits) < 0)
1495 return rewrite_one_error;
6631c736 1496 if (p->parents && p->parents->next)
cc0e6c5a 1497 return rewrite_one_ok;
7dc0fe3b
LT
1498 if (p->object.flags & UNINTERESTING)
1499 return rewrite_one_ok;
1500 if (!(p->object.flags & TREESAME))
cc0e6c5a 1501 return rewrite_one_ok;
765ac8ec 1502 if (!p->parents)
cc0e6c5a 1503 return rewrite_one_noparents;
765ac8ec
LT
1504 *pp = p->parents->item;
1505 }
1506}
1507
11d65967
JH
1508static void remove_duplicate_parents(struct commit *commit)
1509{
e1abc69b 1510 struct commit_list **pp, *p;
11d65967
JH
1511
1512 /* Examine existing parents while marking ones we have seen... */
e1abc69b
LT
1513 pp = &commit->parents;
1514 while ((p = *pp) != NULL) {
11d65967 1515 struct commit *parent = p->item;
e1abc69b
LT
1516 if (parent->object.flags & TMP_MARK) {
1517 *pp = p->next;
11d65967 1518 continue;
e1abc69b 1519 }
11d65967 1520 parent->object.flags |= TMP_MARK;
11d65967
JH
1521 pp = &p->next;
1522 }
1523 /* ... and clear the temporary mark */
1524 for (p = commit->parents; p; p = p->next)
1525 p->item->object.flags &= ~TMP_MARK;
1526}
1527
cc0e6c5a 1528static int rewrite_parents(struct rev_info *revs, struct commit *commit)
765ac8ec
LT
1529{
1530 struct commit_list **pp = &commit->parents;
1531 while (*pp) {
1532 struct commit_list *parent = *pp;
cc0e6c5a
AR
1533 switch (rewrite_one(revs, &parent->item)) {
1534 case rewrite_one_ok:
1535 break;
1536 case rewrite_one_noparents:
765ac8ec
LT
1537 *pp = parent->next;
1538 continue;
cc0e6c5a
AR
1539 case rewrite_one_error:
1540 return -1;
765ac8ec
LT
1541 }
1542 pp = &parent->next;
1543 }
11d65967 1544 remove_duplicate_parents(commit);
cc0e6c5a 1545 return 0;
765ac8ec
LT
1546}
1547
8ecae9b0
JH
1548static int commit_match(struct commit *commit, struct rev_info *opt)
1549{
2d10c555 1550 if (!opt->grep_filter)
8ecae9b0 1551 return 1;
2d10c555
JH
1552 return grep_buffer(opt->grep_filter,
1553 NULL, /* we say nothing, not even filename */
1554 commit->buffer, strlen(commit->buffer));
8ecae9b0
JH
1555}
1556
f35f5603
JH
1557static inline int want_ancestry(struct rev_info *revs)
1558{
8bb65883 1559 return (revs->rewrite_parents || revs->children.name);
f35f5603
JH
1560}
1561
252a7c02
LT
1562enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
1563{
1564 if (commit->object.flags & SHOWN)
1565 return commit_ignore;
1566 if (revs->unpacked && has_sha1_pack(commit->object.sha1, revs->ignore_packed))
1567 return commit_ignore;
3131b713
LT
1568 if (revs->show_all)
1569 return commit_show;
252a7c02
LT
1570 if (commit->object.flags & UNINTERESTING)
1571 return commit_ignore;
1572 if (revs->min_age != -1 && (commit->date > revs->min_age))
1573 return commit_ignore;
1574 if (revs->no_merges && commit->parents && commit->parents->next)
1575 return commit_ignore;
1576 if (!commit_match(commit, revs))
1577 return commit_ignore;
53b2c823 1578 if (revs->prune && revs->dense) {
252a7c02 1579 /* Commit without changes? */
7dc0fe3b 1580 if (commit->object.flags & TREESAME) {
252a7c02 1581 /* drop merges unless we want parenthood */
f35f5603 1582 if (!want_ancestry(revs))
252a7c02
LT
1583 return commit_ignore;
1584 /* non-merge - always ignore it */
1585 if (!commit->parents || !commit->parents->next)
1586 return commit_ignore;
1587 }
f35f5603 1588 if (want_ancestry(revs) && rewrite_parents(revs, commit) < 0)
252a7c02
LT
1589 return commit_error;
1590 }
1591 return commit_show;
1592}
1593
d5db6c9e 1594static struct commit *get_revision_1(struct rev_info *revs)
a4a88b2b 1595{
d5db6c9e 1596 if (!revs->commits)
a4a88b2b 1597 return NULL;
a4a88b2b 1598
765ac8ec 1599 do {
cb115748
LT
1600 struct commit_list *entry = revs->commits;
1601 struct commit *commit = entry->item;
ea5ed3ab 1602
cb115748
LT
1603 revs->commits = entry->next;
1604 free(entry);
2a0925be 1605
8860fd42
JS
1606 if (revs->reflog_info)
1607 fake_reflog_parent(revs->reflog_info, commit);
1608
2a0925be
LT
1609 /*
1610 * If we haven't done the list limiting, we need to look at
be7db6e5
LT
1611 * the parents here. We also need to do the date-based limiting
1612 * that we'd otherwise have done in limit_list().
2a0925be 1613 */
be7db6e5 1614 if (!revs->limited) {
744f4985 1615 if (revs->max_age != -1 &&
86ab4906
JH
1616 (commit->date < revs->max_age))
1617 continue;
cc0e6c5a
AR
1618 if (add_parents_to_list(revs, commit, &revs->commits) < 0)
1619 return NULL;
be7db6e5 1620 }
744f4985 1621
252a7c02
LT
1622 switch (simplify_commit(revs, commit)) {
1623 case commit_ignore:
8ecae9b0 1624 continue;
252a7c02
LT
1625 case commit_error:
1626 return NULL;
1627 default:
1628 return commit;
384e99a4 1629 }
765ac8ec
LT
1630 } while (revs->commits);
1631 return NULL;
1632}
d5db6c9e 1633
86ab4906
JH
1634static void gc_boundary(struct object_array *array)
1635{
1636 unsigned nr = array->nr;
1637 unsigned alloc = array->alloc;
1638 struct object_array_entry *objects = array->objects;
1639
1640 if (alloc <= nr) {
1641 unsigned i, j;
1642 for (i = j = 0; i < nr; i++) {
1643 if (objects[i].item->flags & SHOWN)
1644 continue;
1645 if (i != j)
1646 objects[j] = objects[i];
1647 j++;
1648 }
892ae6bf 1649 for (i = j; i < nr; i++)
86ab4906
JH
1650 objects[i].item = NULL;
1651 array->nr = j;
1652 }
1653}
1654
4603ec0f
AS
1655static void create_boundary_commit_list(struct rev_info *revs)
1656{
1657 unsigned i;
1658 struct commit *c;
1659 struct object_array *array = &revs->boundary_commits;
1660 struct object_array_entry *objects = array->objects;
1661
1662 /*
1663 * If revs->commits is non-NULL at this point, an error occurred in
1664 * get_revision_1(). Ignore the error and continue printing the
1665 * boundary commits anyway. (This is what the code has always
1666 * done.)
1667 */
1668 if (revs->commits) {
1669 free_commit_list(revs->commits);
1670 revs->commits = NULL;
1671 }
1672
1673 /*
1674 * Put all of the actual boundary commits from revs->boundary_commits
1675 * into revs->commits
1676 */
1677 for (i = 0; i < array->nr; i++) {
1678 c = (struct commit *)(objects[i].item);
1679 if (!c)
1680 continue;
1681 if (!(c->object.flags & CHILD_SHOWN))
1682 continue;
1683 if (c->object.flags & (SHOWN | BOUNDARY))
1684 continue;
1685 c->object.flags |= BOUNDARY;
1686 commit_list_insert(c, &revs->commits);
1687 }
1688
1689 /*
1690 * If revs->topo_order is set, sort the boundary commits
1691 * in topological order
1692 */
1693 sort_in_topological_order(&revs->commits, revs->lifo);
1694}
1695
7fefda5c 1696static struct commit *get_revision_internal(struct rev_info *revs)
d5db6c9e
JH
1697{
1698 struct commit *c = NULL;
86ab4906
JH
1699 struct commit_list *l;
1700
1701 if (revs->boundary == 2) {
4603ec0f
AS
1702 /*
1703 * All of the normal commits have already been returned,
1704 * and we are now returning boundary commits.
1705 * create_boundary_commit_list() has populated
1706 * revs->commits with the remaining commits to return.
1707 */
1708 c = pop_commit(&revs->commits);
1709 if (c)
1710 c->object.flags |= SHOWN;
9c5e66e9
JS
1711 return c;
1712 }
1713
86ab4906 1714 if (revs->reverse) {
c33d8593
JH
1715 int limit = -1;
1716
1717 if (0 <= revs->max_count) {
1718 limit = revs->max_count;
1719 if (0 < revs->skip_count)
1720 limit += revs->skip_count;
1721 }
86ab4906 1722 l = NULL;
c33d8593 1723 while ((c = get_revision_1(revs))) {
86ab4906 1724 commit_list_insert(c, &l);
c33d8593
JH
1725 if ((0 < limit) && !--limit)
1726 break;
1727 }
86ab4906
JH
1728 revs->commits = l;
1729 revs->reverse = 0;
c33d8593 1730 revs->max_count = -1;
2b064697 1731 c = NULL;
d5db6c9e
JH
1732 }
1733
86ab4906
JH
1734 /*
1735 * Now pick up what they want to give us
1736 */
8839ac94
JH
1737 c = get_revision_1(revs);
1738 if (c) {
1739 while (0 < revs->skip_count) {
1740 revs->skip_count--;
1741 c = get_revision_1(revs);
1742 if (!c)
1743 break;
1744 }
86ab4906
JH
1745 }
1746
1747 /*
1748 * Check the max_count.
1749 */
d5db6c9e
JH
1750 switch (revs->max_count) {
1751 case -1:
1752 break;
1753 case 0:
86ab4906
JH
1754 c = NULL;
1755 break;
d5db6c9e
JH
1756 default:
1757 revs->max_count--;
1758 }
86ab4906 1759
c33d8593
JH
1760 if (c)
1761 c->object.flags |= SHOWN;
1762
1763 if (!revs->boundary) {
d5db6c9e 1764 return c;
c33d8593 1765 }
86ab4906
JH
1766
1767 if (!c) {
1768 /*
1769 * get_revision_1() runs out the commits, and
1770 * we are done computing the boundaries.
1771 * switch to boundary commits output mode.
1772 */
1773 revs->boundary = 2;
4603ec0f
AS
1774
1775 /*
1776 * Update revs->commits to contain the list of
1777 * boundary commits.
1778 */
1779 create_boundary_commit_list(revs);
1780
3c68d67b 1781 return get_revision_internal(revs);
86ab4906
JH
1782 }
1783
1784 /*
1785 * boundary commits are the commits that are parents of the
1786 * ones we got from get_revision_1() but they themselves are
1787 * not returned from get_revision_1(). Before returning
1788 * 'c', we need to mark its parents that they could be boundaries.
1789 */
1790
1791 for (l = c->parents; l; l = l->next) {
1792 struct object *p;
1793 p = &(l->item->object);
c33d8593 1794 if (p->flags & (CHILD_SHOWN | SHOWN))
86ab4906
JH
1795 continue;
1796 p->flags |= CHILD_SHOWN;
1797 gc_boundary(&revs->boundary_commits);
1798 add_object_array(p, NULL, &revs->boundary_commits);
1799 }
1800
1801 return c;
d5db6c9e 1802}
7fefda5c
AS
1803
1804struct commit *get_revision(struct rev_info *revs)
1805{
1806 struct commit *c = get_revision_internal(revs);
1807 if (c && revs->graph)
1808 graph_update(revs->graph, c);
1809 return c;
1810}