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