list-objects: pass callback data to show_objects()
[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"
78892e32 14#include "log-tree.h"
894a9d33 15#include "string-list.h"
ae563542 16
cdcefbc9
LT
17volatile show_early_output_fn_t show_early_output;
18
cf2ab916 19char *path_name(const struct name_path *path, const char *name)
ae563542 20{
cf2ab916 21 const struct name_path *p;
ae563542
LT
22 char *n, *m;
23 int nlen = strlen(name);
24 int len = nlen + 1;
25
26 for (p = path; p; p = p->up) {
27 if (p->elem_len)
28 len += p->elem_len + 1;
29 }
30 n = xmalloc(len);
31 m = n + len - (nlen + 1);
32 strcpy(m, name);
33 for (p = path; p; p = p->up) {
34 if (p->elem_len) {
35 m -= p->elem_len + 1;
36 memcpy(m, p->elem, p->elem_len);
37 m[p->elem_len] = '/';
38 }
39 }
40 return n;
41}
42
beba25ab
JH
43static int show_path_component_truncated(FILE *out, const char *name, int len)
44{
45 int cnt;
46 for (cnt = 0; cnt < len; cnt++) {
47 int ch = name[cnt];
48 if (!ch || ch == '\n')
49 return -1;
50 fputc(ch, out);
51 }
52 return len;
53}
54
55static int show_path_truncated(FILE *out, const struct name_path *path)
56{
57 int emitted, ours;
58
59 if (!path)
60 return 0;
61 emitted = show_path_truncated(out, path->up);
62 if (emitted < 0)
63 return emitted;
64 if (emitted)
65 fputc('/', out);
66 ours = show_path_component_truncated(out, path->elem, path->elem_len);
67 if (ours < 0)
68 return ours;
69 return ours || emitted;
70}
71
91f17516
JH
72void show_object_with_name(FILE *out, struct object *obj, const struct name_path *path, const char *component)
73{
beba25ab
JH
74 struct name_path leaf;
75 leaf.up = (struct name_path *)path;
76 leaf.elem = component;
77 leaf.elem_len = strlen(component);
91f17516 78
beba25ab
JH
79 fprintf(out, "%s ", sha1_to_hex(obj->sha1));
80 show_path_truncated(out, &leaf);
81 fputc('\n', out);
91f17516
JH
82}
83
1f1e895f
LT
84void add_object(struct object *obj,
85 struct object_array *p,
86 struct name_path *path,
87 const char *name)
ae563542 88{
1f1e895f 89 add_object_array(obj, path_name(path, name), p);
ae563542
LT
90}
91
92static void mark_blob_uninteresting(struct blob *blob)
93{
c1ee9013
MK
94 if (!blob)
95 return;
ae563542
LT
96 if (blob->object.flags & UNINTERESTING)
97 return;
98 blob->object.flags |= UNINTERESTING;
99}
100
101void mark_tree_uninteresting(struct tree *tree)
102{
f75e53ed 103 struct tree_desc desc;
4c068a98 104 struct name_entry entry;
ae563542 105 struct object *obj = &tree->object;
ae563542 106
c1ee9013
MK
107 if (!tree)
108 return;
ae563542
LT
109 if (obj->flags & UNINTERESTING)
110 return;
111 obj->flags |= UNINTERESTING;
112 if (!has_sha1_file(obj->sha1))
113 return;
114 if (parse_tree(tree) < 0)
115 die("bad tree %s", sha1_to_hex(obj->sha1));
f75e53ed 116
6fda5e51 117 init_tree_desc(&desc, tree->buffer, tree->size);
4c068a98 118 while (tree_entry(&desc, &entry)) {
4d1012c3
LT
119 switch (object_type(entry.mode)) {
120 case OBJ_TREE:
4c068a98 121 mark_tree_uninteresting(lookup_tree(entry.sha1));
4d1012c3
LT
122 break;
123 case OBJ_BLOB:
4c068a98 124 mark_blob_uninteresting(lookup_blob(entry.sha1));
4d1012c3
LT
125 break;
126 default:
127 /* Subproject commit - not in this repository */
128 break;
129 }
ae563542 130 }
f75e53ed
LT
131
132 /*
133 * We don't care about the tree any more
134 * after it has been marked uninteresting.
135 */
136 free(tree->buffer);
137 tree->buffer = NULL;
ae563542
LT
138}
139
140void mark_parents_uninteresting(struct commit *commit)
141{
142 struct commit_list *parents = commit->parents;
143
144 while (parents) {
145 struct commit *commit = parents->item;
d2c4af73
MU
146 if (!(commit->object.flags & UNINTERESTING)) {
147 commit->object.flags |= UNINTERESTING;
ae563542 148
d2c4af73
MU
149 /*
150 * Normally we haven't parsed the parent
151 * yet, so we won't have a parent of a parent
152 * here. However, it may turn out that we've
153 * reached this commit some other way (where it
154 * wasn't uninteresting), in which case we need
155 * to mark its parents recursively too..
156 */
157 if (commit->parents)
158 mark_parents_uninteresting(commit);
159 }
ae563542
LT
160
161 /*
162 * A missing commit is ok iff its parent is marked
163 * uninteresting.
164 *
165 * We just mark such a thing parsed, so that when
166 * it is popped next time around, we won't be trying
167 * to parse it and get an error.
168 */
169 if (!has_sha1_file(commit->object.sha1))
170 commit->object.parsed = 1;
171 parents = parents->next;
172 }
173}
174
2d93b9fa 175static void add_pending_object_with_mode(struct rev_info *revs, struct object *obj, const char *name, unsigned mode)
ae563542 176{
cc243c3c
JH
177 if (!obj)
178 return;
aa27e461 179 if (revs->no_walk && (obj->flags & UNINTERESTING))
f222abde 180 revs->no_walk = 0;
105e4733
JH
181 if (revs->reflog_info && obj->type == OBJ_COMMIT) {
182 struct strbuf buf = STRBUF_INIT;
183 int len = interpret_branch_name(name, &buf);
184 int st;
185
186 if (0 < len && name[len] && buf.len)
187 strbuf_addstr(&buf, name + len);
188 st = add_reflog_for_walk(revs->reflog_info,
189 (struct commit *)obj,
190 buf.buf[0] ? buf.buf: name);
191 strbuf_release(&buf);
192 if (st)
193 return;
194 }
bb6c2fba 195 add_object_array_with_mode(obj, name, &revs->pending, mode);
ae563542
LT
196}
197
2d93b9fa
JH
198void add_pending_object(struct rev_info *revs, struct object *obj, const char *name)
199{
200 add_pending_object_with_mode(revs, obj, name, S_IFINVALID);
201}
202
3384a2df
JH
203void add_head_to_pending(struct rev_info *revs)
204{
205 unsigned char sha1[20];
206 struct object *obj;
207 if (get_sha1("HEAD", sha1))
208 return;
209 obj = parse_object(sha1);
210 if (!obj)
211 return;
212 add_pending_object(revs, obj, "HEAD");
213}
214
cd2bdc53 215static struct object *get_reference(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags)
ae563542
LT
216{
217 struct object *object;
218
219 object = parse_object(sha1);
cc243c3c
JH
220 if (!object) {
221 if (revs->ignore_missing)
222 return object;
ae563542 223 die("bad object %s", name);
cc243c3c 224 }
cd2bdc53
LT
225 object->flags |= flags;
226 return object;
227}
228
229static struct commit *handle_commit(struct rev_info *revs, struct object *object, const char *name)
230{
231 unsigned long flags = object->flags;
ae563542
LT
232
233 /*
234 * Tag object? Look what it points to..
235 */
1974632c 236 while (object->type == OBJ_TAG) {
ae563542 237 struct tag *tag = (struct tag *) object;
cd2bdc53 238 if (revs->tag_objects && !(flags & UNINTERESTING))
ae563542 239 add_pending_object(revs, object, tag->tag);
9684afd9
MK
240 if (!tag->tagged)
241 die("bad tag");
ae563542 242 object = parse_object(tag->tagged->sha1);
aeeae1b7
JH
243 if (!object) {
244 if (flags & UNINTERESTING)
245 return NULL;
ae563542 246 die("bad object %s", sha1_to_hex(tag->tagged->sha1));
aeeae1b7 247 }
ae563542
LT
248 }
249
250 /*
251 * Commit object? Just return it, we'll do all the complex
252 * reachability crud.
253 */
1974632c 254 if (object->type == OBJ_COMMIT) {
ae563542 255 struct commit *commit = (struct commit *)object;
ae563542
LT
256 if (parse_commit(commit) < 0)
257 die("unable to parse commit %s", name);
d9a83684 258 if (flags & UNINTERESTING) {
4262c1b0 259 commit->object.flags |= UNINTERESTING;
ae563542 260 mark_parents_uninteresting(commit);
d9a83684
LT
261 revs->limited = 1;
262 }
0f3a290b
LT
263 if (revs->show_source && !commit->util)
264 commit->util = (void *) name;
ae563542
LT
265 return commit;
266 }
267
268 /*
3ea3c215 269 * Tree object? Either mark it uninteresting, or add it
ae563542
LT
270 * to the list of objects to look at later..
271 */
1974632c 272 if (object->type == OBJ_TREE) {
ae563542
LT
273 struct tree *tree = (struct tree *)object;
274 if (!revs->tree_objects)
275 return NULL;
276 if (flags & UNINTERESTING) {
277 mark_tree_uninteresting(tree);
278 return NULL;
279 }
280 add_pending_object(revs, object, "");
281 return NULL;
282 }
283
284 /*
285 * Blob object? You know the drill by now..
286 */
1974632c 287 if (object->type == OBJ_BLOB) {
ae563542
LT
288 struct blob *blob = (struct blob *)object;
289 if (!revs->blob_objects)
290 return NULL;
291 if (flags & UNINTERESTING) {
292 mark_blob_uninteresting(blob);
293 return NULL;
294 }
295 add_pending_object(revs, object, "");
296 return NULL;
297 }
298 die("%s is unknown object", name);
299}
300
a4a88b2b
LT
301static int everybody_uninteresting(struct commit_list *orig)
302{
303 struct commit_list *list = orig;
304 while (list) {
305 struct commit *commit = list->item;
306 list = list->next;
307 if (commit->object.flags & UNINTERESTING)
308 continue;
309 return 0;
310 }
311 return 1;
312}
313
0a4ba7f8
JH
314/*
315 * The goal is to get REV_TREE_NEW as the result only if the
ceff8e7a
LT
316 * diff consists of all '+' (and no other changes), REV_TREE_OLD
317 * if the whole diff is removal of old data, and otherwise
318 * REV_TREE_DIFFERENT (of course if the trees are the same we
319 * want REV_TREE_SAME).
320 * That means that once we get to REV_TREE_DIFFERENT, we do not
321 * have to look any further.
0a4ba7f8 322 */
8efdc326 323static int tree_difference = REV_TREE_SAME;
a4a88b2b
LT
324
325static void file_add_remove(struct diff_options *options,
326 int addremove, unsigned mode,
327 const unsigned char *sha1,
e3d42c47 328 const char *fullpath, unsigned dirty_submodule)
a4a88b2b 329{
ceff8e7a 330 int diff = addremove == '+' ? REV_TREE_NEW : REV_TREE_OLD;
a4a88b2b 331
ceff8e7a 332 tree_difference |= diff;
dd47aa31 333 if (tree_difference == REV_TREE_DIFFERENT)
8f67f8ae 334 DIFF_OPT_SET(options, HAS_CHANGES);
a4a88b2b
LT
335}
336
337static void file_change(struct diff_options *options,
338 unsigned old_mode, unsigned new_mode,
339 const unsigned char *old_sha1,
340 const unsigned char *new_sha1,
e3d42c47
JL
341 const char *fullpath,
342 unsigned old_dirty_submodule, unsigned new_dirty_submodule)
a4a88b2b 343{
8efdc326 344 tree_difference = REV_TREE_DIFFERENT;
8f67f8ae 345 DIFF_OPT_SET(options, HAS_CHANGES);
a4a88b2b
LT
346}
347
3a5e8608 348static int rev_compare_tree(struct rev_info *revs, struct commit *parent, struct commit *commit)
a4a88b2b 349{
3a5e8608
LT
350 struct tree *t1 = parent->tree;
351 struct tree *t2 = commit->tree;
352
a4a88b2b 353 if (!t1)
8efdc326 354 return REV_TREE_NEW;
ceff8e7a
LT
355 if (!t2)
356 return REV_TREE_OLD;
78892e32
LT
357
358 if (revs->simplify_by_decoration) {
359 /*
360 * If we are simplifying by decoration, then the commit
361 * is worth showing if it has a tag pointing at it.
362 */
363 if (lookup_decoration(&name_decoration, &commit->object))
364 return REV_TREE_DIFFERENT;
365 /*
366 * A commit that is not pointed by a tag is uninteresting
367 * if we are not limited by path. This means that you will
368 * see the usual "commits that touch the paths" plus any
369 * tagged commit by specifying both --simplify-by-decoration
370 * and pathspec.
371 */
afe069d1 372 if (!revs->prune_data.nr)
78892e32
LT
373 return REV_TREE_SAME;
374 }
ceff8e7a 375
8efdc326 376 tree_difference = REV_TREE_SAME;
8f67f8ae 377 DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
c4e05b1a 378 if (diff_tree_sha1(t1->object.sha1, t2->object.sha1, "",
cd2bdc53 379 &revs->pruning) < 0)
8efdc326 380 return REV_TREE_DIFFERENT;
a4a88b2b
LT
381 return tree_difference;
382}
383
3a5e8608 384static int rev_same_tree_as_empty(struct rev_info *revs, struct commit *commit)
a4a88b2b
LT
385{
386 int retval;
387 void *tree;
6fda5e51 388 unsigned long size;
a4a88b2b 389 struct tree_desc empty, real;
3a5e8608 390 struct tree *t1 = commit->tree;
a4a88b2b
LT
391
392 if (!t1)
393 return 0;
394
6fda5e51 395 tree = read_object_with_reference(t1->object.sha1, tree_type, &size, NULL);
a4a88b2b
LT
396 if (!tree)
397 return 0;
6fda5e51
LT
398 init_tree_desc(&real, tree, size);
399 init_tree_desc(&empty, "", 0);
a4a88b2b 400
0a4ba7f8 401 tree_difference = REV_TREE_SAME;
8f67f8ae 402 DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
cd2bdc53 403 retval = diff_tree(&empty, &real, "", &revs->pruning);
a4a88b2b
LT
404 free(tree);
405
0a4ba7f8 406 return retval >= 0 && (tree_difference == REV_TREE_SAME);
a4a88b2b
LT
407}
408
409static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
410{
411 struct commit_list **pp, *parent;
6631c736 412 int tree_changed = 0, tree_same = 0;
a4a88b2b 413
53b2c823
LT
414 /*
415 * If we don't do pruning, everything is interesting
416 */
7dc0fe3b 417 if (!revs->prune)
53b2c823 418 return;
53b2c823 419
a4a88b2b
LT
420 if (!commit->tree)
421 return;
422
423 if (!commit->parents) {
3a5e8608 424 if (rev_same_tree_as_empty(revs, commit))
7dc0fe3b 425 commit->object.flags |= TREESAME;
a4a88b2b
LT
426 return;
427 }
428
53b2c823
LT
429 /*
430 * Normal non-merge commit? If we don't want to make the
431 * history dense, we consider it always to be a change..
432 */
7dc0fe3b 433 if (!revs->dense && !commit->parents->next)
53b2c823 434 return;
53b2c823 435
a4a88b2b
LT
436 pp = &commit->parents;
437 while ((parent = *pp) != NULL) {
438 struct commit *p = parent->item;
439
cc0e6c5a
AR
440 if (parse_commit(p) < 0)
441 die("cannot simplify commit %s (because of %s)",
442 sha1_to_hex(commit->object.sha1),
443 sha1_to_hex(p->object.sha1));
3a5e8608 444 switch (rev_compare_tree(revs, p, commit)) {
8efdc326 445 case REV_TREE_SAME:
6631c736 446 tree_same = 1;
9202434c 447 if (!revs->simplify_history || (p->object.flags & UNINTERESTING)) {
f3219fbb
JH
448 /* Even if a merge with an uninteresting
449 * side branch brought the entire change
450 * we are interested in, we do not want
451 * to lose the other branches of this
452 * merge, so we just keep going.
453 */
454 pp = &parent->next;
455 continue;
456 }
a4a88b2b
LT
457 parent->next = NULL;
458 commit->parents = parent;
7dc0fe3b 459 commit->object.flags |= TREESAME;
a4a88b2b
LT
460 return;
461
8efdc326
FK
462 case REV_TREE_NEW:
463 if (revs->remove_empty_trees &&
3a5e8608 464 rev_same_tree_as_empty(revs, p)) {
c348f31a
JH
465 /* We are adding all the specified
466 * paths from this parent, so the
467 * history beyond this parent is not
468 * interesting. Remove its parents
469 * (they are grandparents for us).
470 * IOW, we pretend this parent is a
471 * "root" commit.
a41e109c 472 */
cc0e6c5a
AR
473 if (parse_commit(p) < 0)
474 die("cannot simplify commit %s (invalid %s)",
475 sha1_to_hex(commit->object.sha1),
476 sha1_to_hex(p->object.sha1));
c348f31a 477 p->parents = NULL;
a4a88b2b
LT
478 }
479 /* fallthrough */
ceff8e7a 480 case REV_TREE_OLD:
8efdc326 481 case REV_TREE_DIFFERENT:
f3219fbb 482 tree_changed = 1;
a4a88b2b
LT
483 pp = &parent->next;
484 continue;
485 }
486 die("bad tree compare for commit %s", sha1_to_hex(commit->object.sha1));
487 }
6631c736 488 if (tree_changed && !tree_same)
7dc0fe3b
LT
489 return;
490 commit->object.flags |= TREESAME;
a4a88b2b
LT
491}
492
47e44ed1 493static void commit_list_insert_by_date_cached(struct commit *p, struct commit_list **head,
fce87ae5
AG
494 struct commit_list *cached_base, struct commit_list **cache)
495{
496 struct commit_list *new_entry;
497
498 if (cached_base && p->date < cached_base->item->date)
47e44ed1 499 new_entry = commit_list_insert_by_date(p, &cached_base->next);
fce87ae5 500 else
47e44ed1 501 new_entry = commit_list_insert_by_date(p, head);
fce87ae5
AG
502
503 if (cache && (!*cache || p->date < (*cache)->item->date))
504 *cache = new_entry;
505}
506
507static int add_parents_to_list(struct rev_info *revs, struct commit *commit,
508 struct commit_list **list, struct commit_list **cache_ptr)
a4a88b2b
LT
509{
510 struct commit_list *parent = commit->parents;
577ed5c2 511 unsigned left_flag;
fce87ae5 512 struct commit_list *cached_base = cache_ptr ? *cache_ptr : NULL;
a4a88b2b 513
3381c790 514 if (commit->object.flags & ADDED)
cc0e6c5a 515 return 0;
3381c790
LT
516 commit->object.flags |= ADDED;
517
a4a88b2b
LT
518 /*
519 * If the commit is uninteresting, don't try to
520 * prune parents - we want the maximal uninteresting
521 * set.
522 *
523 * Normally we haven't parsed the parent
524 * yet, so we won't have a parent of a parent
525 * here. However, it may turn out that we've
526 * reached this commit some other way (where it
527 * wasn't uninteresting), in which case we need
528 * to mark its parents recursively too..
529 */
530 if (commit->object.flags & UNINTERESTING) {
531 while (parent) {
532 struct commit *p = parent->item;
533 parent = parent->next;
aeeae1b7
JH
534 if (p)
535 p->object.flags |= UNINTERESTING;
cc0e6c5a 536 if (parse_commit(p) < 0)
aeeae1b7 537 continue;
a4a88b2b
LT
538 if (p->parents)
539 mark_parents_uninteresting(p);
540 if (p->object.flags & SEEN)
541 continue;
542 p->object.flags |= SEEN;
47e44ed1 543 commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
a4a88b2b 544 }
cc0e6c5a 545 return 0;
a4a88b2b
LT
546 }
547
548 /*
549 * Ok, the commit wasn't uninteresting. Try to
550 * simplify the commit history and find the parent
551 * that has no differences in the path set if one exists.
552 */
53b2c823 553 try_to_simplify_commit(revs, commit);
a4a88b2b 554
ba1d4505 555 if (revs->no_walk)
cc0e6c5a 556 return 0;
ba1d4505 557
577ed5c2 558 left_flag = (commit->object.flags & SYMMETRIC_LEFT);
0053e902 559
d9c292e8 560 for (parent = commit->parents; parent; parent = parent->next) {
a4a88b2b
LT
561 struct commit *p = parent->item;
562
cc0e6c5a
AR
563 if (parse_commit(p) < 0)
564 return -1;
0f3a290b
LT
565 if (revs->show_source && !p->util)
566 p->util = commit->util;
577ed5c2 567 p->object.flags |= left_flag;
ad1012eb
LH
568 if (!(p->object.flags & SEEN)) {
569 p->object.flags |= SEEN;
47e44ed1 570 commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
ad1012eb 571 }
60d30b02 572 if (revs->first_parent_only)
d9c292e8 573 break;
a4a88b2b 574 }
cc0e6c5a 575 return 0;
a4a88b2b
LT
576}
577
36d56de6 578static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
d7a17cad
JH
579{
580 struct commit_list *p;
581 int left_count = 0, right_count = 0;
582 int left_first;
583 struct patch_ids ids;
adbbb31e 584 unsigned cherry_flag;
d7a17cad
JH
585
586 /* First count the commits on the left and on the right */
587 for (p = list; p; p = p->next) {
588 struct commit *commit = p->item;
589 unsigned flags = commit->object.flags;
590 if (flags & BOUNDARY)
591 ;
592 else if (flags & SYMMETRIC_LEFT)
593 left_count++;
594 else
595 right_count++;
596 }
597
36c07975
TR
598 if (!left_count || !right_count)
599 return;
600
d7a17cad
JH
601 left_first = left_count < right_count;
602 init_patch_ids(&ids);
66f13625 603 ids.diffopts.pathspec = revs->diffopt.pathspec;
d7a17cad
JH
604
605 /* Compute patch-ids for one side */
606 for (p = list; p; p = p->next) {
607 struct commit *commit = p->item;
608 unsigned flags = commit->object.flags;
609
610 if (flags & BOUNDARY)
611 continue;
612 /*
613 * If we have fewer left, left_first is set and we omit
614 * commits on the right branch in this loop. If we have
615 * fewer right, we skip the left ones.
616 */
617 if (left_first != !!(flags & SYMMETRIC_LEFT))
618 continue;
619 commit->util = add_commit_patch_id(commit, &ids);
620 }
621
adbbb31e
MG
622 /* either cherry_mark or cherry_pick are true */
623 cherry_flag = revs->cherry_mark ? PATCHSAME : SHOWN;
624
d7a17cad
JH
625 /* Check the other side */
626 for (p = list; p; p = p->next) {
627 struct commit *commit = p->item;
628 struct patch_id *id;
629 unsigned flags = commit->object.flags;
630
631 if (flags & BOUNDARY)
632 continue;
633 /*
634 * If we have fewer left, left_first is set and we omit
635 * commits on the left branch in this loop.
636 */
637 if (left_first == !!(flags & SYMMETRIC_LEFT))
638 continue;
639
640 /*
641 * Have we seen the same patch id?
642 */
643 id = has_commit_patch_id(commit, &ids);
644 if (!id)
645 continue;
646 id->seen = 1;
adbbb31e 647 commit->object.flags |= cherry_flag;
d7a17cad
JH
648 }
649
650 /* Now check the original side for seen ones */
651 for (p = list; p; p = p->next) {
652 struct commit *commit = p->item;
653 struct patch_id *ent;
654
655 ent = commit->util;
656 if (!ent)
657 continue;
658 if (ent->seen)
adbbb31e 659 commit->object.flags |= cherry_flag;
d7a17cad
JH
660 commit->util = NULL;
661 }
662
663 free_patch_ids(&ids);
664}
665
7d004199
LT
666/* How many extra uninteresting commits we want to see.. */
667#define SLOP 5
668
669static int still_interesting(struct commit_list *src, unsigned long date, int slop)
3131b713 670{
7d004199
LT
671 /*
672 * No source list at all? We're definitely done..
673 */
674 if (!src)
675 return 0;
676
677 /*
678 * Does the destination list contain entries with a date
679 * before the source list? Definitely _not_ done.
680 */
681 if (date < src->item->date)
682 return SLOP;
683
684 /*
685 * Does the source list still have interesting commits in
686 * it? Definitely not done..
687 */
688 if (!everybody_uninteresting(src))
689 return SLOP;
690
691 /* Ok, we're closing in.. */
692 return slop-1;
3131b713
LT
693}
694
ebdc94f3
JH
695/*
696 * "rev-list --ancestry-path A..B" computes commits that are ancestors
697 * of B but not ancestors of A but further limits the result to those
698 * that are descendants of A. This takes the list of bottom commits and
699 * the result of "A..B" without --ancestry-path, and limits the latter
700 * further to the ones that can reach one of the commits in "bottom".
701 */
702static void limit_to_ancestry(struct commit_list *bottom, struct commit_list *list)
703{
704 struct commit_list *p;
705 struct commit_list *rlist = NULL;
706 int made_progress;
707
708 /*
709 * Reverse the list so that it will be likely that we would
710 * process parents before children.
711 */
712 for (p = list; p; p = p->next)
713 commit_list_insert(p->item, &rlist);
714
715 for (p = bottom; p; p = p->next)
716 p->item->object.flags |= TMP_MARK;
717
718 /*
719 * Mark the ones that can reach bottom commits in "list",
720 * in a bottom-up fashion.
721 */
722 do {
723 made_progress = 0;
724 for (p = rlist; p; p = p->next) {
725 struct commit *c = p->item;
726 struct commit_list *parents;
727 if (c->object.flags & (TMP_MARK | UNINTERESTING))
728 continue;
729 for (parents = c->parents;
730 parents;
731 parents = parents->next) {
732 if (!(parents->item->object.flags & TMP_MARK))
733 continue;
734 c->object.flags |= TMP_MARK;
735 made_progress = 1;
736 break;
737 }
738 }
739 } while (made_progress);
740
741 /*
742 * NEEDSWORK: decide if we want to remove parents that are
743 * not marked with TMP_MARK from commit->parents for commits
744 * in the resulting list. We may not want to do that, though.
745 */
746
747 /*
748 * The ones that are not marked with TMP_MARK are uninteresting
749 */
750 for (p = list; p; p = p->next) {
751 struct commit *c = p->item;
752 if (c->object.flags & TMP_MARK)
753 continue;
754 c->object.flags |= UNINTERESTING;
755 }
756
757 /* We are done with the TMP_MARK */
758 for (p = list; p; p = p->next)
759 p->item->object.flags &= ~TMP_MARK;
760 for (p = bottom; p; p = p->next)
761 p->item->object.flags &= ~TMP_MARK;
762 free_commit_list(rlist);
763}
764
765/*
766 * Before walking the history, keep the set of "negative" refs the
767 * caller has asked to exclude.
768 *
769 * This is used to compute "rev-list --ancestry-path A..B", as we need
770 * to filter the result of "A..B" further to the ones that can actually
771 * reach A.
772 */
773static struct commit_list *collect_bottom_commits(struct commit_list *list)
774{
775 struct commit_list *elem, *bottom = NULL;
776 for (elem = list; elem; elem = elem->next)
777 if (elem->item->object.flags & UNINTERESTING)
778 commit_list_insert(elem->item, &bottom);
779 return bottom;
780}
781
60adf7d7
MG
782/* Assumes either left_only or right_only is set */
783static void limit_left_right(struct commit_list *list, struct rev_info *revs)
784{
785 struct commit_list *p;
786
787 for (p = list; p; p = p->next) {
788 struct commit *commit = p->item;
789
790 if (revs->right_only) {
791 if (commit->object.flags & SYMMETRIC_LEFT)
792 commit->object.flags |= SHOWN;
793 } else /* revs->left_only is set */
794 if (!(commit->object.flags & SYMMETRIC_LEFT))
795 commit->object.flags |= SHOWN;
796 }
797}
798
cc0e6c5a 799static int limit_list(struct rev_info *revs)
a4a88b2b 800{
7d004199
LT
801 int slop = SLOP;
802 unsigned long date = ~0ul;
a4a88b2b
LT
803 struct commit_list *list = revs->commits;
804 struct commit_list *newlist = NULL;
805 struct commit_list **p = &newlist;
ebdc94f3
JH
806 struct commit_list *bottom = NULL;
807
808 if (revs->ancestry_path) {
809 bottom = collect_bottom_commits(list);
810 if (!bottom)
97b03c35 811 die("--ancestry-path given but there are no bottom commits");
ebdc94f3 812 }
a4a88b2b
LT
813
814 while (list) {
815 struct commit_list *entry = list;
816 struct commit *commit = list->item;
817 struct object *obj = &commit->object;
cdcefbc9 818 show_early_output_fn_t show;
a4a88b2b
LT
819
820 list = list->next;
821 free(entry);
822
823 if (revs->max_age != -1 && (commit->date < revs->max_age))
824 obj->flags |= UNINTERESTING;
fce87ae5 825 if (add_parents_to_list(revs, commit, &list, NULL) < 0)
cc0e6c5a 826 return -1;
a4a88b2b
LT
827 if (obj->flags & UNINTERESTING) {
828 mark_parents_uninteresting(commit);
7d004199
LT
829 if (revs->show_all)
830 p = &commit_list_insert(commit, p)->next;
831 slop = still_interesting(list, date, slop);
832 if (slop)
3131b713 833 continue;
7d004199
LT
834 /* If showing all, add the whole pending list to the end */
835 if (revs->show_all)
836 *p = list;
837 break;
a4a88b2b
LT
838 }
839 if (revs->min_age != -1 && (commit->date > revs->min_age))
840 continue;
7d004199 841 date = commit->date;
a4a88b2b 842 p = &commit_list_insert(commit, p)->next;
cdcefbc9
LT
843
844 show = show_early_output;
845 if (!show)
846 continue;
847
848 show(revs, newlist);
849 show_early_output = NULL;
a4a88b2b 850 }
adbbb31e 851 if (revs->cherry_pick || revs->cherry_mark)
36d56de6 852 cherry_pick_list(newlist, revs);
d7a17cad 853
60adf7d7
MG
854 if (revs->left_only || revs->right_only)
855 limit_left_right(newlist, revs);
856
ebdc94f3
JH
857 if (bottom) {
858 limit_to_ancestry(bottom, newlist);
859 free_commit_list(bottom);
860 }
861
a4a88b2b 862 revs->commits = newlist;
cc0e6c5a 863 return 0;
a4a88b2b
LT
864}
865
63049292
JH
866struct all_refs_cb {
867 int all_flags;
71b03b42 868 int warned_bad_reflog;
63049292
JH
869 struct rev_info *all_revs;
870 const char *name_for_errormsg;
871};
ae563542 872
8da19775 873static int handle_one_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
ae563542 874{
63049292
JH
875 struct all_refs_cb *cb = cb_data;
876 struct object *object = get_reference(cb->all_revs, path, sha1,
877 cb->all_flags);
3d1efd8f 878 add_pending_object(cb->all_revs, object, path);
ae563542
LT
879 return 0;
880}
881
d08bae7e
IL
882static void init_all_refs_cb(struct all_refs_cb *cb, struct rev_info *revs,
883 unsigned flags)
884{
885 cb->all_revs = revs;
886 cb->all_flags = flags;
887}
888
9ef6aeb0
HV
889static void handle_refs(const char *submodule, struct rev_info *revs, unsigned flags,
890 int (*for_each)(const char *, each_ref_fn, void *))
ae563542 891{
63049292 892 struct all_refs_cb cb;
d08bae7e 893 init_all_refs_cb(&cb, revs, flags);
9ef6aeb0 894 for_each(submodule, handle_one_ref, &cb);
63049292
JH
895}
896
71b03b42 897static void handle_one_reflog_commit(unsigned char *sha1, void *cb_data)
63049292
JH
898{
899 struct all_refs_cb *cb = cb_data;
71b03b42
SP
900 if (!is_null_sha1(sha1)) {
901 struct object *o = parse_object(sha1);
902 if (o) {
903 o->flags |= cb->all_flags;
904 add_pending_object(cb->all_revs, o, "");
905 }
906 else if (!cb->warned_bad_reflog) {
46efd2d9 907 warning("reflog of '%s' references pruned commits",
71b03b42
SP
908 cb->name_for_errormsg);
909 cb->warned_bad_reflog = 1;
910 }
63049292 911 }
71b03b42
SP
912}
913
883d60fa
JS
914static int handle_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
915 const char *email, unsigned long timestamp, int tz,
916 const char *message, void *cb_data)
71b03b42
SP
917{
918 handle_one_reflog_commit(osha1, cb_data);
919 handle_one_reflog_commit(nsha1, cb_data);
63049292
JH
920 return 0;
921}
922
923static int handle_one_reflog(const char *path, const unsigned char *sha1, int flag, void *cb_data)
924{
925 struct all_refs_cb *cb = cb_data;
71b03b42 926 cb->warned_bad_reflog = 0;
63049292
JH
927 cb->name_for_errormsg = path;
928 for_each_reflog_ent(path, handle_one_reflog_ent, cb_data);
929 return 0;
930}
931
932static void handle_reflog(struct rev_info *revs, unsigned flags)
933{
934 struct all_refs_cb cb;
935 cb.all_revs = revs;
936 cb.all_flags = flags;
25b51e2c 937 for_each_reflog(handle_one_reflog, &cb);
ae563542
LT
938}
939
ea4a19e1
JH
940static int add_parents_only(struct rev_info *revs, const char *arg, int flags)
941{
942 unsigned char sha1[20];
943 struct object *it;
944 struct commit *commit;
945 struct commit_list *parents;
946
947 if (*arg == '^') {
948 flags ^= UNINTERESTING;
949 arg++;
950 }
951 if (get_sha1(arg, sha1))
952 return 0;
953 while (1) {
954 it = get_reference(revs, arg, sha1, 0);
cc243c3c
JH
955 if (!it && revs->ignore_missing)
956 return 0;
1974632c 957 if (it->type != OBJ_TAG)
ea4a19e1 958 break;
9684afd9
MK
959 if (!((struct tag*)it)->tagged)
960 return 0;
e702496e 961 hashcpy(sha1, ((struct tag*)it)->tagged->sha1);
ea4a19e1 962 }
1974632c 963 if (it->type != OBJ_COMMIT)
ea4a19e1
JH
964 return 0;
965 commit = (struct commit *)it;
966 for (parents = commit->parents; parents; parents = parents->next) {
967 it = &parents->item->object;
968 it->flags |= flags;
969 add_pending_object(revs, it, arg);
970 }
971 return 1;
972}
973
db6296a5 974void init_revisions(struct rev_info *revs, const char *prefix)
8efdc326
FK
975{
976 memset(revs, 0, sizeof(*revs));
8e8f9987 977
6b9c58f4 978 revs->abbrev = DEFAULT_ABBREV;
8e8f9987 979 revs->ignore_merges = 1;
9202434c 980 revs->simplify_history = 1;
8f67f8ae 981 DIFF_OPT_SET(&revs->pruning, RECURSIVE);
90b19941 982 DIFF_OPT_SET(&revs->pruning, QUICK);
cd2bdc53
LT
983 revs->pruning.add_remove = file_add_remove;
984 revs->pruning.change = file_change;
8efdc326
FK
985 revs->lifo = 1;
986 revs->dense = 1;
db6296a5 987 revs->prefix = prefix;
8efdc326
FK
988 revs->max_age = -1;
989 revs->min_age = -1;
d5db6c9e 990 revs->skip_count = -1;
8efdc326 991 revs->max_count = -1;
ad5aeede 992 revs->max_parents = -1;
8efdc326 993
cd2bdc53
LT
994 revs->commit_format = CMIT_FMT_DEFAULT;
995
0843acfd
JK
996 revs->grep_filter.status_only = 1;
997 revs->grep_filter.pattern_tail = &(revs->grep_filter.pattern_list);
80235ba7 998 revs->grep_filter.header_tail = &(revs->grep_filter.header_list);
0843acfd
JK
999 revs->grep_filter.regflags = REG_NEWLINE;
1000
cd2bdc53 1001 diff_setup(&revs->diffopt);
c0cb4a06 1002 if (prefix && !revs->diffopt.prefix) {
cd676a51
JH
1003 revs->diffopt.prefix = prefix;
1004 revs->diffopt.prefix_length = strlen(prefix);
1005 }
3a03cf6b
JK
1006
1007 revs->notes_opt.use_default_notes = -1;
8efdc326
FK
1008}
1009
0d2c9d67
RS
1010static void add_pending_commit_list(struct rev_info *revs,
1011 struct commit_list *commit_list,
1012 unsigned int flags)
1013{
1014 while (commit_list) {
1015 struct object *object = &commit_list->item->object;
1016 object->flags |= flags;
1017 add_pending_object(revs, object, sha1_to_hex(object->sha1));
1018 commit_list = commit_list->next;
1019 }
1020}
1021
ae3e5e1e
JH
1022static void prepare_show_merge(struct rev_info *revs)
1023{
1024 struct commit_list *bases;
1025 struct commit *head, *other;
1026 unsigned char sha1[20];
1027 const char **prune = NULL;
1028 int i, prune_num = 1; /* counting terminating NULL */
1029
1030 if (get_sha1("HEAD", sha1) || !(head = lookup_commit(sha1)))
1031 die("--merge without HEAD?");
1032 if (get_sha1("MERGE_HEAD", sha1) || !(other = lookup_commit(sha1)))
1033 die("--merge without MERGE_HEAD?");
1034 add_pending_object(revs, &head->object, "HEAD");
1035 add_pending_object(revs, &other->object, "MERGE_HEAD");
1036 bases = get_merge_bases(head, other, 1);
e82447b1
JH
1037 add_pending_commit_list(revs, bases, UNINTERESTING);
1038 free_commit_list(bases);
1039 head->object.flags |= SYMMETRIC_LEFT;
ae3e5e1e
JH
1040
1041 if (!active_nr)
1042 read_cache();
1043 for (i = 0; i < active_nr; i++) {
1044 struct cache_entry *ce = active_cache[i];
1045 if (!ce_stage(ce))
1046 continue;
eb9cb55b 1047 if (ce_path_match(ce, &revs->prune_data)) {
ae3e5e1e
JH
1048 prune_num++;
1049 prune = xrealloc(prune, sizeof(*prune) * prune_num);
1050 prune[prune_num-2] = ce->name;
1051 prune[prune_num-1] = NULL;
1052 }
1053 while ((i+1 < active_nr) &&
1054 ce_same_name(ce, active_cache[i+1]))
1055 i++;
1056 }
afe069d1
NTND
1057 free_pathspec(&revs->prune_data);
1058 init_pathspec(&revs->prune_data, prune);
e82447b1 1059 revs->limited = 1;
ae3e5e1e
JH
1060}
1061
5d6f0935
JH
1062int handle_revision_arg(const char *arg, struct rev_info *revs,
1063 int flags,
1064 int cant_be_filename)
1065{
bb6c2fba 1066 unsigned mode;
5d6f0935
JH
1067 char *dotdot;
1068 struct object *object;
1069 unsigned char sha1[20];
1070 int local_flags;
1071
1072 dotdot = strstr(arg, "..");
1073 if (dotdot) {
1074 unsigned char from_sha1[20];
1075 const char *next = dotdot + 2;
1076 const char *this = arg;
1077 int symmetric = *next == '.';
1078 unsigned int flags_exclude = flags ^ UNINTERESTING;
1079
1080 *dotdot = 0;
1081 next += symmetric;
1082
1083 if (!*next)
1084 next = "HEAD";
1085 if (dotdot == arg)
1086 this = "HEAD";
1087 if (!get_sha1(this, from_sha1) &&
1088 !get_sha1(next, sha1)) {
1089 struct commit *a, *b;
1090 struct commit_list *exclude;
1091
1092 a = lookup_commit_reference(from_sha1);
1093 b = lookup_commit_reference(sha1);
1094 if (!a || !b) {
cc243c3c
JH
1095 if (revs->ignore_missing)
1096 return 0;
5d6f0935
JH
1097 die(symmetric ?
1098 "Invalid symmetric difference expression %s...%s" :
1099 "Invalid revision range %s..%s",
1100 arg, next);
1101 }
1102
1103 if (!cant_be_filename) {
1104 *dotdot = '.';
1105 verify_non_filename(revs->prefix, arg);
1106 }
1107
1108 if (symmetric) {
1109 exclude = get_merge_bases(a, b, 1);
1110 add_pending_commit_list(revs, exclude,
1111 flags_exclude);
1112 free_commit_list(exclude);
577ed5c2 1113 a->object.flags |= flags | SYMMETRIC_LEFT;
5d6f0935
JH
1114 } else
1115 a->object.flags |= flags_exclude;
1116 b->object.flags |= flags;
1117 add_pending_object(revs, &a->object, this);
1118 add_pending_object(revs, &b->object, next);
1119 return 0;
1120 }
1121 *dotdot = '.';
1122 }
1123 dotdot = strstr(arg, "^@");
1124 if (dotdot && !dotdot[2]) {
1125 *dotdot = 0;
1126 if (add_parents_only(revs, arg, flags))
1127 return 0;
1128 *dotdot = '^';
1129 }
62476c8e
JH
1130 dotdot = strstr(arg, "^!");
1131 if (dotdot && !dotdot[2]) {
1132 *dotdot = 0;
1133 if (!add_parents_only(revs, arg, flags ^ UNINTERESTING))
1134 *dotdot = '^';
1135 }
1136
5d6f0935
JH
1137 local_flags = 0;
1138 if (*arg == '^') {
1139 local_flags = UNINTERESTING;
1140 arg++;
1141 }
bb6c2fba 1142 if (get_sha1_with_mode(arg, sha1, &mode))
cc243c3c 1143 return revs->ignore_missing ? 0 : -1;
5d6f0935
JH
1144 if (!cant_be_filename)
1145 verify_non_filename(revs->prefix, arg);
1146 object = get_reference(revs, arg, sha1, flags ^ local_flags);
bb6c2fba 1147 add_pending_object_with_mode(revs, object, arg, mode);
5d6f0935
JH
1148 return 0;
1149}
1150
4da5af31
JH
1151struct cmdline_pathspec {
1152 int alloc;
1153 int nr;
1154 const char **path;
1155};
1fc561d1 1156
4da5af31
JH
1157static void append_prune_data(struct cmdline_pathspec *prune, const char **av)
1158{
1159 while (*av) {
1160 ALLOC_GROW(prune->path, prune->nr+1, prune->alloc);
1161 prune->path[prune->nr++] = *(av++);
1162 }
1163}
60da8b15 1164
4da5af31
JH
1165static void read_pathspec_from_stdin(struct rev_info *revs, struct strbuf *sb,
1166 struct cmdline_pathspec *prune)
1167{
60da8b15
JH
1168 while (strbuf_getwholeline(sb, stdin, '\n') != EOF) {
1169 int len = sb->len;
1170 if (len && sb->buf[len - 1] == '\n')
1171 sb->buf[--len] = '\0';
4da5af31
JH
1172 ALLOC_GROW(prune->path, prune->nr+1, prune->alloc);
1173 prune->path[prune->nr++] = xstrdup(sb->buf);
60da8b15 1174 }
60da8b15
JH
1175}
1176
4da5af31
JH
1177static void read_revisions_from_stdin(struct rev_info *revs,
1178 struct cmdline_pathspec *prune)
1fc561d1 1179{
63d564b3 1180 struct strbuf sb;
60da8b15 1181 int seen_dashdash = 0;
1fc561d1 1182
63d564b3
JH
1183 strbuf_init(&sb, 1000);
1184 while (strbuf_getwholeline(&sb, stdin, '\n') != EOF) {
1185 int len = sb.len;
1186 if (len && sb.buf[len - 1] == '\n')
1187 sb.buf[--len] = '\0';
1fc561d1
AB
1188 if (!len)
1189 break;
60da8b15
JH
1190 if (sb.buf[0] == '-') {
1191 if (len == 2 && sb.buf[1] == '-') {
1192 seen_dashdash = 1;
1193 break;
1194 }
1fc561d1 1195 die("options not supported in --stdin mode");
60da8b15 1196 }
63d564b3
JH
1197 if (handle_revision_arg(sb.buf, revs, 0, 1))
1198 die("bad revision '%s'", sb.buf);
1fc561d1 1199 }
60da8b15
JH
1200 if (seen_dashdash)
1201 read_pathspec_from_stdin(revs, &sb, prune);
63d564b3 1202 strbuf_release(&sb);
1fc561d1
AB
1203}
1204
2d10c555 1205static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
bd95fcd3 1206{
0843acfd 1207 append_grep_pattern(&revs->grep_filter, ptn, "command line", 0, what);
2d10c555
JH
1208}
1209
a4d7d2c6 1210static void add_header_grep(struct rev_info *revs, enum grep_header_field field, const char *pattern)
2d10c555 1211{
a4d7d2c6 1212 append_header_grep_pattern(&revs->grep_filter, field, pattern);
bd95fcd3
JH
1213}
1214
1215static void add_message_grep(struct rev_info *revs, const char *pattern)
1216{
2d10c555 1217 add_grep(revs, pattern, GREP_PATTERN_BODY);
bd95fcd3
JH
1218}
1219
6b61ec05
PH
1220static int handle_revision_opt(struct rev_info *revs, int argc, const char **argv,
1221 int *unkc, const char **unkv)
02e54220
PH
1222{
1223 const char *arg = argv[0];
7d7b86f7
MM
1224 const char *optarg;
1225 int argcount;
02e54220
PH
1226
1227 /* pseudo revision arguments */
1228 if (!strcmp(arg, "--all") || !strcmp(arg, "--branches") ||
1229 !strcmp(arg, "--tags") || !strcmp(arg, "--remotes") ||
1230 !strcmp(arg, "--reflog") || !strcmp(arg, "--not") ||
ad3f9a71 1231 !strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk") ||
0fc63ec4
JN
1232 !strcmp(arg, "--bisect") || !prefixcmp(arg, "--glob=") ||
1233 !prefixcmp(arg, "--branches=") || !prefixcmp(arg, "--tags=") ||
1234 !prefixcmp(arg, "--remotes="))
02e54220
PH
1235 {
1236 unkv[(*unkc)++] = arg;
0fe8c138 1237 return 1;
02e54220
PH
1238 }
1239
7d7b86f7
MM
1240 if ((argcount = parse_long_opt("max-count", argv, &optarg))) {
1241 revs->max_count = atoi(optarg);
5853caec 1242 revs->no_walk = 0;
7d7b86f7
MM
1243 return argcount;
1244 } else if ((argcount = parse_long_opt("skip", argv, &optarg))) {
1245 revs->skip_count = atoi(optarg);
1246 return argcount;
02e54220
PH
1247 } else if ((*arg == '-') && isdigit(arg[1])) {
1248 /* accept -<digit>, like traditional "head" */
1249 revs->max_count = atoi(arg + 1);
5853caec 1250 revs->no_walk = 0;
02e54220
PH
1251 } else if (!strcmp(arg, "-n")) {
1252 if (argc <= 1)
1253 return error("-n requires an argument");
1254 revs->max_count = atoi(argv[1]);
5853caec 1255 revs->no_walk = 0;
02e54220
PH
1256 return 2;
1257 } else if (!prefixcmp(arg, "-n")) {
1258 revs->max_count = atoi(arg + 2);
5853caec 1259 revs->no_walk = 0;
7d7b86f7
MM
1260 } else if ((argcount = parse_long_opt("max-age", argv, &optarg))) {
1261 revs->max_age = atoi(optarg);
1262 return argcount;
1263 } else if ((argcount = parse_long_opt("since", argv, &optarg))) {
1264 revs->max_age = approxidate(optarg);
1265 return argcount;
1266 } else if ((argcount = parse_long_opt("after", argv, &optarg))) {
1267 revs->max_age = approxidate(optarg);
1268 return argcount;
1269 } else if ((argcount = parse_long_opt("min-age", argv, &optarg))) {
1270 revs->min_age = atoi(optarg);
1271 return argcount;
1272 } else if ((argcount = parse_long_opt("before", argv, &optarg))) {
1273 revs->min_age = approxidate(optarg);
1274 return argcount;
1275 } else if ((argcount = parse_long_opt("until", argv, &optarg))) {
1276 revs->min_age = approxidate(optarg);
1277 return argcount;
02e54220
PH
1278 } else if (!strcmp(arg, "--first-parent")) {
1279 revs->first_parent_only = 1;
ebdc94f3
JH
1280 } else if (!strcmp(arg, "--ancestry-path")) {
1281 revs->ancestry_path = 1;
cb7529e1 1282 revs->simplify_history = 0;
ebdc94f3 1283 revs->limited = 1;
02e54220
PH
1284 } else if (!strcmp(arg, "-g") || !strcmp(arg, "--walk-reflogs")) {
1285 init_reflog_walk(&revs->reflog_info);
1286 } else if (!strcmp(arg, "--default")) {
1287 if (argc <= 1)
1288 return error("bad --default argument");
1289 revs->def = argv[1];
1290 return 2;
1291 } else if (!strcmp(arg, "--merge")) {
1292 revs->show_merge = 1;
1293 } else if (!strcmp(arg, "--topo-order")) {
1294 revs->lifo = 1;
1295 revs->topo_order = 1;
6546b593
JH
1296 } else if (!strcmp(arg, "--simplify-merges")) {
1297 revs->simplify_merges = 1;
1298 revs->rewrite_parents = 1;
1299 revs->simplify_history = 0;
1300 revs->limited = 1;
78892e32
LT
1301 } else if (!strcmp(arg, "--simplify-by-decoration")) {
1302 revs->simplify_merges = 1;
1303 revs->rewrite_parents = 1;
1304 revs->simplify_history = 0;
1305 revs->simplify_by_decoration = 1;
1306 revs->limited = 1;
1307 revs->prune = 1;
33e7018c 1308 load_ref_decorations(DECORATE_SHORT_REFS);
02e54220
PH
1309 } else if (!strcmp(arg, "--date-order")) {
1310 revs->lifo = 0;
1311 revs->topo_order = 1;
1312 } else if (!prefixcmp(arg, "--early-output")) {
1313 int count = 100;
1314 switch (arg[14]) {
1315 case '=':
1316 count = atoi(arg+15);
1317 /* Fallthrough */
1318 case 0:
1319 revs->topo_order = 1;
1320 revs->early_output = count;
1321 }
1322 } else if (!strcmp(arg, "--parents")) {
1323 revs->rewrite_parents = 1;
1324 revs->print_parents = 1;
1325 } else if (!strcmp(arg, "--dense")) {
1326 revs->dense = 1;
1327 } else if (!strcmp(arg, "--sparse")) {
1328 revs->dense = 0;
1329 } else if (!strcmp(arg, "--show-all")) {
1330 revs->show_all = 1;
1331 } else if (!strcmp(arg, "--remove-empty")) {
1332 revs->remove_empty_trees = 1;
b8e8db28 1333 } else if (!strcmp(arg, "--merges")) {
ad5aeede 1334 revs->min_parents = 2;
02e54220 1335 } else if (!strcmp(arg, "--no-merges")) {
ad5aeede
MG
1336 revs->max_parents = 1;
1337 } else if (!prefixcmp(arg, "--min-parents=")) {
1338 revs->min_parents = atoi(arg+14);
1339 } else if (!prefixcmp(arg, "--no-min-parents")) {
1340 revs->min_parents = 0;
1341 } else if (!prefixcmp(arg, "--max-parents=")) {
1342 revs->max_parents = atoi(arg+14);
1343 } else if (!prefixcmp(arg, "--no-max-parents")) {
1344 revs->max_parents = -1;
02e54220
PH
1345 } else if (!strcmp(arg, "--boundary")) {
1346 revs->boundary = 1;
1347 } else if (!strcmp(arg, "--left-right")) {
1348 revs->left_right = 1;
60adf7d7 1349 } else if (!strcmp(arg, "--left-only")) {
24852d91 1350 if (revs->right_only)
94f605ec
MG
1351 die("--left-only is incompatible with --right-only"
1352 " or --cherry");
60adf7d7
MG
1353 revs->left_only = 1;
1354 } else if (!strcmp(arg, "--right-only")) {
24852d91
JH
1355 if (revs->left_only)
1356 die("--right-only is incompatible with --left-only");
60adf7d7 1357 revs->right_only = 1;
94f605ec
MG
1358 } else if (!strcmp(arg, "--cherry")) {
1359 if (revs->left_only)
1360 die("--cherry is incompatible with --left-only");
1361 revs->cherry_mark = 1;
1362 revs->right_only = 1;
ad5aeede 1363 revs->max_parents = 1;
94f605ec 1364 revs->limited = 1;
f69c5018
TR
1365 } else if (!strcmp(arg, "--count")) {
1366 revs->count = 1;
adbbb31e
MG
1367 } else if (!strcmp(arg, "--cherry-mark")) {
1368 if (revs->cherry_pick)
1369 die("--cherry-mark is incompatible with --cherry-pick");
1370 revs->cherry_mark = 1;
1371 revs->limited = 1; /* needs limit_list() */
02e54220 1372 } else if (!strcmp(arg, "--cherry-pick")) {
adbbb31e
MG
1373 if (revs->cherry_mark)
1374 die("--cherry-pick is incompatible with --cherry-mark");
02e54220
PH
1375 revs->cherry_pick = 1;
1376 revs->limited = 1;
1377 } else if (!strcmp(arg, "--objects")) {
1378 revs->tag_objects = 1;
1379 revs->tree_objects = 1;
1380 revs->blob_objects = 1;
1381 } else if (!strcmp(arg, "--objects-edge")) {
1382 revs->tag_objects = 1;
1383 revs->tree_objects = 1;
1384 revs->blob_objects = 1;
1385 revs->edge_hint = 1;
1386 } else if (!strcmp(arg, "--unpacked")) {
1387 revs->unpacked = 1;
03a9683d
JH
1388 } else if (!prefixcmp(arg, "--unpacked=")) {
1389 die("--unpacked=<packfile> no longer supported.");
02e54220
PH
1390 } else if (!strcmp(arg, "-r")) {
1391 revs->diff = 1;
1392 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1393 } else if (!strcmp(arg, "-t")) {
1394 revs->diff = 1;
1395 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1396 DIFF_OPT_SET(&revs->diffopt, TREE_IN_RECURSIVE);
1397 } else if (!strcmp(arg, "-m")) {
1398 revs->ignore_merges = 0;
1399 } else if (!strcmp(arg, "-c")) {
1400 revs->diff = 1;
1401 revs->dense_combined_merges = 0;
1402 revs->combine_merges = 1;
1403 } else if (!strcmp(arg, "--cc")) {
1404 revs->diff = 1;
1405 revs->dense_combined_merges = 1;
1406 revs->combine_merges = 1;
1407 } else if (!strcmp(arg, "-v")) {
1408 revs->verbose_header = 1;
1409 } else if (!strcmp(arg, "--pretty")) {
1410 revs->verbose_header = 1;
66b2ed09 1411 revs->pretty_given = 1;
02e54220 1412 get_commit_format(arg+8, revs);
3a4c1a5e 1413 } else if (!prefixcmp(arg, "--pretty=") || !prefixcmp(arg, "--format=")) {
7d7b86f7
MM
1414 /*
1415 * Detached form ("--pretty X" as opposed to "--pretty=X")
1416 * not allowed, since the argument is optional.
1417 */
02e54220 1418 revs->verbose_header = 1;
66b2ed09 1419 revs->pretty_given = 1;
02e54220 1420 get_commit_format(arg+9, revs);
7249e912 1421 } else if (!strcmp(arg, "--show-notes") || !strcmp(arg, "--notes")) {
66b2ed09
JH
1422 revs->show_notes = 1;
1423 revs->show_notes_given = 1;
3a03cf6b 1424 revs->notes_opt.use_default_notes = 1;
7249e912
JK
1425 } else if (!prefixcmp(arg, "--show-notes=") ||
1426 !prefixcmp(arg, "--notes=")) {
894a9d33
TR
1427 struct strbuf buf = STRBUF_INIT;
1428 revs->show_notes = 1;
1429 revs->show_notes_given = 1;
7249e912
JK
1430 if (!prefixcmp(arg, "--show-notes")) {
1431 if (revs->notes_opt.use_default_notes < 0)
1432 revs->notes_opt.use_default_notes = 1;
1433 strbuf_addstr(&buf, arg+13);
1434 }
1435 else
1436 strbuf_addstr(&buf, arg+8);
c063f0a9 1437 expand_notes_ref(&buf);
304cc11c 1438 string_list_append(&revs->notes_opt.extra_notes_refs,
1d2f80fa 1439 strbuf_detach(&buf, NULL));
66b2ed09
JH
1440 } else if (!strcmp(arg, "--no-notes")) {
1441 revs->show_notes = 0;
1442 revs->show_notes_given = 1;
92e0d425
JK
1443 revs->notes_opt.use_default_notes = -1;
1444 /* we have been strdup'ing ourselves, so trick
1445 * string_list into free()ing strings */
1446 revs->notes_opt.extra_notes_refs.strdup_strings = 1;
1447 string_list_clear(&revs->notes_opt.extra_notes_refs, 0);
1448 revs->notes_opt.extra_notes_refs.strdup_strings = 0;
894a9d33
TR
1449 } else if (!strcmp(arg, "--standard-notes")) {
1450 revs->show_notes_given = 1;
3a03cf6b 1451 revs->notes_opt.use_default_notes = 1;
894a9d33 1452 } else if (!strcmp(arg, "--no-standard-notes")) {
3a03cf6b 1453 revs->notes_opt.use_default_notes = 0;
de84accc
NS
1454 } else if (!strcmp(arg, "--oneline")) {
1455 revs->verbose_header = 1;
1456 get_commit_format("oneline", revs);
7dccadf3 1457 revs->pretty_given = 1;
de84accc 1458 revs->abbrev_commit = 1;
02e54220
PH
1459 } else if (!strcmp(arg, "--graph")) {
1460 revs->topo_order = 1;
1461 revs->rewrite_parents = 1;
1462 revs->graph = graph_init(revs);
1463 } else if (!strcmp(arg, "--root")) {
1464 revs->show_root_diff = 1;
1465 } else if (!strcmp(arg, "--no-commit-id")) {
1466 revs->no_commit_id = 1;
1467 } else if (!strcmp(arg, "--always")) {
1468 revs->always_show_header = 1;
1469 } else if (!strcmp(arg, "--no-abbrev")) {
1470 revs->abbrev = 0;
1471 } else if (!strcmp(arg, "--abbrev")) {
1472 revs->abbrev = DEFAULT_ABBREV;
1473 } else if (!prefixcmp(arg, "--abbrev=")) {
1474 revs->abbrev = strtoul(arg + 9, NULL, 10);
1475 if (revs->abbrev < MINIMUM_ABBREV)
1476 revs->abbrev = MINIMUM_ABBREV;
1477 else if (revs->abbrev > 40)
1478 revs->abbrev = 40;
1479 } else if (!strcmp(arg, "--abbrev-commit")) {
1480 revs->abbrev_commit = 1;
0c47695a
JS
1481 revs->abbrev_commit_given = 1;
1482 } else if (!strcmp(arg, "--no-abbrev-commit")) {
1483 revs->abbrev_commit = 0;
02e54220
PH
1484 } else if (!strcmp(arg, "--full-diff")) {
1485 revs->diff = 1;
1486 revs->full_diff = 1;
1487 } else if (!strcmp(arg, "--full-history")) {
1488 revs->simplify_history = 0;
1489 } else if (!strcmp(arg, "--relative-date")) {
1490 revs->date_mode = DATE_RELATIVE;
f4ea32f0 1491 revs->date_mode_explicit = 1;
7d7b86f7
MM
1492 } else if ((argcount = parse_long_opt("date", argv, &optarg))) {
1493 revs->date_mode = parse_date_format(optarg);
f4ea32f0 1494 revs->date_mode_explicit = 1;
7d7b86f7 1495 return argcount;
02e54220
PH
1496 } else if (!strcmp(arg, "--log-size")) {
1497 revs->show_log_size = 1;
1498 }
1499 /*
1500 * Grepping the commit log
1501 */
7d7b86f7
MM
1502 else if ((argcount = parse_long_opt("author", argv, &optarg))) {
1503 add_header_grep(revs, GREP_HEADER_AUTHOR, optarg);
1504 return argcount;
1505 } else if ((argcount = parse_long_opt("committer", argv, &optarg))) {
1506 add_header_grep(revs, GREP_HEADER_COMMITTER, optarg);
1507 return argcount;
1508 } else if ((argcount = parse_long_opt("grep", argv, &optarg))) {
1509 add_message_grep(revs, optarg);
1510 return argcount;
02e54220 1511 } else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) {
0843acfd 1512 revs->grep_filter.regflags |= REG_EXTENDED;
02e54220 1513 } else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) {
0843acfd 1514 revs->grep_filter.regflags |= REG_ICASE;
02e54220 1515 } else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) {
0843acfd 1516 revs->grep_filter.fixed = 1;
02e54220 1517 } else if (!strcmp(arg, "--all-match")) {
0843acfd 1518 revs->grep_filter.all_match = 1;
7d7b86f7
MM
1519 } else if ((argcount = parse_long_opt("encoding", argv, &optarg))) {
1520 if (strcmp(optarg, "none"))
1521 git_log_output_encoding = xstrdup(optarg);
02e54220
PH
1522 else
1523 git_log_output_encoding = "";
7d7b86f7 1524 return argcount;
02e54220
PH
1525 } else if (!strcmp(arg, "--reverse")) {
1526 revs->reverse ^= 1;
1527 } else if (!strcmp(arg, "--children")) {
1528 revs->children.name = "children";
1529 revs->limited = 1;
cc243c3c
JH
1530 } else if (!strcmp(arg, "--ignore-missing")) {
1531 revs->ignore_missing = 1;
02e54220
PH
1532 } else {
1533 int opts = diff_opt_parse(&revs->diffopt, argv, argc);
1534 if (!opts)
1535 unkv[(*unkc)++] = arg;
1536 return opts;
1537 }
1538
1539 return 1;
1540}
1541
6b61ec05
PH
1542void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
1543 const struct option *options,
1544 const char * const usagestr[])
1545{
1546 int n = handle_revision_opt(revs, ctx->argc, ctx->argv,
1547 &ctx->cpidx, ctx->out);
1548 if (n <= 0) {
1549 error("unknown option `%s'", ctx->argv[0]);
1550 usage_with_options(usagestr, options);
1551 }
1552 ctx->argv += n;
1553 ctx->argc -= n;
1554}
1555
9ef6aeb0 1556static int for_each_bad_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
ad3f9a71 1557{
9ef6aeb0 1558 return for_each_ref_in_submodule(submodule, "refs/bisect/bad", fn, cb_data);
ad3f9a71
LT
1559}
1560
9ef6aeb0 1561static int for_each_good_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
ad3f9a71 1562{
9ef6aeb0 1563 return for_each_ref_in_submodule(submodule, "refs/bisect/good", fn, cb_data);
ad3f9a71
LT
1564}
1565
f6aca0dc
JN
1566static int handle_revision_pseudo_opt(const char *submodule,
1567 struct rev_info *revs,
1568 int argc, const char **argv, int *flags)
1569{
1570 const char *arg = argv[0];
1571 const char *optarg;
1572 int argcount;
1573
0fc63ec4
JN
1574 /*
1575 * NOTE!
1576 *
1577 * Commands like "git shortlog" will not accept the options below
1578 * unless parse_revision_opt queues them (as opposed to erroring
1579 * out).
1580 *
1581 * When implementing your new pseudo-option, remember to
1582 * register it in the list at the top of handle_revision_opt.
1583 */
f6aca0dc
JN
1584 if (!strcmp(arg, "--all")) {
1585 handle_refs(submodule, revs, *flags, for_each_ref_submodule);
1586 handle_refs(submodule, revs, *flags, head_ref_submodule);
1587 } else if (!strcmp(arg, "--branches")) {
1588 handle_refs(submodule, revs, *flags, for_each_branch_ref_submodule);
1589 } else if (!strcmp(arg, "--bisect")) {
1590 handle_refs(submodule, revs, *flags, for_each_bad_bisect_ref);
1591 handle_refs(submodule, revs, *flags ^ UNINTERESTING, for_each_good_bisect_ref);
1592 revs->bisect = 1;
1593 } else if (!strcmp(arg, "--tags")) {
1594 handle_refs(submodule, revs, *flags, for_each_tag_ref_submodule);
1595 } else if (!strcmp(arg, "--remotes")) {
1596 handle_refs(submodule, revs, *flags, for_each_remote_ref_submodule);
1597 } else if ((argcount = parse_long_opt("glob", argv, &optarg))) {
1598 struct all_refs_cb cb;
1599 init_all_refs_cb(&cb, revs, *flags);
1600 for_each_glob_ref(handle_one_ref, optarg, &cb);
1601 return argcount;
1602 } else if (!prefixcmp(arg, "--branches=")) {
1603 struct all_refs_cb cb;
1604 init_all_refs_cb(&cb, revs, *flags);
1605 for_each_glob_ref_in(handle_one_ref, arg + 11, "refs/heads/", &cb);
1606 } else if (!prefixcmp(arg, "--tags=")) {
1607 struct all_refs_cb cb;
1608 init_all_refs_cb(&cb, revs, *flags);
1609 for_each_glob_ref_in(handle_one_ref, arg + 7, "refs/tags/", &cb);
1610 } else if (!prefixcmp(arg, "--remotes=")) {
1611 struct all_refs_cb cb;
1612 init_all_refs_cb(&cb, revs, *flags);
1613 for_each_glob_ref_in(handle_one_ref, arg + 10, "refs/remotes/", &cb);
1614 } else if (!strcmp(arg, "--reflog")) {
1615 handle_reflog(revs, *flags);
1616 } else if (!strcmp(arg, "--not")) {
1617 *flags ^= UNINTERESTING;
1618 } else if (!strcmp(arg, "--no-walk")) {
1619 revs->no_walk = 1;
1620 } else if (!strcmp(arg, "--do-walk")) {
1621 revs->no_walk = 0;
1622 } else {
1623 return 0;
1624 }
1625
1626 return 1;
1627}
1628
ae563542
LT
1629/*
1630 * Parse revision information, filling in the "rev_info" structure,
1631 * and removing the used arguments from the argument list.
1632 *
765ac8ec
LT
1633 * Returns the number of arguments left that weren't recognized
1634 * (which are also moved to the head of the argument list)
ae563542 1635 */
32962c9b 1636int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *opt)
ae563542 1637{
8fcaca3f 1638 int i, flags, left, seen_dashdash, read_from_stdin, got_rev_arg = 0;
4da5af31 1639 struct cmdline_pathspec prune_data;
9ef6aeb0
HV
1640 const char *submodule = NULL;
1641
4da5af31 1642 memset(&prune_data, 0, sizeof(prune_data));
9ef6aeb0
HV
1643 if (opt)
1644 submodule = opt->submodule;
ae563542 1645
ae563542
LT
1646 /* First, search for "--" */
1647 seen_dashdash = 0;
1648 for (i = 1; i < argc; i++) {
1649 const char *arg = argv[i];
1650 if (strcmp(arg, "--"))
1651 continue;
1652 argv[i] = NULL;
1653 argc = i;
a65f2005 1654 if (argv[i + 1])
4da5af31 1655 append_prune_data(&prune_data, argv + i + 1);
ae563542
LT
1656 seen_dashdash = 1;
1657 break;
1658 }
1659
02e54220
PH
1660 /* Second, deal with arguments and options */
1661 flags = 0;
8b3dce56 1662 read_from_stdin = 0;
02e54220 1663 for (left = i = 1; i < argc; i++) {
ae563542 1664 const char *arg = argv[i];
ae563542 1665 if (*arg == '-') {
cd2bdc53 1666 int opts;
02e54220 1667
f6aca0dc
JN
1668 opts = handle_revision_pseudo_opt(submodule,
1669 revs, argc - i, argv + i,
1670 &flags);
1671 if (opts > 0) {
1672 i += opts - 1;
8e64006e
JS
1673 continue;
1674 }
f6aca0dc 1675
8b3dce56
JH
1676 if (!strcmp(arg, "--stdin")) {
1677 if (revs->disable_stdin) {
1678 argv[left++] = arg;
1679 continue;
1680 }
1681 if (read_from_stdin++)
1682 die("--stdin given twice?");
60da8b15 1683 read_revisions_from_stdin(revs, &prune_data);
8b3dce56
JH
1684 continue;
1685 }
2d10c555 1686
02e54220 1687 opts = handle_revision_opt(revs, argc - i, argv + i, &left, argv);
cd2bdc53 1688 if (opts > 0) {
cd2bdc53
LT
1689 i += opts - 1;
1690 continue;
1691 }
02e54220
PH
1692 if (opts < 0)
1693 exit(128);
ae563542
LT
1694 continue;
1695 }
ae563542 1696
5d6f0935
JH
1697 if (handle_revision_arg(arg, revs, flags, seen_dashdash)) {
1698 int j;
1699 if (seen_dashdash || *arg == '^')
ae563542
LT
1700 die("bad revision '%s'", arg);
1701
ea92f41f
JH
1702 /* If we didn't have a "--":
1703 * (1) all filenames must exist;
1704 * (2) all rev-args must not be interpretable
1705 * as a valid filename.
1706 * but the latter we have checked in the main loop.
1707 */
e23d0b4a
LT
1708 for (j = i; j < argc; j++)
1709 verify_filename(revs->prefix, argv[j]);
1710
60da8b15 1711 append_prune_data(&prune_data, argv + i);
ae563542
LT
1712 break;
1713 }
8fcaca3f
DO
1714 else
1715 got_rev_arg = 1;
ae563542 1716 }
5d6f0935 1717
4da5af31 1718 if (prune_data.nr) {
93e7d672
JH
1719 /*
1720 * If we need to introduce the magic "a lone ':' means no
1721 * pathspec whatsoever", here is the place to do so.
1722 *
1723 * if (prune_data.nr == 1 && !strcmp(prune_data[0], ":")) {
1724 * prune_data.nr = 0;
1725 * prune_data.alloc = 0;
1726 * free(prune_data.path);
1727 * prune_data.path = NULL;
1728 * } else {
1729 * terminate prune_data.alloc with NULL and
1730 * call init_pathspec() to set revs->prune_data here.
1731 * }
1732 */
4da5af31
JH
1733 ALLOC_GROW(prune_data.path, prune_data.nr+1, prune_data.alloc);
1734 prune_data.path[prune_data.nr++] = NULL;
8f2d4b19
JH
1735 init_pathspec(&revs->prune_data,
1736 get_pathspec(revs->prefix, prune_data.path));
4da5af31 1737 }
5486ef0e 1738
02e54220 1739 if (revs->def == NULL)
32962c9b 1740 revs->def = opt ? opt->def : NULL;
b4490059
JH
1741 if (opt && opt->tweak)
1742 opt->tweak(revs, opt);
02e54220 1743 if (revs->show_merge)
ae3e5e1e 1744 prepare_show_merge(revs);
8fcaca3f 1745 if (revs->def && !revs->pending.nr && !got_rev_arg) {
ae563542 1746 unsigned char sha1[20];
cd2bdc53 1747 struct object *object;
bb6c2fba 1748 unsigned mode;
02e54220
PH
1749 if (get_sha1_with_mode(revs->def, sha1, &mode))
1750 die("bad default revision '%s'", revs->def);
1751 object = get_reference(revs, revs->def, sha1, 0);
1752 add_pending_object_with_mode(revs, object, revs->def, mode);
ae563542 1753 }
8efdc326 1754
b7bb760d
LT
1755 /* Did the user ask for any diff output? Run the diff! */
1756 if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT)
1757 revs->diff = 1;
1758
0faf2da7
AL
1759 /* Pickaxe, diff-filter and rename following need diffs */
1760 if (revs->diffopt.pickaxe ||
1761 revs->diffopt.filter ||
1762 DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
b7bb760d
LT
1763 revs->diff = 1;
1764
9dad9d2e 1765 if (revs->topo_order)
53069686
JH
1766 revs->limited = 1;
1767
afe069d1
NTND
1768 if (revs->prune_data.nr) {
1769 diff_tree_setup_paths(revs->prune_data.raw, &revs->pruning);
750f7b66 1770 /* Can't prune commits with rename following: the paths change.. */
8f67f8ae 1771 if (!DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
53b2c823 1772 revs->prune = 1;
cd2bdc53 1773 if (!revs->full_diff)
afe069d1 1774 diff_tree_setup_paths(revs->prune_data.raw, &revs->diffopt);
8efdc326 1775 }
b4490059 1776 if (revs->combine_merges)
cd2bdc53 1777 revs->ignore_merges = 0;
cd2bdc53 1778 revs->diffopt.abbrev = revs->abbrev;
72ee96c0
JH
1779 if (diff_setup_done(&revs->diffopt) < 0)
1780 die("diff_setup_done failed");
8efdc326 1781
0843acfd 1782 compile_grep_patterns(&revs->grep_filter);
bd95fcd3 1783
d56651c0
SP
1784 if (revs->reverse && revs->reflog_info)
1785 die("cannot combine --reverse with --walk-reflogs");
8bb65883 1786 if (revs->rewrite_parents && revs->children.name)
f35f5603 1787 die("cannot combine --parents and --children");
d56651c0 1788
7fefda5c
AS
1789 /*
1790 * Limitations on the graph functionality
1791 */
1792 if (revs->reverse && revs->graph)
1793 die("cannot combine --reverse with --graph");
1794
1795 if (revs->reflog_info && revs->graph)
1796 die("cannot combine --walk-reflogs with --graph");
1797
ae563542
LT
1798 return left;
1799}
a4a88b2b 1800
f35f5603
JH
1801static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child)
1802{
1803 struct commit_list *l = xcalloc(1, sizeof(*l));
1804
1805 l->item = child;
1806 l->next = add_decoration(&revs->children, &parent->object, l);
1807}
1808
6546b593
JH
1809static int remove_duplicate_parents(struct commit *commit)
1810{
1811 struct commit_list **pp, *p;
1812 int surviving_parents;
1813
1814 /* Examine existing parents while marking ones we have seen... */
1815 pp = &commit->parents;
1816 while ((p = *pp) != NULL) {
1817 struct commit *parent = p->item;
1818 if (parent->object.flags & TMP_MARK) {
1819 *pp = p->next;
1820 continue;
1821 }
1822 parent->object.flags |= TMP_MARK;
1823 pp = &p->next;
1824 }
1825 /* count them while clearing the temporary mark */
1826 surviving_parents = 0;
1827 for (p = commit->parents; p; p = p->next) {
1828 p->item->object.flags &= ~TMP_MARK;
1829 surviving_parents++;
1830 }
1831 return surviving_parents;
1832}
1833
faf0156b
JH
1834struct merge_simplify_state {
1835 struct commit *simplified;
1836};
1837
1838static struct merge_simplify_state *locate_simplify_state(struct rev_info *revs, struct commit *commit)
1839{
1840 struct merge_simplify_state *st;
1841
1842 st = lookup_decoration(&revs->merge_simplification, &commit->object);
1843 if (!st) {
1844 st = xcalloc(1, sizeof(*st));
1845 add_decoration(&revs->merge_simplification, &commit->object, st);
1846 }
1847 return st;
1848}
1849
1850static struct commit_list **simplify_one(struct rev_info *revs, struct commit *commit, struct commit_list **tail)
6546b593
JH
1851{
1852 struct commit_list *p;
faf0156b 1853 struct merge_simplify_state *st, *pst;
6546b593
JH
1854 int cnt;
1855
faf0156b
JH
1856 st = locate_simplify_state(revs, commit);
1857
6546b593 1858 /*
6546b593
JH
1859 * Have we handled this one?
1860 */
faf0156b 1861 if (st->simplified)
6546b593
JH
1862 return tail;
1863
1864 /*
1865 * An UNINTERESTING commit simplifies to itself, so does a
1866 * root commit. We do not rewrite parents of such commit
1867 * anyway.
1868 */
1869 if ((commit->object.flags & UNINTERESTING) || !commit->parents) {
faf0156b 1870 st->simplified = commit;
6546b593
JH
1871 return tail;
1872 }
1873
1874 /*
1875 * Do we know what commit all of our parents should be rewritten to?
1876 * Otherwise we are not ready to rewrite this one yet.
1877 */
1878 for (cnt = 0, p = commit->parents; p; p = p->next) {
faf0156b
JH
1879 pst = locate_simplify_state(revs, p->item);
1880 if (!pst->simplified) {
6546b593
JH
1881 tail = &commit_list_insert(p->item, tail)->next;
1882 cnt++;
1883 }
1884 }
53030f8d
JH
1885 if (cnt) {
1886 tail = &commit_list_insert(commit, tail)->next;
6546b593 1887 return tail;
53030f8d 1888 }
6546b593
JH
1889
1890 /*
1891 * Rewrite our list of parents.
1892 */
faf0156b
JH
1893 for (p = commit->parents; p; p = p->next) {
1894 pst = locate_simplify_state(revs, p->item);
1895 p->item = pst->simplified;
1896 }
6546b593
JH
1897 cnt = remove_duplicate_parents(commit);
1898
1899 /*
1900 * It is possible that we are a merge and one side branch
1901 * does not have any commit that touches the given paths;
1902 * in such a case, the immediate parents will be rewritten
1903 * to different commits.
1904 *
1905 * o----X X: the commit we are looking at;
1906 * / / o: a commit that touches the paths;
1907 * ---o----'
1908 *
1909 * Further reduce the parents by removing redundant parents.
1910 */
1911 if (1 < cnt) {
1912 struct commit_list *h = reduce_heads(commit->parents);
1913 cnt = commit_list_count(h);
1914 free_commit_list(commit->parents);
1915 commit->parents = h;
1916 }
1917
1918 /*
1919 * A commit simplifies to itself if it is a root, if it is
1920 * UNINTERESTING, if it touches the given paths, or if it is a
1921 * merge and its parents simplifies to more than one commits
1922 * (the first two cases are already handled at the beginning of
1923 * this function).
1924 *
1925 * Otherwise, it simplifies to what its sole parent simplifies to.
1926 */
1927 if (!cnt ||
1928 (commit->object.flags & UNINTERESTING) ||
1929 !(commit->object.flags & TREESAME) ||
1930 (1 < cnt))
faf0156b
JH
1931 st->simplified = commit;
1932 else {
1933 pst = locate_simplify_state(revs, commit->parents->item);
1934 st->simplified = pst->simplified;
1935 }
6546b593
JH
1936 return tail;
1937}
1938
1939static void simplify_merges(struct rev_info *revs)
1940{
1941 struct commit_list *list;
1942 struct commit_list *yet_to_do, **tail;
1943
5eac739e
JH
1944 if (!revs->topo_order)
1945 sort_in_topological_order(&revs->commits, revs->lifo);
1946 if (!revs->prune)
1947 return;
65347030 1948
6546b593
JH
1949 /* feed the list reversed */
1950 yet_to_do = NULL;
1951 for (list = revs->commits; list; list = list->next)
1952 commit_list_insert(list->item, &yet_to_do);
1953 while (yet_to_do) {
1954 list = yet_to_do;
1955 yet_to_do = NULL;
1956 tail = &yet_to_do;
1957 while (list) {
1958 struct commit *commit = list->item;
1959 struct commit_list *next = list->next;
1960 free(list);
1961 list = next;
faf0156b 1962 tail = simplify_one(revs, commit, tail);
6546b593
JH
1963 }
1964 }
1965
1966 /* clean up the result, removing the simplified ones */
1967 list = revs->commits;
1968 revs->commits = NULL;
1969 tail = &revs->commits;
1970 while (list) {
1971 struct commit *commit = list->item;
1972 struct commit_list *next = list->next;
faf0156b 1973 struct merge_simplify_state *st;
6546b593
JH
1974 free(list);
1975 list = next;
faf0156b
JH
1976 st = locate_simplify_state(revs, commit);
1977 if (st->simplified == commit)
6546b593
JH
1978 tail = &commit_list_insert(commit, tail)->next;
1979 }
6546b593
JH
1980}
1981
f35f5603
JH
1982static void set_children(struct rev_info *revs)
1983{
1984 struct commit_list *l;
1985 for (l = revs->commits; l; l = l->next) {
1986 struct commit *commit = l->item;
1987 struct commit_list *p;
1988
1989 for (p = commit->parents; p; p = p->next)
1990 add_child(revs, p->item, commit);
1991 }
1992}
1993
cc0e6c5a 1994int prepare_revision_walk(struct rev_info *revs)
a4a88b2b 1995{
1f1e895f 1996 int nr = revs->pending.nr;
94d23673 1997 struct object_array_entry *e, *list;
cd2bdc53 1998
94d23673 1999 e = list = revs->pending.objects;
1f1e895f
LT
2000 revs->pending.nr = 0;
2001 revs->pending.alloc = 0;
2002 revs->pending.objects = NULL;
2003 while (--nr >= 0) {
94d23673 2004 struct commit *commit = handle_commit(revs, e->item, e->name);
cd2bdc53
LT
2005 if (commit) {
2006 if (!(commit->object.flags & SEEN)) {
2007 commit->object.flags |= SEEN;
47e44ed1 2008 commit_list_insert_by_date(commit, &revs->commits);
cd2bdc53
LT
2009 }
2010 }
94d23673 2011 e++;
cd2bdc53 2012 }
94d23673 2013 free(list);
cd2bdc53 2014
ba1d4505 2015 if (revs->no_walk)
cc0e6c5a 2016 return 0;
a4a88b2b 2017 if (revs->limited)
cc0e6c5a
AR
2018 if (limit_list(revs) < 0)
2019 return -1;
a4a88b2b 2020 if (revs->topo_order)
23c17d4a 2021 sort_in_topological_order(&revs->commits, revs->lifo);
6546b593
JH
2022 if (revs->simplify_merges)
2023 simplify_merges(revs);
f35f5603
JH
2024 if (revs->children.name)
2025 set_children(revs);
cc0e6c5a 2026 return 0;
a4a88b2b
LT
2027}
2028
cc0e6c5a
AR
2029enum rewrite_result {
2030 rewrite_one_ok,
2031 rewrite_one_noparents,
4b05548f 2032 rewrite_one_error
cc0e6c5a
AR
2033};
2034
2035static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)
765ac8ec 2036{
fce87ae5
AG
2037 struct commit_list *cache = NULL;
2038
765ac8ec
LT
2039 for (;;) {
2040 struct commit *p = *pp;
3381c790 2041 if (!revs->limited)
fce87ae5 2042 if (add_parents_to_list(revs, p, &revs->commits, &cache) < 0)
cc0e6c5a 2043 return rewrite_one_error;
6631c736 2044 if (p->parents && p->parents->next)
cc0e6c5a 2045 return rewrite_one_ok;
7dc0fe3b
LT
2046 if (p->object.flags & UNINTERESTING)
2047 return rewrite_one_ok;
2048 if (!(p->object.flags & TREESAME))
cc0e6c5a 2049 return rewrite_one_ok;
765ac8ec 2050 if (!p->parents)
cc0e6c5a 2051 return rewrite_one_noparents;
765ac8ec
LT
2052 *pp = p->parents->item;
2053 }
2054}
2055
cc0e6c5a 2056static int rewrite_parents(struct rev_info *revs, struct commit *commit)
765ac8ec
LT
2057{
2058 struct commit_list **pp = &commit->parents;
2059 while (*pp) {
2060 struct commit_list *parent = *pp;
cc0e6c5a
AR
2061 switch (rewrite_one(revs, &parent->item)) {
2062 case rewrite_one_ok:
2063 break;
2064 case rewrite_one_noparents:
765ac8ec
LT
2065 *pp = parent->next;
2066 continue;
cc0e6c5a
AR
2067 case rewrite_one_error:
2068 return -1;
765ac8ec
LT
2069 }
2070 pp = &parent->next;
2071 }
11d65967 2072 remove_duplicate_parents(commit);
cc0e6c5a 2073 return 0;
765ac8ec
LT
2074}
2075
8ecae9b0
JH
2076static int commit_match(struct commit *commit, struct rev_info *opt)
2077{
80235ba7 2078 if (!opt->grep_filter.pattern_list && !opt->grep_filter.header_list)
8ecae9b0 2079 return 1;
0843acfd 2080 return grep_buffer(&opt->grep_filter,
2d10c555
JH
2081 NULL, /* we say nothing, not even filename */
2082 commit->buffer, strlen(commit->buffer));
8ecae9b0
JH
2083}
2084
f35f5603
JH
2085static inline int want_ancestry(struct rev_info *revs)
2086{
8bb65883 2087 return (revs->rewrite_parents || revs->children.name);
f35f5603
JH
2088}
2089
beb5af43 2090enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit)
252a7c02
LT
2091{
2092 if (commit->object.flags & SHOWN)
2093 return commit_ignore;
4d6acb70 2094 if (revs->unpacked && has_sha1_pack(commit->object.sha1))
252a7c02 2095 return commit_ignore;
3131b713
LT
2096 if (revs->show_all)
2097 return commit_show;
252a7c02
LT
2098 if (commit->object.flags & UNINTERESTING)
2099 return commit_ignore;
2100 if (revs->min_age != -1 && (commit->date > revs->min_age))
2101 return commit_ignore;
ad5aeede
MG
2102 if (revs->min_parents || (revs->max_parents >= 0)) {
2103 int n = 0;
2104 struct commit_list *p;
2105 for (p = commit->parents; p; p = p->next)
2106 n++;
2107 if ((n < revs->min_parents) ||
2108 ((revs->max_parents >= 0) && (n > revs->max_parents)))
2109 return commit_ignore;
2110 }
252a7c02
LT
2111 if (!commit_match(commit, revs))
2112 return commit_ignore;
53b2c823 2113 if (revs->prune && revs->dense) {
252a7c02 2114 /* Commit without changes? */
7dc0fe3b 2115 if (commit->object.flags & TREESAME) {
252a7c02 2116 /* drop merges unless we want parenthood */
f35f5603 2117 if (!want_ancestry(revs))
252a7c02
LT
2118 return commit_ignore;
2119 /* non-merge - always ignore it */
2120 if (!commit->parents || !commit->parents->next)
2121 return commit_ignore;
2122 }
252a7c02
LT
2123 }
2124 return commit_show;
2125}
2126
beb5af43
AS
2127enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
2128{
2129 enum commit_action action = get_commit_action(revs, commit);
2130
2131 if (action == commit_show &&
2132 !revs->show_all &&
2133 revs->prune && revs->dense && want_ancestry(revs)) {
2134 if (rewrite_parents(revs, commit) < 0)
2135 return commit_error;
2136 }
2137 return action;
2138}
2139
d5db6c9e 2140static struct commit *get_revision_1(struct rev_info *revs)
a4a88b2b 2141{
d5db6c9e 2142 if (!revs->commits)
a4a88b2b 2143 return NULL;
a4a88b2b 2144
765ac8ec 2145 do {
cb115748
LT
2146 struct commit_list *entry = revs->commits;
2147 struct commit *commit = entry->item;
ea5ed3ab 2148
cb115748
LT
2149 revs->commits = entry->next;
2150 free(entry);
2a0925be 2151
ffa1eeae 2152 if (revs->reflog_info) {
8860fd42 2153 fake_reflog_parent(revs->reflog_info, commit);
ffa1eeae
JK
2154 commit->object.flags &= ~(ADDED | SEEN | SHOWN);
2155 }
8860fd42 2156
2a0925be
LT
2157 /*
2158 * If we haven't done the list limiting, we need to look at
be7db6e5
LT
2159 * the parents here. We also need to do the date-based limiting
2160 * that we'd otherwise have done in limit_list().
2a0925be 2161 */
be7db6e5 2162 if (!revs->limited) {
744f4985 2163 if (revs->max_age != -1 &&
86ab4906
JH
2164 (commit->date < revs->max_age))
2165 continue;
fce87ae5 2166 if (add_parents_to_list(revs, commit, &revs->commits, NULL) < 0)
ed62089c
JH
2167 die("Failed to traverse parents of commit %s",
2168 sha1_to_hex(commit->object.sha1));
be7db6e5 2169 }
744f4985 2170
252a7c02
LT
2171 switch (simplify_commit(revs, commit)) {
2172 case commit_ignore:
8ecae9b0 2173 continue;
252a7c02 2174 case commit_error:
ed62089c
JH
2175 die("Failed to simplify parents of commit %s",
2176 sha1_to_hex(commit->object.sha1));
252a7c02
LT
2177 default:
2178 return commit;
384e99a4 2179 }
765ac8ec
LT
2180 } while (revs->commits);
2181 return NULL;
2182}
d5db6c9e 2183
86ab4906
JH
2184static void gc_boundary(struct object_array *array)
2185{
2186 unsigned nr = array->nr;
2187 unsigned alloc = array->alloc;
2188 struct object_array_entry *objects = array->objects;
2189
2190 if (alloc <= nr) {
2191 unsigned i, j;
2192 for (i = j = 0; i < nr; i++) {
2193 if (objects[i].item->flags & SHOWN)
2194 continue;
2195 if (i != j)
2196 objects[j] = objects[i];
2197 j++;
2198 }
892ae6bf 2199 for (i = j; i < nr; i++)
86ab4906
JH
2200 objects[i].item = NULL;
2201 array->nr = j;
2202 }
2203}
2204
4603ec0f
AS
2205static void create_boundary_commit_list(struct rev_info *revs)
2206{
2207 unsigned i;
2208 struct commit *c;
2209 struct object_array *array = &revs->boundary_commits;
2210 struct object_array_entry *objects = array->objects;
2211
2212 /*
2213 * If revs->commits is non-NULL at this point, an error occurred in
2214 * get_revision_1(). Ignore the error and continue printing the
2215 * boundary commits anyway. (This is what the code has always
2216 * done.)
2217 */
2218 if (revs->commits) {
2219 free_commit_list(revs->commits);
2220 revs->commits = NULL;
2221 }
2222
2223 /*
2224 * Put all of the actual boundary commits from revs->boundary_commits
2225 * into revs->commits
2226 */
2227 for (i = 0; i < array->nr; i++) {
2228 c = (struct commit *)(objects[i].item);
2229 if (!c)
2230 continue;
2231 if (!(c->object.flags & CHILD_SHOWN))
2232 continue;
2233 if (c->object.flags & (SHOWN | BOUNDARY))
2234 continue;
2235 c->object.flags |= BOUNDARY;
2236 commit_list_insert(c, &revs->commits);
2237 }
2238
2239 /*
2240 * If revs->topo_order is set, sort the boundary commits
2241 * in topological order
2242 */
2243 sort_in_topological_order(&revs->commits, revs->lifo);
2244}
2245
7fefda5c 2246static struct commit *get_revision_internal(struct rev_info *revs)
d5db6c9e
JH
2247{
2248 struct commit *c = NULL;
86ab4906
JH
2249 struct commit_list *l;
2250
2251 if (revs->boundary == 2) {
4603ec0f
AS
2252 /*
2253 * All of the normal commits have already been returned,
2254 * and we are now returning boundary commits.
2255 * create_boundary_commit_list() has populated
2256 * revs->commits with the remaining commits to return.
2257 */
2258 c = pop_commit(&revs->commits);
2259 if (c)
2260 c->object.flags |= SHOWN;
9c5e66e9
JS
2261 return c;
2262 }
2263
86ab4906
JH
2264 /*
2265 * Now pick up what they want to give us
2266 */
8839ac94
JH
2267 c = get_revision_1(revs);
2268 if (c) {
2269 while (0 < revs->skip_count) {
2270 revs->skip_count--;
2271 c = get_revision_1(revs);
2272 if (!c)
2273 break;
2274 }
86ab4906
JH
2275 }
2276
2277 /*
2278 * Check the max_count.
2279 */
d5db6c9e
JH
2280 switch (revs->max_count) {
2281 case -1:
2282 break;
2283 case 0:
86ab4906
JH
2284 c = NULL;
2285 break;
d5db6c9e
JH
2286 default:
2287 revs->max_count--;
2288 }
86ab4906 2289
c33d8593
JH
2290 if (c)
2291 c->object.flags |= SHOWN;
2292
2293 if (!revs->boundary) {
d5db6c9e 2294 return c;
c33d8593 2295 }
86ab4906
JH
2296
2297 if (!c) {
2298 /*
2299 * get_revision_1() runs out the commits, and
2300 * we are done computing the boundaries.
2301 * switch to boundary commits output mode.
2302 */
2303 revs->boundary = 2;
4603ec0f
AS
2304
2305 /*
2306 * Update revs->commits to contain the list of
2307 * boundary commits.
2308 */
2309 create_boundary_commit_list(revs);
2310
3c68d67b 2311 return get_revision_internal(revs);
86ab4906
JH
2312 }
2313
2314 /*
2315 * boundary commits are the commits that are parents of the
2316 * ones we got from get_revision_1() but they themselves are
2317 * not returned from get_revision_1(). Before returning
2318 * 'c', we need to mark its parents that they could be boundaries.
2319 */
2320
2321 for (l = c->parents; l; l = l->next) {
2322 struct object *p;
2323 p = &(l->item->object);
c33d8593 2324 if (p->flags & (CHILD_SHOWN | SHOWN))
86ab4906
JH
2325 continue;
2326 p->flags |= CHILD_SHOWN;
2327 gc_boundary(&revs->boundary_commits);
2328 add_object_array(p, NULL, &revs->boundary_commits);
2329 }
2330
2331 return c;
d5db6c9e 2332}
7fefda5c
AS
2333
2334struct commit *get_revision(struct rev_info *revs)
2335{
498bcd31
TR
2336 struct commit *c;
2337 struct commit_list *reversed;
2338
2339 if (revs->reverse) {
2340 reversed = NULL;
2341 while ((c = get_revision_internal(revs))) {
2342 commit_list_insert(c, &reversed);
2343 }
2344 revs->commits = reversed;
2345 revs->reverse = 0;
2346 revs->reverse_output_stage = 1;
2347 }
2348
2349 if (revs->reverse_output_stage)
2350 return pop_commit(&revs->commits);
2351
2352 c = get_revision_internal(revs);
7fefda5c
AS
2353 if (c && revs->graph)
2354 graph_update(revs->graph, c);
2355 return c;
2356}
1df2d656
MG
2357
2358char *get_revision_mark(const struct rev_info *revs, const struct commit *commit)
2359{
2360 if (commit->object.flags & BOUNDARY)
2361 return "-";
2362 else if (commit->object.flags & UNINTERESTING)
2363 return "^";
adbbb31e
MG
2364 else if (commit->object.flags & PATCHSAME)
2365 return "=";
1df2d656
MG
2366 else if (!revs || revs->left_right) {
2367 if (commit->object.flags & SYMMETRIC_LEFT)
2368 return "<";
2369 else
2370 return ">";
2371 } else if (revs->graph)
2372 return "*";
adbbb31e
MG
2373 else if (revs->cherry_mark)
2374 return "+";
1df2d656
MG
2375 return "";
2376}
b1b47554
MG
2377
2378void put_revision_mark(const struct rev_info *revs, const struct commit *commit)
2379{
2380 char *mark = get_revision_mark(revs, commit);
2381 if (!strlen(mark))
2382 return;
2383 fputs(mark, stdout);
2384 putchar(' ');
2385}