blob: 75dda928ea6be1dacd2fbeba5c0ce207ea46dd25 [file] [log] [blame]
Linus Torvaldsae563542006-02-25 16:19:46 -08001#include "cache.h"
2#include "tag.h"
3#include "blob.h"
4#include "tree.h"
5#include "commit.h"
Linus Torvaldsa4a88b22006-02-28 11:24:00 -08006#include "diff.h"
Linus Torvaldsae563542006-02-25 16:19:46 -08007#include "refs.h"
8#include "revision.h"
Adam Simpkins7fefda52008-05-04 03:36:54 -07009#include "graph.h"
Junio C Hamano8ecae9b2006-09-17 15:43:40 -070010#include "grep.h"
Johannes Schindelin8860fd42007-01-11 11:47:48 +010011#include "reflog-walk.h"
Junio C Hamanod7a17ca2007-04-09 03:40:38 -070012#include "patch-ids.h"
Junio C Hamanof35f5602008-04-03 02:12:06 -070013#include "decorate.h"
Linus Torvalds78892e32008-11-03 11:25:46 -080014#include "log-tree.h"
Thomas Rast894a9d32010-03-12 18:04:26 +010015#include "string-list.h"
Thomas Rast12da1d12013-03-28 17:47:32 +010016#include "line-log.h"
Antoine Pelissed72fbe82013-01-05 22:26:45 +010017#include "mailmap.h"
Thomas Rast53d00b32013-07-31 22:13:20 +020018#include "commit-slab.h"
Nguyễn Thái Ngọc Duy429bb402014-01-24 20:40:28 +070019#include "dir.h"
Jeff King4fe10212014-10-16 20:44:23 -040020#include "cache-tree.h"
Linus Torvaldsae563542006-02-25 16:19:46 -080021
Linus Torvaldscdcefbc2007-11-03 11:11:10 -070022volatile show_early_output_fn_t show_early_output;
23
Linus Torvaldscf2ab912009-04-10 18:15:26 -070024char *path_name(const struct name_path *path, const char *name)
Linus Torvaldsae563542006-02-25 16:19:46 -080025{
Linus Torvaldscf2ab912009-04-10 18:15:26 -070026 const struct name_path *p;
Linus Torvaldsae563542006-02-25 16:19:46 -080027 char *n, *m;
28 int nlen = strlen(name);
29 int len = nlen + 1;
30
31 for (p = path; p; p = p->up) {
32 if (p->elem_len)
33 len += p->elem_len + 1;
34 }
35 n = xmalloc(len);
36 m = n + len - (nlen + 1);
37 strcpy(m, name);
38 for (p = path; p; p = p->up) {
39 if (p->elem_len) {
40 m -= p->elem_len + 1;
41 memcpy(m, p->elem, p->elem_len);
42 m[p->elem_len] = '/';
43 }
44 }
45 return n;
46}
47
Junio C Hamanobeba25a2011-08-17 14:30:35 -070048static int show_path_component_truncated(FILE *out, const char *name, int len)
49{
50 int cnt;
51 for (cnt = 0; cnt < len; cnt++) {
52 int ch = name[cnt];
53 if (!ch || ch == '\n')
54 return -1;
55 fputc(ch, out);
56 }
57 return len;
58}
59
60static int show_path_truncated(FILE *out, const struct name_path *path)
61{
62 int emitted, ours;
63
64 if (!path)
65 return 0;
66 emitted = show_path_truncated(out, path->up);
67 if (emitted < 0)
68 return emitted;
69 if (emitted)
70 fputc('/', out);
71 ours = show_path_component_truncated(out, path->elem, path->elem_len);
72 if (ours < 0)
73 return ours;
74 return ours || emitted;
75}
76
Michael Haggertyff5f5f22013-05-25 11:08:07 +020077void show_object_with_name(FILE *out, struct object *obj,
78 const struct name_path *path, const char *component)
Junio C Hamano91f17512011-08-17 14:30:34 -070079{
Junio C Hamanobeba25a2011-08-17 14:30:35 -070080 struct name_path leaf;
81 leaf.up = (struct name_path *)path;
82 leaf.elem = component;
83 leaf.elem_len = strlen(component);
Junio C Hamano91f17512011-08-17 14:30:34 -070084
Junio C Hamanobeba25a2011-08-17 14:30:35 -070085 fprintf(out, "%s ", sha1_to_hex(obj->sha1));
86 show_path_truncated(out, &leaf);
87 fputc('\n', out);
Junio C Hamano91f17512011-08-17 14:30:34 -070088}
89
Linus Torvaldsae563542006-02-25 16:19:46 -080090static void mark_blob_uninteresting(struct blob *blob)
91{
Martin Koeglerc1ee9012008-02-18 21:47:54 +010092 if (!blob)
93 return;
Linus Torvaldsae563542006-02-25 16:19:46 -080094 if (blob->object.flags & UNINTERESTING)
95 return;
96 blob->object.flags |= UNINTERESTING;
97}
98
Junio C Hamano2ac5e442014-01-15 15:38:01 -080099static void mark_tree_contents_uninteresting(struct tree *tree)
Linus Torvaldsae563542006-02-25 16:19:46 -0800100{
Linus Torvaldsf75e53e2006-05-29 12:20:14 -0700101 struct tree_desc desc;
Linus Torvalds4c068a92006-05-30 09:45:45 -0700102 struct name_entry entry;
Linus Torvaldsae563542006-02-25 16:19:46 -0800103 struct object *obj = &tree->object;
Linus Torvaldsae563542006-02-25 16:19:46 -0800104
Linus Torvaldsae563542006-02-25 16:19:46 -0800105 if (!has_sha1_file(obj->sha1))
106 return;
107 if (parse_tree(tree) < 0)
108 die("bad tree %s", sha1_to_hex(obj->sha1));
Linus Torvaldsf75e53e2006-05-29 12:20:14 -0700109
Linus Torvalds6fda5e52007-03-21 10:08:25 -0700110 init_tree_desc(&desc, tree->buffer, tree->size);
Linus Torvalds4c068a92006-05-30 09:45:45 -0700111 while (tree_entry(&desc, &entry)) {
Linus Torvalds4d1012c2007-11-11 23:35:23 +0000112 switch (object_type(entry.mode)) {
113 case OBJ_TREE:
Linus Torvalds4c068a92006-05-30 09:45:45 -0700114 mark_tree_uninteresting(lookup_tree(entry.sha1));
Linus Torvalds4d1012c2007-11-11 23:35:23 +0000115 break;
116 case OBJ_BLOB:
Linus Torvalds4c068a92006-05-30 09:45:45 -0700117 mark_blob_uninteresting(lookup_blob(entry.sha1));
Linus Torvalds4d1012c2007-11-11 23:35:23 +0000118 break;
119 default:
120 /* Subproject commit - not in this repository */
121 break;
122 }
Linus Torvaldsae563542006-02-25 16:19:46 -0800123 }
Linus Torvaldsf75e53e2006-05-29 12:20:14 -0700124
125 /*
126 * We don't care about the tree any more
127 * after it has been marked uninteresting.
128 */
Jeff King6e454b92013-06-05 18:37:39 -0400129 free_tree_buffer(tree);
Linus Torvaldsae563542006-02-25 16:19:46 -0800130}
131
Junio C Hamano2ac5e442014-01-15 15:38:01 -0800132void mark_tree_uninteresting(struct tree *tree)
133{
134 struct object *obj = &tree->object;
135
136 if (!tree)
137 return;
138 if (obj->flags & UNINTERESTING)
139 return;
140 obj->flags |= UNINTERESTING;
141 mark_tree_contents_uninteresting(tree);
Linus Torvaldsae563542006-02-25 16:19:46 -0800142}
143
144void mark_parents_uninteresting(struct commit *commit)
145{
Nguyễn Thái Ngọc Duy941ba8d2012-01-14 19:19:53 +0700146 struct commit_list *parents = NULL, *l;
147
148 for (l = commit->parents; l; l = l->next)
149 commit_list_insert(l->item, &parents);
Linus Torvaldsae563542006-02-25 16:19:46 -0800150
151 while (parents) {
152 struct commit *commit = parents->item;
Nguyễn Thái Ngọc Duy941ba8d2012-01-14 19:19:53 +0700153 l = parents;
154 parents = parents->next;
155 free(l);
156
157 while (commit) {
158 /*
159 * A missing commit is ok iff its parent is marked
160 * uninteresting.
161 *
162 * We just mark such a thing parsed, so that when
163 * it is popped next time around, we won't be trying
164 * to parse it and get an error.
165 */
166 if (!has_sha1_file(commit->object.sha1))
167 commit->object.parsed = 1;
168
169 if (commit->object.flags & UNINTERESTING)
170 break;
171
Matthias Urlichsd2c4af72006-03-09 05:04:36 +0100172 commit->object.flags |= UNINTERESTING;
Linus Torvaldsae563542006-02-25 16:19:46 -0800173
Matthias Urlichsd2c4af72006-03-09 05:04:36 +0100174 /*
175 * Normally we haven't parsed the parent
176 * yet, so we won't have a parent of a parent
177 * here. However, it may turn out that we've
178 * reached this commit some other way (where it
179 * wasn't uninteresting), in which case we need
180 * to mark its parents recursively too..
181 */
Nguyễn Thái Ngọc Duy941ba8d2012-01-14 19:19:53 +0700182 if (!commit->parents)
183 break;
Linus Torvaldsae563542006-02-25 16:19:46 -0800184
Nguyễn Thái Ngọc Duy941ba8d2012-01-14 19:19:53 +0700185 for (l = commit->parents->next; l; l = l->next)
186 commit_list_insert(l->item, &parents);
187 commit = commit->parents->item;
188 }
Linus Torvaldsae563542006-02-25 16:19:46 -0800189 }
190}
191
Jeff King20739492014-10-15 18:43:19 -0400192static void add_pending_object_with_path(struct rev_info *revs,
Michael Haggertyff5f5f22013-05-25 11:08:07 +0200193 struct object *obj,
Jeff King20739492014-10-15 18:43:19 -0400194 const char *name, unsigned mode,
195 const char *path)
Martin Koeglerbb6c2fb2007-04-22 18:43:59 +0200196{
Junio C Hamanocc243c32011-05-18 18:08:09 -0700197 if (!obj)
198 return;
Linus Torvaldsaa27e462007-02-27 16:22:52 -0800199 if (revs->no_walk && (obj->flags & UNINTERESTING))
Linus Torvaldsf222abd2009-07-13 14:41:12 -0700200 revs->no_walk = 0;
Junio C Hamano105e4732010-01-26 13:48:28 -0800201 if (revs->reflog_info && obj->type == OBJ_COMMIT) {
202 struct strbuf buf = STRBUF_INIT;
Felipe Contrerascf99a762013-09-02 01:34:29 -0500203 int len = interpret_branch_name(name, 0, &buf);
Junio C Hamano105e4732010-01-26 13:48:28 -0800204 int st;
205
206 if (0 < len && name[len] && buf.len)
207 strbuf_addstr(&buf, name + len);
208 st = add_reflog_for_walk(revs->reflog_info,
209 (struct commit *)obj,
210 buf.buf[0] ? buf.buf: name);
211 strbuf_release(&buf);
212 if (st)
213 return;
214 }
Jeff King20739492014-10-15 18:43:19 -0400215 add_object_array_with_path(obj, name, &revs->pending, mode, path);
216}
217
218static void add_pending_object_with_mode(struct rev_info *revs,
219 struct object *obj,
220 const char *name, unsigned mode)
221{
222 add_pending_object_with_path(revs, obj, name, mode, NULL);
Linus Torvaldsae563542006-02-25 16:19:46 -0800223}
224
Michael Haggertyff5f5f22013-05-25 11:08:07 +0200225void add_pending_object(struct rev_info *revs,
226 struct object *obj, const char *name)
Junio C Hamano2d93b9f2007-06-08 02:24:58 -0700227{
228 add_pending_object_with_mode(revs, obj, name, S_IFINVALID);
229}
230
Junio C Hamano3384a2d2007-12-11 10:09:04 -0800231void add_head_to_pending(struct rev_info *revs)
232{
233 unsigned char sha1[20];
234 struct object *obj;
235 if (get_sha1("HEAD", sha1))
236 return;
237 obj = parse_object(sha1);
238 if (!obj)
239 return;
240 add_pending_object(revs, obj, "HEAD");
241}
242
Michael Haggertyff5f5f22013-05-25 11:08:07 +0200243static struct object *get_reference(struct rev_info *revs, const char *name,
244 const unsigned char *sha1,
245 unsigned int flags)
Linus Torvaldsae563542006-02-25 16:19:46 -0800246{
247 struct object *object;
248
249 object = parse_object(sha1);
Junio C Hamanocc243c32011-05-18 18:08:09 -0700250 if (!object) {
251 if (revs->ignore_missing)
252 return object;
Linus Torvaldsae563542006-02-25 16:19:46 -0800253 die("bad object %s", name);
Junio C Hamanocc243c32011-05-18 18:08:09 -0700254 }
Linus Torvaldscd2bdc52006-04-14 16:52:13 -0700255 object->flags |= flags;
256 return object;
257}
258
René Scharfe26c31772011-10-01 17:43:52 +0200259void add_pending_sha1(struct rev_info *revs, const char *name,
260 const unsigned char *sha1, unsigned int flags)
261{
262 struct object *object = get_reference(revs, name, sha1, flags);
263 add_pending_object(revs, object, name);
264}
265
Michael Haggertyff5f5f22013-05-25 11:08:07 +0200266static struct commit *handle_commit(struct rev_info *revs,
Jeff King20739492014-10-15 18:43:19 -0400267 struct object_array_entry *entry)
Linus Torvaldscd2bdc52006-04-14 16:52:13 -0700268{
Jeff King20739492014-10-15 18:43:19 -0400269 struct object *object = entry->item;
270 const char *name = entry->name;
271 const char *path = entry->path;
272 unsigned int mode = entry->mode;
Linus Torvaldscd2bdc52006-04-14 16:52:13 -0700273 unsigned long flags = object->flags;
Linus Torvaldsae563542006-02-25 16:19:46 -0800274
275 /*
276 * Tag object? Look what it points to..
277 */
Linus Torvalds19746322006-07-11 20:45:31 -0700278 while (object->type == OBJ_TAG) {
Linus Torvaldsae563542006-02-25 16:19:46 -0800279 struct tag *tag = (struct tag *) object;
Linus Torvaldscd2bdc52006-04-14 16:52:13 -0700280 if (revs->tag_objects && !(flags & UNINTERESTING))
Linus Torvaldsae563542006-02-25 16:19:46 -0800281 add_pending_object(revs, object, tag->tag);
Martin Koegler9684afd2008-02-18 21:48:01 +0100282 if (!tag->tagged)
283 die("bad tag");
Linus Torvaldsae563542006-02-25 16:19:46 -0800284 object = parse_object(tag->tagged->sha1);
Junio C Hamanoaeeae1b2009-01-27 23:19:30 -0800285 if (!object) {
286 if (flags & UNINTERESTING)
287 return NULL;
Linus Torvaldsae563542006-02-25 16:19:46 -0800288 die("bad object %s", sha1_to_hex(tag->tagged->sha1));
Junio C Hamanoaeeae1b2009-01-27 23:19:30 -0800289 }
Junio C Hamanoa7435282014-01-15 12:26:13 -0800290 object->flags |= flags;
Jeff King20739492014-10-15 18:43:19 -0400291 /*
292 * We'll handle the tagged object by looping or dropping
293 * through to the non-tag handlers below. Do not
294 * propagate data from the tag's pending entry.
295 */
296 name = "";
297 path = NULL;
298 mode = 0;
Linus Torvaldsae563542006-02-25 16:19:46 -0800299 }
300
301 /*
302 * Commit object? Just return it, we'll do all the complex
303 * reachability crud.
304 */
Linus Torvalds19746322006-07-11 20:45:31 -0700305 if (object->type == OBJ_COMMIT) {
Linus Torvaldsae563542006-02-25 16:19:46 -0800306 struct commit *commit = (struct commit *)object;
Linus Torvaldsae563542006-02-25 16:19:46 -0800307 if (parse_commit(commit) < 0)
308 die("unable to parse commit %s", name);
Linus Torvaldsd9a83682006-02-27 08:54:36 -0800309 if (flags & UNINTERESTING) {
Linus Torvaldsae563542006-02-25 16:19:46 -0800310 mark_parents_uninteresting(commit);
Linus Torvaldsd9a83682006-02-27 08:54:36 -0800311 revs->limited = 1;
312 }
Linus Torvalds0f3a2902008-10-27 12:51:59 -0700313 if (revs->show_source && !commit->util)
Jeff King1da1e072014-10-15 18:35:12 -0400314 commit->util = xstrdup(name);
Linus Torvaldsae563542006-02-25 16:19:46 -0800315 return commit;
316 }
317
318 /*
Mike Ralphson3ea3c212009-04-17 19:13:30 +0100319 * Tree object? Either mark it uninteresting, or add it
Linus Torvaldsae563542006-02-25 16:19:46 -0800320 * to the list of objects to look at later..
321 */
Linus Torvalds19746322006-07-11 20:45:31 -0700322 if (object->type == OBJ_TREE) {
Linus Torvaldsae563542006-02-25 16:19:46 -0800323 struct tree *tree = (struct tree *)object;
324 if (!revs->tree_objects)
325 return NULL;
326 if (flags & UNINTERESTING) {
Junio C Hamano2ac5e442014-01-15 15:38:01 -0800327 mark_tree_contents_uninteresting(tree);
Linus Torvaldsae563542006-02-25 16:19:46 -0800328 return NULL;
329 }
Jeff King20739492014-10-15 18:43:19 -0400330 add_pending_object_with_path(revs, object, name, mode, path);
Linus Torvaldsae563542006-02-25 16:19:46 -0800331 return NULL;
332 }
333
334 /*
335 * Blob object? You know the drill by now..
336 */
Linus Torvalds19746322006-07-11 20:45:31 -0700337 if (object->type == OBJ_BLOB) {
Linus Torvaldsae563542006-02-25 16:19:46 -0800338 if (!revs->blob_objects)
339 return NULL;
Junio C Hamanoa7435282014-01-15 12:26:13 -0800340 if (flags & UNINTERESTING)
Linus Torvaldsae563542006-02-25 16:19:46 -0800341 return NULL;
Jeff King20739492014-10-15 18:43:19 -0400342 add_pending_object_with_path(revs, object, name, mode, path);
Linus Torvaldsae563542006-02-25 16:19:46 -0800343 return NULL;
344 }
345 die("%s is unknown object", name);
346}
347
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800348static int everybody_uninteresting(struct commit_list *orig)
349{
350 struct commit_list *list = orig;
351 while (list) {
352 struct commit *commit = list->item;
353 list = list->next;
354 if (commit->object.flags & UNINTERESTING)
355 continue;
356 return 0;
357 }
358 return 1;
359}
360
Junio C Hamano0a4ba7f2007-03-14 13:12:18 -0700361/*
Kevin Bracey4d826602013-05-16 18:32:39 +0300362 * A definition of "relevant" commit that we can use to simplify limited graphs
363 * by eliminating side branches.
364 *
365 * A "relevant" commit is one that is !UNINTERESTING (ie we are including it
366 * in our list), or that is a specified BOTTOM commit. Then after computing
367 * a limited list, during processing we can generally ignore boundary merges
368 * coming from outside the graph, (ie from irrelevant parents), and treat
369 * those merges as if they were single-parent. TREESAME is defined to consider
370 * only relevant parents, if any. If we are TREESAME to our on-graph parents,
371 * we don't care if we were !TREESAME to non-graph parents.
372 *
373 * Treating bottom commits as relevant ensures that a limited graph's
374 * connection to the actual bottom commit is not viewed as a side branch, but
375 * treated as part of the graph. For example:
376 *
377 * ....Z...A---X---o---o---B
378 * . /
379 * W---Y
380 *
381 * When computing "A..B", the A-X connection is at least as important as
382 * Y-X, despite A being flagged UNINTERESTING.
383 *
384 * And when computing --ancestry-path "A..B", the A-X connection is more
385 * important than Y-X, despite both A and Y being flagged UNINTERESTING.
386 */
387static inline int relevant_commit(struct commit *commit)
388{
389 return (commit->object.flags & (UNINTERESTING | BOTTOM)) != UNINTERESTING;
390}
391
392/*
393 * Return a single relevant commit from a parent list. If we are a TREESAME
394 * commit, and this selects one of our parents, then we can safely simplify to
395 * that parent.
396 */
397static struct commit *one_relevant_parent(const struct rev_info *revs,
398 struct commit_list *orig)
399{
400 struct commit_list *list = orig;
401 struct commit *relevant = NULL;
402
403 if (!orig)
404 return NULL;
405
406 /*
407 * For 1-parent commits, or if first-parent-only, then return that
408 * first parent (even if not "relevant" by the above definition).
409 * TREESAME will have been set purely on that parent.
410 */
411 if (revs->first_parent_only || !orig->next)
412 return orig->item;
413
414 /*
415 * For multi-parent commits, identify a sole relevant parent, if any.
416 * If we have only one relevant parent, then TREESAME will be set purely
417 * with regard to that parent, and we can simplify accordingly.
418 *
419 * If we have more than one relevant parent, or no relevant parents
420 * (and multiple irrelevant ones), then we can't select a parent here
421 * and return NULL.
422 */
423 while (list) {
424 struct commit *commit = list->item;
425 list = list->next;
426 if (relevant_commit(commit)) {
427 if (relevant)
428 return NULL;
429 relevant = commit;
430 }
431 }
432 return relevant;
433}
434
435/*
Junio C Hamano0a4ba7f2007-03-14 13:12:18 -0700436 * The goal is to get REV_TREE_NEW as the result only if the
Linus Torvaldsceff8e72009-06-02 18:34:01 -0700437 * diff consists of all '+' (and no other changes), REV_TREE_OLD
438 * if the whole diff is removal of old data, and otherwise
439 * REV_TREE_DIFFERENT (of course if the trees are the same we
440 * want REV_TREE_SAME).
441 * That means that once we get to REV_TREE_DIFFERENT, we do not
442 * have to look any further.
Junio C Hamano0a4ba7f2007-03-14 13:12:18 -0700443 */
Fredrik Kuivinen8efdc322006-03-10 10:21:39 +0100444static int tree_difference = REV_TREE_SAME;
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800445
446static void file_add_remove(struct diff_options *options,
447 int addremove, unsigned mode,
448 const unsigned char *sha1,
Jeff Kinge5450102012-07-28 11:03:01 -0400449 int sha1_valid,
Jens Lehmanne3d42c42010-01-18 21:26:18 +0100450 const char *fullpath, unsigned dirty_submodule)
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800451{
Linus Torvaldsceff8e72009-06-02 18:34:01 -0700452 int diff = addremove == '+' ? REV_TREE_NEW : REV_TREE_OLD;
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800453
Linus Torvaldsceff8e72009-06-02 18:34:01 -0700454 tree_difference |= diff;
Junio C Hamanodd47aa32007-03-14 13:18:15 -0700455 if (tree_difference == REV_TREE_DIFFERENT)
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +0100456 DIFF_OPT_SET(options, HAS_CHANGES);
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800457}
458
459static void file_change(struct diff_options *options,
460 unsigned old_mode, unsigned new_mode,
461 const unsigned char *old_sha1,
462 const unsigned char *new_sha1,
Jeff Kinge5450102012-07-28 11:03:01 -0400463 int old_sha1_valid, int new_sha1_valid,
Jens Lehmanne3d42c42010-01-18 21:26:18 +0100464 const char *fullpath,
465 unsigned old_dirty_submodule, unsigned new_dirty_submodule)
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800466{
Fredrik Kuivinen8efdc322006-03-10 10:21:39 +0100467 tree_difference = REV_TREE_DIFFERENT;
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +0100468 DIFF_OPT_SET(options, HAS_CHANGES);
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800469}
470
Michael Haggertyff5f5f22013-05-25 11:08:07 +0200471static int rev_compare_tree(struct rev_info *revs,
472 struct commit *parent, struct commit *commit)
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800473{
Linus Torvalds3a5e8602008-11-03 10:45:41 -0800474 struct tree *t1 = parent->tree;
475 struct tree *t2 = commit->tree;
476
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800477 if (!t1)
Fredrik Kuivinen8efdc322006-03-10 10:21:39 +0100478 return REV_TREE_NEW;
Linus Torvaldsceff8e72009-06-02 18:34:01 -0700479 if (!t2)
480 return REV_TREE_OLD;
Linus Torvalds78892e32008-11-03 11:25:46 -0800481
482 if (revs->simplify_by_decoration) {
483 /*
484 * If we are simplifying by decoration, then the commit
485 * is worth showing if it has a tag pointing at it.
486 */
Jeff King2608c242014-08-26 06:23:54 -0400487 if (get_name_decoration(&commit->object))
Linus Torvalds78892e32008-11-03 11:25:46 -0800488 return REV_TREE_DIFFERENT;
489 /*
490 * A commit that is not pointed by a tag is uninteresting
491 * if we are not limited by path. This means that you will
492 * see the usual "commits that touch the paths" plus any
493 * tagged commit by specifying both --simplify-by-decoration
494 * and pathspec.
495 */
Nguyễn Thái Ngọc Duyafe069d2010-12-17 19:43:06 +0700496 if (!revs->prune_data.nr)
Linus Torvalds78892e32008-11-03 11:25:46 -0800497 return REV_TREE_SAME;
498 }
Linus Torvaldsceff8e72009-06-02 18:34:01 -0700499
Fredrik Kuivinen8efdc322006-03-10 10:21:39 +0100500 tree_difference = REV_TREE_SAME;
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +0100501 DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
Junio C Hamanoc4e05b12006-04-10 18:14:54 -0700502 if (diff_tree_sha1(t1->object.sha1, t2->object.sha1, "",
Linus Torvaldscd2bdc52006-04-14 16:52:13 -0700503 &revs->pruning) < 0)
Fredrik Kuivinen8efdc322006-03-10 10:21:39 +0100504 return REV_TREE_DIFFERENT;
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800505 return tree_difference;
506}
507
Linus Torvalds3a5e8602008-11-03 10:45:41 -0800508static int rev_same_tree_as_empty(struct rev_info *revs, struct commit *commit)
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800509{
510 int retval;
Linus Torvalds3a5e8602008-11-03 10:45:41 -0800511 struct tree *t1 = commit->tree;
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800512
513 if (!t1)
514 return 0;
515
Junio C Hamano0a4ba7f2007-03-14 13:12:18 -0700516 tree_difference = REV_TREE_SAME;
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +0100517 DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
Kirill Smelkov6275c912014-02-05 20:57:12 +0400518 retval = diff_tree_sha1(NULL, t1->object.sha1, "", &revs->pruning);
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800519
Junio C Hamano0a4ba7f2007-03-14 13:12:18 -0700520 return retval >= 0 && (tree_difference == REV_TREE_SAME);
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800521}
522
Kevin Braceyd0af6632013-05-16 18:32:34 +0300523struct treesame_state {
524 unsigned int nparents;
525 unsigned char treesame[FLEX_ARRAY];
526};
527
528static struct treesame_state *initialise_treesame(struct rev_info *revs, struct commit *commit)
529{
530 unsigned n = commit_list_count(commit->parents);
531 struct treesame_state *st = xcalloc(1, sizeof(*st) + n);
532 st->nparents = n;
533 add_decoration(&revs->treesame, &commit->object, st);
534 return st;
535}
536
537/*
538 * Must be called immediately after removing the nth_parent from a commit's
539 * parent list, if we are maintaining the per-parent treesame[] decoration.
540 * This does not recalculate the master TREESAME flag - update_treesame()
541 * should be called to update it after a sequence of treesame[] modifications
542 * that may have affected it.
543 */
544static int compact_treesame(struct rev_info *revs, struct commit *commit, unsigned nth_parent)
545{
546 struct treesame_state *st;
547 int old_same;
548
549 if (!commit->parents) {
550 /*
551 * Have just removed the only parent from a non-merge.
552 * Different handling, as we lack decoration.
553 */
554 if (nth_parent != 0)
555 die("compact_treesame %u", nth_parent);
556 old_same = !!(commit->object.flags & TREESAME);
557 if (rev_same_tree_as_empty(revs, commit))
558 commit->object.flags |= TREESAME;
559 else
560 commit->object.flags &= ~TREESAME;
561 return old_same;
562 }
563
564 st = lookup_decoration(&revs->treesame, &commit->object);
565 if (!st || nth_parent >= st->nparents)
566 die("compact_treesame %u", nth_parent);
567
568 old_same = st->treesame[nth_parent];
569 memmove(st->treesame + nth_parent,
570 st->treesame + nth_parent + 1,
571 st->nparents - nth_parent - 1);
572
573 /*
574 * If we've just become a non-merge commit, update TREESAME
575 * immediately, and remove the no-longer-needed decoration.
576 * If still a merge, defer update until update_treesame().
577 */
578 if (--st->nparents == 1) {
579 if (commit->parents->next)
580 die("compact_treesame parents mismatch");
581 if (st->treesame[0] && revs->dense)
582 commit->object.flags |= TREESAME;
583 else
584 commit->object.flags &= ~TREESAME;
585 free(add_decoration(&revs->treesame, &commit->object, NULL));
586 }
587
588 return old_same;
589}
590
591static unsigned update_treesame(struct rev_info *revs, struct commit *commit)
592{
593 if (commit->parents && commit->parents->next) {
594 unsigned n;
595 struct treesame_state *st;
Kevin Bracey4d826602013-05-16 18:32:39 +0300596 struct commit_list *p;
597 unsigned relevant_parents;
598 unsigned relevant_change, irrelevant_change;
Kevin Braceyd0af6632013-05-16 18:32:34 +0300599
600 st = lookup_decoration(&revs->treesame, &commit->object);
601 if (!st)
602 die("update_treesame %s", sha1_to_hex(commit->object.sha1));
Kevin Bracey4d826602013-05-16 18:32:39 +0300603 relevant_parents = 0;
604 relevant_change = irrelevant_change = 0;
605 for (p = commit->parents, n = 0; p; n++, p = p->next) {
606 if (relevant_commit(p->item)) {
607 relevant_change |= !st->treesame[n];
608 relevant_parents++;
609 } else
610 irrelevant_change |= !st->treesame[n];
Kevin Braceyd0af6632013-05-16 18:32:34 +0300611 }
Kevin Bracey4d826602013-05-16 18:32:39 +0300612 if (relevant_parents ? relevant_change : irrelevant_change)
613 commit->object.flags &= ~TREESAME;
614 else
615 commit->object.flags |= TREESAME;
Kevin Braceyd0af6632013-05-16 18:32:34 +0300616 }
617
618 return commit->object.flags & TREESAME;
619}
620
Kevin Bracey4d826602013-05-16 18:32:39 +0300621static inline int limiting_can_increase_treesame(const struct rev_info *revs)
622{
623 /*
624 * TREESAME is irrelevant unless prune && dense;
625 * if simplify_history is set, we can't have a mixture of TREESAME and
626 * !TREESAME INTERESTING parents (and we don't have treesame[]
627 * decoration anyway);
628 * if first_parent_only is set, then the TREESAME flag is locked
629 * against the first parent (and again we lack treesame[] decoration).
630 */
631 return revs->prune && revs->dense &&
632 !revs->simplify_history &&
633 !revs->first_parent_only;
634}
635
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800636static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
637{
638 struct commit_list **pp, *parent;
Kevin Braceyd0af6632013-05-16 18:32:34 +0300639 struct treesame_state *ts = NULL;
Kevin Bracey4d826602013-05-16 18:32:39 +0300640 int relevant_change = 0, irrelevant_change = 0;
641 int relevant_parents, nth_parent;
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800642
Linus Torvalds53b2c822007-11-05 13:22:34 -0800643 /*
644 * If we don't do pruning, everything is interesting
645 */
Linus Torvalds7dc0fe32007-11-12 23:16:08 -0800646 if (!revs->prune)
Linus Torvalds53b2c822007-11-05 13:22:34 -0800647 return;
Linus Torvalds53b2c822007-11-05 13:22:34 -0800648
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800649 if (!commit->tree)
650 return;
651
652 if (!commit->parents) {
Linus Torvalds3a5e8602008-11-03 10:45:41 -0800653 if (rev_same_tree_as_empty(revs, commit))
Linus Torvalds7dc0fe32007-11-12 23:16:08 -0800654 commit->object.flags |= TREESAME;
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800655 return;
656 }
657
Linus Torvalds53b2c822007-11-05 13:22:34 -0800658 /*
659 * Normal non-merge commit? If we don't want to make the
660 * history dense, we consider it always to be a change..
661 */
Linus Torvalds7dc0fe32007-11-12 23:16:08 -0800662 if (!revs->dense && !commit->parents->next)
Linus Torvalds53b2c822007-11-05 13:22:34 -0800663 return;
Linus Torvalds53b2c822007-11-05 13:22:34 -0800664
Kevin Bracey4d826602013-05-16 18:32:39 +0300665 for (pp = &commit->parents, nth_parent = 0, relevant_parents = 0;
Kevin Braceyd0af6632013-05-16 18:32:34 +0300666 (parent = *pp) != NULL;
667 pp = &parent->next, nth_parent++) {
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800668 struct commit *p = parent->item;
Kevin Bracey4d826602013-05-16 18:32:39 +0300669 if (relevant_commit(p))
670 relevant_parents++;
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800671
Kevin Braceyd0af6632013-05-16 18:32:34 +0300672 if (nth_parent == 1) {
673 /*
674 * This our second loop iteration - so we now know
675 * we're dealing with a merge.
676 *
677 * Do not compare with later parents when we care only about
678 * the first parent chain, in order to avoid derailing the
679 * traversal to follow a side branch that brought everything
680 * in the path we are limited to by the pathspec.
681 */
682 if (revs->first_parent_only)
683 break;
684 /*
685 * If this will remain a potentially-simplifiable
686 * merge, remember per-parent treesame if needed.
687 * Initialise the array with the comparison from our
688 * first iteration.
689 */
690 if (revs->treesame.name &&
691 !revs->simplify_history &&
692 !(commit->object.flags & UNINTERESTING)) {
693 ts = initialise_treesame(revs, commit);
Kevin Bracey4d826602013-05-16 18:32:39 +0300694 if (!(irrelevant_change || relevant_change))
Kevin Braceyd0af6632013-05-16 18:32:34 +0300695 ts->treesame[0] = 1;
696 }
697 }
Alex Riesencc0e6c52007-05-04 23:54:57 +0200698 if (parse_commit(p) < 0)
699 die("cannot simplify commit %s (because of %s)",
700 sha1_to_hex(commit->object.sha1),
701 sha1_to_hex(p->object.sha1));
Linus Torvalds3a5e8602008-11-03 10:45:41 -0800702 switch (rev_compare_tree(revs, p, commit)) {
Fredrik Kuivinen8efdc322006-03-10 10:21:39 +0100703 case REV_TREE_SAME:
Kevin Bracey141efdb2013-05-16 18:32:41 +0300704 if (!revs->simplify_history || !relevant_commit(p)) {
Junio C Hamanof3219fb2006-03-10 21:59:37 -0800705 /* Even if a merge with an uninteresting
706 * side branch brought the entire change
707 * we are interested in, we do not want
708 * to lose the other branches of this
709 * merge, so we just keep going.
710 */
Kevin Braceyd0af6632013-05-16 18:32:34 +0300711 if (ts)
712 ts->treesame[nth_parent] = 1;
Junio C Hamanof3219fb2006-03-10 21:59:37 -0800713 continue;
714 }
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800715 parent->next = NULL;
716 commit->parents = parent;
Linus Torvalds7dc0fe32007-11-12 23:16:08 -0800717 commit->object.flags |= TREESAME;
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800718 return;
719
Fredrik Kuivinen8efdc322006-03-10 10:21:39 +0100720 case REV_TREE_NEW:
721 if (revs->remove_empty_trees &&
Linus Torvalds3a5e8602008-11-03 10:45:41 -0800722 rev_same_tree_as_empty(revs, p)) {
Junio C Hamanoc348f312006-03-12 13:39:31 -0800723 /* We are adding all the specified
724 * paths from this parent, so the
725 * history beyond this parent is not
726 * interesting. Remove its parents
727 * (they are grandparents for us).
728 * IOW, we pretend this parent is a
729 * "root" commit.
Junio C Hamanoa41e1092006-03-12 13:39:31 -0800730 */
Alex Riesencc0e6c52007-05-04 23:54:57 +0200731 if (parse_commit(p) < 0)
732 die("cannot simplify commit %s (invalid %s)",
733 sha1_to_hex(commit->object.sha1),
734 sha1_to_hex(p->object.sha1));
Junio C Hamanoc348f312006-03-12 13:39:31 -0800735 p->parents = NULL;
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800736 }
737 /* fallthrough */
Linus Torvaldsceff8e72009-06-02 18:34:01 -0700738 case REV_TREE_OLD:
Fredrik Kuivinen8efdc322006-03-10 10:21:39 +0100739 case REV_TREE_DIFFERENT:
Kevin Bracey4d826602013-05-16 18:32:39 +0300740 if (relevant_commit(p))
741 relevant_change = 1;
742 else
743 irrelevant_change = 1;
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800744 continue;
745 }
746 die("bad tree compare for commit %s", sha1_to_hex(commit->object.sha1));
747 }
Kevin Bracey4d826602013-05-16 18:32:39 +0300748
749 /*
750 * TREESAME is straightforward for single-parent commits. For merge
751 * commits, it is most useful to define it so that "irrelevant"
752 * parents cannot make us !TREESAME - if we have any relevant
753 * parents, then we only consider TREESAMEness with respect to them,
754 * allowing irrelevant merges from uninteresting branches to be
755 * simplified away. Only if we have only irrelevant parents do we
756 * base TREESAME on them. Note that this logic is replicated in
757 * update_treesame, which should be kept in sync.
758 */
759 if (relevant_parents ? !relevant_change : !irrelevant_change)
760 commit->object.flags |= TREESAME;
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800761}
762
Thiago Farina47e44ed2010-11-26 23:58:14 -0200763static void commit_list_insert_by_date_cached(struct commit *p, struct commit_list **head,
Alexander N. Gavrilovfce87ae2008-07-12 22:00:57 +0400764 struct commit_list *cached_base, struct commit_list **cache)
765{
766 struct commit_list *new_entry;
767
768 if (cached_base && p->date < cached_base->item->date)
Thiago Farina47e44ed2010-11-26 23:58:14 -0200769 new_entry = commit_list_insert_by_date(p, &cached_base->next);
Alexander N. Gavrilovfce87ae2008-07-12 22:00:57 +0400770 else
Thiago Farina47e44ed2010-11-26 23:58:14 -0200771 new_entry = commit_list_insert_by_date(p, head);
Alexander N. Gavrilovfce87ae2008-07-12 22:00:57 +0400772
773 if (cache && (!*cache || p->date < (*cache)->item->date))
774 *cache = new_entry;
775}
776
777static int add_parents_to_list(struct rev_info *revs, struct commit *commit,
778 struct commit_list **list, struct commit_list **cache_ptr)
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800779{
780 struct commit_list *parent = commit->parents;
Junio C Hamano577ed5c2006-10-22 17:32:47 -0700781 unsigned left_flag;
Alexander N. Gavrilovfce87ae2008-07-12 22:00:57 +0400782 struct commit_list *cached_base = cache_ptr ? *cache_ptr : NULL;
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800783
Linus Torvalds3381c792006-04-08 17:05:58 -0700784 if (commit->object.flags & ADDED)
Alex Riesencc0e6c52007-05-04 23:54:57 +0200785 return 0;
Linus Torvalds3381c792006-04-08 17:05:58 -0700786 commit->object.flags |= ADDED;
787
Vicent Martia330de32013-10-24 14:01:41 -0400788 if (revs->include_check &&
789 !revs->include_check(commit, revs->include_check_data))
790 return 0;
791
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800792 /*
793 * If the commit is uninteresting, don't try to
794 * prune parents - we want the maximal uninteresting
795 * set.
796 *
797 * Normally we haven't parsed the parent
798 * yet, so we won't have a parent of a parent
799 * here. However, it may turn out that we've
800 * reached this commit some other way (where it
801 * wasn't uninteresting), in which case we need
802 * to mark its parents recursively too..
803 */
804 if (commit->object.flags & UNINTERESTING) {
805 while (parent) {
806 struct commit *p = parent->item;
807 parent = parent->next;
Junio C Hamanoaeeae1b2009-01-27 23:19:30 -0800808 if (p)
809 p->object.flags |= UNINTERESTING;
Alex Riesencc0e6c52007-05-04 23:54:57 +0200810 if (parse_commit(p) < 0)
Junio C Hamanoaeeae1b2009-01-27 23:19:30 -0800811 continue;
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800812 if (p->parents)
813 mark_parents_uninteresting(p);
814 if (p->object.flags & SEEN)
815 continue;
816 p->object.flags |= SEEN;
Thiago Farina47e44ed2010-11-26 23:58:14 -0200817 commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800818 }
Alex Riesencc0e6c52007-05-04 23:54:57 +0200819 return 0;
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800820 }
821
822 /*
823 * Ok, the commit wasn't uninteresting. Try to
824 * simplify the commit history and find the parent
825 * that has no differences in the path set if one exists.
826 */
Linus Torvalds53b2c822007-11-05 13:22:34 -0800827 try_to_simplify_commit(revs, commit);
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800828
Linus Torvaldsba1d4502006-04-15 12:09:56 -0700829 if (revs->no_walk)
Alex Riesencc0e6c52007-05-04 23:54:57 +0200830 return 0;
Linus Torvaldsba1d4502006-04-15 12:09:56 -0700831
Junio C Hamano577ed5c2006-10-22 17:32:47 -0700832 left_flag = (commit->object.flags & SYMMETRIC_LEFT);
Junio C Hamano0053e902007-03-13 01:57:22 -0700833
Stephen R. van den Bergd9c292e2008-04-27 19:32:46 +0200834 for (parent = commit->parents; parent; parent = parent->next) {
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800835 struct commit *p = parent->item;
836
Alex Riesencc0e6c52007-05-04 23:54:57 +0200837 if (parse_commit(p) < 0)
838 return -1;
Linus Torvalds0f3a2902008-10-27 12:51:59 -0700839 if (revs->show_source && !p->util)
840 p->util = commit->util;
Junio C Hamano577ed5c2006-10-22 17:32:47 -0700841 p->object.flags |= left_flag;
Lars Hjemliad1012e2008-05-12 17:12:36 +0200842 if (!(p->object.flags & SEEN)) {
843 p->object.flags |= SEEN;
Thiago Farina47e44ed2010-11-26 23:58:14 -0200844 commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
Lars Hjemliad1012e2008-05-12 17:12:36 +0200845 }
Junio C Hamano60d30b02008-07-31 22:17:13 -0700846 if (revs->first_parent_only)
Stephen R. van den Bergd9c292e2008-04-27 19:32:46 +0200847 break;
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800848 }
Alex Riesencc0e6c52007-05-04 23:54:57 +0200849 return 0;
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800850}
851
Johannes Schindelin36d56de2007-07-10 14:50:49 +0100852static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
Junio C Hamanod7a17ca2007-04-09 03:40:38 -0700853{
854 struct commit_list *p;
855 int left_count = 0, right_count = 0;
856 int left_first;
857 struct patch_ids ids;
Michael J Gruberadbbb312011-03-07 13:31:40 +0100858 unsigned cherry_flag;
Junio C Hamanod7a17ca2007-04-09 03:40:38 -0700859
860 /* First count the commits on the left and on the right */
861 for (p = list; p; p = p->next) {
862 struct commit *commit = p->item;
863 unsigned flags = commit->object.flags;
864 if (flags & BOUNDARY)
865 ;
866 else if (flags & SYMMETRIC_LEFT)
867 left_count++;
868 else
869 right_count++;
870 }
871
Thomas Rast36c07972010-02-20 12:42:04 +0100872 if (!left_count || !right_count)
873 return;
874
Junio C Hamanod7a17ca2007-04-09 03:40:38 -0700875 left_first = left_count < right_count;
876 init_patch_ids(&ids);
Nguyễn Thái Ngọc Duy66f13622010-12-15 22:02:38 +0700877 ids.diffopts.pathspec = revs->diffopt.pathspec;
Junio C Hamanod7a17ca2007-04-09 03:40:38 -0700878
879 /* Compute patch-ids for one side */
880 for (p = list; p; p = p->next) {
881 struct commit *commit = p->item;
882 unsigned flags = commit->object.flags;
883
884 if (flags & BOUNDARY)
885 continue;
886 /*
887 * If we have fewer left, left_first is set and we omit
888 * commits on the right branch in this loop. If we have
889 * fewer right, we skip the left ones.
890 */
891 if (left_first != !!(flags & SYMMETRIC_LEFT))
892 continue;
893 commit->util = add_commit_patch_id(commit, &ids);
894 }
895
Michael J Gruberadbbb312011-03-07 13:31:40 +0100896 /* either cherry_mark or cherry_pick are true */
897 cherry_flag = revs->cherry_mark ? PATCHSAME : SHOWN;
898
Junio C Hamanod7a17ca2007-04-09 03:40:38 -0700899 /* Check the other side */
900 for (p = list; p; p = p->next) {
901 struct commit *commit = p->item;
902 struct patch_id *id;
903 unsigned flags = commit->object.flags;
904
905 if (flags & BOUNDARY)
906 continue;
907 /*
908 * If we have fewer left, left_first is set and we omit
909 * commits on the left branch in this loop.
910 */
911 if (left_first == !!(flags & SYMMETRIC_LEFT))
912 continue;
913
914 /*
915 * Have we seen the same patch id?
916 */
917 id = has_commit_patch_id(commit, &ids);
918 if (!id)
919 continue;
920 id->seen = 1;
Michael J Gruberadbbb312011-03-07 13:31:40 +0100921 commit->object.flags |= cherry_flag;
Junio C Hamanod7a17ca2007-04-09 03:40:38 -0700922 }
923
924 /* Now check the original side for seen ones */
925 for (p = list; p; p = p->next) {
926 struct commit *commit = p->item;
927 struct patch_id *ent;
928
929 ent = commit->util;
930 if (!ent)
931 continue;
932 if (ent->seen)
Michael J Gruberadbbb312011-03-07 13:31:40 +0100933 commit->object.flags |= cherry_flag;
Junio C Hamanod7a17ca2007-04-09 03:40:38 -0700934 commit->util = NULL;
935 }
936
937 free_patch_ids(&ids);
938}
939
Linus Torvalds7d004192008-03-17 18:56:33 -0700940/* How many extra uninteresting commits we want to see.. */
941#define SLOP 5
942
943static int still_interesting(struct commit_list *src, unsigned long date, int slop)
Linus Torvalds3131b712008-02-09 14:02:07 -0800944{
Linus Torvalds7d004192008-03-17 18:56:33 -0700945 /*
946 * No source list at all? We're definitely done..
947 */
948 if (!src)
949 return 0;
950
951 /*
952 * Does the destination list contain entries with a date
953 * before the source list? Definitely _not_ done.
954 */
Kacper Kornetc19d1b42013-03-22 19:38:19 +0100955 if (date <= src->item->date)
Linus Torvalds7d004192008-03-17 18:56:33 -0700956 return SLOP;
957
958 /*
959 * Does the source list still have interesting commits in
960 * it? Definitely not done..
961 */
962 if (!everybody_uninteresting(src))
963 return SLOP;
964
965 /* Ok, we're closing in.. */
966 return slop-1;
Linus Torvalds3131b712008-02-09 14:02:07 -0800967}
968
Junio C Hamanoebdc94f2010-04-20 13:48:39 -0700969/*
970 * "rev-list --ancestry-path A..B" computes commits that are ancestors
971 * of B but not ancestors of A but further limits the result to those
972 * that are descendants of A. This takes the list of bottom commits and
973 * the result of "A..B" without --ancestry-path, and limits the latter
974 * further to the ones that can reach one of the commits in "bottom".
975 */
976static void limit_to_ancestry(struct commit_list *bottom, struct commit_list *list)
977{
978 struct commit_list *p;
979 struct commit_list *rlist = NULL;
980 int made_progress;
981
982 /*
983 * Reverse the list so that it will be likely that we would
984 * process parents before children.
985 */
986 for (p = list; p; p = p->next)
987 commit_list_insert(p->item, &rlist);
988
989 for (p = bottom; p; p = p->next)
990 p->item->object.flags |= TMP_MARK;
991
992 /*
993 * Mark the ones that can reach bottom commits in "list",
994 * in a bottom-up fashion.
995 */
996 do {
997 made_progress = 0;
998 for (p = rlist; p; p = p->next) {
999 struct commit *c = p->item;
1000 struct commit_list *parents;
1001 if (c->object.flags & (TMP_MARK | UNINTERESTING))
1002 continue;
1003 for (parents = c->parents;
1004 parents;
1005 parents = parents->next) {
1006 if (!(parents->item->object.flags & TMP_MARK))
1007 continue;
1008 c->object.flags |= TMP_MARK;
1009 made_progress = 1;
1010 break;
1011 }
1012 }
1013 } while (made_progress);
1014
1015 /*
1016 * NEEDSWORK: decide if we want to remove parents that are
1017 * not marked with TMP_MARK from commit->parents for commits
1018 * in the resulting list. We may not want to do that, though.
1019 */
1020
1021 /*
1022 * The ones that are not marked with TMP_MARK are uninteresting
1023 */
1024 for (p = list; p; p = p->next) {
1025 struct commit *c = p->item;
1026 if (c->object.flags & TMP_MARK)
1027 continue;
1028 c->object.flags |= UNINTERESTING;
1029 }
1030
1031 /* We are done with the TMP_MARK */
1032 for (p = list; p; p = p->next)
1033 p->item->object.flags &= ~TMP_MARK;
1034 for (p = bottom; p; p = p->next)
1035 p->item->object.flags &= ~TMP_MARK;
1036 free_commit_list(rlist);
1037}
1038
1039/*
1040 * Before walking the history, keep the set of "negative" refs the
1041 * caller has asked to exclude.
1042 *
1043 * This is used to compute "rev-list --ancestry-path A..B", as we need
1044 * to filter the result of "A..B" further to the ones that can actually
1045 * reach A.
1046 */
Kevin Bracey7f34a462013-05-16 18:32:38 +03001047static struct commit_list *collect_bottom_commits(struct commit_list *list)
Junio C Hamanoebdc94f2010-04-20 13:48:39 -07001048{
Kevin Bracey7f34a462013-05-16 18:32:38 +03001049 struct commit_list *elem, *bottom = NULL;
1050 for (elem = list; elem; elem = elem->next)
1051 if (elem->item->object.flags & BOTTOM)
1052 commit_list_insert(elem->item, &bottom);
Junio C Hamanoebdc94f2010-04-20 13:48:39 -07001053 return bottom;
1054}
1055
Michael J Gruber60adf7d2011-02-21 17:09:11 +01001056/* Assumes either left_only or right_only is set */
1057static void limit_left_right(struct commit_list *list, struct rev_info *revs)
1058{
1059 struct commit_list *p;
1060
1061 for (p = list; p; p = p->next) {
1062 struct commit *commit = p->item;
1063
1064 if (revs->right_only) {
1065 if (commit->object.flags & SYMMETRIC_LEFT)
1066 commit->object.flags |= SHOWN;
1067 } else /* revs->left_only is set */
1068 if (!(commit->object.flags & SYMMETRIC_LEFT))
1069 commit->object.flags |= SHOWN;
1070 }
1071}
1072
Alex Riesencc0e6c52007-05-04 23:54:57 +02001073static int limit_list(struct rev_info *revs)
Linus Torvaldsa4a88b22006-02-28 11:24:00 -08001074{
Linus Torvalds7d004192008-03-17 18:56:33 -07001075 int slop = SLOP;
1076 unsigned long date = ~0ul;
Linus Torvaldsa4a88b22006-02-28 11:24:00 -08001077 struct commit_list *list = revs->commits;
1078 struct commit_list *newlist = NULL;
1079 struct commit_list **p = &newlist;
Junio C Hamanoebdc94f2010-04-20 13:48:39 -07001080 struct commit_list *bottom = NULL;
1081
1082 if (revs->ancestry_path) {
Kevin Bracey7f34a462013-05-16 18:32:38 +03001083 bottom = collect_bottom_commits(list);
Junio C Hamanoebdc94f2010-04-20 13:48:39 -07001084 if (!bottom)
Johan Herland97b03c32010-06-04 01:17:36 +02001085 die("--ancestry-path given but there are no bottom commits");
Junio C Hamanoebdc94f2010-04-20 13:48:39 -07001086 }
Linus Torvaldsa4a88b22006-02-28 11:24:00 -08001087
1088 while (list) {
1089 struct commit_list *entry = list;
1090 struct commit *commit = list->item;
1091 struct object *obj = &commit->object;
Linus Torvaldscdcefbc2007-11-03 11:11:10 -07001092 show_early_output_fn_t show;
Linus Torvaldsa4a88b22006-02-28 11:24:00 -08001093
1094 list = list->next;
1095 free(entry);
1096
1097 if (revs->max_age != -1 && (commit->date < revs->max_age))
1098 obj->flags |= UNINTERESTING;
Alexander N. Gavrilovfce87ae2008-07-12 22:00:57 +04001099 if (add_parents_to_list(revs, commit, &list, NULL) < 0)
Alex Riesencc0e6c52007-05-04 23:54:57 +02001100 return -1;
Linus Torvaldsa4a88b22006-02-28 11:24:00 -08001101 if (obj->flags & UNINTERESTING) {
1102 mark_parents_uninteresting(commit);
Linus Torvalds7d004192008-03-17 18:56:33 -07001103 if (revs->show_all)
1104 p = &commit_list_insert(commit, p)->next;
1105 slop = still_interesting(list, date, slop);
1106 if (slop)
Linus Torvalds3131b712008-02-09 14:02:07 -08001107 continue;
Linus Torvalds7d004192008-03-17 18:56:33 -07001108 /* If showing all, add the whole pending list to the end */
1109 if (revs->show_all)
1110 *p = list;
1111 break;
Linus Torvaldsa4a88b22006-02-28 11:24:00 -08001112 }
1113 if (revs->min_age != -1 && (commit->date > revs->min_age))
1114 continue;
Linus Torvalds7d004192008-03-17 18:56:33 -07001115 date = commit->date;
Linus Torvaldsa4a88b22006-02-28 11:24:00 -08001116 p = &commit_list_insert(commit, p)->next;
Linus Torvaldscdcefbc2007-11-03 11:11:10 -07001117
1118 show = show_early_output;
1119 if (!show)
1120 continue;
1121
1122 show(revs, newlist);
1123 show_early_output = NULL;
Linus Torvaldsa4a88b22006-02-28 11:24:00 -08001124 }
Michael J Gruberadbbb312011-03-07 13:31:40 +01001125 if (revs->cherry_pick || revs->cherry_mark)
Johannes Schindelin36d56de2007-07-10 14:50:49 +01001126 cherry_pick_list(newlist, revs);
Junio C Hamanod7a17ca2007-04-09 03:40:38 -07001127
Michael J Gruber60adf7d2011-02-21 17:09:11 +01001128 if (revs->left_only || revs->right_only)
1129 limit_left_right(newlist, revs);
1130
Junio C Hamanoebdc94f2010-04-20 13:48:39 -07001131 if (bottom) {
1132 limit_to_ancestry(bottom, newlist);
1133 free_commit_list(bottom);
1134 }
1135
Kevin Bracey4d826602013-05-16 18:32:39 +03001136 /*
1137 * Check if any commits have become TREESAME by some of their parents
1138 * becoming UNINTERESTING.
1139 */
1140 if (limiting_can_increase_treesame(revs))
1141 for (list = newlist; list; list = list->next) {
1142 struct commit *c = list->item;
1143 if (c->object.flags & (UNINTERESTING | TREESAME))
1144 continue;
1145 update_treesame(revs, c);
1146 }
1147
Linus Torvaldsa4a88b22006-02-28 11:24:00 -08001148 revs->commits = newlist;
Alex Riesencc0e6c52007-05-04 23:54:57 +02001149 return 0;
Linus Torvaldsa4a88b22006-02-28 11:24:00 -08001150}
1151
Michael Haggertydf835d32013-05-25 11:08:02 +02001152/*
1153 * Add an entry to refs->cmdline with the specified information.
1154 * *name is copied.
1155 */
Junio C Hamano281eee42011-08-25 17:35:39 -07001156static void add_rev_cmdline(struct rev_info *revs,
1157 struct object *item,
1158 const char *name,
1159 int whence,
1160 unsigned flags)
1161{
1162 struct rev_cmdline_info *info = &revs->cmdline;
1163 int nr = info->nr;
1164
1165 ALLOC_GROW(info->rev, nr + 1, info->alloc);
1166 info->rev[nr].item = item;
Michael Haggertydf835d32013-05-25 11:08:02 +02001167 info->rev[nr].name = xstrdup(name);
Junio C Hamano281eee42011-08-25 17:35:39 -07001168 info->rev[nr].whence = whence;
1169 info->rev[nr].flags = flags;
1170 info->nr++;
1171}
1172
Kevin Braceya7654992013-05-13 18:00:47 +03001173static void add_rev_cmdline_list(struct rev_info *revs,
1174 struct commit_list *commit_list,
1175 int whence,
1176 unsigned flags)
1177{
1178 while (commit_list) {
1179 struct object *object = &commit_list->item->object;
1180 add_rev_cmdline(revs, object, sha1_to_hex(object->sha1),
1181 whence, flags);
1182 commit_list = commit_list->next;
1183 }
1184}
1185
Junio C Hamano63049292006-12-18 17:25:28 -08001186struct all_refs_cb {
1187 int all_flags;
Shawn O. Pearce71b03b42006-12-21 19:49:06 -05001188 int warned_bad_reflog;
Junio C Hamano63049292006-12-18 17:25:28 -08001189 struct rev_info *all_revs;
1190 const char *name_for_errormsg;
1191};
Linus Torvaldsae563542006-02-25 16:19:46 -08001192
Junio C Hamanoff32d342013-11-01 12:02:45 -07001193int ref_excluded(struct string_list *ref_excludes, const char *path)
Junio C Hamanoe7b432c2013-08-30 16:37:55 -07001194{
1195 struct string_list_item *item;
1196
Junio C Hamanoff32d342013-11-01 12:02:45 -07001197 if (!ref_excludes)
Junio C Hamanoe7b432c2013-08-30 16:37:55 -07001198 return 0;
Junio C Hamanoff32d342013-11-01 12:02:45 -07001199 for_each_string_list_item(item, ref_excludes) {
Nguyễn Thái Ngọc Duyeb078942014-02-15 09:01:46 +07001200 if (!wildmatch(item->string, path, 0, NULL))
Junio C Hamanoe7b432c2013-08-30 16:37:55 -07001201 return 1;
1202 }
1203 return 0;
1204}
1205
Junio C Hamano8da19772006-09-20 22:02:01 -07001206static int handle_one_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
Linus Torvaldsae563542006-02-25 16:19:46 -08001207{
Junio C Hamano63049292006-12-18 17:25:28 -08001208 struct all_refs_cb *cb = cb_data;
Junio C Hamanoe7b432c2013-08-30 16:37:55 -07001209 struct object *object;
1210
Junio C Hamanoff32d342013-11-01 12:02:45 -07001211 if (ref_excluded(cb->all_revs->ref_excludes, path))
Junio C Hamanoe7b432c2013-08-30 16:37:55 -07001212 return 0;
1213
1214 object = get_reference(cb->all_revs, path, sha1, cb->all_flags);
Junio C Hamano281eee42011-08-25 17:35:39 -07001215 add_rev_cmdline(cb->all_revs, object, path, REV_CMD_REF, cb->all_flags);
René Scharfe26c31772011-10-01 17:43:52 +02001216 add_pending_sha1(cb->all_revs, path, sha1, cb->all_flags);
Linus Torvaldsae563542006-02-25 16:19:46 -08001217 return 0;
1218}
1219
Ilari Liusvaarad08bae72010-01-20 11:48:25 +02001220static void init_all_refs_cb(struct all_refs_cb *cb, struct rev_info *revs,
1221 unsigned flags)
1222{
1223 cb->all_revs = revs;
1224 cb->all_flags = flags;
1225}
1226
Junio C Hamanoff32d342013-11-01 12:02:45 -07001227void clear_ref_exclusion(struct string_list **ref_excludes_p)
Junio C Hamanoe7b432c2013-08-30 16:37:55 -07001228{
Junio C Hamanoff32d342013-11-01 12:02:45 -07001229 if (*ref_excludes_p) {
1230 string_list_clear(*ref_excludes_p, 0);
1231 free(*ref_excludes_p);
Junio C Hamanoe7b432c2013-08-30 16:37:55 -07001232 }
Junio C Hamanoff32d342013-11-01 12:02:45 -07001233 *ref_excludes_p = NULL;
Junio C Hamanoe7b432c2013-08-30 16:37:55 -07001234}
1235
Junio C Hamanoff32d342013-11-01 12:02:45 -07001236void add_ref_exclusion(struct string_list **ref_excludes_p, const char *exclude)
Junio C Hamanoe7b432c2013-08-30 16:37:55 -07001237{
Junio C Hamanoff32d342013-11-01 12:02:45 -07001238 if (!*ref_excludes_p) {
1239 *ref_excludes_p = xcalloc(1, sizeof(**ref_excludes_p));
1240 (*ref_excludes_p)->strdup_strings = 1;
Junio C Hamanoe7b432c2013-08-30 16:37:55 -07001241 }
Junio C Hamanoff32d342013-11-01 12:02:45 -07001242 string_list_append(*ref_excludes_p, exclude);
Junio C Hamanoe7b432c2013-08-30 16:37:55 -07001243}
1244
Heiko Voigt9ef6aeb2010-07-07 15:39:12 +02001245static void handle_refs(const char *submodule, struct rev_info *revs, unsigned flags,
1246 int (*for_each)(const char *, each_ref_fn, void *))
Linus Torvaldsae563542006-02-25 16:19:46 -08001247{
Junio C Hamano63049292006-12-18 17:25:28 -08001248 struct all_refs_cb cb;
Ilari Liusvaarad08bae72010-01-20 11:48:25 +02001249 init_all_refs_cb(&cb, revs, flags);
Heiko Voigt9ef6aeb2010-07-07 15:39:12 +02001250 for_each(submodule, handle_one_ref, &cb);
Junio C Hamano63049292006-12-18 17:25:28 -08001251}
1252
Shawn O. Pearce71b03b42006-12-21 19:49:06 -05001253static void handle_one_reflog_commit(unsigned char *sha1, void *cb_data)
Junio C Hamano63049292006-12-18 17:25:28 -08001254{
1255 struct all_refs_cb *cb = cb_data;
Shawn O. Pearce71b03b42006-12-21 19:49:06 -05001256 if (!is_null_sha1(sha1)) {
1257 struct object *o = parse_object(sha1);
1258 if (o) {
1259 o->flags |= cb->all_flags;
Junio C Hamano281eee42011-08-25 17:35:39 -07001260 /* ??? CMDLINEFLAGS ??? */
Shawn O. Pearce71b03b42006-12-21 19:49:06 -05001261 add_pending_object(cb->all_revs, o, "");
1262 }
1263 else if (!cb->warned_bad_reflog) {
Theodore Ts'o46efd2d2007-03-30 19:07:05 -04001264 warning("reflog of '%s' references pruned commits",
Shawn O. Pearce71b03b42006-12-21 19:49:06 -05001265 cb->name_for_errormsg);
1266 cb->warned_bad_reflog = 1;
1267 }
Junio C Hamano63049292006-12-18 17:25:28 -08001268 }
Shawn O. Pearce71b03b42006-12-21 19:49:06 -05001269}
1270
Johannes Schindelin883d60f2007-01-08 01:59:54 +01001271static int handle_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
1272 const char *email, unsigned long timestamp, int tz,
1273 const char *message, void *cb_data)
Shawn O. Pearce71b03b42006-12-21 19:49:06 -05001274{
1275 handle_one_reflog_commit(osha1, cb_data);
1276 handle_one_reflog_commit(nsha1, cb_data);
Junio C Hamano63049292006-12-18 17:25:28 -08001277 return 0;
1278}
1279
1280static int handle_one_reflog(const char *path, const unsigned char *sha1, int flag, void *cb_data)
1281{
1282 struct all_refs_cb *cb = cb_data;
Shawn O. Pearce71b03b42006-12-21 19:49:06 -05001283 cb->warned_bad_reflog = 0;
Junio C Hamano63049292006-12-18 17:25:28 -08001284 cb->name_for_errormsg = path;
1285 for_each_reflog_ent(path, handle_one_reflog_ent, cb_data);
1286 return 0;
1287}
1288
Jeff King718ccc92014-10-15 18:38:31 -04001289void add_reflogs_to_pending(struct rev_info *revs, unsigned flags)
Junio C Hamano63049292006-12-18 17:25:28 -08001290{
1291 struct all_refs_cb cb;
1292 cb.all_revs = revs;
1293 cb.all_flags = flags;
Junio C Hamano25b51e22007-02-12 23:06:54 -08001294 for_each_reflog(handle_one_reflog, &cb);
Linus Torvaldsae563542006-02-25 16:19:46 -08001295}
1296
Jeff King4fe10212014-10-16 20:44:23 -04001297static void add_cache_tree(struct cache_tree *it, struct rev_info *revs,
1298 struct strbuf *path)
1299{
1300 size_t baselen = path->len;
1301 int i;
1302
1303 if (it->entry_count >= 0) {
1304 struct tree *tree = lookup_tree(it->sha1);
1305 add_pending_object_with_path(revs, &tree->object, "",
1306 040000, path->buf);
1307 }
1308
1309 for (i = 0; i < it->subtree_nr; i++) {
1310 struct cache_tree_sub *sub = it->down[i];
1311 strbuf_addf(path, "%s%s", baselen ? "/" : "", sub->name);
1312 add_cache_tree(sub->cache_tree, revs, path);
1313 strbuf_setlen(path, baselen);
1314 }
1315
1316}
1317
1318void add_index_objects_to_pending(struct rev_info *revs, unsigned flags)
1319{
1320 int i;
1321
1322 read_cache();
1323 for (i = 0; i < active_nr; i++) {
1324 struct cache_entry *ce = active_cache[i];
1325 struct blob *blob;
1326
1327 if (S_ISGITLINK(ce->ce_mode))
1328 continue;
1329
1330 blob = lookup_blob(ce->sha1);
1331 if (!blob)
1332 die("unable to add index blob to traversal");
1333 add_pending_object_with_path(revs, &blob->object, "",
1334 ce->ce_mode, ce->name);
1335 }
1336
1337 if (active_cache_tree) {
1338 struct strbuf path = STRBUF_INIT;
1339 add_cache_tree(active_cache_tree, revs, &path);
1340 strbuf_release(&path);
1341 }
1342}
1343
Junio C Hamano281eee42011-08-25 17:35:39 -07001344static int add_parents_only(struct rev_info *revs, const char *arg_, int flags)
Junio C Hamanoea4a19e2006-04-30 00:54:29 -07001345{
1346 unsigned char sha1[20];
1347 struct object *it;
1348 struct commit *commit;
1349 struct commit_list *parents;
Junio C Hamano281eee42011-08-25 17:35:39 -07001350 const char *arg = arg_;
Junio C Hamanoea4a19e2006-04-30 00:54:29 -07001351
1352 if (*arg == '^') {
Kevin Bracey7f34a462013-05-16 18:32:38 +03001353 flags ^= UNINTERESTING | BOTTOM;
Junio C Hamanoea4a19e2006-04-30 00:54:29 -07001354 arg++;
1355 }
Junio C Hamanocd74e472012-07-02 12:04:52 -07001356 if (get_sha1_committish(arg, sha1))
Junio C Hamanoea4a19e2006-04-30 00:54:29 -07001357 return 0;
1358 while (1) {
1359 it = get_reference(revs, arg, sha1, 0);
Junio C Hamanocc243c32011-05-18 18:08:09 -07001360 if (!it && revs->ignore_missing)
1361 return 0;
Linus Torvalds19746322006-07-11 20:45:31 -07001362 if (it->type != OBJ_TAG)
Junio C Hamanoea4a19e2006-04-30 00:54:29 -07001363 break;
Martin Koegler9684afd2008-02-18 21:48:01 +01001364 if (!((struct tag*)it)->tagged)
1365 return 0;
Shawn Pearcee7024962006-08-23 02:49:00 -04001366 hashcpy(sha1, ((struct tag*)it)->tagged->sha1);
Junio C Hamanoea4a19e2006-04-30 00:54:29 -07001367 }
Linus Torvalds19746322006-07-11 20:45:31 -07001368 if (it->type != OBJ_COMMIT)
Junio C Hamanoea4a19e2006-04-30 00:54:29 -07001369 return 0;
1370 commit = (struct commit *)it;
1371 for (parents = commit->parents; parents; parents = parents->next) {
1372 it = &parents->item->object;
1373 it->flags |= flags;
Junio C Hamano281eee42011-08-25 17:35:39 -07001374 add_rev_cmdline(revs, it, arg_, REV_CMD_PARENTS_ONLY, flags);
Junio C Hamanoea4a19e2006-04-30 00:54:29 -07001375 add_pending_object(revs, it, arg);
1376 }
1377 return 1;
1378}
1379
Linus Torvaldsdb6296a2006-07-28 21:21:48 -07001380void init_revisions(struct rev_info *revs, const char *prefix)
Fredrik Kuivinen8efdc322006-03-10 10:21:39 +01001381{
1382 memset(revs, 0, sizeof(*revs));
Junio C Hamano8e8f9982006-04-14 22:19:38 -07001383
Junio C Hamano6b9c58f2006-04-15 23:46:36 -07001384 revs->abbrev = DEFAULT_ABBREV;
Junio C Hamano8e8f9982006-04-14 22:19:38 -07001385 revs->ignore_merges = 1;
Linus Torvalds92024342006-06-11 10:57:35 -07001386 revs->simplify_history = 1;
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +01001387 DIFF_OPT_SET(&revs->pruning, RECURSIVE);
Junio C Hamano90b19942009-05-23 01:15:35 -07001388 DIFF_OPT_SET(&revs->pruning, QUICK);
Linus Torvaldscd2bdc52006-04-14 16:52:13 -07001389 revs->pruning.add_remove = file_add_remove;
1390 revs->pruning.change = file_change;
Junio C Hamano08f704f2013-06-06 16:07:14 -07001391 revs->sort_order = REV_SORT_IN_GRAPH_ORDER;
Fredrik Kuivinen8efdc322006-03-10 10:21:39 +01001392 revs->dense = 1;
Linus Torvaldsdb6296a2006-07-28 21:21:48 -07001393 revs->prefix = prefix;
Fredrik Kuivinen8efdc322006-03-10 10:21:39 +01001394 revs->max_age = -1;
1395 revs->min_age = -1;
Junio C Hamanod5db6c92006-12-19 18:25:32 -08001396 revs->skip_count = -1;
Fredrik Kuivinen8efdc322006-03-10 10:21:39 +01001397 revs->max_count = -1;
Michael J Gruberad5aeed2011-03-21 11:14:06 +01001398 revs->max_parents = -1;
Fredrik Kuivinen8efdc322006-03-10 10:21:39 +01001399
Linus Torvaldscd2bdc52006-04-14 16:52:13 -07001400 revs->commit_format = CMIT_FMT_DEFAULT;
1401
Junio C Hamano918d4e12012-10-09 16:40:03 -07001402 init_grep_defaults();
1403 grep_init(&revs->grep_filter, prefix);
Jeff King0843acf2008-08-25 02:15:05 -04001404 revs->grep_filter.status_only = 1;
Jeff King0843acf2008-08-25 02:15:05 -04001405 revs->grep_filter.regflags = REG_NEWLINE;
1406
Linus Torvaldscd2bdc52006-04-14 16:52:13 -07001407 diff_setup(&revs->diffopt);
Junio C Hamanoc0cb4a02008-02-13 00:34:39 -08001408 if (prefix && !revs->diffopt.prefix) {
Junio C Hamanocd676a52008-02-12 14:26:02 -08001409 revs->diffopt.prefix = prefix;
1410 revs->diffopt.prefix_length = strlen(prefix);
1411 }
Jeff King3a03cf62011-03-29 16:57:27 -04001412
1413 revs->notes_opt.use_default_notes = -1;
Fredrik Kuivinen8efdc322006-03-10 10:21:39 +01001414}
1415
Rene Scharfe0d2c9d62006-07-02 01:29:37 +02001416static void add_pending_commit_list(struct rev_info *revs,
1417 struct commit_list *commit_list,
1418 unsigned int flags)
1419{
1420 while (commit_list) {
1421 struct object *object = &commit_list->item->object;
1422 object->flags |= flags;
1423 add_pending_object(revs, object, sha1_to_hex(object->sha1));
1424 commit_list = commit_list->next;
1425 }
1426}
1427
Junio C Hamanoae3e5e12006-07-03 02:59:32 -07001428static void prepare_show_merge(struct rev_info *revs)
1429{
1430 struct commit_list *bases;
1431 struct commit *head, *other;
1432 unsigned char sha1[20];
1433 const char **prune = NULL;
1434 int i, prune_num = 1; /* counting terminating NULL */
1435
Nguyễn Thái Ngọc Duybaf18fc2011-09-17 21:57:45 +10001436 if (get_sha1("HEAD", sha1))
Junio C Hamanoae3e5e12006-07-03 02:59:32 -07001437 die("--merge without HEAD?");
Nguyễn Thái Ngọc Duybaf18fc2011-09-17 21:57:45 +10001438 head = lookup_commit_or_die(sha1, "HEAD");
1439 if (get_sha1("MERGE_HEAD", sha1))
Junio C Hamanoae3e5e12006-07-03 02:59:32 -07001440 die("--merge without MERGE_HEAD?");
Nguyễn Thái Ngọc Duybaf18fc2011-09-17 21:57:45 +10001441 other = lookup_commit_or_die(sha1, "MERGE_HEAD");
Junio C Hamanoae3e5e12006-07-03 02:59:32 -07001442 add_pending_object(revs, &head->object, "HEAD");
1443 add_pending_object(revs, &other->object, "MERGE_HEAD");
1444 bases = get_merge_bases(head, other, 1);
Kevin Bracey7f34a462013-05-16 18:32:38 +03001445 add_rev_cmdline_list(revs, bases, REV_CMD_MERGE_BASE, UNINTERESTING | BOTTOM);
1446 add_pending_commit_list(revs, bases, UNINTERESTING | BOTTOM);
Junio C Hamanoe82447b2008-02-26 23:18:38 -08001447 free_commit_list(bases);
1448 head->object.flags |= SYMMETRIC_LEFT;
Junio C Hamanoae3e5e12006-07-03 02:59:32 -07001449
1450 if (!active_nr)
1451 read_cache();
1452 for (i = 0; i < active_nr; i++) {
Nguyễn Thái Ngọc Duy9c5e6c82013-07-09 22:29:00 +07001453 const struct cache_entry *ce = active_cache[i];
Junio C Hamanoae3e5e12006-07-03 02:59:32 -07001454 if (!ce_stage(ce))
1455 continue;
Nguyễn Thái Ngọc Duy429bb402014-01-24 20:40:28 +07001456 if (ce_path_match(ce, &revs->prune_data, NULL)) {
Junio C Hamanoae3e5e12006-07-03 02:59:32 -07001457 prune_num++;
René Scharfe2756ca42014-09-16 20:56:57 +02001458 REALLOC_ARRAY(prune, prune_num);
Junio C Hamanoae3e5e12006-07-03 02:59:32 -07001459 prune[prune_num-2] = ce->name;
1460 prune[prune_num-1] = NULL;
1461 }
1462 while ((i+1 < active_nr) &&
1463 ce_same_name(ce, active_cache[i+1]))
1464 i++;
1465 }
Nguyễn Thái Ngọc Duyafe069d2010-12-17 19:43:06 +07001466 free_pathspec(&revs->prune_data);
Nguyễn Thái Ngọc Duy4a2d5ae2013-10-26 09:09:20 +07001467 parse_pathspec(&revs->prune_data, PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
Junio C Hamanoc6f1b922013-11-18 14:31:29 -08001468 PATHSPEC_PREFER_FULL | PATHSPEC_LITERAL_PATH, "", prune);
Junio C Hamanoe82447b2008-02-26 23:18:38 -08001469 revs->limited = 1;
Junio C Hamanoae3e5e12006-07-03 02:59:32 -07001470}
1471
Junio C Hamano8e676e82012-07-02 12:33:52 -07001472int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsigned revarg_opt)
Junio C Hamano5d6f0932006-09-05 21:28:36 -07001473{
Junio C Hamano249c8f42012-07-02 12:56:44 -07001474 struct object_context oc;
Junio C Hamano5d6f0932006-09-05 21:28:36 -07001475 char *dotdot;
1476 struct object *object;
1477 unsigned char sha1[20];
1478 int local_flags;
Junio C Hamano281eee42011-08-25 17:35:39 -07001479 const char *arg = arg_;
Junio C Hamano8e676e82012-07-02 12:33:52 -07001480 int cant_be_filename = revarg_opt & REVARG_CANNOT_BE_FILENAME;
Junio C Hamanod5f6b1d2012-07-02 12:43:05 -07001481 unsigned get_sha1_flags = 0;
Junio C Hamano5d6f0932006-09-05 21:28:36 -07001482
Kevin Bracey7f34a462013-05-16 18:32:38 +03001483 flags = flags & UNINTERESTING ? flags | BOTTOM : flags & ~BOTTOM;
1484
Junio C Hamano5d6f0932006-09-05 21:28:36 -07001485 dotdot = strstr(arg, "..");
1486 if (dotdot) {
1487 unsigned char from_sha1[20];
1488 const char *next = dotdot + 2;
1489 const char *this = arg;
1490 int symmetric = *next == '.';
Kevin Bracey7f34a462013-05-16 18:32:38 +03001491 unsigned int flags_exclude = flags ^ (UNINTERESTING | BOTTOM);
Junio C Hamano003c84f2011-05-02 13:39:16 -07001492 static const char head_by_default[] = "HEAD";
Junio C Hamano281eee42011-08-25 17:35:39 -07001493 unsigned int a_flags;
Junio C Hamano5d6f0932006-09-05 21:28:36 -07001494
1495 *dotdot = 0;
1496 next += symmetric;
1497
1498 if (!*next)
Junio C Hamano003c84f2011-05-02 13:39:16 -07001499 next = head_by_default;
Junio C Hamano5d6f0932006-09-05 21:28:36 -07001500 if (dotdot == arg)
Junio C Hamano003c84f2011-05-02 13:39:16 -07001501 this = head_by_default;
1502 if (this == head_by_default && next == head_by_default &&
1503 !symmetric) {
1504 /*
1505 * Just ".."? That is not a range but the
1506 * pathspec for the parent directory.
1507 */
1508 if (!cant_be_filename) {
1509 *dotdot = '.';
1510 return -1;
1511 }
1512 }
Junio C Hamanocd74e472012-07-02 12:04:52 -07001513 if (!get_sha1_committish(this, from_sha1) &&
1514 !get_sha1_committish(next, sha1)) {
Junio C Hamano895c5ba2013-09-19 14:20:34 -07001515 struct object *a_obj, *b_obj;
Junio C Hamano5d6f0932006-09-05 21:28:36 -07001516
1517 if (!cant_be_filename) {
1518 *dotdot = '.';
1519 verify_non_filename(revs->prefix, arg);
1520 }
1521
Junio C Hamano895c5ba2013-09-19 14:20:34 -07001522 a_obj = parse_object(from_sha1);
1523 b_obj = parse_object(sha1);
1524 if (!a_obj || !b_obj) {
1525 missing:
1526 if (revs->ignore_missing)
1527 return 0;
1528 die(symmetric
1529 ? "Invalid symmetric difference expression %s"
1530 : "Invalid revision range %s", arg);
1531 }
1532
1533 if (!symmetric) {
1534 /* just A..B */
1535 a_flags = flags_exclude;
1536 } else {
1537 /* A...B -- find merge bases between the two */
1538 struct commit *a, *b;
1539 struct commit_list *exclude;
1540
1541 a = (a_obj->type == OBJ_COMMIT
1542 ? (struct commit *)a_obj
1543 : lookup_commit_reference(a_obj->sha1));
1544 b = (b_obj->type == OBJ_COMMIT
1545 ? (struct commit *)b_obj
1546 : lookup_commit_reference(b_obj->sha1));
1547 if (!a || !b)
1548 goto missing;
Junio C Hamano5d6f0932006-09-05 21:28:36 -07001549 exclude = get_merge_bases(a, b, 1);
Kevin Braceya7654992013-05-13 18:00:47 +03001550 add_rev_cmdline_list(revs, exclude,
1551 REV_CMD_MERGE_BASE,
1552 flags_exclude);
Junio C Hamano5d6f0932006-09-05 21:28:36 -07001553 add_pending_commit_list(revs, exclude,
1554 flags_exclude);
1555 free_commit_list(exclude);
Junio C Hamano895c5ba2013-09-19 14:20:34 -07001556
Junio C Hamano281eee42011-08-25 17:35:39 -07001557 a_flags = flags | SYMMETRIC_LEFT;
Junio C Hamano895c5ba2013-09-19 14:20:34 -07001558 }
1559
1560 a_obj->flags |= a_flags;
1561 b_obj->flags |= flags;
1562 add_rev_cmdline(revs, a_obj, this,
Junio C Hamano281eee42011-08-25 17:35:39 -07001563 REV_CMD_LEFT, a_flags);
Junio C Hamano895c5ba2013-09-19 14:20:34 -07001564 add_rev_cmdline(revs, b_obj, next,
Junio C Hamano281eee42011-08-25 17:35:39 -07001565 REV_CMD_RIGHT, flags);
Junio C Hamano895c5ba2013-09-19 14:20:34 -07001566 add_pending_object(revs, a_obj, this);
1567 add_pending_object(revs, b_obj, next);
Junio C Hamano5d6f0932006-09-05 21:28:36 -07001568 return 0;
1569 }
1570 *dotdot = '.';
1571 }
1572 dotdot = strstr(arg, "^@");
1573 if (dotdot && !dotdot[2]) {
1574 *dotdot = 0;
1575 if (add_parents_only(revs, arg, flags))
1576 return 0;
1577 *dotdot = '^';
1578 }
Junio C Hamano62476c82006-10-31 14:22:34 -08001579 dotdot = strstr(arg, "^!");
1580 if (dotdot && !dotdot[2]) {
1581 *dotdot = 0;
Kevin Bracey7f34a462013-05-16 18:32:38 +03001582 if (!add_parents_only(revs, arg, flags ^ (UNINTERESTING | BOTTOM)))
Junio C Hamano62476c82006-10-31 14:22:34 -08001583 *dotdot = '^';
1584 }
1585
Junio C Hamano5d6f0932006-09-05 21:28:36 -07001586 local_flags = 0;
1587 if (*arg == '^') {
Kevin Bracey7f34a462013-05-16 18:32:38 +03001588 local_flags = UNINTERESTING | BOTTOM;
Junio C Hamano5d6f0932006-09-05 21:28:36 -07001589 arg++;
1590 }
Junio C Hamanod5f6b1d2012-07-02 12:43:05 -07001591
1592 if (revarg_opt & REVARG_COMMITTISH)
1593 get_sha1_flags = GET_SHA1_COMMITTISH;
1594
1595 if (get_sha1_with_context(arg, get_sha1_flags, sha1, &oc))
Junio C Hamanocc243c32011-05-18 18:08:09 -07001596 return revs->ignore_missing ? 0 : -1;
Junio C Hamano5d6f0932006-09-05 21:28:36 -07001597 if (!cant_be_filename)
1598 verify_non_filename(revs->prefix, arg);
1599 object = get_reference(revs, arg, sha1, flags ^ local_flags);
Junio C Hamano281eee42011-08-25 17:35:39 -07001600 add_rev_cmdline(revs, object, arg_, REV_CMD_REV, flags ^ local_flags);
Junio C Hamano249c8f42012-07-02 12:56:44 -07001601 add_pending_object_with_mode(revs, object, arg, oc.mode);
Junio C Hamano5d6f0932006-09-05 21:28:36 -07001602 return 0;
1603}
1604
Junio C Hamano4da5af32011-05-11 14:01:19 -07001605struct cmdline_pathspec {
1606 int alloc;
1607 int nr;
1608 const char **path;
1609};
1610
1611static void append_prune_data(struct cmdline_pathspec *prune, const char **av)
Adam Brewster1fc561d2008-07-05 17:26:39 -04001612{
Junio C Hamano4da5af32011-05-11 14:01:19 -07001613 while (*av) {
Felipe Contreras9e57ac52013-10-31 03:25:43 -06001614 ALLOC_GROW(prune->path, prune->nr + 1, prune->alloc);
Junio C Hamano4da5af32011-05-11 14:01:19 -07001615 prune->path[prune->nr++] = *(av++);
1616 }
1617}
Adam Brewster1fc561d2008-07-05 17:26:39 -04001618
Junio C Hamano4da5af32011-05-11 14:01:19 -07001619static void read_pathspec_from_stdin(struct rev_info *revs, struct strbuf *sb,
1620 struct cmdline_pathspec *prune)
1621{
Junio C Hamano60da8b12009-11-20 02:50:21 -08001622 while (strbuf_getwholeline(sb, stdin, '\n') != EOF) {
1623 int len = sb->len;
1624 if (len && sb->buf[len - 1] == '\n')
1625 sb->buf[--len] = '\0';
Felipe Contreras9e57ac52013-10-31 03:25:43 -06001626 ALLOC_GROW(prune->path, prune->nr + 1, prune->alloc);
Junio C Hamano4da5af32011-05-11 14:01:19 -07001627 prune->path[prune->nr++] = xstrdup(sb->buf);
Junio C Hamano60da8b12009-11-20 02:50:21 -08001628 }
Junio C Hamano60da8b12009-11-20 02:50:21 -08001629}
1630
Junio C Hamano4da5af32011-05-11 14:01:19 -07001631static void read_revisions_from_stdin(struct rev_info *revs,
1632 struct cmdline_pathspec *prune)
Adam Brewster1fc561d2008-07-05 17:26:39 -04001633{
Junio C Hamano63d564b2009-11-20 02:00:40 -08001634 struct strbuf sb;
Junio C Hamano60da8b12009-11-20 02:50:21 -08001635 int seen_dashdash = 0;
Jeff King4c30d502014-03-12 16:06:17 -04001636 int save_warning;
1637
1638 save_warning = warn_on_object_refname_ambiguity;
1639 warn_on_object_refname_ambiguity = 0;
Adam Brewster1fc561d2008-07-05 17:26:39 -04001640
Junio C Hamano63d564b2009-11-20 02:00:40 -08001641 strbuf_init(&sb, 1000);
1642 while (strbuf_getwholeline(&sb, stdin, '\n') != EOF) {
1643 int len = sb.len;
1644 if (len && sb.buf[len - 1] == '\n')
1645 sb.buf[--len] = '\0';
Adam Brewster1fc561d2008-07-05 17:26:39 -04001646 if (!len)
1647 break;
Junio C Hamano60da8b12009-11-20 02:50:21 -08001648 if (sb.buf[0] == '-') {
1649 if (len == 2 && sb.buf[1] == '-') {
1650 seen_dashdash = 1;
1651 break;
1652 }
Adam Brewster1fc561d2008-07-05 17:26:39 -04001653 die("options not supported in --stdin mode");
Junio C Hamano60da8b12009-11-20 02:50:21 -08001654 }
Michael Haggerty31faeb22013-05-25 11:08:14 +02001655 if (handle_revision_arg(sb.buf, revs, 0,
Thomas Rast70d26c62013-04-16 11:57:45 +02001656 REVARG_CANNOT_BE_FILENAME))
Junio C Hamano63d564b2009-11-20 02:00:40 -08001657 die("bad revision '%s'", sb.buf);
Adam Brewster1fc561d2008-07-05 17:26:39 -04001658 }
Junio C Hamano60da8b12009-11-20 02:50:21 -08001659 if (seen_dashdash)
1660 read_pathspec_from_stdin(revs, &sb, prune);
Jeff King4c30d502014-03-12 16:06:17 -04001661
Junio C Hamano63d564b2009-11-20 02:00:40 -08001662 strbuf_release(&sb);
Jeff King4c30d502014-03-12 16:06:17 -04001663 warn_on_object_refname_ambiguity = save_warning;
Adam Brewster1fc561d2008-07-05 17:26:39 -04001664}
1665
Junio C Hamano2d10c552006-09-20 13:21:56 -07001666static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
1667{
Jeff King0843acf2008-08-25 02:15:05 -04001668 append_grep_pattern(&revs->grep_filter, ptn, "command line", 0, what);
Junio C Hamano2d10c552006-09-20 13:21:56 -07001669}
1670
Junio C Hamanoa4d7d2c2008-09-04 22:15:02 -07001671static void add_header_grep(struct rev_info *revs, enum grep_header_field field, const char *pattern)
Junio C Hamanobd95fcd2006-09-17 17:23:20 -07001672{
Junio C Hamanoa4d7d2c2008-09-04 22:15:02 -07001673 append_header_grep_pattern(&revs->grep_filter, field, pattern);
Junio C Hamanobd95fcd2006-09-17 17:23:20 -07001674}
1675
1676static void add_message_grep(struct rev_info *revs, const char *pattern)
1677{
Junio C Hamano2d10c552006-09-20 13:21:56 -07001678 add_grep(revs, pattern, GREP_PATTERN_BODY);
Junio C Hamanobd95fcd2006-09-17 17:23:20 -07001679}
1680
Pierre Habouzit6b61ec02008-07-09 23:38:34 +02001681static int handle_revision_opt(struct rev_info *revs, int argc, const char **argv,
1682 int *unkc, const char **unkv)
Pierre Habouzit02e54222008-07-08 15:19:33 +02001683{
1684 const char *arg = argv[0];
Matthieu Moy7d7b86f2010-08-05 10:22:55 +02001685 const char *optarg;
1686 int argcount;
Pierre Habouzit02e54222008-07-08 15:19:33 +02001687
1688 /* pseudo revision arguments */
1689 if (!strcmp(arg, "--all") || !strcmp(arg, "--branches") ||
1690 !strcmp(arg, "--tags") || !strcmp(arg, "--remotes") ||
1691 !strcmp(arg, "--reflog") || !strcmp(arg, "--not") ||
Linus Torvaldsad3f9a72009-10-27 11:28:07 -07001692 !strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk") ||
Christian Couder59556542013-11-30 21:55:40 +01001693 !strcmp(arg, "--bisect") || starts_with(arg, "--glob=") ||
Jeff King4fe10212014-10-16 20:44:23 -04001694 !strcmp(arg, "--indexed-objects") ||
Junio C Hamano07768e02014-06-09 11:30:12 -07001695 starts_with(arg, "--exclude=") ||
Christian Couder59556542013-11-30 21:55:40 +01001696 starts_with(arg, "--branches=") || starts_with(arg, "--tags=") ||
1697 starts_with(arg, "--remotes=") || starts_with(arg, "--no-walk="))
Pierre Habouzit02e54222008-07-08 15:19:33 +02001698 {
1699 unkv[(*unkc)++] = arg;
Pierre Habouzit0fe8c132008-07-31 12:22:23 +02001700 return 1;
Pierre Habouzit02e54222008-07-08 15:19:33 +02001701 }
1702
Matthieu Moy7d7b86f2010-08-05 10:22:55 +02001703 if ((argcount = parse_long_opt("max-count", argv, &optarg))) {
1704 revs->max_count = atoi(optarg);
Jonathan Nieder5853cae2010-06-01 03:35:49 -05001705 revs->no_walk = 0;
Matthieu Moy7d7b86f2010-08-05 10:22:55 +02001706 return argcount;
1707 } else if ((argcount = parse_long_opt("skip", argv, &optarg))) {
1708 revs->skip_count = atoi(optarg);
1709 return argcount;
Pierre Habouzit02e54222008-07-08 15:19:33 +02001710 } else if ((*arg == '-') && isdigit(arg[1])) {
Junio C Hamanoe3fa5682014-06-06 15:33:25 -07001711 /* accept -<digit>, like traditional "head" */
1712 if (strtol_i(arg + 1, 10, &revs->max_count) < 0 ||
1713 revs->max_count < 0)
1714 die("'%s': not a non-negative integer", arg + 1);
Jonathan Nieder5853cae2010-06-01 03:35:49 -05001715 revs->no_walk = 0;
Pierre Habouzit02e54222008-07-08 15:19:33 +02001716 } else if (!strcmp(arg, "-n")) {
1717 if (argc <= 1)
1718 return error("-n requires an argument");
1719 revs->max_count = atoi(argv[1]);
Jonathan Nieder5853cae2010-06-01 03:35:49 -05001720 revs->no_walk = 0;
Pierre Habouzit02e54222008-07-08 15:19:33 +02001721 return 2;
Christian Couder59556542013-11-30 21:55:40 +01001722 } else if (starts_with(arg, "-n")) {
Pierre Habouzit02e54222008-07-08 15:19:33 +02001723 revs->max_count = atoi(arg + 2);
Jonathan Nieder5853cae2010-06-01 03:35:49 -05001724 revs->no_walk = 0;
Matthieu Moy7d7b86f2010-08-05 10:22:55 +02001725 } else if ((argcount = parse_long_opt("max-age", argv, &optarg))) {
1726 revs->max_age = atoi(optarg);
1727 return argcount;
1728 } else if ((argcount = parse_long_opt("since", argv, &optarg))) {
1729 revs->max_age = approxidate(optarg);
1730 return argcount;
1731 } else if ((argcount = parse_long_opt("after", argv, &optarg))) {
1732 revs->max_age = approxidate(optarg);
1733 return argcount;
1734 } else if ((argcount = parse_long_opt("min-age", argv, &optarg))) {
1735 revs->min_age = atoi(optarg);
1736 return argcount;
1737 } else if ((argcount = parse_long_opt("before", argv, &optarg))) {
1738 revs->min_age = approxidate(optarg);
1739 return argcount;
1740 } else if ((argcount = parse_long_opt("until", argv, &optarg))) {
1741 revs->min_age = approxidate(optarg);
1742 return argcount;
Pierre Habouzit02e54222008-07-08 15:19:33 +02001743 } else if (!strcmp(arg, "--first-parent")) {
1744 revs->first_parent_only = 1;
Junio C Hamanoebdc94f2010-04-20 13:48:39 -07001745 } else if (!strcmp(arg, "--ancestry-path")) {
1746 revs->ancestry_path = 1;
Johan Herlandcb7529e2010-06-04 01:17:37 +02001747 revs->simplify_history = 0;
Junio C Hamanoebdc94f2010-04-20 13:48:39 -07001748 revs->limited = 1;
Pierre Habouzit02e54222008-07-08 15:19:33 +02001749 } else if (!strcmp(arg, "-g") || !strcmp(arg, "--walk-reflogs")) {
1750 init_reflog_walk(&revs->reflog_info);
1751 } else if (!strcmp(arg, "--default")) {
1752 if (argc <= 1)
1753 return error("bad --default argument");
1754 revs->def = argv[1];
1755 return 2;
1756 } else if (!strcmp(arg, "--merge")) {
1757 revs->show_merge = 1;
1758 } else if (!strcmp(arg, "--topo-order")) {
Junio C Hamano08f704f2013-06-06 16:07:14 -07001759 revs->sort_order = REV_SORT_IN_GRAPH_ORDER;
Pierre Habouzit02e54222008-07-08 15:19:33 +02001760 revs->topo_order = 1;
Junio C Hamano6546b592008-07-31 01:17:41 -07001761 } else if (!strcmp(arg, "--simplify-merges")) {
1762 revs->simplify_merges = 1;
Junio C Hamanoa52f0072012-06-08 14:47:08 -07001763 revs->topo_order = 1;
Junio C Hamano6546b592008-07-31 01:17:41 -07001764 revs->rewrite_parents = 1;
1765 revs->simplify_history = 0;
1766 revs->limited = 1;
Linus Torvalds78892e32008-11-03 11:25:46 -08001767 } else if (!strcmp(arg, "--simplify-by-decoration")) {
1768 revs->simplify_merges = 1;
Junio C Hamanoa52f0072012-06-08 14:47:08 -07001769 revs->topo_order = 1;
Linus Torvalds78892e32008-11-03 11:25:46 -08001770 revs->rewrite_parents = 1;
1771 revs->simplify_history = 0;
1772 revs->simplify_by_decoration = 1;
1773 revs->limited = 1;
1774 revs->prune = 1;
Lars Hjemli33e70182009-08-15 16:23:12 +02001775 load_ref_decorations(DECORATE_SHORT_REFS);
Pierre Habouzit02e54222008-07-08 15:19:33 +02001776 } else if (!strcmp(arg, "--date-order")) {
Junio C Hamano08f704f2013-06-06 16:07:14 -07001777 revs->sort_order = REV_SORT_BY_COMMIT_DATE;
Pierre Habouzit02e54222008-07-08 15:19:33 +02001778 revs->topo_order = 1;
Junio C Hamano81c6b382013-06-07 10:35:54 -07001779 } else if (!strcmp(arg, "--author-date-order")) {
1780 revs->sort_order = REV_SORT_BY_AUTHOR_DATE;
Pierre Habouzit02e54222008-07-08 15:19:33 +02001781 revs->topo_order = 1;
Christian Couder59556542013-11-30 21:55:40 +01001782 } else if (starts_with(arg, "--early-output")) {
Pierre Habouzit02e54222008-07-08 15:19:33 +02001783 int count = 100;
1784 switch (arg[14]) {
1785 case '=':
1786 count = atoi(arg+15);
1787 /* Fallthrough */
1788 case 0:
1789 revs->topo_order = 1;
1790 revs->early_output = count;
1791 }
1792 } else if (!strcmp(arg, "--parents")) {
1793 revs->rewrite_parents = 1;
1794 revs->print_parents = 1;
1795 } else if (!strcmp(arg, "--dense")) {
1796 revs->dense = 1;
1797 } else if (!strcmp(arg, "--sparse")) {
1798 revs->dense = 0;
1799 } else if (!strcmp(arg, "--show-all")) {
1800 revs->show_all = 1;
1801 } else if (!strcmp(arg, "--remove-empty")) {
1802 revs->remove_empty_trees = 1;
Linus Torvaldsb8e8db22009-06-29 10:28:25 -07001803 } else if (!strcmp(arg, "--merges")) {
Michael J Gruberad5aeed2011-03-21 11:14:06 +01001804 revs->min_parents = 2;
Pierre Habouzit02e54222008-07-08 15:19:33 +02001805 } else if (!strcmp(arg, "--no-merges")) {
Michael J Gruberad5aeed2011-03-21 11:14:06 +01001806 revs->max_parents = 1;
Christian Couder59556542013-11-30 21:55:40 +01001807 } else if (starts_with(arg, "--min-parents=")) {
Michael J Gruberad5aeed2011-03-21 11:14:06 +01001808 revs->min_parents = atoi(arg+14);
Christian Couder59556542013-11-30 21:55:40 +01001809 } else if (starts_with(arg, "--no-min-parents")) {
Michael J Gruberad5aeed2011-03-21 11:14:06 +01001810 revs->min_parents = 0;
Christian Couder59556542013-11-30 21:55:40 +01001811 } else if (starts_with(arg, "--max-parents=")) {
Michael J Gruberad5aeed2011-03-21 11:14:06 +01001812 revs->max_parents = atoi(arg+14);
Christian Couder59556542013-11-30 21:55:40 +01001813 } else if (starts_with(arg, "--no-max-parents")) {
Michael J Gruberad5aeed2011-03-21 11:14:06 +01001814 revs->max_parents = -1;
Pierre Habouzit02e54222008-07-08 15:19:33 +02001815 } else if (!strcmp(arg, "--boundary")) {
1816 revs->boundary = 1;
1817 } else if (!strcmp(arg, "--left-right")) {
1818 revs->left_right = 1;
Michael J Gruber60adf7d2011-02-21 17:09:11 +01001819 } else if (!strcmp(arg, "--left-only")) {
Junio C Hamano24852d92011-02-21 16:58:37 -08001820 if (revs->right_only)
Michael J Gruber94f605e2011-03-07 13:31:42 +01001821 die("--left-only is incompatible with --right-only"
1822 " or --cherry");
Michael J Gruber60adf7d2011-02-21 17:09:11 +01001823 revs->left_only = 1;
1824 } else if (!strcmp(arg, "--right-only")) {
Junio C Hamano24852d92011-02-21 16:58:37 -08001825 if (revs->left_only)
1826 die("--right-only is incompatible with --left-only");
Michael J Gruber60adf7d2011-02-21 17:09:11 +01001827 revs->right_only = 1;
Michael J Gruber94f605e2011-03-07 13:31:42 +01001828 } else if (!strcmp(arg, "--cherry")) {
1829 if (revs->left_only)
1830 die("--cherry is incompatible with --left-only");
1831 revs->cherry_mark = 1;
1832 revs->right_only = 1;
Michael J Gruberad5aeed2011-03-21 11:14:06 +01001833 revs->max_parents = 1;
Michael J Gruber94f605e2011-03-07 13:31:42 +01001834 revs->limited = 1;
Thomas Rastf69c5012010-06-10 13:47:23 +02001835 } else if (!strcmp(arg, "--count")) {
1836 revs->count = 1;
Michael J Gruberadbbb312011-03-07 13:31:40 +01001837 } else if (!strcmp(arg, "--cherry-mark")) {
1838 if (revs->cherry_pick)
1839 die("--cherry-mark is incompatible with --cherry-pick");
1840 revs->cherry_mark = 1;
1841 revs->limited = 1; /* needs limit_list() */
Pierre Habouzit02e54222008-07-08 15:19:33 +02001842 } else if (!strcmp(arg, "--cherry-pick")) {
Michael J Gruberadbbb312011-03-07 13:31:40 +01001843 if (revs->cherry_mark)
1844 die("--cherry-pick is incompatible with --cherry-mark");
Pierre Habouzit02e54222008-07-08 15:19:33 +02001845 revs->cherry_pick = 1;
1846 revs->limited = 1;
1847 } else if (!strcmp(arg, "--objects")) {
1848 revs->tag_objects = 1;
1849 revs->tree_objects = 1;
1850 revs->blob_objects = 1;
1851 } else if (!strcmp(arg, "--objects-edge")) {
1852 revs->tag_objects = 1;
1853 revs->tree_objects = 1;
1854 revs->blob_objects = 1;
1855 revs->edge_hint = 1;
Junio C Hamano5a48d242011-09-01 15:43:34 -07001856 } else if (!strcmp(arg, "--verify-objects")) {
1857 revs->tag_objects = 1;
1858 revs->tree_objects = 1;
1859 revs->blob_objects = 1;
1860 revs->verify_objects = 1;
Pierre Habouzit02e54222008-07-08 15:19:33 +02001861 } else if (!strcmp(arg, "--unpacked")) {
1862 revs->unpacked = 1;
Christian Couder59556542013-11-30 21:55:40 +01001863 } else if (starts_with(arg, "--unpacked=")) {
Junio C Hamano03a96832009-02-28 00:00:21 -08001864 die("--unpacked=<packfile> no longer supported.");
Pierre Habouzit02e54222008-07-08 15:19:33 +02001865 } else if (!strcmp(arg, "-r")) {
1866 revs->diff = 1;
1867 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1868 } else if (!strcmp(arg, "-t")) {
1869 revs->diff = 1;
1870 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1871 DIFF_OPT_SET(&revs->diffopt, TREE_IN_RECURSIVE);
1872 } else if (!strcmp(arg, "-m")) {
1873 revs->ignore_merges = 0;
1874 } else if (!strcmp(arg, "-c")) {
1875 revs->diff = 1;
1876 revs->dense_combined_merges = 0;
1877 revs->combine_merges = 1;
1878 } else if (!strcmp(arg, "--cc")) {
1879 revs->diff = 1;
1880 revs->dense_combined_merges = 1;
1881 revs->combine_merges = 1;
1882 } else if (!strcmp(arg, "-v")) {
1883 revs->verbose_header = 1;
1884 } else if (!strcmp(arg, "--pretty")) {
1885 revs->verbose_header = 1;
Junio C Hamano66b2ed02010-01-20 13:59:36 -08001886 revs->pretty_given = 1;
Jeff Kingae181652014-07-29 13:53:40 -04001887 get_commit_format(NULL, revs);
Christian Couder59556542013-11-30 21:55:40 +01001888 } else if (starts_with(arg, "--pretty=") || starts_with(arg, "--format=")) {
Matthieu Moy7d7b86f2010-08-05 10:22:55 +02001889 /*
1890 * Detached form ("--pretty X" as opposed to "--pretty=X")
1891 * not allowed, since the argument is optional.
1892 */
Pierre Habouzit02e54222008-07-08 15:19:33 +02001893 revs->verbose_header = 1;
Junio C Hamano66b2ed02010-01-20 13:59:36 -08001894 revs->pretty_given = 1;
Pierre Habouzit02e54222008-07-08 15:19:33 +02001895 get_commit_format(arg+9, revs);
Jeff King7249e912011-03-29 16:57:47 -04001896 } else if (!strcmp(arg, "--show-notes") || !strcmp(arg, "--notes")) {
Junio C Hamano66b2ed02010-01-20 13:59:36 -08001897 revs->show_notes = 1;
1898 revs->show_notes_given = 1;
Jeff King3a03cf62011-03-29 16:57:27 -04001899 revs->notes_opt.use_default_notes = 1;
Junio C Hamano0c37f1f2011-10-18 15:53:23 -07001900 } else if (!strcmp(arg, "--show-signature")) {
1901 revs->show_signature = 1;
Nguyễn Thái Ngọc Duy1b32dec2014-03-25 20:23:27 +07001902 } else if (!strcmp(arg, "--show-linear-break") ||
1903 starts_with(arg, "--show-linear-break=")) {
1904 if (starts_with(arg, "--show-linear-break="))
1905 revs->break_bar = xstrdup(arg + 20);
1906 else
1907 revs->break_bar = " ..........";
1908 revs->track_linear = 1;
1909 revs->track_first_time = 1;
Christian Couder59556542013-11-30 21:55:40 +01001910 } else if (starts_with(arg, "--show-notes=") ||
1911 starts_with(arg, "--notes=")) {
Thomas Rast894a9d32010-03-12 18:04:26 +01001912 struct strbuf buf = STRBUF_INIT;
1913 revs->show_notes = 1;
1914 revs->show_notes_given = 1;
Christian Couder59556542013-11-30 21:55:40 +01001915 if (starts_with(arg, "--show-notes")) {
Jeff King7249e912011-03-29 16:57:47 -04001916 if (revs->notes_opt.use_default_notes < 0)
1917 revs->notes_opt.use_default_notes = 1;
1918 strbuf_addstr(&buf, arg+13);
1919 }
1920 else
1921 strbuf_addstr(&buf, arg+8);
Jeff Kingc063f0a2011-03-29 16:56:04 -04001922 expand_notes_ref(&buf);
Jeff King304cc112011-03-29 16:56:53 -04001923 string_list_append(&revs->notes_opt.extra_notes_refs,
Julian Phillips1d2f80f2010-06-26 00:41:38 +01001924 strbuf_detach(&buf, NULL));
Junio C Hamano66b2ed02010-01-20 13:59:36 -08001925 } else if (!strcmp(arg, "--no-notes")) {
1926 revs->show_notes = 0;
1927 revs->show_notes_given = 1;
Jeff King92e0d422011-03-29 16:59:42 -04001928 revs->notes_opt.use_default_notes = -1;
1929 /* we have been strdup'ing ourselves, so trick
1930 * string_list into free()ing strings */
1931 revs->notes_opt.extra_notes_refs.strdup_strings = 1;
1932 string_list_clear(&revs->notes_opt.extra_notes_refs, 0);
1933 revs->notes_opt.extra_notes_refs.strdup_strings = 0;
Thomas Rast894a9d32010-03-12 18:04:26 +01001934 } else if (!strcmp(arg, "--standard-notes")) {
1935 revs->show_notes_given = 1;
Jeff King3a03cf62011-03-29 16:57:27 -04001936 revs->notes_opt.use_default_notes = 1;
Thomas Rast894a9d32010-03-12 18:04:26 +01001937 } else if (!strcmp(arg, "--no-standard-notes")) {
Jeff King3a03cf62011-03-29 16:57:27 -04001938 revs->notes_opt.use_default_notes = 0;
Nanako Shiraishide84acc2009-02-24 18:59:16 +09001939 } else if (!strcmp(arg, "--oneline")) {
1940 revs->verbose_header = 1;
1941 get_commit_format("oneline", revs);
Junio C Hamano7dccadf2010-01-21 14:57:41 -08001942 revs->pretty_given = 1;
Nanako Shiraishide84acc2009-02-24 18:59:16 +09001943 revs->abbrev_commit = 1;
Pierre Habouzit02e54222008-07-08 15:19:33 +02001944 } else if (!strcmp(arg, "--graph")) {
1945 revs->topo_order = 1;
1946 revs->rewrite_parents = 1;
1947 revs->graph = graph_init(revs);
1948 } else if (!strcmp(arg, "--root")) {
1949 revs->show_root_diff = 1;
1950 } else if (!strcmp(arg, "--no-commit-id")) {
1951 revs->no_commit_id = 1;
1952 } else if (!strcmp(arg, "--always")) {
1953 revs->always_show_header = 1;
1954 } else if (!strcmp(arg, "--no-abbrev")) {
1955 revs->abbrev = 0;
1956 } else if (!strcmp(arg, "--abbrev")) {
1957 revs->abbrev = DEFAULT_ABBREV;
Christian Couder59556542013-11-30 21:55:40 +01001958 } else if (starts_with(arg, "--abbrev=")) {
Pierre Habouzit02e54222008-07-08 15:19:33 +02001959 revs->abbrev = strtoul(arg + 9, NULL, 10);
1960 if (revs->abbrev < MINIMUM_ABBREV)
1961 revs->abbrev = MINIMUM_ABBREV;
1962 else if (revs->abbrev > 40)
1963 revs->abbrev = 40;
1964 } else if (!strcmp(arg, "--abbrev-commit")) {
1965 revs->abbrev_commit = 1;
Jay Soffian0c476952011-05-18 13:56:04 -04001966 revs->abbrev_commit_given = 1;
1967 } else if (!strcmp(arg, "--no-abbrev-commit")) {
1968 revs->abbrev_commit = 0;
Pierre Habouzit02e54222008-07-08 15:19:33 +02001969 } else if (!strcmp(arg, "--full-diff")) {
1970 revs->diff = 1;
1971 revs->full_diff = 1;
1972 } else if (!strcmp(arg, "--full-history")) {
1973 revs->simplify_history = 0;
1974 } else if (!strcmp(arg, "--relative-date")) {
1975 revs->date_mode = DATE_RELATIVE;
Jeff Kingf4ea32f2009-09-24 04:28:15 -04001976 revs->date_mode_explicit = 1;
Matthieu Moy7d7b86f2010-08-05 10:22:55 +02001977 } else if ((argcount = parse_long_opt("date", argv, &optarg))) {
1978 revs->date_mode = parse_date_format(optarg);
Jeff Kingf4ea32f2009-09-24 04:28:15 -04001979 revs->date_mode_explicit = 1;
Matthieu Moy7d7b86f2010-08-05 10:22:55 +02001980 return argcount;
Pierre Habouzit02e54222008-07-08 15:19:33 +02001981 } else if (!strcmp(arg, "--log-size")) {
1982 revs->show_log_size = 1;
1983 }
1984 /*
1985 * Grepping the commit log
1986 */
Matthieu Moy7d7b86f2010-08-05 10:22:55 +02001987 else if ((argcount = parse_long_opt("author", argv, &optarg))) {
1988 add_header_grep(revs, GREP_HEADER_AUTHOR, optarg);
1989 return argcount;
1990 } else if ((argcount = parse_long_opt("committer", argv, &optarg))) {
1991 add_header_grep(revs, GREP_HEADER_COMMITTER, optarg);
1992 return argcount;
Nguyễn Thái Ngọc Duy72fd13f2012-09-29 11:41:28 +07001993 } else if ((argcount = parse_long_opt("grep-reflog", argv, &optarg))) {
1994 add_header_grep(revs, GREP_HEADER_REFLOG, optarg);
1995 return argcount;
Matthieu Moy7d7b86f2010-08-05 10:22:55 +02001996 } else if ((argcount = parse_long_opt("grep", argv, &optarg))) {
1997 add_message_grep(revs, optarg);
1998 return argcount;
Junio C Hamano17bf35a2012-09-13 14:21:44 -07001999 } else if (!strcmp(arg, "--grep-debug")) {
2000 revs->grep_filter.debug = 1;
Junio C Hamano727b6fc2012-10-03 15:01:34 -07002001 } else if (!strcmp(arg, "--basic-regexp")) {
2002 grep_set_pattern_type_option(GREP_PATTERN_TYPE_BRE, &revs->grep_filter);
Pierre Habouzit02e54222008-07-08 15:19:33 +02002003 } else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) {
Junio C Hamano34a4ae52012-10-03 14:50:51 -07002004 grep_set_pattern_type_option(GREP_PATTERN_TYPE_ERE, &revs->grep_filter);
Pierre Habouzit02e54222008-07-08 15:19:33 +02002005 } else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) {
Jeff King0843acf2008-08-25 02:15:05 -04002006 revs->grep_filter.regflags |= REG_ICASE;
Junio C Hamanoaccccde2012-02-21 01:02:46 -08002007 DIFF_OPT_SET(&revs->diffopt, PICKAXE_IGNORE_CASE);
Pierre Habouzit02e54222008-07-08 15:19:33 +02002008 } else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) {
Junio C Hamano34a4ae52012-10-03 14:50:51 -07002009 grep_set_pattern_type_option(GREP_PATTERN_TYPE_FIXED, &revs->grep_filter);
Junio C Hamano727b6fc2012-10-03 15:01:34 -07002010 } else if (!strcmp(arg, "--perl-regexp")) {
2011 grep_set_pattern_type_option(GREP_PATTERN_TYPE_PCRE, &revs->grep_filter);
Pierre Habouzit02e54222008-07-08 15:19:33 +02002012 } else if (!strcmp(arg, "--all-match")) {
Jeff King0843acf2008-08-25 02:15:05 -04002013 revs->grep_filter.all_match = 1;
Matthieu Moy7d7b86f2010-08-05 10:22:55 +02002014 } else if ((argcount = parse_long_opt("encoding", argv, &optarg))) {
2015 if (strcmp(optarg, "none"))
2016 git_log_output_encoding = xstrdup(optarg);
Pierre Habouzit02e54222008-07-08 15:19:33 +02002017 else
2018 git_log_output_encoding = "";
Matthieu Moy7d7b86f2010-08-05 10:22:55 +02002019 return argcount;
Pierre Habouzit02e54222008-07-08 15:19:33 +02002020 } else if (!strcmp(arg, "--reverse")) {
2021 revs->reverse ^= 1;
2022 } else if (!strcmp(arg, "--children")) {
2023 revs->children.name = "children";
2024 revs->limited = 1;
Junio C Hamanocc243c32011-05-18 18:08:09 -07002025 } else if (!strcmp(arg, "--ignore-missing")) {
2026 revs->ignore_missing = 1;
Pierre Habouzit02e54222008-07-08 15:19:33 +02002027 } else {
2028 int opts = diff_opt_parse(&revs->diffopt, argv, argc);
2029 if (!opts)
2030 unkv[(*unkc)++] = arg;
2031 return opts;
2032 }
Nguyễn Thái Ngọc Duy1b32dec2014-03-25 20:23:27 +07002033 if (revs->graph && revs->track_linear)
2034 die("--show-linear-break and --graph are incompatible");
Pierre Habouzit02e54222008-07-08 15:19:33 +02002035
2036 return 1;
2037}
2038
Pierre Habouzit6b61ec02008-07-09 23:38:34 +02002039void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
2040 const struct option *options,
2041 const char * const usagestr[])
2042{
2043 int n = handle_revision_opt(revs, ctx->argc, ctx->argv,
2044 &ctx->cpidx, ctx->out);
2045 if (n <= 0) {
2046 error("unknown option `%s'", ctx->argv[0]);
2047 usage_with_options(usagestr, options);
2048 }
2049 ctx->argv += n;
2050 ctx->argc -= n;
2051}
2052
Heiko Voigt9ef6aeb2010-07-07 15:39:12 +02002053static int for_each_bad_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
Linus Torvaldsad3f9a72009-10-27 11:28:07 -07002054{
Heiko Voigt9ef6aeb2010-07-07 15:39:12 +02002055 return for_each_ref_in_submodule(submodule, "refs/bisect/bad", fn, cb_data);
Linus Torvaldsad3f9a72009-10-27 11:28:07 -07002056}
2057
Heiko Voigt9ef6aeb2010-07-07 15:39:12 +02002058static int for_each_good_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
Linus Torvaldsad3f9a72009-10-27 11:28:07 -07002059{
Heiko Voigt9ef6aeb2010-07-07 15:39:12 +02002060 return for_each_ref_in_submodule(submodule, "refs/bisect/good", fn, cb_data);
Linus Torvaldsad3f9a72009-10-27 11:28:07 -07002061}
2062
Jonathan Niederf6aca0d2011-04-21 05:45:07 -05002063static int handle_revision_pseudo_opt(const char *submodule,
2064 struct rev_info *revs,
2065 int argc, const char **argv, int *flags)
2066{
2067 const char *arg = argv[0];
2068 const char *optarg;
2069 int argcount;
2070
Jonathan Nieder0fc63ec2011-04-21 05:48:24 -05002071 /*
2072 * NOTE!
2073 *
2074 * Commands like "git shortlog" will not accept the options below
2075 * unless parse_revision_opt queues them (as opposed to erroring
2076 * out).
2077 *
2078 * When implementing your new pseudo-option, remember to
2079 * register it in the list at the top of handle_revision_opt.
2080 */
Jonathan Niederf6aca0d2011-04-21 05:45:07 -05002081 if (!strcmp(arg, "--all")) {
2082 handle_refs(submodule, revs, *flags, for_each_ref_submodule);
2083 handle_refs(submodule, revs, *flags, head_ref_submodule);
Junio C Hamanoff32d342013-11-01 12:02:45 -07002084 clear_ref_exclusion(&revs->ref_excludes);
Jonathan Niederf6aca0d2011-04-21 05:45:07 -05002085 } else if (!strcmp(arg, "--branches")) {
2086 handle_refs(submodule, revs, *flags, for_each_branch_ref_submodule);
Junio C Hamanoff32d342013-11-01 12:02:45 -07002087 clear_ref_exclusion(&revs->ref_excludes);
Jonathan Niederf6aca0d2011-04-21 05:45:07 -05002088 } else if (!strcmp(arg, "--bisect")) {
2089 handle_refs(submodule, revs, *flags, for_each_bad_bisect_ref);
Kevin Bracey7f34a462013-05-16 18:32:38 +03002090 handle_refs(submodule, revs, *flags ^ (UNINTERESTING | BOTTOM), for_each_good_bisect_ref);
Jonathan Niederf6aca0d2011-04-21 05:45:07 -05002091 revs->bisect = 1;
2092 } else if (!strcmp(arg, "--tags")) {
2093 handle_refs(submodule, revs, *flags, for_each_tag_ref_submodule);
Junio C Hamanoff32d342013-11-01 12:02:45 -07002094 clear_ref_exclusion(&revs->ref_excludes);
Jonathan Niederf6aca0d2011-04-21 05:45:07 -05002095 } else if (!strcmp(arg, "--remotes")) {
2096 handle_refs(submodule, revs, *flags, for_each_remote_ref_submodule);
Junio C Hamanoff32d342013-11-01 12:02:45 -07002097 clear_ref_exclusion(&revs->ref_excludes);
Jonathan Niederf6aca0d2011-04-21 05:45:07 -05002098 } else if ((argcount = parse_long_opt("glob", argv, &optarg))) {
2099 struct all_refs_cb cb;
2100 init_all_refs_cb(&cb, revs, *flags);
2101 for_each_glob_ref(handle_one_ref, optarg, &cb);
Junio C Hamanoff32d342013-11-01 12:02:45 -07002102 clear_ref_exclusion(&revs->ref_excludes);
Junio C Hamanoe7b432c2013-08-30 16:37:55 -07002103 return argcount;
2104 } else if ((argcount = parse_long_opt("exclude", argv, &optarg))) {
Junio C Hamanoff32d342013-11-01 12:02:45 -07002105 add_ref_exclusion(&revs->ref_excludes, optarg);
Jonathan Niederf6aca0d2011-04-21 05:45:07 -05002106 return argcount;
Christian Couder59556542013-11-30 21:55:40 +01002107 } else if (starts_with(arg, "--branches=")) {
Jonathan Niederf6aca0d2011-04-21 05:45:07 -05002108 struct all_refs_cb cb;
2109 init_all_refs_cb(&cb, revs, *flags);
2110 for_each_glob_ref_in(handle_one_ref, arg + 11, "refs/heads/", &cb);
Junio C Hamanoff32d342013-11-01 12:02:45 -07002111 clear_ref_exclusion(&revs->ref_excludes);
Christian Couder59556542013-11-30 21:55:40 +01002112 } else if (starts_with(arg, "--tags=")) {
Jonathan Niederf6aca0d2011-04-21 05:45:07 -05002113 struct all_refs_cb cb;
2114 init_all_refs_cb(&cb, revs, *flags);
2115 for_each_glob_ref_in(handle_one_ref, arg + 7, "refs/tags/", &cb);
Junio C Hamanoff32d342013-11-01 12:02:45 -07002116 clear_ref_exclusion(&revs->ref_excludes);
Christian Couder59556542013-11-30 21:55:40 +01002117 } else if (starts_with(arg, "--remotes=")) {
Jonathan Niederf6aca0d2011-04-21 05:45:07 -05002118 struct all_refs_cb cb;
2119 init_all_refs_cb(&cb, revs, *flags);
2120 for_each_glob_ref_in(handle_one_ref, arg + 10, "refs/remotes/", &cb);
Junio C Hamanoff32d342013-11-01 12:02:45 -07002121 clear_ref_exclusion(&revs->ref_excludes);
Jonathan Niederf6aca0d2011-04-21 05:45:07 -05002122 } else if (!strcmp(arg, "--reflog")) {
Jeff King718ccc92014-10-15 18:38:31 -04002123 add_reflogs_to_pending(revs, *flags);
Jeff King4fe10212014-10-16 20:44:23 -04002124 } else if (!strcmp(arg, "--indexed-objects")) {
2125 add_index_objects_to_pending(revs, *flags);
Jonathan Niederf6aca0d2011-04-21 05:45:07 -05002126 } else if (!strcmp(arg, "--not")) {
Kevin Bracey7f34a462013-05-16 18:32:38 +03002127 *flags ^= UNINTERESTING | BOTTOM;
Jonathan Niederf6aca0d2011-04-21 05:45:07 -05002128 } else if (!strcmp(arg, "--no-walk")) {
Martin von Zweigbergkca92e592012-08-28 23:15:54 -07002129 revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
Christian Couder59556542013-11-30 21:55:40 +01002130 } else if (starts_with(arg, "--no-walk=")) {
Martin von Zweigbergkca92e592012-08-28 23:15:54 -07002131 /*
2132 * Detached form ("--no-walk X" as opposed to "--no-walk=X")
2133 * not allowed, since the argument is optional.
2134 */
2135 if (!strcmp(arg + 10, "sorted"))
2136 revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
2137 else if (!strcmp(arg + 10, "unsorted"))
2138 revs->no_walk = REVISION_WALK_NO_WALK_UNSORTED;
2139 else
2140 return error("invalid argument to --no-walk");
Jonathan Niederf6aca0d2011-04-21 05:45:07 -05002141 } else if (!strcmp(arg, "--do-walk")) {
2142 revs->no_walk = 0;
2143 } else {
2144 return 0;
2145 }
2146
2147 return 1;
2148}
2149
Linus Torvaldsae563542006-02-25 16:19:46 -08002150/*
2151 * Parse revision information, filling in the "rev_info" structure,
2152 * and removing the used arguments from the argument list.
2153 *
Linus Torvalds765ac8e2006-02-28 15:07:20 -08002154 * Returns the number of arguments left that weren't recognized
2155 * (which are also moved to the head of the argument list)
Linus Torvaldsae563542006-02-25 16:19:46 -08002156 */
Junio C Hamano32962c92010-03-08 22:58:09 -08002157int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *opt)
Linus Torvaldsae563542006-02-25 16:19:46 -08002158{
Junio C Hamano8e676e82012-07-02 12:33:52 -07002159 int i, flags, left, seen_dashdash, read_from_stdin, got_rev_arg = 0, revarg_opt;
Junio C Hamano4da5af32011-05-11 14:01:19 -07002160 struct cmdline_pathspec prune_data;
Heiko Voigt9ef6aeb2010-07-07 15:39:12 +02002161 const char *submodule = NULL;
2162
Junio C Hamano4da5af32011-05-11 14:01:19 -07002163 memset(&prune_data, 0, sizeof(prune_data));
Heiko Voigt9ef6aeb2010-07-07 15:39:12 +02002164 if (opt)
2165 submodule = opt->submodule;
Linus Torvaldsae563542006-02-25 16:19:46 -08002166
Linus Torvaldsae563542006-02-25 16:19:46 -08002167 /* First, search for "--" */
Clemens Buchacher6d5b93f2012-04-14 21:04:48 +02002168 if (opt && opt->assume_dashdash) {
Linus Torvaldsae563542006-02-25 16:19:46 -08002169 seen_dashdash = 1;
Clemens Buchacher6d5b93f2012-04-14 21:04:48 +02002170 } else {
2171 seen_dashdash = 0;
2172 for (i = 1; i < argc; i++) {
2173 const char *arg = argv[i];
2174 if (strcmp(arg, "--"))
2175 continue;
2176 argv[i] = NULL;
2177 argc = i;
2178 if (argv[i + 1])
2179 append_prune_data(&prune_data, argv + i + 1);
2180 seen_dashdash = 1;
2181 break;
2182 }
Linus Torvaldsae563542006-02-25 16:19:46 -08002183 }
2184
Pierre Habouzit02e54222008-07-08 15:19:33 +02002185 /* Second, deal with arguments and options */
2186 flags = 0;
Junio C Hamanod5f6b1d2012-07-02 12:43:05 -07002187 revarg_opt = opt ? opt->revarg_opt : 0;
2188 if (seen_dashdash)
2189 revarg_opt |= REVARG_CANNOT_BE_FILENAME;
Junio C Hamano8b3dce52009-11-03 06:59:18 -08002190 read_from_stdin = 0;
Pierre Habouzit02e54222008-07-08 15:19:33 +02002191 for (left = i = 1; i < argc; i++) {
Linus Torvaldsae563542006-02-25 16:19:46 -08002192 const char *arg = argv[i];
Linus Torvaldsae563542006-02-25 16:19:46 -08002193 if (*arg == '-') {
Linus Torvaldscd2bdc52006-04-14 16:52:13 -07002194 int opts;
Pierre Habouzit02e54222008-07-08 15:19:33 +02002195
Jonathan Niederf6aca0d2011-04-21 05:45:07 -05002196 opts = handle_revision_pseudo_opt(submodule,
2197 revs, argc - i, argv + i,
2198 &flags);
2199 if (opts > 0) {
2200 i += opts - 1;
Uwe Kleine-Königa5aa9302008-02-28 08:24:25 +01002201 continue;
2202 }
Jonathan Niederf6aca0d2011-04-21 05:45:07 -05002203
Junio C Hamano8b3dce52009-11-03 06:59:18 -08002204 if (!strcmp(arg, "--stdin")) {
2205 if (revs->disable_stdin) {
2206 argv[left++] = arg;
2207 continue;
2208 }
2209 if (read_from_stdin++)
2210 die("--stdin given twice?");
Junio C Hamano60da8b12009-11-20 02:50:21 -08002211 read_revisions_from_stdin(revs, &prune_data);
Junio C Hamano8b3dce52009-11-03 06:59:18 -08002212 continue;
2213 }
Junio C Hamano2d10c552006-09-20 13:21:56 -07002214
Pierre Habouzit02e54222008-07-08 15:19:33 +02002215 opts = handle_revision_opt(revs, argc - i, argv + i, &left, argv);
Linus Torvaldscd2bdc52006-04-14 16:52:13 -07002216 if (opts > 0) {
Linus Torvaldscd2bdc52006-04-14 16:52:13 -07002217 i += opts - 1;
2218 continue;
2219 }
Pierre Habouzit02e54222008-07-08 15:19:33 +02002220 if (opts < 0)
2221 exit(128);
Linus Torvaldsae563542006-02-25 16:19:46 -08002222 continue;
2223 }
Rene Scharfe0d2c9d62006-07-02 01:29:37 +02002224
Junio C Hamano8e676e82012-07-02 12:33:52 -07002225
2226 if (handle_revision_arg(arg, revs, flags, revarg_opt)) {
Linus Torvaldsae563542006-02-25 16:19:46 -08002227 int j;
Junio C Hamano5d6f0932006-09-05 21:28:36 -07002228 if (seen_dashdash || *arg == '^')
Linus Torvaldsae563542006-02-25 16:19:46 -08002229 die("bad revision '%s'", arg);
2230
Junio C Hamanoea92f412006-04-26 15:09:27 -07002231 /* If we didn't have a "--":
2232 * (1) all filenames must exist;
2233 * (2) all rev-args must not be interpretable
2234 * as a valid filename.
2235 * but the latter we have checked in the main loop.
2236 */
Linus Torvaldse23d0b42006-04-26 10:15:54 -07002237 for (j = i; j < argc; j++)
Matthieu Moy023e37c2012-06-18 20:18:21 +02002238 verify_filename(revs->prefix, argv[j], j == i);
Linus Torvaldse23d0b42006-04-26 10:15:54 -07002239
Junio C Hamano60da8b12009-11-20 02:50:21 -08002240 append_prune_data(&prune_data, argv + i);
Linus Torvaldsae563542006-02-25 16:19:46 -08002241 break;
2242 }
Dave Olszewski8fcaca32010-03-13 14:47:05 -08002243 else
2244 got_rev_arg = 1;
Linus Torvaldsae563542006-02-25 16:19:46 -08002245 }
Junio C Hamano5d6f0932006-09-05 21:28:36 -07002246
Junio C Hamano4da5af32011-05-11 14:01:19 -07002247 if (prune_data.nr) {
Junio C Hamano93e7d672011-05-11 15:23:25 -07002248 /*
2249 * If we need to introduce the magic "a lone ':' means no
2250 * pathspec whatsoever", here is the place to do so.
2251 *
2252 * if (prune_data.nr == 1 && !strcmp(prune_data[0], ":")) {
2253 * prune_data.nr = 0;
2254 * prune_data.alloc = 0;
2255 * free(prune_data.path);
2256 * prune_data.path = NULL;
2257 * } else {
2258 * terminate prune_data.alloc with NULL and
2259 * call init_pathspec() to set revs->prune_data here.
2260 * }
2261 */
Felipe Contreras9e57ac52013-10-31 03:25:43 -06002262 ALLOC_GROW(prune_data.path, prune_data.nr + 1, prune_data.alloc);
Junio C Hamano4da5af32011-05-11 14:01:19 -07002263 prune_data.path[prune_data.nr++] = NULL;
Nguyễn Thái Ngọc Duy0fdc2ae2013-07-14 15:35:31 +07002264 parse_pathspec(&revs->prune_data, 0, 0,
2265 revs->prefix, prune_data.path);
Junio C Hamano4da5af32011-05-11 14:01:19 -07002266 }
Junio C Hamano5486ef02009-11-20 02:33:28 -08002267
Pierre Habouzit02e54222008-07-08 15:19:33 +02002268 if (revs->def == NULL)
Junio C Hamano32962c92010-03-08 22:58:09 -08002269 revs->def = opt ? opt->def : NULL;
Junio C Hamanob4490052010-03-08 23:27:25 -08002270 if (opt && opt->tweak)
2271 opt->tweak(revs, opt);
Pierre Habouzit02e54222008-07-08 15:19:33 +02002272 if (revs->show_merge)
Junio C Hamanoae3e5e12006-07-03 02:59:32 -07002273 prepare_show_merge(revs);
Dave Olszewski8fcaca32010-03-13 14:47:05 -08002274 if (revs->def && !revs->pending.nr && !got_rev_arg) {
Linus Torvaldsae563542006-02-25 16:19:46 -08002275 unsigned char sha1[20];
Linus Torvaldscd2bdc52006-04-14 16:52:13 -07002276 struct object *object;
Junio C Hamano249c8f42012-07-02 12:56:44 -07002277 struct object_context oc;
Junio C Hamano33bd5982012-07-02 10:32:11 -07002278 if (get_sha1_with_context(revs->def, 0, sha1, &oc))
Pierre Habouzit02e54222008-07-08 15:19:33 +02002279 die("bad default revision '%s'", revs->def);
2280 object = get_reference(revs, revs->def, sha1, 0);
Junio C Hamano249c8f42012-07-02 12:56:44 -07002281 add_pending_object_with_mode(revs, object, revs->def, oc.mode);
Linus Torvaldsae563542006-02-25 16:19:46 -08002282 }
Fredrik Kuivinen8efdc322006-03-10 10:21:39 +01002283
Linus Torvaldsb7bb7602007-09-29 09:50:39 -07002284 /* Did the user ask for any diff output? Run the diff! */
2285 if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT)
2286 revs->diff = 1;
2287
Arjen Laarhoven0faf2da2007-12-25 12:06:47 +01002288 /* Pickaxe, diff-filter and rename following need diffs */
2289 if (revs->diffopt.pickaxe ||
2290 revs->diffopt.filter ||
2291 DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
Linus Torvaldsb7bb7602007-09-29 09:50:39 -07002292 revs->diff = 1;
2293
Junio C Hamano9dad9d22006-10-30 18:58:03 -08002294 if (revs->topo_order)
Junio C Hamano53069682006-04-01 18:38:25 -08002295 revs->limited = 1;
2296
Nguyễn Thái Ngọc Duyafe069d2010-12-17 19:43:06 +07002297 if (revs->prune_data.nr) {
Nguyễn Thái Ngọc Duybd1928d2013-07-14 15:35:58 +07002298 copy_pathspec(&revs->pruning.pathspec, &revs->prune_data);
Linus Torvalds750f7b62007-06-19 14:22:46 -07002299 /* Can't prune commits with rename following: the paths change.. */
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +01002300 if (!DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
Linus Torvalds53b2c822007-11-05 13:22:34 -08002301 revs->prune = 1;
Linus Torvaldscd2bdc52006-04-14 16:52:13 -07002302 if (!revs->full_diff)
Nguyễn Thái Ngọc Duybd1928d2013-07-14 15:35:58 +07002303 copy_pathspec(&revs->diffopt.pathspec,
2304 &revs->prune_data);
Fredrik Kuivinen8efdc322006-03-10 10:21:39 +01002305 }
Junio C Hamanob4490052010-03-08 23:27:25 -08002306 if (revs->combine_merges)
Linus Torvaldscd2bdc52006-04-14 16:52:13 -07002307 revs->ignore_merges = 0;
Linus Torvaldscd2bdc52006-04-14 16:52:13 -07002308 revs->diffopt.abbrev = revs->abbrev;
Thomas Rast12da1d12013-03-28 17:47:32 +01002309
2310 if (revs->line_level_traverse) {
2311 revs->limited = 1;
2312 revs->topo_order = 1;
2313 }
2314
Thomas Rast28452652012-08-03 14:16:24 +02002315 diff_setup_done(&revs->diffopt);
Fredrik Kuivinen8efdc322006-03-10 10:21:39 +01002316
Junio C Hamano918d4e12012-10-09 16:40:03 -07002317 grep_commit_pattern_type(GREP_PATTERN_TYPE_UNSPECIFIED,
2318 &revs->grep_filter);
Jeff King0843acf2008-08-25 02:15:05 -04002319 compile_grep_patterns(&revs->grep_filter);
Junio C Hamanobd95fcd2006-09-17 17:23:20 -07002320
Shawn O. Pearced56651c2007-08-19 22:33:43 -04002321 if (revs->reverse && revs->reflog_info)
2322 die("cannot combine --reverse with --walk-reflogs");
Junio C Hamano8bb65882008-07-08 15:25:44 -07002323 if (revs->rewrite_parents && revs->children.name)
Junio C Hamanof35f5602008-04-03 02:12:06 -07002324 die("cannot combine --parents and --children");
Shawn O. Pearced56651c2007-08-19 22:33:43 -04002325
Adam Simpkins7fefda52008-05-04 03:36:54 -07002326 /*
2327 * Limitations on the graph functionality
2328 */
2329 if (revs->reverse && revs->graph)
2330 die("cannot combine --reverse with --graph");
2331
2332 if (revs->reflog_info && revs->graph)
2333 die("cannot combine --walk-reflogs with --graph");
Junio C Hamanobaa63782012-09-29 11:59:52 -07002334 if (!revs->reflog_info && revs->grep_filter.use_reflog_filter)
2335 die("cannot use --grep-reflog without --walk-reflogs");
Adam Simpkins7fefda52008-05-04 03:36:54 -07002336
Linus Torvaldsae563542006-02-25 16:19:46 -08002337 return left;
2338}
Linus Torvaldsa4a88b22006-02-28 11:24:00 -08002339
Junio C Hamanof35f5602008-04-03 02:12:06 -07002340static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child)
2341{
2342 struct commit_list *l = xcalloc(1, sizeof(*l));
2343
2344 l->item = child;
2345 l->next = add_decoration(&revs->children, &parent->object, l);
2346}
2347
Kevin Braceyd0af6632013-05-16 18:32:34 +03002348static int remove_duplicate_parents(struct rev_info *revs, struct commit *commit)
Junio C Hamano6546b592008-07-31 01:17:41 -07002349{
Kevin Braceyd0af6632013-05-16 18:32:34 +03002350 struct treesame_state *ts = lookup_decoration(&revs->treesame, &commit->object);
Junio C Hamano6546b592008-07-31 01:17:41 -07002351 struct commit_list **pp, *p;
2352 int surviving_parents;
2353
2354 /* Examine existing parents while marking ones we have seen... */
2355 pp = &commit->parents;
Kevin Braceyd0af6632013-05-16 18:32:34 +03002356 surviving_parents = 0;
Junio C Hamano6546b592008-07-31 01:17:41 -07002357 while ((p = *pp) != NULL) {
2358 struct commit *parent = p->item;
2359 if (parent->object.flags & TMP_MARK) {
2360 *pp = p->next;
Kevin Braceyd0af6632013-05-16 18:32:34 +03002361 if (ts)
2362 compact_treesame(revs, commit, surviving_parents);
Junio C Hamano6546b592008-07-31 01:17:41 -07002363 continue;
2364 }
2365 parent->object.flags |= TMP_MARK;
Kevin Braceyd0af6632013-05-16 18:32:34 +03002366 surviving_parents++;
Junio C Hamano6546b592008-07-31 01:17:41 -07002367 pp = &p->next;
2368 }
Kevin Braceyd0af6632013-05-16 18:32:34 +03002369 /* clear the temporary mark */
Junio C Hamano6546b592008-07-31 01:17:41 -07002370 for (p = commit->parents; p; p = p->next) {
2371 p->item->object.flags &= ~TMP_MARK;
Junio C Hamano6546b592008-07-31 01:17:41 -07002372 }
Kevin Braceyd0af6632013-05-16 18:32:34 +03002373 /* no update_treesame() - removing duplicates can't affect TREESAME */
Junio C Hamano6546b592008-07-31 01:17:41 -07002374 return surviving_parents;
2375}
2376
Junio C Hamanofaf01562008-08-14 10:59:44 -07002377struct merge_simplify_state {
2378 struct commit *simplified;
2379};
2380
2381static struct merge_simplify_state *locate_simplify_state(struct rev_info *revs, struct commit *commit)
2382{
2383 struct merge_simplify_state *st;
2384
2385 st = lookup_decoration(&revs->merge_simplification, &commit->object);
2386 if (!st) {
2387 st = xcalloc(1, sizeof(*st));
2388 add_decoration(&revs->merge_simplification, &commit->object, st);
2389 }
2390 return st;
2391}
2392
Kevin Braceyd0af6632013-05-16 18:32:34 +03002393static int mark_redundant_parents(struct rev_info *revs, struct commit *commit)
2394{
2395 struct commit_list *h = reduce_heads(commit->parents);
2396 int i = 0, marked = 0;
2397 struct commit_list *po, *pn;
2398
2399 /* Want these for sanity-checking only */
2400 int orig_cnt = commit_list_count(commit->parents);
2401 int cnt = commit_list_count(h);
2402
2403 /*
2404 * Not ready to remove items yet, just mark them for now, based
2405 * on the output of reduce_heads(). reduce_heads outputs the reduced
2406 * set in its original order, so this isn't too hard.
2407 */
2408 po = commit->parents;
2409 pn = h;
2410 while (po) {
2411 if (pn && po->item == pn->item) {
2412 pn = pn->next;
2413 i++;
2414 } else {
2415 po->item->object.flags |= TMP_MARK;
2416 marked++;
2417 }
2418 po=po->next;
2419 }
2420
2421 if (i != cnt || cnt+marked != orig_cnt)
2422 die("mark_redundant_parents %d %d %d %d", orig_cnt, cnt, i, marked);
2423
2424 free_commit_list(h);
2425
2426 return marked;
2427}
2428
Kevin Bracey143f1ea2013-05-16 18:32:37 +03002429static int mark_treesame_root_parents(struct rev_info *revs, struct commit *commit)
2430{
2431 struct commit_list *p;
2432 int marked = 0;
2433
2434 for (p = commit->parents; p; p = p->next) {
2435 struct commit *parent = p->item;
2436 if (!parent->parents && (parent->object.flags & TREESAME)) {
2437 parent->object.flags |= TMP_MARK;
2438 marked++;
2439 }
2440 }
2441
2442 return marked;
2443}
2444
Kevin Bracey9c129ea2013-05-16 18:32:36 +03002445/*
2446 * Awkward naming - this means one parent we are TREESAME to.
2447 * cf mark_treesame_root_parents: root parents that are TREESAME (to an
2448 * empty tree). Better name suggestions?
2449 */
2450static int leave_one_treesame_to_parent(struct rev_info *revs, struct commit *commit)
2451{
2452 struct treesame_state *ts = lookup_decoration(&revs->treesame, &commit->object);
2453 struct commit *unmarked = NULL, *marked = NULL;
2454 struct commit_list *p;
2455 unsigned n;
2456
2457 for (p = commit->parents, n = 0; p; p = p->next, n++) {
2458 if (ts->treesame[n]) {
2459 if (p->item->object.flags & TMP_MARK) {
2460 if (!marked)
2461 marked = p->item;
2462 } else {
2463 if (!unmarked) {
2464 unmarked = p->item;
2465 break;
2466 }
2467 }
2468 }
2469 }
2470
2471 /*
2472 * If we are TREESAME to a marked-for-deletion parent, but not to any
2473 * unmarked parents, unmark the first TREESAME parent. This is the
2474 * parent that the default simplify_history==1 scan would have followed,
2475 * and it doesn't make sense to omit that path when asking for a
2476 * simplified full history. Retaining it improves the chances of
2477 * understanding odd missed merges that took an old version of a file.
2478 *
2479 * Example:
2480 *
2481 * I--------*X A modified the file, but mainline merge X used
2482 * \ / "-s ours", so took the version from I. X is
2483 * `-*A--' TREESAME to I and !TREESAME to A.
2484 *
2485 * Default log from X would produce "I". Without this check,
2486 * --full-history --simplify-merges would produce "I-A-X", showing
2487 * the merge commit X and that it changed A, but not making clear that
2488 * it had just taken the I version. With this check, the topology above
2489 * is retained.
2490 *
2491 * Note that it is possible that the simplification chooses a different
2492 * TREESAME parent from the default, in which case this test doesn't
2493 * activate, and we _do_ drop the default parent. Example:
2494 *
2495 * I------X A modified the file, but it was reverted in B,
2496 * \ / meaning mainline merge X is TREESAME to both
2497 * *A-*B parents.
2498 *
2499 * Default log would produce "I" by following the first parent;
2500 * --full-history --simplify-merges will produce "I-A-B". But this is a
2501 * reasonable result - it presents a logical full history leading from
2502 * I to X, and X is not an important merge.
2503 */
2504 if (!unmarked && marked) {
2505 marked->object.flags &= ~TMP_MARK;
2506 return 1;
2507 }
2508
2509 return 0;
2510}
2511
Kevin Braceyd0af6632013-05-16 18:32:34 +03002512static int remove_marked_parents(struct rev_info *revs, struct commit *commit)
2513{
2514 struct commit_list **pp, *p;
2515 int nth_parent, removed = 0;
2516
2517 pp = &commit->parents;
2518 nth_parent = 0;
2519 while ((p = *pp) != NULL) {
2520 struct commit *parent = p->item;
2521 if (parent->object.flags & TMP_MARK) {
2522 parent->object.flags &= ~TMP_MARK;
2523 *pp = p->next;
2524 free(p);
2525 removed++;
2526 compact_treesame(revs, commit, nth_parent);
2527 continue;
2528 }
2529 pp = &p->next;
2530 nth_parent++;
2531 }
2532
2533 /* Removing parents can only increase TREESAMEness */
2534 if (removed && !(commit->object.flags & TREESAME))
2535 update_treesame(revs, commit);
2536
2537 return nth_parent;
2538}
2539
Junio C Hamanofaf01562008-08-14 10:59:44 -07002540static struct commit_list **simplify_one(struct rev_info *revs, struct commit *commit, struct commit_list **tail)
Junio C Hamano6546b592008-07-31 01:17:41 -07002541{
2542 struct commit_list *p;
Kevin Bracey4d826602013-05-16 18:32:39 +03002543 struct commit *parent;
Junio C Hamanofaf01562008-08-14 10:59:44 -07002544 struct merge_simplify_state *st, *pst;
Junio C Hamano6546b592008-07-31 01:17:41 -07002545 int cnt;
2546
Junio C Hamanofaf01562008-08-14 10:59:44 -07002547 st = locate_simplify_state(revs, commit);
2548
Junio C Hamano6546b592008-07-31 01:17:41 -07002549 /*
Junio C Hamano6546b592008-07-31 01:17:41 -07002550 * Have we handled this one?
2551 */
Junio C Hamanofaf01562008-08-14 10:59:44 -07002552 if (st->simplified)
Junio C Hamano6546b592008-07-31 01:17:41 -07002553 return tail;
2554
2555 /*
2556 * An UNINTERESTING commit simplifies to itself, so does a
2557 * root commit. We do not rewrite parents of such commit
2558 * anyway.
2559 */
2560 if ((commit->object.flags & UNINTERESTING) || !commit->parents) {
Junio C Hamanofaf01562008-08-14 10:59:44 -07002561 st->simplified = commit;
Junio C Hamano6546b592008-07-31 01:17:41 -07002562 return tail;
2563 }
2564
2565 /*
Junio C Hamano6e513ba2012-06-08 14:56:03 -07002566 * Do we know what commit all of our parents that matter
2567 * should be rewritten to? Otherwise we are not ready to
2568 * rewrite this one yet.
Junio C Hamano6546b592008-07-31 01:17:41 -07002569 */
2570 for (cnt = 0, p = commit->parents; p; p = p->next) {
Junio C Hamanofaf01562008-08-14 10:59:44 -07002571 pst = locate_simplify_state(revs, p->item);
2572 if (!pst->simplified) {
Junio C Hamano6546b592008-07-31 01:17:41 -07002573 tail = &commit_list_insert(p->item, tail)->next;
2574 cnt++;
2575 }
Junio C Hamano6e513ba2012-06-08 14:56:03 -07002576 if (revs->first_parent_only)
2577 break;
Junio C Hamano6546b592008-07-31 01:17:41 -07002578 }
Junio C Hamano53030f82008-08-18 00:37:34 -07002579 if (cnt) {
2580 tail = &commit_list_insert(commit, tail)->next;
Junio C Hamano6546b592008-07-31 01:17:41 -07002581 return tail;
Junio C Hamano53030f82008-08-18 00:37:34 -07002582 }
Junio C Hamano6546b592008-07-31 01:17:41 -07002583
2584 /*
Kevin Braceyd0af6632013-05-16 18:32:34 +03002585 * Rewrite our list of parents. Note that this cannot
2586 * affect our TREESAME flags in any way - a commit is
2587 * always TREESAME to its simplification.
Junio C Hamano6546b592008-07-31 01:17:41 -07002588 */
Junio C Hamanofaf01562008-08-14 10:59:44 -07002589 for (p = commit->parents; p; p = p->next) {
2590 pst = locate_simplify_state(revs, p->item);
2591 p->item = pst->simplified;
Junio C Hamano6e513ba2012-06-08 14:56:03 -07002592 if (revs->first_parent_only)
2593 break;
Junio C Hamanofaf01562008-08-14 10:59:44 -07002594 }
Junio C Hamano4b7f53d2013-01-17 14:23:03 -08002595
Junio C Hamano0290bf12013-04-08 13:10:27 -07002596 if (revs->first_parent_only)
Junio C Hamano6e513ba2012-06-08 14:56:03 -07002597 cnt = 1;
Junio C Hamano0290bf12013-04-08 13:10:27 -07002598 else
Kevin Braceyd0af6632013-05-16 18:32:34 +03002599 cnt = remove_duplicate_parents(revs, commit);
Junio C Hamano6546b592008-07-31 01:17:41 -07002600
2601 /*
2602 * It is possible that we are a merge and one side branch
2603 * does not have any commit that touches the given paths;
Kevin Braceyd0af6632013-05-16 18:32:34 +03002604 * in such a case, the immediate parent from that branch
2605 * will be rewritten to be the merge base.
Junio C Hamano6546b592008-07-31 01:17:41 -07002606 *
2607 * o----X X: the commit we are looking at;
2608 * / / o: a commit that touches the paths;
2609 * ---o----'
2610 *
Kevin Bracey143f1ea2013-05-16 18:32:37 +03002611 * Further, a merge of an independent branch that doesn't
2612 * touch the path will reduce to a treesame root parent:
2613 *
2614 * ----o----X X: the commit we are looking at;
2615 * / o: a commit that touches the paths;
2616 * r r: a root commit not touching the paths
2617 *
2618 * Detect and simplify both cases.
Junio C Hamano6546b592008-07-31 01:17:41 -07002619 */
2620 if (1 < cnt) {
Kevin Braceyd0af6632013-05-16 18:32:34 +03002621 int marked = mark_redundant_parents(revs, commit);
Kevin Bracey143f1ea2013-05-16 18:32:37 +03002622 marked += mark_treesame_root_parents(revs, commit);
Kevin Braceyd0af6632013-05-16 18:32:34 +03002623 if (marked)
Kevin Bracey9c129ea2013-05-16 18:32:36 +03002624 marked -= leave_one_treesame_to_parent(revs, commit);
2625 if (marked)
Kevin Braceyd0af6632013-05-16 18:32:34 +03002626 cnt = remove_marked_parents(revs, commit);
Junio C Hamano6546b592008-07-31 01:17:41 -07002627 }
2628
2629 /*
2630 * A commit simplifies to itself if it is a root, if it is
2631 * UNINTERESTING, if it touches the given paths, or if it is a
Kevin Bracey4d826602013-05-16 18:32:39 +03002632 * merge and its parents don't simplify to one relevant commit
Junio C Hamano6546b592008-07-31 01:17:41 -07002633 * (the first two cases are already handled at the beginning of
2634 * this function).
2635 *
Kevin Bracey4d826602013-05-16 18:32:39 +03002636 * Otherwise, it simplifies to what its sole relevant parent
2637 * simplifies to.
Junio C Hamano6546b592008-07-31 01:17:41 -07002638 */
2639 if (!cnt ||
2640 (commit->object.flags & UNINTERESTING) ||
2641 !(commit->object.flags & TREESAME) ||
Kevin Bracey4d826602013-05-16 18:32:39 +03002642 (parent = one_relevant_parent(revs, commit->parents)) == NULL)
Junio C Hamanofaf01562008-08-14 10:59:44 -07002643 st->simplified = commit;
2644 else {
Kevin Bracey4d826602013-05-16 18:32:39 +03002645 pst = locate_simplify_state(revs, parent);
Junio C Hamanofaf01562008-08-14 10:59:44 -07002646 st->simplified = pst->simplified;
2647 }
Junio C Hamano6546b592008-07-31 01:17:41 -07002648 return tail;
2649}
2650
2651static void simplify_merges(struct rev_info *revs)
2652{
Junio C Hamanoab9d75a2012-06-08 14:50:22 -07002653 struct commit_list *list, *next;
Junio C Hamano6546b592008-07-31 01:17:41 -07002654 struct commit_list *yet_to_do, **tail;
Junio C Hamanoab9d75a2012-06-08 14:50:22 -07002655 struct commit *commit;
Junio C Hamano6546b592008-07-31 01:17:41 -07002656
Junio C Hamano5eac7392008-08-14 13:52:36 -07002657 if (!revs->prune)
2658 return;
Junio C Hamano65347032008-08-03 17:47:16 -07002659
Junio C Hamano6546b592008-07-31 01:17:41 -07002660 /* feed the list reversed */
2661 yet_to_do = NULL;
Junio C Hamanoab9d75a2012-06-08 14:50:22 -07002662 for (list = revs->commits; list; list = next) {
2663 commit = list->item;
2664 next = list->next;
2665 /*
2666 * Do not free(list) here yet; the original list
2667 * is used later in this function.
2668 */
2669 commit_list_insert(commit, &yet_to_do);
2670 }
Junio C Hamano6546b592008-07-31 01:17:41 -07002671 while (yet_to_do) {
2672 list = yet_to_do;
2673 yet_to_do = NULL;
2674 tail = &yet_to_do;
2675 while (list) {
Junio C Hamanoab9d75a2012-06-08 14:50:22 -07002676 commit = list->item;
2677 next = list->next;
Junio C Hamano6546b592008-07-31 01:17:41 -07002678 free(list);
2679 list = next;
Junio C Hamanofaf01562008-08-14 10:59:44 -07002680 tail = simplify_one(revs, commit, tail);
Junio C Hamano6546b592008-07-31 01:17:41 -07002681 }
2682 }
2683
2684 /* clean up the result, removing the simplified ones */
2685 list = revs->commits;
2686 revs->commits = NULL;
2687 tail = &revs->commits;
2688 while (list) {
Junio C Hamanofaf01562008-08-14 10:59:44 -07002689 struct merge_simplify_state *st;
Junio C Hamanoab9d75a2012-06-08 14:50:22 -07002690
2691 commit = list->item;
2692 next = list->next;
Junio C Hamano6546b592008-07-31 01:17:41 -07002693 free(list);
2694 list = next;
Junio C Hamanofaf01562008-08-14 10:59:44 -07002695 st = locate_simplify_state(revs, commit);
2696 if (st->simplified == commit)
Junio C Hamano6546b592008-07-31 01:17:41 -07002697 tail = &commit_list_insert(commit, tail)->next;
2698 }
Junio C Hamano6546b592008-07-31 01:17:41 -07002699}
2700
Junio C Hamanof35f5602008-04-03 02:12:06 -07002701static void set_children(struct rev_info *revs)
2702{
2703 struct commit_list *l;
2704 for (l = revs->commits; l; l = l->next) {
2705 struct commit *commit = l->item;
2706 struct commit_list *p;
2707
2708 for (p = commit->parents; p; p = p->next)
2709 add_child(revs, p->item, commit);
2710 }
2711}
2712
Heiko Voigtbcc0a3e2012-03-29 09:21:21 +02002713void reset_revision_walk(void)
2714{
2715 clear_object_flags(SEEN | ADDED | SHOWN);
2716}
2717
Alex Riesencc0e6c52007-05-04 23:54:57 +02002718int prepare_revision_walk(struct rev_info *revs)
Linus Torvaldsa4a88b22006-02-28 11:24:00 -08002719{
Jeff King1da1e072014-10-15 18:35:12 -04002720 int i;
2721 struct object_array old_pending;
René Scharfe2e7da8e2012-04-25 22:35:41 +02002722 struct commit_list **next = &revs->commits;
Linus Torvaldscd2bdc52006-04-14 16:52:13 -07002723
Jeff King1da1e072014-10-15 18:35:12 -04002724 memcpy(&old_pending, &revs->pending, sizeof(old_pending));
Linus Torvalds1f1e8952006-06-19 17:42:35 -07002725 revs->pending.nr = 0;
2726 revs->pending.alloc = 0;
2727 revs->pending.objects = NULL;
Jeff King1da1e072014-10-15 18:35:12 -04002728 for (i = 0; i < old_pending.nr; i++) {
2729 struct object_array_entry *e = old_pending.objects + i;
Jeff King20739492014-10-15 18:43:19 -04002730 struct commit *commit = handle_commit(revs, e);
Linus Torvaldscd2bdc52006-04-14 16:52:13 -07002731 if (commit) {
2732 if (!(commit->object.flags & SEEN)) {
2733 commit->object.flags |= SEEN;
René Scharfe2e7da8e2012-04-25 22:35:41 +02002734 next = commit_list_append(commit, next);
Linus Torvaldscd2bdc52006-04-14 16:52:13 -07002735 }
2736 }
Linus Torvaldscd2bdc52006-04-14 16:52:13 -07002737 }
René Scharfe4a43d372011-10-01 17:56:08 +02002738 if (!revs->leak_pending)
Jeff King1da1e072014-10-15 18:35:12 -04002739 object_array_clear(&old_pending);
Linus Torvaldscd2bdc52006-04-14 16:52:13 -07002740
Kevin Braceyd0af6632013-05-16 18:32:34 +03002741 /* Signal whether we need per-parent treesame decoration */
Kevin Bracey4d826602013-05-16 18:32:39 +03002742 if (revs->simplify_merges ||
2743 (revs->limited && limiting_can_increase_treesame(revs)))
Kevin Braceyd0af6632013-05-16 18:32:34 +03002744 revs->treesame.name = "treesame";
2745
Martin von Zweigbergkca92e592012-08-28 23:15:54 -07002746 if (revs->no_walk != REVISION_WALK_NO_WALK_UNSORTED)
2747 commit_list_sort_by_date(&revs->commits);
Linus Torvaldsba1d4502006-04-15 12:09:56 -07002748 if (revs->no_walk)
Alex Riesencc0e6c52007-05-04 23:54:57 +02002749 return 0;
Linus Torvaldsa4a88b22006-02-28 11:24:00 -08002750 if (revs->limited)
Alex Riesencc0e6c52007-05-04 23:54:57 +02002751 if (limit_list(revs) < 0)
2752 return -1;
Linus Torvaldsa4a88b22006-02-28 11:24:00 -08002753 if (revs->topo_order)
Junio C Hamano08f704f2013-06-06 16:07:14 -07002754 sort_in_topological_order(&revs->commits, revs->sort_order);
Thomas Rast12da1d12013-03-28 17:47:32 +01002755 if (revs->line_level_traverse)
2756 line_log_filter(revs);
Junio C Hamano6546b592008-07-31 01:17:41 -07002757 if (revs->simplify_merges)
2758 simplify_merges(revs);
Junio C Hamanof35f5602008-04-03 02:12:06 -07002759 if (revs->children.name)
2760 set_children(revs);
Alex Riesencc0e6c52007-05-04 23:54:57 +02002761 return 0;
Linus Torvaldsa4a88b22006-02-28 11:24:00 -08002762}
2763
Alex Riesencc0e6c52007-05-04 23:54:57 +02002764static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)
Linus Torvaldsa4a88b22006-02-28 11:24:00 -08002765{
Alexander N. Gavrilovfce87ae2008-07-12 22:00:57 +04002766 struct commit_list *cache = NULL;
2767
Linus Torvalds765ac8e2006-02-28 15:07:20 -08002768 for (;;) {
2769 struct commit *p = *pp;
Linus Torvalds3381c792006-04-08 17:05:58 -07002770 if (!revs->limited)
Alexander N. Gavrilovfce87ae2008-07-12 22:00:57 +04002771 if (add_parents_to_list(revs, p, &revs->commits, &cache) < 0)
Alex Riesencc0e6c52007-05-04 23:54:57 +02002772 return rewrite_one_error;
Linus Torvalds7dc0fe32007-11-12 23:16:08 -08002773 if (p->object.flags & UNINTERESTING)
2774 return rewrite_one_ok;
2775 if (!(p->object.flags & TREESAME))
Alex Riesencc0e6c52007-05-04 23:54:57 +02002776 return rewrite_one_ok;
Linus Torvalds765ac8e2006-02-28 15:07:20 -08002777 if (!p->parents)
Alex Riesencc0e6c52007-05-04 23:54:57 +02002778 return rewrite_one_noparents;
Kevin Bracey4d826602013-05-16 18:32:39 +03002779 if ((p = one_relevant_parent(revs, p->parents)) == NULL)
2780 return rewrite_one_ok;
2781 *pp = p;
Linus Torvalds765ac8e2006-02-28 15:07:20 -08002782 }
Linus Torvaldsa4a88b22006-02-28 11:24:00 -08002783}
2784
Bo Yangc7edcae2013-03-28 17:47:31 +01002785int rewrite_parents(struct rev_info *revs, struct commit *commit,
2786 rewrite_parent_fn_t rewrite_parent)
Linus Torvalds765ac8e2006-02-28 15:07:20 -08002787{
2788 struct commit_list **pp = &commit->parents;
2789 while (*pp) {
2790 struct commit_list *parent = *pp;
Bo Yangc7edcae2013-03-28 17:47:31 +01002791 switch (rewrite_parent(revs, &parent->item)) {
Alex Riesencc0e6c52007-05-04 23:54:57 +02002792 case rewrite_one_ok:
2793 break;
2794 case rewrite_one_noparents:
Linus Torvalds765ac8e2006-02-28 15:07:20 -08002795 *pp = parent->next;
2796 continue;
Alex Riesencc0e6c52007-05-04 23:54:57 +02002797 case rewrite_one_error:
2798 return -1;
Linus Torvalds765ac8e2006-02-28 15:07:20 -08002799 }
2800 pp = &parent->next;
2801 }
Kevin Braceyd0af6632013-05-16 18:32:34 +03002802 remove_duplicate_parents(revs, commit);
Alex Riesencc0e6c52007-05-04 23:54:57 +02002803 return 0;
Linus Torvalds765ac8e2006-02-28 15:07:20 -08002804}
Linus Torvaldsa4a88b22006-02-28 11:24:00 -08002805
Antoine Pelissed72fbe82013-01-05 22:26:45 +01002806static int commit_rewrite_person(struct strbuf *buf, const char *what, struct string_list *mailmap)
2807{
2808 char *person, *endp;
2809 size_t len, namelen, maillen;
2810 const char *name;
2811 const char *mail;
2812 struct ident_split ident;
2813
2814 person = strstr(buf->buf, what);
2815 if (!person)
2816 return 0;
2817
2818 person += strlen(what);
2819 endp = strchr(person, '\n');
2820 if (!endp)
2821 return 0;
2822
2823 len = endp - person;
2824
2825 if (split_ident_line(&ident, person, len))
2826 return 0;
2827
2828 mail = ident.mail_begin;
2829 maillen = ident.mail_end - ident.mail_begin;
2830 name = ident.name_begin;
2831 namelen = ident.name_end - ident.name_begin;
2832
2833 if (map_user(mailmap, &mail, &maillen, &name, &namelen)) {
2834 struct strbuf namemail = STRBUF_INIT;
2835
2836 strbuf_addf(&namemail, "%.*s <%.*s>",
2837 (int)namelen, name, (int)maillen, mail);
2838
2839 strbuf_splice(buf, ident.name_begin - buf->buf,
2840 ident.mail_end - ident.name_begin + 1,
2841 namemail.buf, namemail.len);
2842
2843 strbuf_release(&namemail);
2844
2845 return 1;
2846 }
2847
2848 return 0;
2849}
2850
Junio C Hamano8ecae9b2006-09-17 15:43:40 -07002851static int commit_match(struct commit *commit, struct rev_info *opt)
2852{
Nguyễn Thái Ngọc Duy72fd13f2012-09-29 11:41:28 +07002853 int retval;
Jeff King04deccd2013-02-11 15:59:58 -05002854 const char *encoding;
Jeff Kingb000c592014-06-10 17:39:30 -04002855 const char *message;
Nguyễn Thái Ngọc Duy72fd13f2012-09-29 11:41:28 +07002856 struct strbuf buf = STRBUF_INIT;
Jeff King04deccd2013-02-11 15:59:58 -05002857
Junio C Hamano80235ba2010-01-17 20:09:06 -08002858 if (!opt->grep_filter.pattern_list && !opt->grep_filter.header_list)
Junio C Hamano8ecae9b2006-09-17 15:43:40 -07002859 return 1;
Junio C Hamanobaa63782012-09-29 11:59:52 -07002860
2861 /* Prepend "fake" headers as needed */
2862 if (opt->grep_filter.use_reflog_filter) {
Nguyễn Thái Ngọc Duy72fd13f2012-09-29 11:41:28 +07002863 strbuf_addstr(&buf, "reflog ");
2864 get_reflog_message(&buf, opt->reflog_info);
2865 strbuf_addch(&buf, '\n');
Nguyễn Thái Ngọc Duy72fd13f2012-09-29 11:41:28 +07002866 }
Junio C Hamanobaa63782012-09-29 11:59:52 -07002867
Jeff King04deccd2013-02-11 15:59:58 -05002868 /*
2869 * We grep in the user's output encoding, under the assumption that it
2870 * is the encoding they are most likely to write their grep pattern
2871 * for. In addition, it means we will match the "notes" encoding below,
2872 * so we will not end up with a buffer that has two different encodings
2873 * in it.
2874 */
2875 encoding = get_log_output_encoding();
Nguyễn Thái Ngọc Duy5a10d232013-04-19 09:08:40 +10002876 message = logmsg_reencode(commit, NULL, encoding);
Jeff King04deccd2013-02-11 15:59:58 -05002877
Junio C Hamanobaa63782012-09-29 11:59:52 -07002878 /* Copy the commit to temporary if we are using "fake" headers */
2879 if (buf.len)
Jeff King04deccd2013-02-11 15:59:58 -05002880 strbuf_addstr(&buf, message);
Junio C Hamanobaa63782012-09-29 11:59:52 -07002881
Junio C Hamanodf874fa2013-01-08 00:02:49 -08002882 if (opt->grep_filter.header_list && opt->mailmap) {
Antoine Pelissed72fbe82013-01-05 22:26:45 +01002883 if (!buf.len)
Jeff King04deccd2013-02-11 15:59:58 -05002884 strbuf_addstr(&buf, message);
Antoine Pelissed72fbe82013-01-05 22:26:45 +01002885
2886 commit_rewrite_person(&buf, "\nauthor ", opt->mailmap);
2887 commit_rewrite_person(&buf, "\ncommitter ", opt->mailmap);
2888 }
2889
Nguyễn Thái Ngọc Duy38cfe912012-09-29 11:41:29 +07002890 /* Append "fake" message parts as needed */
2891 if (opt->show_notes) {
2892 if (!buf.len)
Jeff King04deccd2013-02-11 15:59:58 -05002893 strbuf_addstr(&buf, message);
2894 format_display_notes(commit->object.sha1, &buf, encoding, 1);
Nguyễn Thái Ngọc Duy38cfe912012-09-29 11:41:29 +07002895 }
2896
Jeff Kingb000c592014-06-10 17:39:30 -04002897 /*
2898 * Find either in the original commit message, or in the temporary.
2899 * Note that we cast away the constness of "message" here. It is
2900 * const because it may come from the cached commit buffer. That's OK,
2901 * because we know that it is modifiable heap memory, and that while
2902 * grep_buffer may modify it for speed, it will restore any
2903 * changes before returning.
2904 */
Nguyễn Thái Ngọc Duy72fd13f2012-09-29 11:41:28 +07002905 if (buf.len)
2906 retval = grep_buffer(&opt->grep_filter, buf.buf, buf.len);
2907 else
2908 retval = grep_buffer(&opt->grep_filter,
Jeff Kingb000c592014-06-10 17:39:30 -04002909 (char *)message, strlen(message));
Nguyễn Thái Ngọc Duy72fd13f2012-09-29 11:41:28 +07002910 strbuf_release(&buf);
Jeff Kingb66103c2014-06-10 17:41:39 -04002911 unuse_commit_buffer(commit, message);
Nguyễn Thái Ngọc Duy72fd13f2012-09-29 11:41:28 +07002912 return retval;
Junio C Hamano8ecae9b2006-09-17 15:43:40 -07002913}
2914
Thomas Rast53d00b32013-07-31 22:13:20 +02002915static inline int want_ancestry(const struct rev_info *revs)
Junio C Hamanof35f5602008-04-03 02:12:06 -07002916{
Junio C Hamano8bb65882008-07-08 15:25:44 -07002917 return (revs->rewrite_parents || revs->children.name);
Junio C Hamanof35f5602008-04-03 02:12:06 -07002918}
2919
Adam Simpkinsbeb5af42009-08-18 19:34:33 -07002920enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit)
Linus Torvalds252a7c02007-11-04 12:12:05 -08002921{
2922 if (commit->object.flags & SHOWN)
2923 return commit_ignore;
Brandon Casey4d6acb72009-03-19 22:47:54 -05002924 if (revs->unpacked && has_sha1_pack(commit->object.sha1))
Linus Torvalds252a7c02007-11-04 12:12:05 -08002925 return commit_ignore;
Linus Torvalds3131b712008-02-09 14:02:07 -08002926 if (revs->show_all)
2927 return commit_show;
Linus Torvalds252a7c02007-11-04 12:12:05 -08002928 if (commit->object.flags & UNINTERESTING)
2929 return commit_ignore;
2930 if (revs->min_age != -1 && (commit->date > revs->min_age))
2931 return commit_ignore;
Michael J Gruberad5aeed2011-03-21 11:14:06 +01002932 if (revs->min_parents || (revs->max_parents >= 0)) {
Kevin Braceybf3418b2013-05-16 18:32:40 +03002933 int n = commit_list_count(commit->parents);
Michael J Gruberad5aeed2011-03-21 11:14:06 +01002934 if ((n < revs->min_parents) ||
2935 ((revs->max_parents >= 0) && (n > revs->max_parents)))
2936 return commit_ignore;
2937 }
Linus Torvalds252a7c02007-11-04 12:12:05 -08002938 if (!commit_match(commit, revs))
2939 return commit_ignore;
Linus Torvalds53b2c822007-11-05 13:22:34 -08002940 if (revs->prune && revs->dense) {
Linus Torvalds252a7c02007-11-04 12:12:05 -08002941 /* Commit without changes? */
Linus Torvalds7dc0fe32007-11-12 23:16:08 -08002942 if (commit->object.flags & TREESAME) {
Kevin Braceybf3418b2013-05-16 18:32:40 +03002943 int n;
2944 struct commit_list *p;
Linus Torvalds252a7c02007-11-04 12:12:05 -08002945 /* drop merges unless we want parenthood */
Junio C Hamanof35f5602008-04-03 02:12:06 -07002946 if (!want_ancestry(revs))
Linus Torvalds252a7c02007-11-04 12:12:05 -08002947 return commit_ignore;
Kevin Braceybf3418b2013-05-16 18:32:40 +03002948 /*
2949 * If we want ancestry, then need to keep any merges
2950 * between relevant commits to tie together topology.
2951 * For consistency with TREESAME and simplification
2952 * use "relevant" here rather than just INTERESTING,
2953 * to treat bottom commit(s) as part of the topology.
2954 */
2955 for (n = 0, p = commit->parents; p; p = p->next)
2956 if (relevant_commit(p->item))
2957 if (++n >= 2)
2958 return commit_show;
2959 return commit_ignore;
Linus Torvalds252a7c02007-11-04 12:12:05 -08002960 }
Linus Torvalds252a7c02007-11-04 12:12:05 -08002961 }
2962 return commit_show;
2963}
2964
Adam Simpkinsbeb5af42009-08-18 19:34:33 -07002965enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
2966{
2967 enum commit_action action = get_commit_action(revs, commit);
2968
2969 if (action == commit_show &&
2970 !revs->show_all &&
2971 revs->prune && revs->dense && want_ancestry(revs)) {
Thomas Rast53d00b32013-07-31 22:13:20 +02002972 /*
2973 * --full-diff on simplified parents is no good: it
2974 * will show spurious changes from the commits that
2975 * were elided. So we save the parents on the side
2976 * when --full-diff is in effect.
2977 */
2978 if (revs->full_diff)
2979 save_parents(revs, commit);
Bo Yangc7edcae2013-03-28 17:47:31 +01002980 if (rewrite_parents(revs, commit, rewrite_one) < 0)
Adam Simpkinsbeb5af42009-08-18 19:34:33 -07002981 return commit_error;
2982 }
2983 return action;
2984}
2985
Nguyễn Thái Ngọc Duy1b32dec2014-03-25 20:23:27 +07002986static void track_linear(struct rev_info *revs, struct commit *commit)
2987{
2988 if (revs->track_first_time) {
2989 revs->linear = 1;
2990 revs->track_first_time = 0;
2991 } else {
2992 struct commit_list *p;
2993 for (p = revs->previous_parents; p; p = p->next)
2994 if (p->item == NULL || /* first commit */
2995 !hashcmp(p->item->object.sha1, commit->object.sha1))
2996 break;
2997 revs->linear = p != NULL;
2998 }
2999 if (revs->reverse) {
3000 if (revs->linear)
3001 commit->object.flags |= TRACK_LINEAR;
3002 }
3003 free_commit_list(revs->previous_parents);
3004 revs->previous_parents = copy_commit_list(commit->parents);
3005}
3006
Junio C Hamanod5db6c92006-12-19 18:25:32 -08003007static struct commit *get_revision_1(struct rev_info *revs)
Linus Torvalds765ac8e2006-02-28 15:07:20 -08003008{
Junio C Hamanod5db6c92006-12-19 18:25:32 -08003009 if (!revs->commits)
Linus Torvalds765ac8e2006-02-28 15:07:20 -08003010 return NULL;
3011
Linus Torvalds765ac8e2006-02-28 15:07:20 -08003012 do {
Linus Torvaldscb115742006-06-17 18:47:58 -07003013 struct commit_list *entry = revs->commits;
3014 struct commit *commit = entry->item;
Linus Torvaldsea5ed3a2006-03-05 09:53:52 -08003015
Linus Torvaldscb115742006-06-17 18:47:58 -07003016 revs->commits = entry->next;
3017 free(entry);
Linus Torvalds2a0925b2006-03-30 17:05:25 -08003018
Jeff Kingffa1eea2010-11-21 23:42:53 -05003019 if (revs->reflog_info) {
Thomas Rast838f9a12013-08-03 12:36:15 +02003020 save_parents(revs, commit);
Johannes Schindelin8860fd42007-01-11 11:47:48 +01003021 fake_reflog_parent(revs->reflog_info, commit);
Jeff Kingffa1eea2010-11-21 23:42:53 -05003022 commit->object.flags &= ~(ADDED | SEEN | SHOWN);
3023 }
Johannes Schindelin8860fd42007-01-11 11:47:48 +01003024
Linus Torvalds2a0925b2006-03-30 17:05:25 -08003025 /*
3026 * If we haven't done the list limiting, we need to look at
Linus Torvaldsbe7db6e2006-04-01 16:35:06 -08003027 * the parents here. We also need to do the date-based limiting
3028 * that we'd otherwise have done in limit_list().
Linus Torvalds2a0925b2006-03-30 17:05:25 -08003029 */
Linus Torvaldsbe7db6e2006-04-01 16:35:06 -08003030 if (!revs->limited) {
Jan Harkes744f4982006-10-30 20:37:49 -05003031 if (revs->max_age != -1 &&
Junio C Hamano86ab4902007-03-05 13:10:06 -08003032 (commit->date < revs->max_age))
3033 continue;
Vicent Marti2db1a432014-03-28 06:00:43 -04003034 if (add_parents_to_list(revs, commit, &revs->commits, NULL) < 0) {
3035 if (!revs->ignore_missing_links)
3036 die("Failed to traverse parents of commit %s",
3037 sha1_to_hex(commit->object.sha1));
3038 }
Linus Torvaldsbe7db6e2006-04-01 16:35:06 -08003039 }
Junio C Hamano1b65a5a2006-04-16 18:12:49 -07003040
Linus Torvalds252a7c02007-11-04 12:12:05 -08003041 switch (simplify_commit(revs, commit)) {
3042 case commit_ignore:
Linus Torvalds2a0925b2006-03-30 17:05:25 -08003043 continue;
Linus Torvalds252a7c02007-11-04 12:12:05 -08003044 case commit_error:
Junio C Hamanoed620892009-02-11 01:27:43 -08003045 die("Failed to simplify parents of commit %s",
3046 sha1_to_hex(commit->object.sha1));
Linus Torvalds252a7c02007-11-04 12:12:05 -08003047 default:
Nguyễn Thái Ngọc Duy1b32dec2014-03-25 20:23:27 +07003048 if (revs->track_linear)
3049 track_linear(revs, commit);
Linus Torvalds252a7c02007-11-04 12:12:05 -08003050 return commit;
Junio C Hamano384e99a2006-03-27 23:58:34 -08003051 }
Linus Torvalds765ac8e2006-02-28 15:07:20 -08003052 } while (revs->commits);
3053 return NULL;
3054}
Junio C Hamanod5db6c92006-12-19 18:25:32 -08003055
Michael Haggertybe6754c2013-05-25 11:08:09 +02003056/*
3057 * Return true for entries that have not yet been shown. (This is an
3058 * object_array_each_func_t.)
3059 */
3060static int entry_unshown(struct object_array_entry *entry, void *cb_data_unused)
3061{
3062 return !(entry->item->flags & SHOWN);
3063}
3064
3065/*
3066 * If array is on the verge of a realloc, garbage-collect any entries
3067 * that have already been shown to try to free up some space.
3068 */
Junio C Hamano86ab4902007-03-05 13:10:06 -08003069static void gc_boundary(struct object_array *array)
3070{
Michael Haggertybe6754c2013-05-25 11:08:09 +02003071 if (array->nr == array->alloc)
3072 object_array_filter(array, entry_unshown, NULL);
Junio C Hamano86ab4902007-03-05 13:10:06 -08003073}
3074
Adam Simpkins4603ec02008-05-24 16:02:05 -07003075static void create_boundary_commit_list(struct rev_info *revs)
3076{
3077 unsigned i;
3078 struct commit *c;
3079 struct object_array *array = &revs->boundary_commits;
3080 struct object_array_entry *objects = array->objects;
3081
3082 /*
3083 * If revs->commits is non-NULL at this point, an error occurred in
3084 * get_revision_1(). Ignore the error and continue printing the
3085 * boundary commits anyway. (This is what the code has always
3086 * done.)
3087 */
3088 if (revs->commits) {
3089 free_commit_list(revs->commits);
3090 revs->commits = NULL;
3091 }
3092
3093 /*
3094 * Put all of the actual boundary commits from revs->boundary_commits
3095 * into revs->commits
3096 */
3097 for (i = 0; i < array->nr; i++) {
3098 c = (struct commit *)(objects[i].item);
3099 if (!c)
3100 continue;
3101 if (!(c->object.flags & CHILD_SHOWN))
3102 continue;
3103 if (c->object.flags & (SHOWN | BOUNDARY))
3104 continue;
3105 c->object.flags |= BOUNDARY;
3106 commit_list_insert(c, &revs->commits);
3107 }
3108
3109 /*
3110 * If revs->topo_order is set, sort the boundary commits
3111 * in topological order
3112 */
Junio C Hamano08f704f2013-06-06 16:07:14 -07003113 sort_in_topological_order(&revs->commits, revs->sort_order);
Adam Simpkins4603ec02008-05-24 16:02:05 -07003114}
3115
Adam Simpkins7fefda52008-05-04 03:36:54 -07003116static struct commit *get_revision_internal(struct rev_info *revs)
Junio C Hamanod5db6c92006-12-19 18:25:32 -08003117{
3118 struct commit *c = NULL;
Junio C Hamano86ab4902007-03-05 13:10:06 -08003119 struct commit_list *l;
Junio C Hamanod5db6c92006-12-19 18:25:32 -08003120
Junio C Hamano86ab4902007-03-05 13:10:06 -08003121 if (revs->boundary == 2) {
Adam Simpkins4603ec02008-05-24 16:02:05 -07003122 /*
3123 * All of the normal commits have already been returned,
3124 * and we are now returning boundary commits.
3125 * create_boundary_commit_list() has populated
3126 * revs->commits with the remaining commits to return.
3127 */
3128 c = pop_commit(&revs->commits);
3129 if (c)
3130 c->object.flags |= SHOWN;
Johannes Schindelin9c5e66e2007-01-20 23:04:02 +01003131 return c;
3132 }
3133
Junio C Hamano86ab4902007-03-05 13:10:06 -08003134 /*
Jeff Kingb72a1902012-07-13 03:50:23 -04003135 * If our max_count counter has reached zero, then we are done. We
3136 * don't simply return NULL because we still might need to show
3137 * boundary commits. But we want to avoid calling get_revision_1, which
3138 * might do a considerable amount of work finding the next commit only
3139 * for us to throw it away.
3140 *
3141 * If it is non-zero, then either we don't have a max_count at all
3142 * (-1), or it is still counting, in which case we decrement.
Junio C Hamano86ab4902007-03-05 13:10:06 -08003143 */
Jeff Kingb72a1902012-07-13 03:50:23 -04003144 if (revs->max_count) {
3145 c = get_revision_1(revs);
3146 if (c) {
Felipe Contreras9e57ac52013-10-31 03:25:43 -06003147 while (revs->skip_count > 0) {
Jeff Kingb72a1902012-07-13 03:50:23 -04003148 revs->skip_count--;
3149 c = get_revision_1(revs);
3150 if (!c)
3151 break;
3152 }
Junio C Hamano8839ac92007-03-06 03:20:55 -08003153 }
Junio C Hamano86ab4902007-03-05 13:10:06 -08003154
Jeff Kingb72a1902012-07-13 03:50:23 -04003155 if (revs->max_count > 0)
3156 revs->max_count--;
Junio C Hamanod5db6c92006-12-19 18:25:32 -08003157 }
Junio C Hamano86ab4902007-03-05 13:10:06 -08003158
Junio C Hamanoc33d8592007-03-05 18:23:57 -08003159 if (c)
3160 c->object.flags |= SHOWN;
3161
Felipe Contreras9e57ac52013-10-31 03:25:43 -06003162 if (!revs->boundary)
Junio C Hamanod5db6c92006-12-19 18:25:32 -08003163 return c;
Junio C Hamano86ab4902007-03-05 13:10:06 -08003164
3165 if (!c) {
3166 /*
3167 * get_revision_1() runs out the commits, and
3168 * we are done computing the boundaries.
3169 * switch to boundary commits output mode.
3170 */
3171 revs->boundary = 2;
Adam Simpkins4603ec02008-05-24 16:02:05 -07003172
3173 /*
3174 * Update revs->commits to contain the list of
3175 * boundary commits.
3176 */
3177 create_boundary_commit_list(revs);
3178
Adam Simpkins3c68d672008-05-24 16:02:04 -07003179 return get_revision_internal(revs);
Junio C Hamano86ab4902007-03-05 13:10:06 -08003180 }
3181
3182 /*
3183 * boundary commits are the commits that are parents of the
3184 * ones we got from get_revision_1() but they themselves are
3185 * not returned from get_revision_1(). Before returning
3186 * 'c', we need to mark its parents that they could be boundaries.
3187 */
3188
3189 for (l = c->parents; l; l = l->next) {
3190 struct object *p;
3191 p = &(l->item->object);
Junio C Hamanoc33d8592007-03-05 18:23:57 -08003192 if (p->flags & (CHILD_SHOWN | SHOWN))
Junio C Hamano86ab4902007-03-05 13:10:06 -08003193 continue;
3194 p->flags |= CHILD_SHOWN;
3195 gc_boundary(&revs->boundary_commits);
3196 add_object_array(p, NULL, &revs->boundary_commits);
3197 }
3198
3199 return c;
Junio C Hamanod5db6c92006-12-19 18:25:32 -08003200}
Adam Simpkins7fefda52008-05-04 03:36:54 -07003201
3202struct commit *get_revision(struct rev_info *revs)
3203{
Thomas Rast498bcd32008-08-29 21:18:38 +02003204 struct commit *c;
3205 struct commit_list *reversed;
3206
3207 if (revs->reverse) {
3208 reversed = NULL;
Felipe Contreras9e57ac52013-10-31 03:25:43 -06003209 while ((c = get_revision_internal(revs)))
Thomas Rast498bcd32008-08-29 21:18:38 +02003210 commit_list_insert(c, &reversed);
Thomas Rast498bcd32008-08-29 21:18:38 +02003211 revs->commits = reversed;
3212 revs->reverse = 0;
3213 revs->reverse_output_stage = 1;
3214 }
3215
Nguyễn Thái Ngọc Duy1b32dec2014-03-25 20:23:27 +07003216 if (revs->reverse_output_stage) {
3217 c = pop_commit(&revs->commits);
3218 if (revs->track_linear)
3219 revs->linear = !!(c && c->object.flags & TRACK_LINEAR);
3220 return c;
3221 }
Thomas Rast498bcd32008-08-29 21:18:38 +02003222
3223 c = get_revision_internal(revs);
Adam Simpkins7fefda52008-05-04 03:36:54 -07003224 if (c && revs->graph)
3225 graph_update(revs->graph, c);
Nguyễn Thái Ngọc Duy1b32dec2014-03-25 20:23:27 +07003226 if (!c) {
Thomas Rast53d00b32013-07-31 22:13:20 +02003227 free_saved_parents(revs);
Nguyễn Thái Ngọc Duy1b32dec2014-03-25 20:23:27 +07003228 if (revs->previous_parents) {
3229 free_commit_list(revs->previous_parents);
3230 revs->previous_parents = NULL;
3231 }
3232 }
Adam Simpkins7fefda52008-05-04 03:36:54 -07003233 return c;
3234}
Michael J Gruber1df2d652011-03-07 13:31:39 +01003235
3236char *get_revision_mark(const struct rev_info *revs, const struct commit *commit)
3237{
3238 if (commit->object.flags & BOUNDARY)
3239 return "-";
3240 else if (commit->object.flags & UNINTERESTING)
3241 return "^";
Michael J Gruberadbbb312011-03-07 13:31:40 +01003242 else if (commit->object.flags & PATCHSAME)
3243 return "=";
Michael J Gruber1df2d652011-03-07 13:31:39 +01003244 else if (!revs || revs->left_right) {
3245 if (commit->object.flags & SYMMETRIC_LEFT)
3246 return "<";
3247 else
3248 return ">";
3249 } else if (revs->graph)
3250 return "*";
Michael J Gruberadbbb312011-03-07 13:31:40 +01003251 else if (revs->cherry_mark)
3252 return "+";
Michael J Gruber1df2d652011-03-07 13:31:39 +01003253 return "";
3254}
Michael J Gruberb1b47552011-03-10 15:45:03 +01003255
3256void put_revision_mark(const struct rev_info *revs, const struct commit *commit)
3257{
3258 char *mark = get_revision_mark(revs, commit);
3259 if (!strlen(mark))
3260 return;
3261 fputs(mark, stdout);
3262 putchar(' ');
3263}
Thomas Rast53d00b32013-07-31 22:13:20 +02003264
3265define_commit_slab(saved_parents, struct commit_list *);
3266
Thomas Rast838f9a12013-08-03 12:36:15 +02003267#define EMPTY_PARENT_LIST ((struct commit_list *)-1)
3268
Thomas Rast53d00b32013-07-31 22:13:20 +02003269void save_parents(struct rev_info *revs, struct commit *commit)
3270{
3271 struct commit_list **pp;
3272
3273 if (!revs->saved_parents_slab) {
3274 revs->saved_parents_slab = xmalloc(sizeof(struct saved_parents));
3275 init_saved_parents(revs->saved_parents_slab);
3276 }
3277
3278 pp = saved_parents_at(revs->saved_parents_slab, commit);
Thomas Rast838f9a12013-08-03 12:36:15 +02003279
3280 /*
3281 * When walking with reflogs, we may visit the same commit
3282 * several times: once for each appearance in the reflog.
3283 *
3284 * In this case, save_parents() will be called multiple times.
3285 * We want to keep only the first set of parents. We need to
3286 * store a sentinel value for an empty (i.e., NULL) parent
3287 * list to distinguish it from a not-yet-saved list, however.
3288 */
3289 if (*pp)
3290 return;
3291 if (commit->parents)
3292 *pp = copy_commit_list(commit->parents);
3293 else
3294 *pp = EMPTY_PARENT_LIST;
Thomas Rast53d00b32013-07-31 22:13:20 +02003295}
3296
3297struct commit_list *get_saved_parents(struct rev_info *revs, const struct commit *commit)
3298{
Thomas Rast838f9a12013-08-03 12:36:15 +02003299 struct commit_list *parents;
3300
Thomas Rast53d00b32013-07-31 22:13:20 +02003301 if (!revs->saved_parents_slab)
3302 return commit->parents;
3303
Thomas Rast838f9a12013-08-03 12:36:15 +02003304 parents = *saved_parents_at(revs->saved_parents_slab, commit);
3305 if (parents == EMPTY_PARENT_LIST)
3306 return NULL;
3307 return parents;
Thomas Rast53d00b32013-07-31 22:13:20 +02003308}
3309
3310void free_saved_parents(struct rev_info *revs)
3311{
3312 if (revs->saved_parents_slab)
3313 clear_saved_parents(revs->saved_parents_slab);
3314}