🌐 AI搜索 & 代理 主页
Google Git
Sign in
chromium / external / github.com / git / git / refs/tags/v2.13.4 / . / revision.c
blob: 5dfb322ccd63276603537b6e43c5c00f9b9e8dd6 [file] [log] [blame]
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]1#include "cache.h"
2#include "tag.h"
3#include "blob.h"
4#include "tree.h"
5#include "commit.h"
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]6#include "diff.h"
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]7#include "refs.h"
8#include "revision.h"
Adam Simpkins7fefda52008-05-04 10:36:54[diff] [blame]9#include "graph.h"
Junio C Hamano8ecae9b2006-09-17 22:43:40[diff] [blame]10#include "grep.h"
Johannes Schindelin8860fd42007-01-11 10:47:48[diff] [blame]11#include "reflog-walk.h"
Junio C Hamanod7a17ca2007-04-09 10:40:38[diff] [blame]12#include "patch-ids.h"
Junio C Hamanof35f5602008-04-03 09:12:06[diff] [blame]13#include "decorate.h"
Linus Torvalds78892e32008-11-03 19:25:46[diff] [blame]14#include "log-tree.h"
Thomas Rast894a9d32010-03-12 17:04:26[diff] [blame]15#include "string-list.h"
Thomas Rast12da1d12013-03-28 16:47:32[diff] [blame]16#include "line-log.h"
Antoine Pelissed72fbe82013-01-05 21:26:45[diff] [blame]17#include "mailmap.h"
Thomas Rast53d00b32013-07-31 20:13:20[diff] [blame]18#include "commit-slab.h"
Nguyễn Thái Ngọc Duy429bb402014-01-24 13:40:28[diff] [blame]19#include "dir.h"
Jeff King4fe10212014-10-17 00:44:23[diff] [blame]20#include "cache-tree.h"
Antoine Delaitecb46d632015-06-29 15:40:30[diff] [blame]21#include "bisect.h"
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]22
Linus Torvaldscdcefbc2007-11-03 18:11:10[diff] [blame]23volatile show_early_output_fn_t show_early_output;
24
Antoine Delaitecb46d632015-06-29 15:40:30[diff] [blame]25static const char *term_bad;
26static const char *term_good;
27
Jeff Kingde1e67d2016-02-11 22:28:36[diff] [blame]28void show_object_with_name(FILE *out, struct object *obj, const char *name)
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]29{
Jeff Kingde1e67d2016-02-11 22:28:36[diff] [blame]30 const char *p;
Junio C Hamano91f17512011-08-17 21:30:34[diff] [blame]31
brian m. carlsonf2fd0762015-11-10 02:22:28[diff] [blame]32 fprintf(out, "%s ", oid_to_hex(&obj->oid));
Jeff Kingf9fb9d02016-02-11 22:24:18[diff] [blame]33 for (p = name; *p && *p != '\n'; p++)
34 fputc(*p, out);
Junio C Hamanobeba25a2011-08-17 21:30:35[diff] [blame]35 fputc('\n', out);
Junio C Hamano91f17512011-08-17 21:30:34[diff] [blame]36}
37
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]38static void mark_blob_uninteresting(struct blob *blob)
39{
Martin Koeglerc1ee9012008-02-18 20:47:54[diff] [blame]40 if (!blob)
41 return;
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]42 if (blob->object.flags & UNINTERESTING)
43 return;
44 blob->object.flags |= UNINTERESTING;
45}
46
Junio C Hamano2ac5e442014-01-15 23:38:01[diff] [blame]47static void mark_tree_contents_uninteresting(struct tree *tree)
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]48{
Linus Torvaldsf75e53e2006-05-29 19:20:14[diff] [blame]49 struct tree_desc desc;
Linus Torvalds4c068a92006-05-30 16:45:45[diff] [blame]50 struct name_entry entry;
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]51 struct object *obj = &tree->object;
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]52
brian m. carlsonf2fd0762015-11-10 02:22:28[diff] [blame]53 if (!has_object_file(&obj->oid))
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]54 return;
55 if (parse_tree(tree) < 0)
brian m. carlsonf2fd0762015-11-10 02:22:28[diff] [blame]56 die("bad tree %s", oid_to_hex(&obj->oid));
Linus Torvaldsf75e53e2006-05-29 19:20:14[diff] [blame]57
Linus Torvalds6fda5e52007-03-21 17:08:25[diff] [blame]58 init_tree_desc(&desc, tree->buffer, tree->size);
Linus Torvalds4c068a92006-05-30 16:45:45[diff] [blame]59 while (tree_entry(&desc, &entry)) {
Linus Torvalds4d1012c2007-11-11 23:35:23[diff] [blame]60 switch (object_type(entry.mode)) {
61 case OBJ_TREE:
brian m. carlson7d924c92016-04-17 23:10:39[diff] [blame]62 mark_tree_uninteresting(lookup_tree(entry.oid->hash));
Linus Torvalds4d1012c2007-11-11 23:35:23[diff] [blame]63 break;
64 case OBJ_BLOB:
brian m. carlson7d924c92016-04-17 23:10:39[diff] [blame]65 mark_blob_uninteresting(lookup_blob(entry.oid->hash));
Linus Torvalds4d1012c2007-11-11 23:35:23[diff] [blame]66 break;
67 default:
68 /* Subproject commit - not in this repository */
69 break;
70 }
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]71 }
Linus Torvaldsf75e53e2006-05-29 19:20:14[diff] [blame]72
73 /*
74 * We don't care about the tree any more
75 * after it has been marked uninteresting.
76 */
Jeff King6e454b92013-06-05 22:37:39[diff] [blame]77 free_tree_buffer(tree);
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]78}
79
Junio C Hamano2ac5e442014-01-15 23:38:01[diff] [blame]80void mark_tree_uninteresting(struct tree *tree)
81{
Stefan Naewea2678df2015-12-05 15:27:24[diff] [blame]82 struct object *obj;
Junio C Hamano2ac5e442014-01-15 23:38:01[diff] [blame]83
84 if (!tree)
85 return;
Stefan Naewea2678df2015-12-05 15:27:24[diff] [blame]86
87 obj = &tree->object;
Junio C Hamano2ac5e442014-01-15 23:38:01[diff] [blame]88 if (obj->flags & UNINTERESTING)
89 return;
90 obj->flags |= UNINTERESTING;
91 mark_tree_contents_uninteresting(tree);
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]92}
93
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]94void mark_parents_uninteresting(struct commit *commit)
95{
Nguyễn Thái Ngọc Duy941ba8d2012-01-14 12:19:53[diff] [blame]96 struct commit_list *parents = NULL, *l;
97
98 for (l = commit->parents; l; l = l->next)
99 commit_list_insert(l->item, &parents);
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]100
101 while (parents) {
René Scharfee510ab82015-10-24 16:21:31[diff] [blame]102 struct commit *commit = pop_commit(&parents);
Nguyễn Thái Ngọc Duy941ba8d2012-01-14 12:19:53[diff] [blame]103
104 while (commit) {
105 /*
106 * A missing commit is ok iff its parent is marked
107 * uninteresting.
108 *
109 * We just mark such a thing parsed, so that when
110 * it is popped next time around, we won't be trying
111 * to parse it and get an error.
112 */
brian m. carlsonf2fd0762015-11-10 02:22:28[diff] [blame]113 if (!has_object_file(&commit->object.oid))
Nguyễn Thái Ngọc Duy941ba8d2012-01-14 12:19:53[diff] [blame]114 commit->object.parsed = 1;
115
116 if (commit->object.flags & UNINTERESTING)
117 break;
118
Matthias Urlichsd2c4af72006-03-09 04:04:36[diff] [blame]119 commit->object.flags |= UNINTERESTING;
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]120
Matthias Urlichsd2c4af72006-03-09 04:04:36[diff] [blame]121 /*
122 * Normally we haven't parsed the parent
123 * yet, so we won't have a parent of a parent
124 * here. However, it may turn out that we've
125 * reached this commit some other way (where it
126 * wasn't uninteresting), in which case we need
127 * to mark its parents recursively too..
128 */
Nguyễn Thái Ngọc Duy941ba8d2012-01-14 12:19:53[diff] [blame]129 if (!commit->parents)
130 break;
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]131
Nguyễn Thái Ngọc Duy941ba8d2012-01-14 12:19:53[diff] [blame]132 for (l = commit->parents->next; l; l = l->next)
133 commit_list_insert(l->item, &parents);
134 commit = commit->parents->item;
135 }
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]136 }
137}
138
Jeff King20739492014-10-15 22:43:19[diff] [blame]139static void add_pending_object_with_path(struct rev_info *revs,
Michael Haggertyff5f5f22013-05-25 09:08:07[diff] [blame]140 struct object *obj,
Jeff King20739492014-10-15 22:43:19[diff] [blame]141 const char *name, unsigned mode,
142 const char *path)
Martin Koeglerbb6c2fb2007-04-22 16:43:59[diff] [blame]143{
Junio C Hamanocc243c32011-05-19 01:08:09[diff] [blame]144 if (!obj)
145 return;
Linus Torvaldsaa27e462007-02-28 00:22:52[diff] [blame]146 if (revs->no_walk && (obj->flags & UNINTERESTING))
Linus Torvaldsf222abd2009-07-13 21:41:12[diff] [blame]147 revs->no_walk = 0;
Junio C Hamano105e4732010-01-26 21:48:28[diff] [blame]148 if (revs->reflog_info && obj->type == OBJ_COMMIT) {
149 struct strbuf buf = STRBUF_INIT;
Jeff King0e9f62d2017-03-02 08:23:01[diff] [blame]150 int len = interpret_branch_name(name, 0, &buf, 0);
Junio C Hamano105e4732010-01-26 21:48:28[diff] [blame]151 int st;
152
153 if (0 < len && name[len] && buf.len)
154 strbuf_addstr(&buf, name + len);
155 st = add_reflog_for_walk(revs->reflog_info,
156 (struct commit *)obj,
157 buf.buf[0] ? buf.buf: name);
158 strbuf_release(&buf);
159 if (st)
160 return;
161 }
Jeff King20739492014-10-15 22:43:19[diff] [blame]162 add_object_array_with_path(obj, name, &revs->pending, mode, path);
163}
164
165static void add_pending_object_with_mode(struct rev_info *revs,
166 struct object *obj,
167 const char *name, unsigned mode)
168{
169 add_pending_object_with_path(revs, obj, name, mode, NULL);
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]170}
171
Michael Haggertyff5f5f22013-05-25 09:08:07[diff] [blame]172void add_pending_object(struct rev_info *revs,
173 struct object *obj, const char *name)
Junio C Hamano2d93b9f2007-06-08 09:24:58[diff] [blame]174{
175 add_pending_object_with_mode(revs, obj, name, S_IFINVALID);
176}
177
Junio C Hamano3384a2d2007-12-11 18:09:04[diff] [blame]178void add_head_to_pending(struct rev_info *revs)
179{
180 unsigned char sha1[20];
181 struct object *obj;
182 if (get_sha1("HEAD", sha1))
183 return;
184 obj = parse_object(sha1);
185 if (!obj)
186 return;
187 add_pending_object(revs, obj, "HEAD");
188}
189
Michael Haggertyff5f5f22013-05-25 09:08:07[diff] [blame]190static struct object *get_reference(struct rev_info *revs, const char *name,
191 const unsigned char *sha1,
192 unsigned int flags)
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]193{
194 struct object *object;
195
196 object = parse_object(sha1);
Junio C Hamanocc243c32011-05-19 01:08:09[diff] [blame]197 if (!object) {
198 if (revs->ignore_missing)
199 return object;
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]200 die("bad object %s", name);
Junio C Hamanocc243c32011-05-19 01:08:09[diff] [blame]201 }
Linus Torvaldscd2bdc52006-04-14 23:52:13[diff] [blame]202 object->flags |= flags;
203 return object;
204}
205
René Scharfe26c31772011-10-01 15:43:52[diff] [blame]206void add_pending_sha1(struct rev_info *revs, const char *name,
207 const unsigned char *sha1, unsigned int flags)
208{
209 struct object *object = get_reference(revs, name, sha1, flags);
210 add_pending_object(revs, object, name);
211}
212
Michael Haggertyff5f5f22013-05-25 09:08:07[diff] [blame]213static struct commit *handle_commit(struct rev_info *revs,
Jeff King20739492014-10-15 22:43:19[diff] [blame]214 struct object_array_entry *entry)
Linus Torvaldscd2bdc52006-04-14 23:52:13[diff] [blame]215{
Jeff King20739492014-10-15 22:43:19[diff] [blame]216 struct object *object = entry->item;
217 const char *name = entry->name;
218 const char *path = entry->path;
219 unsigned int mode = entry->mode;
Linus Torvaldscd2bdc52006-04-14 23:52:13[diff] [blame]220 unsigned long flags = object->flags;
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]221
222 /*
223 * Tag object? Look what it points to..
224 */
Linus Torvalds19746322006-07-12 03:45:31[diff] [blame]225 while (object->type == OBJ_TAG) {
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]226 struct tag *tag = (struct tag *) object;
Linus Torvaldscd2bdc52006-04-14 23:52:13[diff] [blame]227 if (revs->tag_objects && !(flags & UNINTERESTING))
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]228 add_pending_object(revs, object, tag->tag);
Martin Koegler9684afd2008-02-18 20:48:01[diff] [blame]229 if (!tag->tagged)
230 die("bad tag");
brian m. carlsoned1c9972015-11-10 02:22:29[diff] [blame]231 object = parse_object(tag->tagged->oid.hash);
Junio C Hamanoaeeae1b2009-01-28 07:19:30[diff] [blame]232 if (!object) {
Jeff Kinga3ba6bf2017-05-20 08:30:25[diff] [blame]233 if (revs->ignore_missing_links || (flags & UNINTERESTING))
Junio C Hamanoaeeae1b2009-01-28 07:19:30[diff] [blame]234 return NULL;
brian m. carlsonf2fd0762015-11-10 02:22:28[diff] [blame]235 die("bad object %s", oid_to_hex(&tag->tagged->oid));
Junio C Hamanoaeeae1b2009-01-28 07:19:30[diff] [blame]236 }
Junio C Hamanoa7435282014-01-15 20:26:13[diff] [blame]237 object->flags |= flags;
Jeff King20739492014-10-15 22:43:19[diff] [blame]238 /*
239 * We'll handle the tagged object by looping or dropping
240 * through to the non-tag handlers below. Do not
Jeff King728350b2015-12-17 06:47:07[diff] [blame]241 * propagate path data from the tag's pending entry.
Jeff King20739492014-10-15 22:43:19[diff] [blame]242 */
Jeff King20739492014-10-15 22:43:19[diff] [blame]243 path = NULL;
244 mode = 0;
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]245 }
246
247 /*
248 * Commit object? Just return it, we'll do all the complex
249 * reachability crud.
250 */
Linus Torvalds19746322006-07-12 03:45:31[diff] [blame]251 if (object->type == OBJ_COMMIT) {
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]252 struct commit *commit = (struct commit *)object;
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]253 if (parse_commit(commit) < 0)
254 die("unable to parse commit %s", name);
Linus Torvaldsd9a83682006-02-27 16:54:36[diff] [blame]255 if (flags & UNINTERESTING) {
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]256 mark_parents_uninteresting(commit);
Linus Torvaldsd9a83682006-02-27 16:54:36[diff] [blame]257 revs->limited = 1;
258 }
Linus Torvalds0f3a2902008-10-27 19:51:59[diff] [blame]259 if (revs->show_source && !commit->util)
Jeff King1da1e072014-10-15 22:35:12[diff] [blame]260 commit->util = xstrdup(name);
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]261 return commit;
262 }
263
264 /*
Mike Ralphson3ea3c212009-04-17 18:13:30[diff] [blame]265 * Tree object? Either mark it uninteresting, or add it
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]266 * to the list of objects to look at later..
267 */
Linus Torvalds19746322006-07-12 03:45:31[diff] [blame]268 if (object->type == OBJ_TREE) {
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]269 struct tree *tree = (struct tree *)object;
270 if (!revs->tree_objects)
271 return NULL;
272 if (flags & UNINTERESTING) {
Junio C Hamano2ac5e442014-01-15 23:38:01[diff] [blame]273 mark_tree_contents_uninteresting(tree);
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]274 return NULL;
275 }
Jeff King20739492014-10-15 22:43:19[diff] [blame]276 add_pending_object_with_path(revs, object, name, mode, path);
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]277 return NULL;
278 }
279
280 /*
281 * Blob object? You know the drill by now..
282 */
Linus Torvalds19746322006-07-12 03:45:31[diff] [blame]283 if (object->type == OBJ_BLOB) {
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]284 if (!revs->blob_objects)
285 return NULL;
Junio C Hamanoa7435282014-01-15 20:26:13[diff] [blame]286 if (flags & UNINTERESTING)
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]287 return NULL;
Jeff King20739492014-10-15 22:43:19[diff] [blame]288 add_pending_object_with_path(revs, object, name, mode, path);
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]289 return NULL;
290 }
291 die("%s is unknown object", name);
292}
293
Jeff Kingb6e8a3b2015-04-17 22:11:04[diff] [blame]294static int everybody_uninteresting(struct commit_list *orig,
295 struct commit **interesting_cache)
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]296{
297 struct commit_list *list = orig;
Jeff Kingb6e8a3b2015-04-17 22:11:04[diff] [blame]298
299 if (*interesting_cache) {
300 struct commit *commit = *interesting_cache;
301 if (!(commit->object.flags & UNINTERESTING))
302 return 0;
303 }
304
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]305 while (list) {
306 struct commit *commit = list->item;
307 list = list->next;
308 if (commit->object.flags & UNINTERESTING)
309 continue;
Stefan Bellerae40ebd2015-06-26 19:40:19[diff] [blame]310
311 *interesting_cache = commit;
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]312 return 0;
313 }
314 return 1;
315}
316
Junio C Hamano0a4ba7f2007-03-14 20:12:18[diff] [blame]317/*
Kevin Bracey4d826602013-05-16 15:32:39[diff] [blame]318 * A definition of "relevant" commit that we can use to simplify limited graphs
319 * by eliminating side branches.
320 *
321 * A "relevant" commit is one that is !UNINTERESTING (ie we are including it
322 * in our list), or that is a specified BOTTOM commit. Then after computing
323 * a limited list, during processing we can generally ignore boundary merges
324 * coming from outside the graph, (ie from irrelevant parents), and treat
325 * those merges as if they were single-parent. TREESAME is defined to consider
326 * only relevant parents, if any. If we are TREESAME to our on-graph parents,
327 * we don't care if we were !TREESAME to non-graph parents.
328 *
329 * Treating bottom commits as relevant ensures that a limited graph's
330 * connection to the actual bottom commit is not viewed as a side branch, but
331 * treated as part of the graph. For example:
332 *
333 * ....Z...A---X---o---o---B
334 * . /
335 * W---Y
336 *
337 * When computing "A..B", the A-X connection is at least as important as
338 * Y-X, despite A being flagged UNINTERESTING.
339 *
340 * And when computing --ancestry-path "A..B", the A-X connection is more
341 * important than Y-X, despite both A and Y being flagged UNINTERESTING.
342 */
343static inline int relevant_commit(struct commit *commit)
344{
345 return (commit->object.flags & (UNINTERESTING | BOTTOM)) != UNINTERESTING;
346}
347
348/*
349 * Return a single relevant commit from a parent list. If we are a TREESAME
350 * commit, and this selects one of our parents, then we can safely simplify to
351 * that parent.
352 */
353static struct commit *one_relevant_parent(const struct rev_info *revs,
354 struct commit_list *orig)
355{
356 struct commit_list *list = orig;
357 struct commit *relevant = NULL;
358
359 if (!orig)
360 return NULL;
361
362 /*
363 * For 1-parent commits, or if first-parent-only, then return that
364 * first parent (even if not "relevant" by the above definition).
365 * TREESAME will have been set purely on that parent.
366 */
367 if (revs->first_parent_only || !orig->next)
368 return orig->item;
369
370 /*
371 * For multi-parent commits, identify a sole relevant parent, if any.
372 * If we have only one relevant parent, then TREESAME will be set purely
373 * with regard to that parent, and we can simplify accordingly.
374 *
375 * If we have more than one relevant parent, or no relevant parents
376 * (and multiple irrelevant ones), then we can't select a parent here
377 * and return NULL.
378 */
379 while (list) {
380 struct commit *commit = list->item;
381 list = list->next;
382 if (relevant_commit(commit)) {
383 if (relevant)
384 return NULL;
385 relevant = commit;
386 }
387 }
388 return relevant;
389}
390
391/*
Junio C Hamano0a4ba7f2007-03-14 20:12:18[diff] [blame]392 * The goal is to get REV_TREE_NEW as the result only if the
Linus Torvaldsceff8e72009-06-03 01:34:01[diff] [blame]393 * diff consists of all '+' (and no other changes), REV_TREE_OLD
394 * if the whole diff is removal of old data, and otherwise
395 * REV_TREE_DIFFERENT (of course if the trees are the same we
396 * want REV_TREE_SAME).
397 * That means that once we get to REV_TREE_DIFFERENT, we do not
398 * have to look any further.
Junio C Hamano0a4ba7f2007-03-14 20:12:18[diff] [blame]399 */
Fredrik Kuivinen8efdc322006-03-10 09:21:39[diff] [blame]400static int tree_difference = REV_TREE_SAME;
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]401
402static void file_add_remove(struct diff_options *options,
403 int addremove, unsigned mode,
404 const unsigned char *sha1,
Jeff Kinge5450102012-07-28 15:03:01[diff] [blame]405 int sha1_valid,
Jens Lehmanne3d42c42010-01-18 20:26:18[diff] [blame]406 const char *fullpath, unsigned dirty_submodule)
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]407{
Linus Torvaldsceff8e72009-06-03 01:34:01[diff] [blame]408 int diff = addremove == '+' ? REV_TREE_NEW : REV_TREE_OLD;
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]409
Linus Torvaldsceff8e72009-06-03 01:34:01[diff] [blame]410 tree_difference |= diff;
Junio C Hamanodd47aa32007-03-14 20:18:15[diff] [blame]411 if (tree_difference == REV_TREE_DIFFERENT)
Pierre Habouzit8f67f8a2007-11-10 19:05:14[diff] [blame]412 DIFF_OPT_SET(options, HAS_CHANGES);
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]413}
414
415static void file_change(struct diff_options *options,
416 unsigned old_mode, unsigned new_mode,
417 const unsigned char *old_sha1,
418 const unsigned char *new_sha1,
Jeff Kinge5450102012-07-28 15:03:01[diff] [blame]419 int old_sha1_valid, int new_sha1_valid,
Jens Lehmanne3d42c42010-01-18 20:26:18[diff] [blame]420 const char *fullpath,
421 unsigned old_dirty_submodule, unsigned new_dirty_submodule)
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]422{
Fredrik Kuivinen8efdc322006-03-10 09:21:39[diff] [blame]423 tree_difference = REV_TREE_DIFFERENT;
Pierre Habouzit8f67f8a2007-11-10 19:05:14[diff] [blame]424 DIFF_OPT_SET(options, HAS_CHANGES);
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]425}
426
Michael Haggertyff5f5f22013-05-25 09:08:07[diff] [blame]427static int rev_compare_tree(struct rev_info *revs,
428 struct commit *parent, struct commit *commit)
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]429{
Linus Torvalds3a5e8602008-11-03 18:45:41[diff] [blame]430 struct tree *t1 = parent->tree;
431 struct tree *t2 = commit->tree;
432
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]433 if (!t1)
Fredrik Kuivinen8efdc322006-03-10 09:21:39[diff] [blame]434 return REV_TREE_NEW;
Linus Torvaldsceff8e72009-06-03 01:34:01[diff] [blame]435 if (!t2)
436 return REV_TREE_OLD;
Linus Torvalds78892e32008-11-03 19:25:46[diff] [blame]437
438 if (revs->simplify_by_decoration) {
439 /*
440 * If we are simplifying by decoration, then the commit
441 * is worth showing if it has a tag pointing at it.
442 */
Jeff King2608c242014-08-26 10:23:54[diff] [blame]443 if (get_name_decoration(&commit->object))
Linus Torvalds78892e32008-11-03 19:25:46[diff] [blame]444 return REV_TREE_DIFFERENT;
445 /*
446 * A commit that is not pointed by a tag is uninteresting
447 * if we are not limited by path. This means that you will
448 * see the usual "commits that touch the paths" plus any
449 * tagged commit by specifying both --simplify-by-decoration
450 * and pathspec.
451 */
Nguyễn Thái Ngọc Duyafe069d2010-12-17 12:43:06[diff] [blame]452 if (!revs->prune_data.nr)
Linus Torvalds78892e32008-11-03 19:25:46[diff] [blame]453 return REV_TREE_SAME;
454 }
Linus Torvaldsceff8e72009-06-03 01:34:01[diff] [blame]455
Fredrik Kuivinen8efdc322006-03-10 09:21:39[diff] [blame]456 tree_difference = REV_TREE_SAME;
Pierre Habouzit8f67f8a2007-11-10 19:05:14[diff] [blame]457 DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
brian m. carlsoned1c9972015-11-10 02:22:29[diff] [blame]458 if (diff_tree_sha1(t1->object.oid.hash, t2->object.oid.hash, "",
Linus Torvaldscd2bdc52006-04-14 23:52:13[diff] [blame]459 &revs->pruning) < 0)
Fredrik Kuivinen8efdc322006-03-10 09:21:39[diff] [blame]460 return REV_TREE_DIFFERENT;
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]461 return tree_difference;
462}
463
Linus Torvalds3a5e8602008-11-03 18:45:41[diff] [blame]464static int rev_same_tree_as_empty(struct rev_info *revs, struct commit *commit)
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]465{
466 int retval;
Linus Torvalds3a5e8602008-11-03 18:45:41[diff] [blame]467 struct tree *t1 = commit->tree;
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]468
469 if (!t1)
470 return 0;
471
Junio C Hamano0a4ba7f2007-03-14 20:12:18[diff] [blame]472 tree_difference = REV_TREE_SAME;
Pierre Habouzit8f67f8a2007-11-10 19:05:14[diff] [blame]473 DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
brian m. carlsoned1c9972015-11-10 02:22:29[diff] [blame]474 retval = diff_tree_sha1(NULL, t1->object.oid.hash, "", &revs->pruning);
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]475
Junio C Hamano0a4ba7f2007-03-14 20:12:18[diff] [blame]476 return retval >= 0 && (tree_difference == REV_TREE_SAME);
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]477}
478
Kevin Braceyd0af6632013-05-16 15:32:34[diff] [blame]479struct treesame_state {
480 unsigned int nparents;
481 unsigned char treesame[FLEX_ARRAY];
482};
483
484static struct treesame_state *initialise_treesame(struct rev_info *revs, struct commit *commit)
485{
486 unsigned n = commit_list_count(commit->parents);
Jeff King50a6c8e2016-02-22 22:44:35[diff] [blame]487 struct treesame_state *st = xcalloc(1, st_add(sizeof(*st), n));
Kevin Braceyd0af6632013-05-16 15:32:34[diff] [blame]488 st->nparents = n;
489 add_decoration(&revs->treesame, &commit->object, st);
490 return st;
491}
492
493/*
494 * Must be called immediately after removing the nth_parent from a commit's
495 * parent list, if we are maintaining the per-parent treesame[] decoration.
496 * This does not recalculate the master TREESAME flag - update_treesame()
497 * should be called to update it after a sequence of treesame[] modifications
498 * that may have affected it.
499 */
500static int compact_treesame(struct rev_info *revs, struct commit *commit, unsigned nth_parent)
501{
502 struct treesame_state *st;
503 int old_same;
504
505 if (!commit->parents) {
506 /*
507 * Have just removed the only parent from a non-merge.
508 * Different handling, as we lack decoration.
509 */
510 if (nth_parent != 0)
511 die("compact_treesame %u", nth_parent);
512 old_same = !!(commit->object.flags & TREESAME);
513 if (rev_same_tree_as_empty(revs, commit))
514 commit->object.flags |= TREESAME;
515 else
516 commit->object.flags &= ~TREESAME;
517 return old_same;
518 }
519
520 st = lookup_decoration(&revs->treesame, &commit->object);
521 if (!st || nth_parent >= st->nparents)
522 die("compact_treesame %u", nth_parent);
523
524 old_same = st->treesame[nth_parent];
525 memmove(st->treesame + nth_parent,
526 st->treesame + nth_parent + 1,
527 st->nparents - nth_parent - 1);
528
529 /*
530 * If we've just become a non-merge commit, update TREESAME
531 * immediately, and remove the no-longer-needed decoration.
532 * If still a merge, defer update until update_treesame().
533 */
534 if (--st->nparents == 1) {
535 if (commit->parents->next)
536 die("compact_treesame parents mismatch");
537 if (st->treesame[0] && revs->dense)
538 commit->object.flags |= TREESAME;
539 else
540 commit->object.flags &= ~TREESAME;
541 free(add_decoration(&revs->treesame, &commit->object, NULL));
542 }
543
544 return old_same;
545}
546
547static unsigned update_treesame(struct rev_info *revs, struct commit *commit)
548{
549 if (commit->parents && commit->parents->next) {
550 unsigned n;
551 struct treesame_state *st;
Kevin Bracey4d826602013-05-16 15:32:39[diff] [blame]552 struct commit_list *p;
553 unsigned relevant_parents;
554 unsigned relevant_change, irrelevant_change;
Kevin Braceyd0af6632013-05-16 15:32:34[diff] [blame]555
556 st = lookup_decoration(&revs->treesame, &commit->object);
557 if (!st)
brian m. carlsonf2fd0762015-11-10 02:22:28[diff] [blame]558 die("update_treesame %s", oid_to_hex(&commit->object.oid));
Kevin Bracey4d826602013-05-16 15:32:39[diff] [blame]559 relevant_parents = 0;
560 relevant_change = irrelevant_change = 0;
561 for (p = commit->parents, n = 0; p; n++, p = p->next) {
562 if (relevant_commit(p->item)) {
563 relevant_change |= !st->treesame[n];
564 relevant_parents++;
565 } else
566 irrelevant_change |= !st->treesame[n];
Kevin Braceyd0af6632013-05-16 15:32:34[diff] [blame]567 }
Kevin Bracey4d826602013-05-16 15:32:39[diff] [blame]568 if (relevant_parents ? relevant_change : irrelevant_change)
569 commit->object.flags &= ~TREESAME;
570 else
571 commit->object.flags |= TREESAME;
Kevin Braceyd0af6632013-05-16 15:32:34[diff] [blame]572 }
573
574 return commit->object.flags & TREESAME;
575}
576
Kevin Bracey4d826602013-05-16 15:32:39[diff] [blame]577static inline int limiting_can_increase_treesame(const struct rev_info *revs)
578{
579 /*
580 * TREESAME is irrelevant unless prune && dense;
581 * if simplify_history is set, we can't have a mixture of TREESAME and
582 * !TREESAME INTERESTING parents (and we don't have treesame[]
583 * decoration anyway);
584 * if first_parent_only is set, then the TREESAME flag is locked
585 * against the first parent (and again we lack treesame[] decoration).
586 */
587 return revs->prune && revs->dense &&
588 !revs->simplify_history &&
589 !revs->first_parent_only;
590}
591
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]592static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
593{
594 struct commit_list **pp, *parent;
Kevin Braceyd0af6632013-05-16 15:32:34[diff] [blame]595 struct treesame_state *ts = NULL;
Kevin Bracey4d826602013-05-16 15:32:39[diff] [blame]596 int relevant_change = 0, irrelevant_change = 0;
597 int relevant_parents, nth_parent;
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]598
Linus Torvalds53b2c822007-11-05 21:22:34[diff] [blame]599 /*
600 * If we don't do pruning, everything is interesting
601 */
Linus Torvalds7dc0fe32007-11-13 07:16:08[diff] [blame]602 if (!revs->prune)
Linus Torvalds53b2c822007-11-05 21:22:34[diff] [blame]603 return;
Linus Torvalds53b2c822007-11-05 21:22:34[diff] [blame]604
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]605 if (!commit->tree)
606 return;
607
608 if (!commit->parents) {
Linus Torvalds3a5e8602008-11-03 18:45:41[diff] [blame]609 if (rev_same_tree_as_empty(revs, commit))
Linus Torvalds7dc0fe32007-11-13 07:16:08[diff] [blame]610 commit->object.flags |= TREESAME;
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]611 return;
612 }
613
Linus Torvalds53b2c822007-11-05 21:22:34[diff] [blame]614 /*
615 * Normal non-merge commit? If we don't want to make the
616 * history dense, we consider it always to be a change..
617 */
Linus Torvalds7dc0fe32007-11-13 07:16:08[diff] [blame]618 if (!revs->dense && !commit->parents->next)
Linus Torvalds53b2c822007-11-05 21:22:34[diff] [blame]619 return;
Linus Torvalds53b2c822007-11-05 21:22:34[diff] [blame]620
Kevin Bracey4d826602013-05-16 15:32:39[diff] [blame]621 for (pp = &commit->parents, nth_parent = 0, relevant_parents = 0;
Kevin Braceyd0af6632013-05-16 15:32:34[diff] [blame]622 (parent = *pp) != NULL;
623 pp = &parent->next, nth_parent++) {
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]624 struct commit *p = parent->item;
Kevin Bracey4d826602013-05-16 15:32:39[diff] [blame]625 if (relevant_commit(p))
626 relevant_parents++;
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]627
Kevin Braceyd0af6632013-05-16 15:32:34[diff] [blame]628 if (nth_parent == 1) {
629 /*
630 * This our second loop iteration - so we now know
631 * we're dealing with a merge.
632 *
633 * Do not compare with later parents when we care only about
634 * the first parent chain, in order to avoid derailing the
635 * traversal to follow a side branch that brought everything
636 * in the path we are limited to by the pathspec.
637 */
638 if (revs->first_parent_only)
639 break;
640 /*
641 * If this will remain a potentially-simplifiable
642 * merge, remember per-parent treesame if needed.
643 * Initialise the array with the comparison from our
644 * first iteration.
645 */
646 if (revs->treesame.name &&
647 !revs->simplify_history &&
648 !(commit->object.flags & UNINTERESTING)) {
649 ts = initialise_treesame(revs, commit);
Kevin Bracey4d826602013-05-16 15:32:39[diff] [blame]650 if (!(irrelevant_change || relevant_change))
Kevin Braceyd0af6632013-05-16 15:32:34[diff] [blame]651 ts->treesame[0] = 1;
652 }
653 }
Alex Riesencc0e6c52007-05-04 21:54:57[diff] [blame]654 if (parse_commit(p) < 0)
655 die("cannot simplify commit %s (because of %s)",
brian m. carlsonf2fd0762015-11-10 02:22:28[diff] [blame]656 oid_to_hex(&commit->object.oid),
657 oid_to_hex(&p->object.oid));
Linus Torvalds3a5e8602008-11-03 18:45:41[diff] [blame]658 switch (rev_compare_tree(revs, p, commit)) {
Fredrik Kuivinen8efdc322006-03-10 09:21:39[diff] [blame]659 case REV_TREE_SAME:
Kevin Bracey141efdb2013-05-16 15:32:41[diff] [blame]660 if (!revs->simplify_history || !relevant_commit(p)) {
Junio C Hamanof3219fb2006-03-11 05:59:37[diff] [blame]661 /* Even if a merge with an uninteresting
662 * side branch brought the entire change
663 * we are interested in, we do not want
664 * to lose the other branches of this
665 * merge, so we just keep going.
666 */
Kevin Braceyd0af6632013-05-16 15:32:34[diff] [blame]667 if (ts)
668 ts->treesame[nth_parent] = 1;
Junio C Hamanof3219fb2006-03-11 05:59:37[diff] [blame]669 continue;
670 }
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]671 parent->next = NULL;
672 commit->parents = parent;
Linus Torvalds7dc0fe32007-11-13 07:16:08[diff] [blame]673 commit->object.flags |= TREESAME;
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]674 return;
675
Fredrik Kuivinen8efdc322006-03-10 09:21:39[diff] [blame]676 case REV_TREE_NEW:
677 if (revs->remove_empty_trees &&
Linus Torvalds3a5e8602008-11-03 18:45:41[diff] [blame]678 rev_same_tree_as_empty(revs, p)) {
Junio C Hamanoc348f312006-03-12 21:39:31[diff] [blame]679 /* We are adding all the specified
680 * paths from this parent, so the
681 * history beyond this parent is not
682 * interesting. Remove its parents
683 * (they are grandparents for us).
684 * IOW, we pretend this parent is a
685 * "root" commit.
Junio C Hamanoa41e1092006-03-12 21:39:31[diff] [blame]686 */
Alex Riesencc0e6c52007-05-04 21:54:57[diff] [blame]687 if (parse_commit(p) < 0)
688 die("cannot simplify commit %s (invalid %s)",
brian m. carlsonf2fd0762015-11-10 02:22:28[diff] [blame]689 oid_to_hex(&commit->object.oid),
690 oid_to_hex(&p->object.oid));
Junio C Hamanoc348f312006-03-12 21:39:31[diff] [blame]691 p->parents = NULL;
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]692 }
693 /* fallthrough */
Linus Torvaldsceff8e72009-06-03 01:34:01[diff] [blame]694 case REV_TREE_OLD:
Fredrik Kuivinen8efdc322006-03-10 09:21:39[diff] [blame]695 case REV_TREE_DIFFERENT:
Kevin Bracey4d826602013-05-16 15:32:39[diff] [blame]696 if (relevant_commit(p))
697 relevant_change = 1;
698 else
699 irrelevant_change = 1;
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]700 continue;
701 }
brian m. carlsonf2fd0762015-11-10 02:22:28[diff] [blame]702 die("bad tree compare for commit %s", oid_to_hex(&commit->object.oid));
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]703 }
Kevin Bracey4d826602013-05-16 15:32:39[diff] [blame]704
705 /*
706 * TREESAME is straightforward for single-parent commits. For merge
707 * commits, it is most useful to define it so that "irrelevant"
708 * parents cannot make us !TREESAME - if we have any relevant
709 * parents, then we only consider TREESAMEness with respect to them,
710 * allowing irrelevant merges from uninteresting branches to be
711 * simplified away. Only if we have only irrelevant parents do we
712 * base TREESAME on them. Note that this logic is replicated in
713 * update_treesame, which should be kept in sync.
714 */
715 if (relevant_parents ? !relevant_change : !irrelevant_change)
716 commit->object.flags |= TREESAME;
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]717}
718
Thiago Farina47e44ed2010-11-27 01:58:14[diff] [blame]719static void commit_list_insert_by_date_cached(struct commit *p, struct commit_list **head,
Alexander N. Gavrilovfce87ae2008-07-12 18:00:57[diff] [blame]720 struct commit_list *cached_base, struct commit_list **cache)
721{
722 struct commit_list *new_entry;
723
724 if (cached_base && p->date < cached_base->item->date)
Thiago Farina47e44ed2010-11-27 01:58:14[diff] [blame]725 new_entry = commit_list_insert_by_date(p, &cached_base->next);
Alexander N. Gavrilovfce87ae2008-07-12 18:00:57[diff] [blame]726 else
Thiago Farina47e44ed2010-11-27 01:58:14[diff] [blame]727 new_entry = commit_list_insert_by_date(p, head);
Alexander N. Gavrilovfce87ae2008-07-12 18:00:57[diff] [blame]728
729 if (cache && (!*cache || p->date < (*cache)->item->date))
730 *cache = new_entry;
731}
732
733static int add_parents_to_list(struct rev_info *revs, struct commit *commit,
734 struct commit_list **list, struct commit_list **cache_ptr)
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]735{
736 struct commit_list *parent = commit->parents;
Junio C Hamano577ed5c2006-10-23 00:32:47[diff] [blame]737 unsigned left_flag;
Alexander N. Gavrilovfce87ae2008-07-12 18:00:57[diff] [blame]738 struct commit_list *cached_base = cache_ptr ? *cache_ptr : NULL;
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]739
Linus Torvalds3381c792006-04-09 00:05:58[diff] [blame]740 if (commit->object.flags & ADDED)
Alex Riesencc0e6c52007-05-04 21:54:57[diff] [blame]741 return 0;
Linus Torvalds3381c792006-04-09 00:05:58[diff] [blame]742 commit->object.flags |= ADDED;
743
Vicent Martia330de32013-10-24 18:01:41[diff] [blame]744 if (revs->include_check &&
745 !revs->include_check(commit, revs->include_check_data))
746 return 0;
747
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]748 /*
749 * If the commit is uninteresting, don't try to
750 * prune parents - we want the maximal uninteresting
751 * set.
752 *
753 * Normally we haven't parsed the parent
754 * yet, so we won't have a parent of a parent
755 * here. However, it may turn out that we've
756 * reached this commit some other way (where it
757 * wasn't uninteresting), in which case we need
758 * to mark its parents recursively too..
759 */
760 if (commit->object.flags & UNINTERESTING) {
761 while (parent) {
762 struct commit *p = parent->item;
763 parent = parent->next;
Junio C Hamanoaeeae1b2009-01-28 07:19:30[diff] [blame]764 if (p)
765 p->object.flags |= UNINTERESTING;
Jeff Kingce4e7b22015-06-01 09:56:40[diff] [blame]766 if (parse_commit_gently(p, 1) < 0)
Junio C Hamanoaeeae1b2009-01-28 07:19:30[diff] [blame]767 continue;
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]768 if (p->parents)
769 mark_parents_uninteresting(p);
770 if (p->object.flags & SEEN)
771 continue;
772 p->object.flags |= SEEN;
Thiago Farina47e44ed2010-11-27 01:58:14[diff] [blame]773 commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]774 }
Alex Riesencc0e6c52007-05-04 21:54:57[diff] [blame]775 return 0;
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]776 }
777
778 /*
779 * Ok, the commit wasn't uninteresting. Try to
780 * simplify the commit history and find the parent
781 * that has no differences in the path set if one exists.
782 */
Linus Torvalds53b2c822007-11-05 21:22:34[diff] [blame]783 try_to_simplify_commit(revs, commit);
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]784
Linus Torvaldsba1d4502006-04-15 19:09:56[diff] [blame]785 if (revs->no_walk)
Alex Riesencc0e6c52007-05-04 21:54:57[diff] [blame]786 return 0;
Linus Torvaldsba1d4502006-04-15 19:09:56[diff] [blame]787
Junio C Hamano577ed5c2006-10-23 00:32:47[diff] [blame]788 left_flag = (commit->object.flags & SYMMETRIC_LEFT);
Junio C Hamano0053e902007-03-13 08:57:22[diff] [blame]789
Stephen R. van den Bergd9c292e2008-04-27 17:32:46[diff] [blame]790 for (parent = commit->parents; parent; parent = parent->next) {
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]791 struct commit *p = parent->item;
792
Jeff Kingdaf7d862015-06-01 09:56:37[diff] [blame]793 if (parse_commit_gently(p, revs->ignore_missing_links) < 0)
Alex Riesencc0e6c52007-05-04 21:54:57[diff] [blame]794 return -1;
Linus Torvalds0f3a2902008-10-27 19:51:59[diff] [blame]795 if (revs->show_source && !p->util)
796 p->util = commit->util;
Junio C Hamano577ed5c2006-10-23 00:32:47[diff] [blame]797 p->object.flags |= left_flag;
Lars Hjemliad1012e2008-05-12 15:12:36[diff] [blame]798 if (!(p->object.flags & SEEN)) {
799 p->object.flags |= SEEN;
Thiago Farina47e44ed2010-11-27 01:58:14[diff] [blame]800 commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
Lars Hjemliad1012e2008-05-12 15:12:36[diff] [blame]801 }
Junio C Hamano60d30b02008-08-01 05:17:13[diff] [blame]802 if (revs->first_parent_only)
Stephen R. van den Bergd9c292e2008-04-27 17:32:46[diff] [blame]803 break;
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]804 }
Alex Riesencc0e6c52007-05-04 21:54:57[diff] [blame]805 return 0;
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]806}
807
Johannes Schindelin36d56de2007-07-10 13:50:49[diff] [blame]808static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
Junio C Hamanod7a17ca2007-04-09 10:40:38[diff] [blame]809{
810 struct commit_list *p;
811 int left_count = 0, right_count = 0;
812 int left_first;
813 struct patch_ids ids;
Michael J Gruberadbbb312011-03-07 12:31:40[diff] [blame]814 unsigned cherry_flag;
Junio C Hamanod7a17ca2007-04-09 10:40:38[diff] [blame]815
816 /* First count the commits on the left and on the right */
817 for (p = list; p; p = p->next) {
818 struct commit *commit = p->item;
819 unsigned flags = commit->object.flags;
820 if (flags & BOUNDARY)
821 ;
822 else if (flags & SYMMETRIC_LEFT)
823 left_count++;
824 else
825 right_count++;
826 }
827
Thomas Rast36c07972010-02-20 11:42:04[diff] [blame]828 if (!left_count || !right_count)
829 return;
830
Junio C Hamanod7a17ca2007-04-09 10:40:38[diff] [blame]831 left_first = left_count < right_count;
832 init_patch_ids(&ids);
Nguy��n Thái Ngọc Duy66f13622010-12-15 15:02:38[diff] [blame]833 ids.diffopts.pathspec = revs->diffopt.pathspec;
Junio C Hamanod7a17ca2007-04-09 10:40:38[diff] [blame]834
835 /* Compute patch-ids for one side */
836 for (p = list; p; p = p->next) {
837 struct commit *commit = p->item;
838 unsigned flags = commit->object.flags;
839
840 if (flags & BOUNDARY)
841 continue;
842 /*
843 * If we have fewer left, left_first is set and we omit
844 * commits on the right branch in this loop. If we have
845 * fewer right, we skip the left ones.
846 */
847 if (left_first != !!(flags & SYMMETRIC_LEFT))
848 continue;
Kevin Willford683f17e2016-07-29 16:19:18[diff] [blame]849 add_commit_patch_id(commit, &ids);
Junio C Hamanod7a17ca2007-04-09 10:40:38[diff] [blame]850 }
851
Michael J Gruberadbbb312011-03-07 12:31:40[diff] [blame]852 /* either cherry_mark or cherry_pick are true */
853 cherry_flag = revs->cherry_mark ? PATCHSAME : SHOWN;
854
Junio C Hamanod7a17ca2007-04-09 10:40:38[diff] [blame]855 /* Check the other side */
856 for (p = list; p; p = p->next) {
857 struct commit *commit = p->item;
858 struct patch_id *id;
859 unsigned flags = commit->object.flags;
860
861 if (flags & BOUNDARY)
862 continue;
863 /*
864 * If we have fewer left, left_first is set and we omit
865 * commits on the left branch in this loop.
866 */
867 if (left_first == !!(flags & SYMMETRIC_LEFT))
868 continue;
869
870 /*
871 * Have we seen the same patch id?
872 */
873 id = has_commit_patch_id(commit, &ids);
874 if (!id)
875 continue;
Kevin Willford683f17e2016-07-29 16:19:18[diff] [blame]876
Michael J Gruberadbbb312011-03-07 12:31:40[diff] [blame]877 commit->object.flags |= cherry_flag;
Kevin Willford683f17e2016-07-29 16:19:18[diff] [blame]878 id->commit->object.flags |= cherry_flag;
Junio C Hamanod7a17ca2007-04-09 10:40:38[diff] [blame]879 }
880
881 free_patch_ids(&ids);
882}
883
Linus Torvalds7d004192008-03-18 01:56:33[diff] [blame]884/* How many extra uninteresting commits we want to see.. */
885#define SLOP 5
886
Jeff Kingb6e8a3b2015-04-17 22:11:04[diff] [blame]887static int still_interesting(struct commit_list *src, unsigned long date, int slop,
888 struct commit **interesting_cache)
Linus Torvalds3131b712008-02-09 22:02:07[diff] [blame]889{
Linus Torvalds7d004192008-03-18 01:56:33[diff] [blame]890 /*
891 * No source list at all? We're definitely done..
892 */
893 if (!src)
894 return 0;
895
896 /*
897 * Does the destination list contain entries with a date
898 * before the source list? Definitely _not_ done.
899 */
Kacper Kornetc19d1b42013-03-22 18:38:19[diff] [blame]900 if (date <= src->item->date)
Linus Torvalds7d004192008-03-18 01:56:33[diff] [blame]901 return SLOP;
902
903 /*
904 * Does the source list still have interesting commits in
905 * it? Definitely not done..
906 */
Jeff Kingb6e8a3b2015-04-17 22:11:04[diff] [blame]907 if (!everybody_uninteresting(src, interesting_cache))
Linus Torvalds7d004192008-03-18 01:56:33[diff] [blame]908 return SLOP;
909
910 /* Ok, we're closing in.. */
911 return slop-1;
Linus Torvalds3131b712008-02-09 22:02:07[diff] [blame]912}
913
Junio C Hamanoebdc94f2010-04-20 20:48:39[diff] [blame]914/*
915 * "rev-list --ancestry-path A..B" computes commits that are ancestors
916 * of B but not ancestors of A but further limits the result to those
917 * that are descendants of A. This takes the list of bottom commits and
918 * the result of "A..B" without --ancestry-path, and limits the latter
919 * further to the ones that can reach one of the commits in "bottom".
920 */
921static void limit_to_ancestry(struct commit_list *bottom, struct commit_list *list)
922{
923 struct commit_list *p;
924 struct commit_list *rlist = NULL;
925 int made_progress;
926
927 /*
928 * Reverse the list so that it will be likely that we would
929 * process parents before children.
930 */
931 for (p = list; p; p = p->next)
932 commit_list_insert(p->item, &rlist);
933
934 for (p = bottom; p; p = p->next)
935 p->item->object.flags |= TMP_MARK;
936
937 /*
938 * Mark the ones that can reach bottom commits in "list",
939 * in a bottom-up fashion.
940 */
941 do {
942 made_progress = 0;
943 for (p = rlist; p; p = p->next) {
944 struct commit *c = p->item;
945 struct commit_list *parents;
946 if (c->object.flags & (TMP_MARK | UNINTERESTING))
947 continue;
948 for (parents = c->parents;
949 parents;
950 parents = parents->next) {
951 if (!(parents->item->object.flags & TMP_MARK))
952 continue;
953 c->object.flags |= TMP_MARK;
954 made_progress = 1;
955 break;
956 }
957 }
958 } while (made_progress);
959
960 /*
961 * NEEDSWORK: decide if we want to remove parents that are
962 * not marked with TMP_MARK from commit->parents for commits
963 * in the resulting list. We may not want to do that, though.
964 */
965
966 /*
967 * The ones that are not marked with TMP_MARK are uninteresting
968 */
969 for (p = list; p; p = p->next) {
970 struct commit *c = p->item;
971 if (c->object.flags & TMP_MARK)
972 continue;
973 c->object.flags |= UNINTERESTING;
974 }
975
976 /* We are done with the TMP_MARK */
977 for (p = list; p; p = p->next)
978 p->item->object.flags &= ~TMP_MARK;
979 for (p = bottom; p; p = p->next)
980 p->item->object.flags &= ~TMP_MARK;
981 free_commit_list(rlist);
982}
983
984/*
985 * Before walking the history, keep the set of "negative" refs the
986 * caller has asked to exclude.
987 *
988 * This is used to compute "rev-list --ancestry-path A..B", as we need
989 * to filter the result of "A..B" further to the ones that can actually
990 * reach A.
991 */
Kevin Bracey7f34a462013-05-16 15:32:38[diff] [blame]992static struct commit_list *collect_bottom_commits(struct commit_list *list)
Junio C Hamanoebdc94f2010-04-20 20:48:39[diff] [blame]993{
Kevin Bracey7f34a462013-05-16 15:32:38[diff] [blame]994 struct commit_list *elem, *bottom = NULL;
995 for (elem = list; elem; elem = elem->next)
996 if (elem->item->object.flags & BOTTOM)
997 commit_list_insert(elem->item, &bottom);
Junio C Hamanoebdc94f2010-04-20 20:48:39[diff] [blame]998 return bottom;
999}
1000
Michael J Gruber60adf7d2011-02-21 16:09:11[diff] [blame]1001/* Assumes either left_only or right_only is set */
1002static void limit_left_right(struct commit_list *list, struct rev_info *revs)
1003{
1004 struct commit_list *p;
1005
1006 for (p = list; p; p = p->next) {
1007 struct commit *commit = p->item;
1008
1009 if (revs->right_only) {
1010 if (commit->object.flags & SYMMETRIC_LEFT)
1011 commit->object.flags |= SHOWN;
1012 } else /* revs->left_only is set */
1013 if (!(commit->object.flags & SYMMETRIC_LEFT))
1014 commit->object.flags |= SHOWN;
1015 }
1016}
1017
Alex Riesencc0e6c52007-05-04 21:54:57[diff] [blame]1018static int limit_list(struct rev_info *revs)
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]1019{
Linus Torvalds7d004192008-03-18 01:56:33[diff] [blame]1020 int slop = SLOP;
1021 unsigned long date = ~0ul;
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]1022 struct commit_list *list = revs->commits;
1023 struct commit_list *newlist = NULL;
1024 struct commit_list **p = &newlist;
Junio C Hamanoebdc94f2010-04-20 20:48:39[diff] [blame]1025 struct commit_list *bottom = NULL;
Jeff Kingb6e8a3b2015-04-17 22:11:04[diff] [blame]1026 struct commit *interesting_cache = NULL;
Junio C Hamanoebdc94f2010-04-20 20:48:39[diff] [blame]1027
1028 if (revs->ancestry_path) {
Kevin Bracey7f34a462013-05-16 15:32:38[diff] [blame]1029 bottom = collect_bottom_commits(list);
Junio C Hamanoebdc94f2010-04-20 20:48:39[diff] [blame]1030 if (!bottom)
Johan Herland97b03c32010-06-03 23:17:36[diff] [blame]1031 die("--ancestry-path given but there are no bottom commits");
Junio C Hamanoebdc94f2010-04-20 20:48:39[diff] [blame]1032 }
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]1033
1034 while (list) {
René Scharfee510ab82015-10-24 16:21:31[diff] [blame]1035 struct commit *commit = pop_commit(&list);
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]1036 struct object *obj = &commit->object;
Linus Torvaldscdcefbc2007-11-03 18:11:10[diff] [blame]1037 show_early_output_fn_t show;
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]1038
Jeff Kingb6e8a3b2015-04-17 22:11:04[diff] [blame]1039 if (commit == interesting_cache)
1040 interesting_cache = NULL;
1041
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]1042 if (revs->max_age != -1 && (commit->date < revs->max_age))
1043 obj->flags |= UNINTERESTING;
Alexander N. Gavrilovfce87ae2008-07-12 18:00:57[diff] [blame]1044 if (add_parents_to_list(revs, commit, &list, NULL) < 0)
Alex Riesencc0e6c52007-05-04 21:54:57[diff] [blame]1045 return -1;
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]1046 if (obj->flags & UNINTERESTING) {
1047 mark_parents_uninteresting(commit);
Linus Torvalds7d004192008-03-18 01:56:33[diff] [blame]1048 if (revs->show_all)
1049 p = &commit_list_insert(commit, p)->next;
Jeff Kingb6e8a3b2015-04-17 22:11:04[diff] [blame]1050 slop = still_interesting(list, date, slop, &interesting_cache);
Linus Torvalds7d004192008-03-18 01:56:33[diff] [blame]1051 if (slop)
Linus Torvalds3131b712008-02-09 22:02:07[diff] [blame]1052 continue;
Linus Torvalds7d004192008-03-18 01:56:33[diff] [blame]1053 /* If showing all, add the whole pending list to the end */
1054 if (revs->show_all)
1055 *p = list;
1056 break;
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]1057 }
1058 if (revs->min_age != -1 && (commit->date > revs->min_age))
1059 continue;
Linus Torvalds7d004192008-03-18 01:56:33[diff] [blame]1060 date = commit->date;
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]1061 p = &commit_list_insert(commit, p)->next;
Linus Torvaldscdcefbc2007-11-03 18:11:10[diff] [blame]1062
1063 show = show_early_output;
1064 if (!show)
1065 continue;
1066
1067 show(revs, newlist);
1068 show_early_output = NULL;
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]1069 }
Michael J Gruberadbbb312011-03-07 12:31:40[diff] [blame]1070 if (revs->cherry_pick || revs->cherry_mark)
Johannes Schindelin36d56de2007-07-10 13:50:49[diff] [blame]1071 cherry_pick_list(newlist, revs);
Junio C Hamanod7a17ca2007-04-09 10:40:38[diff] [blame]1072
Michael J Gruber60adf7d2011-02-21 16:09:11[diff] [blame]1073 if (revs->left_only || revs->right_only)
1074 limit_left_right(newlist, revs);
1075
Junio C Hamanoebdc94f2010-04-20 20:48:39[diff] [blame]1076 if (bottom) {
1077 limit_to_ancestry(bottom, newlist);
1078 free_commit_list(bottom);
1079 }
1080
Kevin Bracey4d826602013-05-16 15:32:39[diff] [blame]1081 /*
1082 * Check if any commits have become TREESAME by some of their parents
1083 * becoming UNINTERESTING.
1084 */
1085 if (limiting_can_increase_treesame(revs))
1086 for (list = newlist; list; list = list->next) {
1087 struct commit *c = list->item;
1088 if (c->object.flags & (UNINTERESTING | TREESAME))
1089 continue;
1090 update_treesame(revs, c);
1091 }
1092
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]1093 revs->commits = newlist;
Alex Riesencc0e6c52007-05-04 21:54:57[diff] [blame]1094 return 0;
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]1095}
1096
Michael Haggertydf835d32013-05-25 09:08:02[diff] [blame]1097/*
1098 * Add an entry to refs->cmdline with the specified information.
1099 * *name is copied.
1100 */
Junio C Hamano281eee42011-08-26 00:35:39[diff] [blame]1101static void add_rev_cmdline(struct rev_info *revs,
1102 struct object *item,
1103 const char *name,
1104 int whence,
1105 unsigned flags)
1106{
1107 struct rev_cmdline_info *info = &revs->cmdline;
1108 int nr = info->nr;
1109
1110 ALLOC_GROW(info->rev, nr + 1, info->alloc);
1111 info->rev[nr].item = item;
Michael Haggertydf835d32013-05-25 09:08:02[diff] [blame]1112 info->rev[nr].name = xstrdup(name);
Junio C Hamano281eee42011-08-26 00:35:39[diff] [blame]1113 info->rev[nr].whence = whence;
1114 info->rev[nr].flags = flags;
1115 info->nr++;
1116}
1117
Kevin Braceya7654992013-05-13 15:00:47[diff] [blame]1118static void add_rev_cmdline_list(struct rev_info *revs,
1119 struct commit_list *commit_list,
1120 int whence,
1121 unsigned flags)
1122{
1123 while (commit_list) {
1124 struct object *object = &commit_list->item->object;
brian m. carlsonf2fd0762015-11-10 02:22:28[diff] [blame]1125 add_rev_cmdline(revs, object, oid_to_hex(&object->oid),
Kevin Braceya7654992013-05-13 15:00:47[diff] [blame]1126 whence, flags);
1127 commit_list = commit_list->next;
1128 }
1129}
1130
Junio C Hamano63049292006-12-19 01:25:28[diff] [blame]1131struct all_refs_cb {
1132 int all_flags;
Shawn O. Pearce71b03b42006-12-22 00:49:06[diff] [blame]1133 int warned_bad_reflog;
Junio C Hamano63049292006-12-19 01:25:28[diff] [blame]1134 struct rev_info *all_revs;
1135 const char *name_for_errormsg;
1136};
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]1137
Junio C Hamanoff32d342013-11-01 19:02:45[diff] [blame]1138int ref_excluded(struct string_list *ref_excludes, const char *path)
Junio C Hamanoe7b432c2013-08-30 23:37:55[diff] [blame]1139{
1140 struct string_list_item *item;
1141
Junio C Hamanoff32d342013-11-01 19:02:45[diff] [blame]1142 if (!ref_excludes)
Junio C Hamanoe7b432c2013-08-30 23:37:55[diff] [blame]1143 return 0;
Junio C Hamanoff32d342013-11-01 19:02:45[diff] [blame]1144 for_each_string_list_item(item, ref_excludes) {
Nguyễn Thái Ngọc Duyeb078942014-02-15 02:01:46[diff] [blame]1145 if (!wildmatch(item->string, path, 0, NULL))
Junio C Hamanoe7b432c2013-08-30 23:37:55[diff] [blame]1146 return 1;
1147 }
1148 return 0;
1149}
1150
Michael Haggertya217dcb2015-05-25 18:38:30[diff] [blame]1151static int handle_one_ref(const char *path, const struct object_id *oid,
1152 int flag, void *cb_data)
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]1153{
Junio C Hamano63049292006-12-19 01:25:28[diff] [blame]1154 struct all_refs_cb *cb = cb_data;
Junio C Hamanoe7b432c2013-08-30 23:37:55[diff] [blame]1155 struct object *object;
1156
Junio C Hamanoff32d342013-11-01 19:02:45[diff] [blame]1157 if (ref_excluded(cb->all_revs->ref_excludes, path))
Junio C Hamanoe7b432c2013-08-30 23:37:55[diff] [blame]1158 return 0;
1159
Michael Haggertya217dcb2015-05-25 18:38:30[diff] [blame]1160 object = get_reference(cb->all_revs, path, oid->hash, cb->all_flags);
Junio C Hamano281eee42011-08-26 00:35:39[diff] [blame]1161 add_rev_cmdline(cb->all_revs, object, path, REV_CMD_REF, cb->all_flags);
Michael Haggertya217dcb2015-05-25 18:38:30[diff] [blame]1162 add_pending_sha1(cb->all_revs, path, oid->hash, cb->all_flags);
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]1163 return 0;
1164}
1165
Ilari Liusvaarad08bae72010-01-20 09:48:25[diff] [blame]1166static void init_all_refs_cb(struct all_refs_cb *cb, struct rev_info *revs,
1167 unsigned flags)
1168{
1169 cb->all_revs = revs;
1170 cb->all_flags = flags;
1171}
1172
Junio C Hamanoff32d342013-11-01 19:02:45[diff] [blame]1173void clear_ref_exclusion(struct string_list **ref_excludes_p)
Junio C Hamanoe7b432c2013-08-30 23:37:55[diff] [blame]1174{
Junio C Hamanoff32d342013-11-01 19:02:45[diff] [blame]1175 if (*ref_excludes_p) {
1176 string_list_clear(*ref_excludes_p, 0);
1177 free(*ref_excludes_p);
Junio C Hamanoe7b432c2013-08-30 23:37:55[diff] [blame]1178 }
Junio C Hamanoff32d342013-11-01 19:02:45[diff] [blame]1179 *ref_excludes_p = NULL;
Junio C Hamanoe7b432c2013-08-30 23:37:55[diff] [blame]1180}
1181
Junio C Hamanoff32d342013-11-01 19:02:45[diff] [blame]1182void add_ref_exclusion(struct string_list **ref_excludes_p, const char *exclude)
Junio C Hamanoe7b432c2013-08-30 23:37:55[diff] [blame]1183{
Junio C Hamanoff32d342013-11-01 19:02:45[diff] [blame]1184 if (!*ref_excludes_p) {
1185 *ref_excludes_p = xcalloc(1, sizeof(**ref_excludes_p));
1186 (*ref_excludes_p)->strdup_strings = 1;
Junio C Hamanoe7b432c2013-08-30 23:37:55[diff] [blame]1187 }
Junio C Hamanoff32d342013-11-01 19:02:45[diff] [blame]1188 string_list_append(*ref_excludes_p, exclude);
Junio C Hamanoe7b432c2013-08-30 23:37:55[diff] [blame]1189}
1190
Heiko Voigt9ef6aeb2010-07-07 13:39:12[diff] [blame]1191static void handle_refs(const char *submodule, struct rev_info *revs, unsigned flags,
1192 int (*for_each)(const char *, each_ref_fn, void *))
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]1193{
Junio C Hamano63049292006-12-19 01:25:28[diff] [blame]1194 struct all_refs_cb cb;
Ilari Liusvaarad08bae72010-01-20 09:48:25[diff] [blame]1195 init_all_refs_cb(&cb, revs, flags);
Michael Haggertya217dcb2015-05-25 18:38:30[diff] [blame]1196 for_each(submodule, handle_one_ref, &cb);
Junio C Hamano63049292006-12-19 01:25:28[diff] [blame]1197}
1198
brian m. carlson9461d272017-02-21 23:47:32[diff] [blame]1199static void handle_one_reflog_commit(struct object_id *oid, void *cb_data)
Junio C Hamano63049292006-12-19 01:25:28[diff] [blame]1200{
1201 struct all_refs_cb *cb = cb_data;
brian m. carlson9461d272017-02-21 23:47:32[diff] [blame]1202 if (!is_null_oid(oid)) {
1203 struct object *o = parse_object(oid->hash);
Shawn O. Pearce71b03b42006-12-22 00:49:06[diff] [blame]1204 if (o) {
1205 o->flags |= cb->all_flags;
Junio C Hamano281eee42011-08-26 00:35:39[diff] [blame]1206 /* ??? CMDLINEFLAGS ??? */
Shawn O. Pearce71b03b42006-12-22 00:49:06[diff] [blame]1207 add_pending_object(cb->all_revs, o, "");
1208 }
1209 else if (!cb->warned_bad_reflog) {
Theodore Ts'o46efd2d2007-03-30 23:07:05[diff] [blame]1210 warning("reflog of '%s' references pruned commits",
Shawn O. Pearce71b03b42006-12-22 00:49:06[diff] [blame]1211 cb->name_for_errormsg);
1212 cb->warned_bad_reflog = 1;
1213 }
Junio C Hamano63049292006-12-19 01:25:28[diff] [blame]1214 }
Shawn O. Pearce71b03b42006-12-22 00:49:06[diff] [blame]1215}
1216
brian m. carlson9461d272017-02-21 23:47:32[diff] [blame]1217static int handle_one_reflog_ent(struct object_id *ooid, struct object_id *noid,
Johannes Schindelin883d60f2007-01-08 00:59:54[diff] [blame]1218 const char *email, unsigned long timestamp, int tz,
1219 const char *message, void *cb_data)
Shawn O. Pearce71b03b42006-12-22 00:49:06[diff] [blame]1220{
brian m. carlson9461d272017-02-21 23:47:32[diff] [blame]1221 handle_one_reflog_commit(ooid, cb_data);
1222 handle_one_reflog_commit(noid, cb_data);
Junio C Hamano63049292006-12-19 01:25:28[diff] [blame]1223 return 0;
1224}
1225
Michael Haggertya89caf42015-05-25 18:39:03[diff] [blame]1226static int handle_one_reflog(const char *path, const struct object_id *oid,
1227 int flag, void *cb_data)
Junio C Hamano63049292006-12-19 01:25:28[diff] [blame]1228{
1229 struct all_refs_cb *cb = cb_data;
Shawn O. Pearce71b03b42006-12-22 00:49:06[diff] [blame]1230 cb->warned_bad_reflog = 0;
Junio C Hamano63049292006-12-19 01:25:28[diff] [blame]1231 cb->name_for_errormsg = path;
1232 for_each_reflog_ent(path, handle_one_reflog_ent, cb_data);
1233 return 0;
1234}
1235
Jeff King718ccc92014-10-15 22:38:31[diff] [blame]1236void add_reflogs_to_pending(struct rev_info *revs, unsigned flags)
Junio C Hamano63049292006-12-19 01:25:28[diff] [blame]1237{
1238 struct all_refs_cb cb;
Michael Haggerty2b2a5be2015-05-25 18:38:28[diff] [blame]1239
Junio C Hamano63049292006-12-19 01:25:28[diff] [blame]1240 cb.all_revs = revs;
1241 cb.all_flags = flags;
Michael Haggertya89caf42015-05-25 18:39:03[diff] [blame]1242 for_each_reflog(handle_one_reflog, &cb);
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]1243}
1244
Jeff King4fe10212014-10-17 00:44:23[diff] [blame]1245static void add_cache_tree(struct cache_tree *it, struct rev_info *revs,
1246 struct strbuf *path)
1247{
1248 size_t baselen = path->len;
1249 int i;
1250
1251 if (it->entry_count >= 0) {
1252 struct tree *tree = lookup_tree(it->sha1);
1253 add_pending_object_with_path(revs, &tree->object, "",
1254 040000, path->buf);
1255 }
1256
1257 for (i = 0; i < it->subtree_nr; i++) {
1258 struct cache_tree_sub *sub = it->down[i];
1259 strbuf_addf(path, "%s%s", baselen ? "/" : "", sub->name);
1260 add_cache_tree(sub->cache_tree, revs, path);
1261 strbuf_setlen(path, baselen);
1262 }
1263
1264}
1265
1266void add_index_objects_to_pending(struct rev_info *revs, unsigned flags)
1267{
1268 int i;
1269
1270 read_cache();
1271 for (i = 0; i < active_nr; i++) {
1272 struct cache_entry *ce = active_cache[i];
1273 struct blob *blob;
1274
1275 if (S_ISGITLINK(ce->ce_mode))
1276 continue;
1277
brian m. carlson99d1a982016-09-05 20:07:52[diff] [blame]1278 blob = lookup_blob(ce->oid.hash);
Jeff King4fe10212014-10-17 00:44:23[diff] [blame]1279 if (!blob)
1280 die("unable to add index blob to traversal");
1281 add_pending_object_with_path(revs, &blob->object, "",
1282 ce->ce_mode, ce->name);
1283 }
1284
1285 if (active_cache_tree) {
1286 struct strbuf path = STRBUF_INIT;
1287 add_cache_tree(active_cache_tree, revs, &path);
1288 strbuf_release(&path);
1289 }
1290}
1291
Vegard Nossum87793512016-09-27 08:32:49[diff] [blame]1292static int add_parents_only(struct rev_info *revs, const char *arg_, int flags,
1293 int exclude_parent)
Junio C Hamanoea4a19e2006-04-30 07:54:29[diff] [blame]1294{
1295 unsigned char sha1[20];
1296 struct object *it;
1297 struct commit *commit;
1298 struct commit_list *parents;
Vegard Nossum87793512016-09-27 08:32:49[diff] [blame]1299 int parent_number;
Junio C Hamano281eee42011-08-26 00:35:39[diff] [blame]1300 const char *arg = arg_;
Junio C Hamanoea4a19e2006-04-30 07:54:29[diff] [blame]1301
1302 if (*arg == '^') {
Kevin Bracey7f34a462013-05-16 15:32:38[diff] [blame]1303 flags ^= UNINTERESTING | BOTTOM;
Junio C Hamanoea4a19e2006-04-30 07:54:29[diff] [blame]1304 arg++;
1305 }
Junio C Hamanocd74e472012-07-02 19:04:52[diff] [blame]1306 if (get_sha1_committish(arg, sha1))
Junio C Hamanoea4a19e2006-04-30 07:54:29[diff] [blame]1307 return 0;
1308 while (1) {
1309 it = get_reference(revs, arg, sha1, 0);
Junio C Hamanocc243c32011-05-19 01:08:09[diff] [blame]1310 if (!it && revs->ignore_missing)
1311 return 0;
Linus Torvalds19746322006-07-12 03:45:31[diff] [blame]1312 if (it->type != OBJ_TAG)
Junio C Hamanoea4a19e2006-04-30 07:54:29[diff] [blame]1313 break;
Martin Koegler9684afd2008-02-18 20:48:01[diff] [blame]1314 if (!((struct tag*)it)->tagged)
1315 return 0;
brian m. carlsoned1c9972015-11-10 02:22:29[diff] [blame]1316 hashcpy(sha1, ((struct tag*)it)->tagged->oid.hash);
Junio C Hamanoea4a19e2006-04-30 07:54:29[diff] [blame]1317 }
Linus Torvalds19746322006-07-12 03:45:31[diff] [blame]1318 if (it->type != OBJ_COMMIT)
Junio C Hamanoea4a19e2006-04-30 07:54:29[diff] [blame]1319 return 0;
1320 commit = (struct commit *)it;
Vegard Nossum87793512016-09-27 08:32:49[diff] [blame]1321 if (exclude_parent &&
1322 exclude_parent > commit_list_count(commit->parents))
1323 return 0;
1324 for (parents = commit->parents, parent_number = 1;
1325 parents;
1326 parents = parents->next, parent_number++) {
1327 if (exclude_parent && parent_number != exclude_parent)
1328 continue;
1329
Junio C Hamanoea4a19e2006-04-30 07:54:29[diff] [blame]1330 it = &parents->item->object;
1331 it->flags |= flags;
Junio C Hamano281eee42011-08-26 00:35:39[diff] [blame]1332 add_rev_cmdline(revs, it, arg_, REV_CMD_PARENTS_ONLY, flags);
Junio C Hamanoea4a19e2006-04-30 07:54:29[diff] [blame]1333 add_pending_object(revs, it, arg);
1334 }
1335 return 1;
1336}
1337
Linus Torvaldsdb6296a2006-07-29 04:21:48[diff] [blame]1338void init_revisions(struct rev_info *revs, const char *prefix)
Fredrik Kuivinen8efdc322006-03-10 09:21:39[diff] [blame]1339{
1340 memset(revs, 0, sizeof(*revs));
Junio C Hamano8e8f9982006-04-15 05:19:38[diff] [blame]1341
Junio C Hamano6b9c58f2006-04-16 06:46:36[diff] [blame]1342 revs->abbrev = DEFAULT_ABBREV;
Junio C Hamano8e8f9982006-04-15 05:19:38[diff] [blame]1343 revs->ignore_merges = 1;
Linus Torvalds92024342006-06-11 17:57:35[diff] [blame]1344 revs->simplify_history = 1;
Pierre Habouzit8f67f8a2007-11-10 19:05:14[diff] [blame]1345 DIFF_OPT_SET(&revs->pruning, RECURSIVE);
Junio C Hamano90b19942009-05-23 08:15:35[diff] [blame]1346 DIFF_OPT_SET(&revs->pruning, QUICK);
Linus Torvaldscd2bdc52006-04-14 23:52:13[diff] [blame]1347 revs->pruning.add_remove = file_add_remove;
1348 revs->pruning.change = file_change;
Junio C Hamano08f704f2013-06-06 23:07:14[diff] [blame]1349 revs->sort_order = REV_SORT_IN_GRAPH_ORDER;
Fredrik Kuivinen8efdc322006-03-10 09:21:39[diff] [blame]1350 revs->dense = 1;
Linus Torvaldsdb6296a2006-07-29 04:21:48[diff] [blame]1351 revs->prefix = prefix;
Fredrik Kuivinen8efdc322006-03-10 09:21:39[diff] [blame]1352 revs->max_age = -1;
1353 revs->min_age = -1;
Junio C Hamanod5db6c92006-12-20 02:25:32[diff] [blame]1354 revs->skip_count = -1;
Fredrik Kuivinen8efdc322006-03-10 09:21:39[diff] [blame]1355 revs->max_count = -1;
Michael J Gruberad5aeed2011-03-21 10:14:06[diff] [blame]1356 revs->max_parents = -1;
Junio C Hamano0893eec2016-03-29 22:49:24[diff] [blame]1357 revs->expand_tabs_in_log = -1;
Fredrik Kuivinen8efdc322006-03-10 09:21:39[diff] [blame]1358
Linus Torvaldscd2bdc52006-04-14 23:52:13[diff] [blame]1359 revs->commit_format = CMIT_FMT_DEFAULT;
Junio C Hamanofe37a9c2016-03-29 23:05:39[diff] [blame]1360 revs->expand_tabs_in_log_default = 8;
Linus Torvaldscd2bdc52006-04-14 23:52:13[diff] [blame]1361
Junio C Hamano918d4e12012-10-09 23:40:03[diff] [blame]1362 init_grep_defaults();
1363 grep_init(&revs->grep_filter, prefix);
Jeff King0843acf2008-08-25 06:15:05[diff] [blame]1364 revs->grep_filter.status_only = 1;
Jeff King0843acf2008-08-25 06:15:05[diff] [blame]1365 revs->grep_filter.regflags = REG_NEWLINE;
1366
Linus Torvaldscd2bdc52006-04-14 23:52:13[diff] [blame]1367 diff_setup(&revs->diffopt);
Junio C Hamanoc0cb4a02008-02-13 08:34:39[diff] [blame]1368 if (prefix && !revs->diffopt.prefix) {
Junio C Hamanocd676a52008-02-12 22:26:02[diff] [blame]1369 revs->diffopt.prefix = prefix;
1370 revs->diffopt.prefix_length = strlen(prefix);
1371 }
Jeff King3a03cf62011-03-29 20:57:27[diff] [blame]1372
1373 revs->notes_opt.use_default_notes = -1;
Fredrik Kuivinen8efdc322006-03-10 09:21:39[diff] [blame]1374}
1375
Rene Scharfe0d2c9d62006-07-01 23:29:37[diff] [blame]1376static void add_pending_commit_list(struct rev_info *revs,
1377 struct commit_list *commit_list,
1378 unsigned int flags)
1379{
1380 while (commit_list) {
1381 struct object *object = &commit_list->item->object;
1382 object->flags |= flags;
brian m. carlsonf2fd0762015-11-10 02:22:28[diff] [blame]1383 add_pending_object(revs, object, oid_to_hex(&object->oid));
Rene Scharfe0d2c9d62006-07-01 23:29:37[diff] [blame]1384 commit_list = commit_list->next;
1385 }
1386}
1387
Junio C Hamanoae3e5e12006-07-03 09:59:32[diff] [blame]1388static void prepare_show_merge(struct rev_info *revs)
1389{
1390 struct commit_list *bases;
1391 struct commit *head, *other;
1392 unsigned char sha1[20];
1393 const char **prune = NULL;
1394 int i, prune_num = 1; /* counting terminating NULL */
1395
Nguyễn Thái Ngọc Duybaf18fc2011-09-17 11:57:45[diff] [blame]1396 if (get_sha1("HEAD", sha1))
Junio C Hamanoae3e5e12006-07-03 09:59:32[diff] [blame]1397 die("--merge without HEAD?");
Nguyễn Thái Ngọc Duybaf18fc2011-09-17 11:57:45[diff] [blame]1398 head = lookup_commit_or_die(sha1, "HEAD");
1399 if (get_sha1("MERGE_HEAD", sha1))
Junio C Hamanoae3e5e12006-07-03 09:59:32[diff] [blame]1400 die("--merge without MERGE_HEAD?");
Nguyễn Thái Ngọc Duybaf18fc2011-09-17 11:57:45[diff] [blame]1401 other = lookup_commit_or_die(sha1, "MERGE_HEAD");
Junio C Hamanoae3e5e12006-07-03 09:59:32[diff] [blame]1402 add_pending_object(revs, &head->object, "HEAD");
1403 add_pending_object(revs, &other->object, "MERGE_HEAD");
Junio C Hamano2ce406c2014-10-30 19:20:44[diff] [blame]1404 bases = get_merge_bases(head, other);
Kevin Bracey7f34a462013-05-16 15:32:38[diff] [blame]1405 add_rev_cmdline_list(revs, bases, REV_CMD_MERGE_BASE, UNINTERESTING | BOTTOM);
1406 add_pending_commit_list(revs, bases, UNINTERESTING | BOTTOM);
Junio C Hamanoe82447b2008-02-27 07:18:38[diff] [blame]1407 free_commit_list(bases);
1408 head->object.flags |= SYMMETRIC_LEFT;
Junio C Hamanoae3e5e12006-07-03 09:59:32[diff] [blame]1409
1410 if (!active_nr)
1411 read_cache();
1412 for (i = 0; i < active_nr; i++) {
Nguyễn Thái Ngọc Duy9c5e6c82013-07-09 15:29:00[diff] [blame]1413 const struct cache_entry *ce = active_cache[i];
Junio C Hamanoae3e5e12006-07-03 09:59:32[diff] [blame]1414 if (!ce_stage(ce))
1415 continue;
Nguyễn Thái Ngọc Duy429bb402014-01-24 13:40:28[diff] [blame]1416 if (ce_path_match(ce, &revs->prune_data, NULL)) {
Junio C Hamanoae3e5e12006-07-03 09:59:32[diff] [blame]1417 prune_num++;
René Scharfe2756ca42014-09-16 18:56:57[diff] [blame]1418 REALLOC_ARRAY(prune, prune_num);
Junio C Hamanoae3e5e12006-07-03 09:59:32[diff] [blame]1419 prune[prune_num-2] = ce->name;
1420 prune[prune_num-1] = NULL;
1421 }
1422 while ((i+1 < active_nr) &&
1423 ce_same_name(ce, active_cache[i+1]))
1424 i++;
1425 }
Junio C Hamanoed6e8032016-06-02 21:09:22[diff] [blame]1426 clear_pathspec(&revs->prune_data);
Nguyễn Thái Ngọc Duy4a2d5ae2013-10-26 02:09:20[diff] [blame]1427 parse_pathspec(&revs->prune_data, PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
Junio C Hamanoc6f1b922013-11-18 22:31:29[diff] [blame]1428 PATHSPEC_PREFER_FULL | PATHSPEC_LITERAL_PATH, "", prune);
Junio C Hamanoe82447b2008-02-27 07:18:38[diff] [blame]1429 revs->limited = 1;
Junio C Hamanoae3e5e12006-07-03 09:59:32[diff] [blame]1430}
1431
Jeff King62faad52017-05-19 12:52:00[diff] [blame]1432static int dotdot_missing(const char *arg, char *dotdot,
1433 struct rev_info *revs, int symmetric)
1434{
1435 if (revs->ignore_missing)
1436 return 0;
1437 /* de-munge so we report the full argument */
1438 *dotdot = '.';
1439 die(symmetric
1440 ? "Invalid symmetric difference expression %s"
1441 : "Invalid revision range %s", arg);
1442}
1443
1444static int handle_dotdot_1(const char *arg, char *dotdot,
1445 struct rev_info *revs, int flags,
Jeff King18f1ad72017-05-19 12:55:26[diff] [blame]1446 int cant_be_filename,
1447 struct object_context *a_oc,
1448 struct object_context *b_oc)
Jeff King62faad52017-05-19 12:52:00[diff] [blame]1449{
1450 const char *a_name, *b_name;
1451 struct object_id a_oid, b_oid;
1452 struct object *a_obj, *b_obj;
1453 unsigned int a_flags, b_flags;
1454 int symmetric = 0;
1455 unsigned int flags_exclude = flags ^ (UNINTERESTING | BOTTOM);
Jeff King18f1ad72017-05-19 12:55:26[diff] [blame]1456 unsigned int oc_flags = GET_SHA1_COMMITTISH | GET_SHA1_RECORD_PATH;
Jeff King62faad52017-05-19 12:52:00[diff] [blame]1457
1458 a_name = arg;
1459 if (!*a_name)
1460 a_name = "HEAD";
1461
1462 b_name = dotdot + 2;
1463 if (*b_name == '.') {
1464 symmetric = 1;
1465 b_name++;
1466 }
1467 if (!*b_name)
1468 b_name = "HEAD";
1469
Jeff King18f1ad72017-05-19 12:55:26[diff] [blame]1470 if (get_sha1_with_context(a_name, oc_flags, a_oid.hash, a_oc) ||
1471 get_sha1_with_context(b_name, oc_flags, b_oid.hash, b_oc))
Jeff King62faad52017-05-19 12:52:00[diff] [blame]1472 return -1;
1473
1474 if (!cant_be_filename) {
1475 *dotdot = '.';
1476 verify_non_filename(revs->prefix, arg);
1477 *dotdot = '\0';
1478 }
1479
1480 a_obj = parse_object(a_oid.hash);
1481 b_obj = parse_object(b_oid.hash);
1482 if (!a_obj || !b_obj)
1483 return dotdot_missing(arg, dotdot, revs, symmetric);
1484
1485 if (!symmetric) {
1486 /* just A..B */
1487 b_flags = flags;
1488 a_flags = flags_exclude;
1489 } else {
1490 /* A...B -- find merge bases between the two */
1491 struct commit *a, *b;
1492 struct commit_list *exclude;
1493
1494 a = lookup_commit_reference(a_obj->oid.hash);
1495 b = lookup_commit_reference(b_obj->oid.hash);
1496 if (!a || !b)
1497 return dotdot_missing(arg, dotdot, revs, symmetric);
1498
1499 exclude = get_merge_bases(a, b);
1500 add_rev_cmdline_list(revs, exclude, REV_CMD_MERGE_BASE,
1501 flags_exclude);
1502 add_pending_commit_list(revs, exclude, flags_exclude);
1503 free_commit_list(exclude);
1504
1505 b_flags = flags;
1506 a_flags = flags | SYMMETRIC_LEFT;
1507 }
1508
1509 a_obj->flags |= a_flags;
1510 b_obj->flags |= b_flags;
1511 add_rev_cmdline(revs, a_obj, a_name, REV_CMD_LEFT, a_flags);
1512 add_rev_cmdline(revs, b_obj, b_name, REV_CMD_RIGHT, b_flags);
Jeff King18f1ad72017-05-19 12:55:26[diff] [blame]1513 add_pending_object_with_path(revs, a_obj, a_name, a_oc->mode, a_oc->path);
1514 add_pending_object_with_path(revs, b_obj, b_name, b_oc->mode, b_oc->path);
Jeff King62faad52017-05-19 12:52:00[diff] [blame]1515 return 0;
1516}
1517
1518static int handle_dotdot(const char *arg,
1519 struct rev_info *revs, int flags,
1520 int cant_be_filename)
1521{
Jeff King18f1ad72017-05-19 12:55:26[diff] [blame]1522 struct object_context a_oc, b_oc;
Jeff King62faad52017-05-19 12:52:00[diff] [blame]1523 char *dotdot = strstr(arg, "..");
1524 int ret;
1525
1526 if (!dotdot)
1527 return -1;
1528
Jeff King18f1ad72017-05-19 12:55:26[diff] [blame]1529 memset(&a_oc, 0, sizeof(a_oc));
1530 memset(&b_oc, 0, sizeof(b_oc));
1531
Jeff King62faad52017-05-19 12:52:00[diff] [blame]1532 *dotdot = '\0';
Jeff King18f1ad72017-05-19 12:55:26[diff] [blame]1533 ret = handle_dotdot_1(arg, dotdot, revs, flags, cant_be_filename,
1534 &a_oc, &b_oc);
Jeff King62faad52017-05-19 12:52:00[diff] [blame]1535 *dotdot = '.';
1536
Jeff King18f1ad72017-05-19 12:55:26[diff] [blame]1537 free(a_oc.path);
1538 free(b_oc.path);
1539
Jeff King62faad52017-05-19 12:52:00[diff] [blame]1540 return ret;
1541}
1542
Junio C Hamano8e676e82012-07-02 19:33:52[diff] [blame]1543int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsigned revarg_opt)
Junio C Hamano5d6f0932006-09-06 04:28:36[diff] [blame]1544{
Junio C Hamano249c8f42012-07-02 19:56:44[diff] [blame]1545 struct object_context oc;
Jeff Kingf632ded2017-05-19 12:50:07[diff] [blame]1546 char *mark;
Junio C Hamano5d6f0932006-09-06 04:28:36[diff] [blame]1547 struct object *object;
1548 unsigned char sha1[20];
1549 int local_flags;
Junio C Hamano281eee42011-08-26 00:35:39[diff] [blame]1550 const char *arg = arg_;
Junio C Hamano8e676e82012-07-02 19:33:52[diff] [blame]1551 int cant_be_filename = revarg_opt & REVARG_CANNOT_BE_FILENAME;
Jeff King18f1ad72017-05-19 12:55:26[diff] [blame]1552 unsigned get_sha1_flags = GET_SHA1_RECORD_PATH;
Junio C Hamano5d6f0932006-09-06 04:28:36[diff] [blame]1553
Kevin Bracey7f34a462013-05-16 15:32:38[diff] [blame]1554 flags = flags & UNINTERESTING ? flags | BOTTOM : flags & ~BOTTOM;
1555
Jeff Kingd89797f2017-05-19 12:51:40[diff] [blame]1556 if (!cant_be_filename && !strcmp(arg, "..")) {
1557 /*
1558 * Just ".."? That is not a range but the
1559 * pathspec for the parent directory.
1560 */
1561 return -1;
Junio C Hamano5d6f0932006-09-06 04:28:36[diff] [blame]1562 }
Vegard Nossum87793512016-09-27 08:32:49[diff] [blame]1563
Jeff King62faad52017-05-19 12:52:00[diff] [blame]1564 if (!handle_dotdot(arg, revs, flags, revarg_opt))
1565 return 0;
Junio C Hamano5d6f0932006-09-06 04:28:36[diff] [blame]1566
Jeff Kingf632ded2017-05-19 12:50:07[diff] [blame]1567 mark = strstr(arg, "^@");
1568 if (mark && !mark[2]) {
1569 *mark = 0;
Vegard Nossum87793512016-09-27 08:32:49[diff] [blame]1570 if (add_parents_only(revs, arg, flags, 0))
Junio C Hamano5d6f0932006-09-06 04:28:36[diff] [blame]1571 return 0;
Jeff Kingf632ded2017-05-19 12:50:07[diff] [blame]1572 *mark = '^';
Junio C Hamano5d6f0932006-09-06 04:28:36[diff] [blame]1573 }
Jeff Kingf632ded2017-05-19 12:50:07[diff] [blame]1574 mark = strstr(arg, "^!");
1575 if (mark && !mark[2]) {
1576 *mark = 0;
Vegard Nossum87793512016-09-27 08:32:49[diff] [blame]1577 if (!add_parents_only(revs, arg, flags ^ (UNINTERESTING | BOTTOM), 0))
Jeff Kingf632ded2017-05-19 12:50:07[diff] [blame]1578 *mark = '^';
Vegard Nossum87793512016-09-27 08:32:49[diff] [blame]1579 }
Jeff Kingf632ded2017-05-19 12:50:07[diff] [blame]1580 mark = strstr(arg, "^-");
1581 if (mark) {
Vegard Nossum87793512016-09-27 08:32:49[diff] [blame]1582 int exclude_parent = 1;
1583
Jeff Kingf632ded2017-05-19 12:50:07[diff] [blame]1584 if (mark[2]) {
Vegard Nossum87793512016-09-27 08:32:49[diff] [blame]1585 char *end;
Jeff Kingf632ded2017-05-19 12:50:07[diff] [blame]1586 exclude_parent = strtoul(mark + 2, &end, 10);
Vegard Nossum87793512016-09-27 08:32:49[diff] [blame]1587 if (*end != '\0' || !exclude_parent)
1588 return -1;
1589 }
1590
Jeff Kingf632ded2017-05-19 12:50:07[diff] [blame]1591 *mark = 0;
Vegard Nossum87793512016-09-27 08:32:49[diff] [blame]1592 if (!add_parents_only(revs, arg, flags ^ (UNINTERESTING | BOTTOM), exclude_parent))
Jeff Kingf632ded2017-05-19 12:50:07[diff] [blame]1593 *mark = '^';
Junio C Hamano62476c82006-10-31 22:22:34[diff] [blame]1594 }
1595
Junio C Hamano5d6f0932006-09-06 04:28:36[diff] [blame]1596 local_flags = 0;
1597 if (*arg == '^') {
Kevin Bracey7f34a462013-05-16 15:32:38[diff] [blame]1598 local_flags = UNINTERESTING | BOTTOM;
Junio C Hamano5d6f0932006-09-06 04:28:36[diff] [blame]1599 arg++;
1600 }
Junio C Hamanod5f6b1d2012-07-02 19:43:05[diff] [blame]1601
1602 if (revarg_opt & REVARG_COMMITTISH)
Jeff King18f1ad72017-05-19 12:55:26[diff] [blame]1603 get_sha1_flags |= GET_SHA1_COMMITTISH;
Junio C Hamanod5f6b1d2012-07-02 19:43:05[diff] [blame]1604
1605 if (get_sha1_with_context(arg, get_sha1_flags, sha1, &oc))
Junio C Hamanocc243c32011-05-19 01:08:09[diff] [blame]1606 return revs->ignore_missing ? 0 : -1;
Junio C Hamano5d6f0932006-09-06 04:28:36[diff] [blame]1607 if (!cant_be_filename)
1608 verify_non_filename(revs->prefix, arg);
1609 object = get_reference(revs, arg, sha1, flags ^ local_flags);
Junio C Hamano281eee42011-08-26 00:35:39[diff] [blame]1610 add_rev_cmdline(revs, object, arg_, REV_CMD_REV, flags ^ local_flags);
Jeff King18f1ad72017-05-19 12:55:26[diff] [blame]1611 add_pending_object_with_path(revs, object, arg, oc.mode, oc.path);
1612 free(oc.path);
Junio C Hamano5d6f0932006-09-06 04:28:36[diff] [blame]1613 return 0;
1614}
1615
Junio C Hamano4da5af32011-05-11 21:01:19[diff] [blame]1616struct cmdline_pathspec {
1617 int alloc;
1618 int nr;
1619 const char **path;
1620};
1621
1622static void append_prune_data(struct cmdline_pathspec *prune, const char **av)
Adam Brewster1fc561d2008-07-05 21:26:39[diff] [blame]1623{
Junio C Hamano4da5af32011-05-11 21:01:19[diff] [blame]1624 while (*av) {
Felipe Contreras9e57ac52013-10-31 09:25:43[diff] [blame]1625 ALLOC_GROW(prune->path, prune->nr + 1, prune->alloc);
Junio C Hamano4da5af32011-05-11 21:01:19[diff] [blame]1626 prune->path[prune->nr++] = *(av++);
1627 }
1628}
Adam Brewster1fc561d2008-07-05 21:26:39[diff] [blame]1629
Junio C Hamano4da5af32011-05-11 21:01:19[diff] [blame]1630static void read_pathspec_from_stdin(struct rev_info *revs, struct strbuf *sb,
1631 struct cmdline_pathspec *prune)
1632{
Junio C Hamano6e8d46f2015-10-28 21:05:53[diff] [blame]1633 while (strbuf_getline(sb, stdin) != EOF) {
Felipe Contreras9e57ac52013-10-31 09:25:43[diff] [blame]1634 ALLOC_GROW(prune->path, prune->nr + 1, prune->alloc);
Junio C Hamano4da5af32011-05-11 21:01:19[diff] [blame]1635 prune->path[prune->nr++] = xstrdup(sb->buf);
Junio C Hamano60da8b12009-11-20 10:50:21[diff] [blame]1636 }
Junio C Hamano60da8b12009-11-20 10:50:21[diff] [blame]1637}
1638
Junio C Hamano4da5af32011-05-11 21:01:19[diff] [blame]1639static void read_revisions_from_stdin(struct rev_info *revs,
1640 struct cmdline_pathspec *prune)
Adam Brewster1fc561d2008-07-05 21:26:39[diff] [blame]1641{
Junio C Hamano63d564b2009-11-20 10:00:40[diff] [blame]1642 struct strbuf sb;
Junio C Hamano60da8b12009-11-20 10:50:21[diff] [blame]1643 int seen_dashdash = 0;
Jeff King4c30d502014-03-12 20:06:17[diff] [blame]1644 int save_warning;
1645
1646 save_warning = warn_on_object_refname_ambiguity;
1647 warn_on_object_refname_ambiguity = 0;
Adam Brewster1fc561d2008-07-05 21:26:39[diff] [blame]1648
Junio C Hamano63d564b2009-11-20 10:00:40[diff] [blame]1649 strbuf_init(&sb, 1000);
Junio C Hamano6e8d46f2015-10-28 21:05:53[diff] [blame]1650 while (strbuf_getline(&sb, stdin) != EOF) {
Junio C Hamano63d564b2009-11-20 10:00:40[diff] [blame]1651 int len = sb.len;
Adam Brewster1fc561d2008-07-05 21:26:39[diff] [blame]1652 if (!len)
1653 break;
Junio C Hamano60da8b12009-11-20 10:50:21[diff] [blame]1654 if (sb.buf[0] == '-') {
1655 if (len == 2 && sb.buf[1] == '-') {
1656 seen_dashdash = 1;
1657 break;
1658 }
Adam Brewster1fc561d2008-07-05 21:26:39[diff] [blame]1659 die("options not supported in --stdin mode");
Junio C Hamano60da8b12009-11-20 10:50:21[diff] [blame]1660 }
Michael Haggerty31faeb22013-05-25 09:08:14[diff] [blame]1661 if (handle_revision_arg(sb.buf, revs, 0,
Thomas Rast70d26c62013-04-16 09:57:45[diff] [blame]1662 REVARG_CANNOT_BE_FILENAME))
Junio C Hamano63d564b2009-11-20 10:00:40[diff] [blame]1663 die("bad revision '%s'", sb.buf);
Adam Brewster1fc561d2008-07-05 21:26:39[diff] [blame]1664 }
Junio C Hamano60da8b12009-11-20 10:50:21[diff] [blame]1665 if (seen_dashdash)
1666 read_pathspec_from_stdin(revs, &sb, prune);
Jeff King4c30d502014-03-12 20:06:17[diff] [blame]1667
Junio C Hamano63d564b2009-11-20 10:00:40[diff] [blame]1668 strbuf_release(&sb);
Jeff King4c30d502014-03-12 20:06:17[diff] [blame]1669 warn_on_object_refname_ambiguity = save_warning;
Adam Brewster1fc561d2008-07-05 21:26:39[diff] [blame]1670}
1671
Junio C Hamano2d10c552006-09-20 20:21:56[diff] [blame]1672static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
1673{
Jeff King0843acf2008-08-25 06:15:05[diff] [blame]1674 append_grep_pattern(&revs->grep_filter, ptn, "command line", 0, what);
Junio C Hamano2d10c552006-09-20 20:21:56[diff] [blame]1675}
1676
Junio C Hamanoa4d7d2c2008-09-05 05:15:02[diff] [blame]1677static void add_header_grep(struct rev_info *revs, enum grep_header_field field, const char *pattern)
Junio C Hamanobd95fcd2006-09-18 00:23:20[diff] [blame]1678{
Junio C Hamanoa4d7d2c2008-09-05 05:15:02[diff] [blame]1679 append_header_grep_pattern(&revs->grep_filter, field, pattern);
Junio C Hamanobd95fcd2006-09-18 00:23:20[diff] [blame]1680}
1681
1682static void add_message_grep(struct rev_info *revs, const char *pattern)
1683{
Junio C Hamano2d10c552006-09-20 20:21:56[diff] [blame]1684 add_grep(revs, pattern, GREP_PATTERN_BODY);
Junio C Hamanobd95fcd2006-09-18 00:23:20[diff] [blame]1685}
1686
Pierre Habouzit6b61ec02008-07-09 21:38:34[diff] [blame]1687static int handle_revision_opt(struct rev_info *revs, int argc, const char **argv,
1688 int *unkc, const char **unkv)
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]1689{
1690 const char *arg = argv[0];
Matthieu Moy7d7b86f2010-08-05 08:22:55[diff] [blame]1691 const char *optarg;
1692 int argcount;
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]1693
1694 /* pseudo revision arguments */
1695 if (!strcmp(arg, "--all") || !strcmp(arg, "--branches") ||
1696 !strcmp(arg, "--tags") || !strcmp(arg, "--remotes") ||
1697 !strcmp(arg, "--reflog") || !strcmp(arg, "--not") ||
Linus Torvaldsad3f9a72009-10-27 18:28:07[diff] [blame]1698 !strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk") ||
Christian Couder59556542013-11-30 20:55:40[diff] [blame]1699 !strcmp(arg, "--bisect") || starts_with(arg, "--glob=") ||
Jeff King4fe10212014-10-17 00:44:23[diff] [blame]1700 !strcmp(arg, "--indexed-objects") ||
Junio C Hamano07768e02014-06-09 18:30:12[diff] [blame]1701 starts_with(arg, "--exclude=") ||
Christian Couder59556542013-11-30 20:55:40[diff] [blame]1702 starts_with(arg, "--branches=") || starts_with(arg, "--tags=") ||
1703 starts_with(arg, "--remotes=") || starts_with(arg, "--no-walk="))
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]1704 {
1705 unkv[(*unkc)++] = arg;
Pierre Habouzit0fe8c132008-07-31 10:22:23[diff] [blame]1706 return 1;
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]1707 }
1708
Matthieu Moy7d7b86f2010-08-05 08:22:55[diff] [blame]1709 if ((argcount = parse_long_opt("max-count", argv, &optarg))) {
1710 revs->max_count = atoi(optarg);
Jonathan Nieder5853cae2010-06-01 08:35:49[diff] [blame]1711 revs->no_walk = 0;
Matthieu Moy7d7b86f2010-08-05 08:22:55[diff] [blame]1712 return argcount;
1713 } else if ((argcount = parse_long_opt("skip", argv, &optarg))) {
1714 revs->skip_count = atoi(optarg);
1715 return argcount;
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]1716 } else if ((*arg == '-') && isdigit(arg[1])) {
Junio C Hamanoe3fa5682014-06-06 22:33:25[diff] [blame]1717 /* accept -<digit>, like traditional "head" */
1718 if (strtol_i(arg + 1, 10, &revs->max_count) < 0 ||
1719 revs->max_count < 0)
1720 die("'%s': not a non-negative integer", arg + 1);
Jonathan Nieder5853cae2010-06-01 08:35:49[diff] [blame]1721 revs->no_walk = 0;
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]1722 } else if (!strcmp(arg, "-n")) {
1723 if (argc <= 1)
1724 return error("-n requires an argument");
1725 revs->max_count = atoi(argv[1]);
Jonathan Nieder5853cae2010-06-01 08:35:49[diff] [blame]1726 revs->no_walk = 0;
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]1727 return 2;
SZEDER Gábor479b3d92017-06-09 18:17:32[diff] [blame]1728 } else if (skip_prefix(arg, "-n", &optarg)) {
1729 revs->max_count = atoi(optarg);
Jonathan Nieder5853cae2010-06-01 08:35:49[diff] [blame]1730 revs->no_walk = 0;
Matthieu Moy7d7b86f2010-08-05 08:22:55[diff] [blame]1731 } else if ((argcount = parse_long_opt("max-age", argv, &optarg))) {
1732 revs->max_age = atoi(optarg);
1733 return argcount;
1734 } else if ((argcount = parse_long_opt("since", argv, &optarg))) {
1735 revs->max_age = approxidate(optarg);
1736 return argcount;
1737 } else if ((argcount = parse_long_opt("after", argv, &optarg))) {
1738 revs->max_age = approxidate(optarg);
1739 return argcount;
1740 } else if ((argcount = parse_long_opt("min-age", argv, &optarg))) {
1741 revs->min_age = atoi(optarg);
1742 return argcount;
1743 } else if ((argcount = parse_long_opt("before", argv, &optarg))) {
1744 revs->min_age = approxidate(optarg);
1745 return argcount;
1746 } else if ((argcount = parse_long_opt("until", argv, &optarg))) {
1747 revs->min_age = approxidate(optarg);
1748 return argcount;
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]1749 } else if (!strcmp(arg, "--first-parent")) {
1750 revs->first_parent_only = 1;
Junio C Hamanoebdc94f2010-04-20 20:48:39[diff] [blame]1751 } else if (!strcmp(arg, "--ancestry-path")) {
1752 revs->ancestry_path = 1;
Johan Herlandcb7529e2010-06-03 23:17:37[diff] [blame]1753 revs->simplify_history = 0;
Junio C Hamanoebdc94f2010-04-20 20:48:39[diff] [blame]1754 revs->limited = 1;
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]1755 } else if (!strcmp(arg, "-g") || !strcmp(arg, "--walk-reflogs")) {
1756 init_reflog_walk(&revs->reflog_info);
1757 } else if (!strcmp(arg, "--default")) {
1758 if (argc <= 1)
1759 return error("bad --default argument");
1760 revs->def = argv[1];
1761 return 2;
1762 } else if (!strcmp(arg, "--merge")) {
1763 revs->show_merge = 1;
1764 } else if (!strcmp(arg, "--topo-order")) {
Junio C Hamano08f704f2013-06-06 23:07:14[diff] [blame]1765 revs->sort_order = REV_SORT_IN_GRAPH_ORDER;
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]1766 revs->topo_order = 1;
Junio C Hamano6546b592008-07-31 08:17:41[diff] [blame]1767 } else if (!strcmp(arg, "--simplify-merges")) {
1768 revs->simplify_merges = 1;
Junio C Hamanoa52f0072012-06-08 21:47:08[diff] [blame]1769 revs->topo_order = 1;
Junio C Hamano6546b592008-07-31 08:17:41[diff] [blame]1770 revs->rewrite_parents = 1;
1771 revs->simplify_history = 0;
1772 revs->limited = 1;
Linus Torvalds78892e32008-11-03 19:25:46[diff] [blame]1773 } else if (!strcmp(arg, "--simplify-by-decoration")) {
1774 revs->simplify_merges = 1;
Junio C Hamanoa52f0072012-06-08 21:47:08[diff] [blame]1775 revs->topo_order = 1;
Linus Torvalds78892e32008-11-03 19:25:46[diff] [blame]1776 revs->rewrite_parents = 1;
1777 revs->simplify_history = 0;
1778 revs->simplify_by_decoration = 1;
1779 revs->limited = 1;
1780 revs->prune = 1;
Lars Hjemli33e70182009-08-15 14:23:12[diff] [blame]1781 load_ref_decorations(DECORATE_SHORT_REFS);
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]1782 } else if (!strcmp(arg, "--date-order")) {
Junio C Hamano08f704f2013-06-06 23:07:14[diff] [blame]1783 revs->sort_order = REV_SORT_BY_COMMIT_DATE;
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]1784 revs->topo_order = 1;
Junio C Hamano81c6b382013-06-07 17:35:54[diff] [blame]1785 } else if (!strcmp(arg, "--author-date-order")) {
1786 revs->sort_order = REV_SORT_BY_AUTHOR_DATE;
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]1787 revs->topo_order = 1;
SZEDER Gábordffc6512017-06-09 18:17:31[diff] [blame]1788 } else if (!strcmp(arg, "--early-output")) {
1789 revs->early_output = 100;
1790 revs->topo_order = 1;
1791 } else if (skip_prefix(arg, "--early-output=", &optarg)) {
1792 if (strtoul_ui(optarg, 10, &revs->early_output) < 0)
1793 die("'%s': not a non-negative integer", optarg);
1794 revs->topo_order = 1;
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]1795 } else if (!strcmp(arg, "--parents")) {
1796 revs->rewrite_parents = 1;
1797 revs->print_parents = 1;
1798 } else if (!strcmp(arg, "--dense")) {
1799 revs->dense = 1;
1800 } else if (!strcmp(arg, "--sparse")) {
1801 revs->dense = 0;
1802 } else if (!strcmp(arg, "--show-all")) {
1803 revs->show_all = 1;
1804 } else if (!strcmp(arg, "--remove-empty")) {
1805 revs->remove_empty_trees = 1;
Linus Torvaldsb8e8db22009-06-29 17:28:25[diff] [blame]1806 } else if (!strcmp(arg, "--merges")) {
Michael J Gruberad5aeed2011-03-21 10:14:06[diff] [blame]1807 revs->min_parents = 2;
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]1808 } else if (!strcmp(arg, "--no-merges")) {
Michael J Gruberad5aeed2011-03-21 10:14:06[diff] [blame]1809 revs->max_parents = 1;
SZEDER Gábor479b3d92017-06-09 18:17:32[diff] [blame]1810 } else if (skip_prefix(arg, "--min-parents=", &optarg)) {
1811 revs->min_parents = atoi(optarg);
SZEDER Gábor9ada7ae2017-06-09 18:17:30[diff] [blame]1812 } else if (!strcmp(arg, "--no-min-parents")) {
Michael J Gruberad5aeed2011-03-21 10:14:06[diff] [blame]1813 revs->min_parents = 0;
SZEDER Gábor479b3d92017-06-09 18:17:32[diff] [blame]1814 } else if (skip_prefix(arg, "--max-parents=", &optarg)) {
1815 revs->max_parents = atoi(optarg);
SZEDER Gábor9ada7ae2017-06-09 18:17:30[diff] [blame]1816 } else if (!strcmp(arg, "--no-max-parents")) {
Michael J Gruberad5aeed2011-03-21 10:14:06[diff] [blame]1817 revs->max_parents = -1;
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]1818 } else if (!strcmp(arg, "--boundary")) {
1819 revs->boundary = 1;
1820 } else if (!strcmp(arg, "--left-right")) {
1821 revs->left_right = 1;
Michael J Gruber60adf7d2011-02-21 16:09:11[diff] [blame]1822 } else if (!strcmp(arg, "--left-only")) {
Junio C Hamano24852d92011-02-22 00:58:37[diff] [blame]1823 if (revs->right_only)
Michael J Gruber94f605e2011-03-07 12:31:42[diff] [blame]1824 die("--left-only is incompatible with --right-only"
1825 " or --cherry");
Michael J Gruber60adf7d2011-02-21 16:09:11[diff] [blame]1826 revs->left_only = 1;
1827 } else if (!strcmp(arg, "--right-only")) {
Junio C Hamano24852d92011-02-22 00:58:37[diff] [blame]1828 if (revs->left_only)
1829 die("--right-only is incompatible with --left-only");
Michael J Gruber60adf7d2011-02-21 16:09:11[diff] [blame]1830 revs->right_only = 1;
Michael J Gruber94f605e2011-03-07 12:31:42[diff] [blame]1831 } else if (!strcmp(arg, "--cherry")) {
1832 if (revs->left_only)
1833 die("--cherry is incompatible with --left-only");
1834 revs->cherry_mark = 1;
1835 revs->right_only = 1;
Michael J Gruberad5aeed2011-03-21 10:14:06[diff] [blame]1836 revs->max_parents = 1;
Michael J Gruber94f605e2011-03-07 12:31:42[diff] [blame]1837 revs->limited = 1;
Thomas Rastf69c5012010-06-10 11:47:23[diff] [blame]1838 } else if (!strcmp(arg, "--count")) {
1839 revs->count = 1;
Michael J Gruberadbbb312011-03-07 12:31:40[diff] [blame]1840 } else if (!strcmp(arg, "--cherry-mark")) {
1841 if (revs->cherry_pick)
1842 die("--cherry-mark is incompatible with --cherry-pick");
1843 revs->cherry_mark = 1;
1844 revs->limited = 1; /* needs limit_list() */
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]1845 } else if (!strcmp(arg, "--cherry-pick")) {
Michael J Gruberadbbb312011-03-07 12:31:40[diff] [blame]1846 if (revs->cherry_mark)
1847 die("--cherry-pick is incompatible with --cherry-mark");
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]1848 revs->cherry_pick = 1;
1849 revs->limited = 1;
1850 } else if (!strcmp(arg, "--objects")) {
1851 revs->tag_objects = 1;
1852 revs->tree_objects = 1;
1853 revs->blob_objects = 1;
1854 } else if (!strcmp(arg, "--objects-edge")) {
1855 revs->tag_objects = 1;
1856 revs->tree_objects = 1;
1857 revs->blob_objects = 1;
1858 revs->edge_hint = 1;
brian m. carlson1684c1b2014-12-24 23:05:39[diff] [blame]1859 } else if (!strcmp(arg, "--objects-edge-aggressive")) {
1860 revs->tag_objects = 1;
1861 revs->tree_objects = 1;
1862 revs->blob_objects = 1;
1863 revs->edge_hint = 1;
1864 revs->edge_hint_aggressive = 1;
Junio C Hamano5a48d242011-09-01 22:43:34[diff] [blame]1865 } else if (!strcmp(arg, "--verify-objects")) {
1866 revs->tag_objects = 1;
1867 revs->tree_objects = 1;
1868 revs->blob_objects = 1;
1869 revs->verify_objects = 1;
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]1870 } else if (!strcmp(arg, "--unpacked")) {
1871 revs->unpacked = 1;
Christian Couder59556542013-11-30 20:55:40[diff] [blame]1872 } else if (starts_with(arg, "--unpacked=")) {
Junio C Hamano03a96832009-02-28 08:00:21[diff] [blame]1873 die("--unpacked=<packfile> no longer supported.");
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]1874 } else if (!strcmp(arg, "-r")) {
1875 revs->diff = 1;
1876 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1877 } else if (!strcmp(arg, "-t")) {
1878 revs->diff = 1;
1879 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1880 DIFF_OPT_SET(&revs->diffopt, TREE_IN_RECURSIVE);
1881 } else if (!strcmp(arg, "-m")) {
1882 revs->ignore_merges = 0;
1883 } else if (!strcmp(arg, "-c")) {
1884 revs->diff = 1;
1885 revs->dense_combined_merges = 0;
1886 revs->combine_merges = 1;
1887 } else if (!strcmp(arg, "--cc")) {
1888 revs->diff = 1;
1889 revs->dense_combined_merges = 1;
1890 revs->combine_merges = 1;
1891 } else if (!strcmp(arg, "-v")) {
1892 revs->verbose_header = 1;
1893 } else if (!strcmp(arg, "--pretty")) {
1894 revs->verbose_header = 1;
Junio C Hamano66b2ed02010-01-20 21:59:36[diff] [blame]1895 revs->pretty_given = 1;
Jeff Kingae181652014-07-29 17:53:40[diff] [blame]1896 get_commit_format(NULL, revs);
SZEDER Gábor479b3d92017-06-09 18:17:32[diff] [blame]1897 } else if (skip_prefix(arg, "--pretty=", &optarg) ||
1898 skip_prefix(arg, "--format=", &optarg)) {
Matthieu Moy7d7b86f2010-08-05 08:22:55[diff] [blame]1899 /*
1900 * Detached form ("--pretty X" as opposed to "--pretty=X")
1901 * not allowed, since the argument is optional.
1902 */
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]1903 revs->verbose_header = 1;
Junio C Hamano66b2ed02010-01-20 21:59:36[diff] [blame]1904 revs->pretty_given = 1;
SZEDER Gábor479b3d92017-06-09 18:17:32[diff] [blame]1905 get_commit_format(optarg, revs);
Linus Torvalds7cc13c72016-03-16 16:15:53[diff] [blame]1906 } else if (!strcmp(arg, "--expand-tabs")) {
Junio C Hamanofe37a9c2016-03-29 23:05:39[diff] [blame]1907 revs->expand_tabs_in_log = 8;
Junio C Hamano0893eec2016-03-29 22:49:24[diff] [blame]1908 } else if (!strcmp(arg, "--no-expand-tabs")) {
1909 revs->expand_tabs_in_log = 0;
Junio C Hamanofe37a9c2016-03-29 23:05:39[diff] [blame]1910 } else if (skip_prefix(arg, "--expand-tabs=", &arg)) {
1911 int val;
1912 if (strtol_i(arg, 10, &val) < 0 || val < 0)
1913 die("'%s': not a non-negative integer", arg);
1914 revs->expand_tabs_in_log = val;
Jeff King7249e912011-03-29 20:57:47[diff] [blame]1915 } else if (!strcmp(arg, "--show-notes") || !strcmp(arg, "--notes")) {
Junio C Hamano66b2ed02010-01-20 21:59:36[diff] [blame]1916 revs->show_notes = 1;
1917 revs->show_notes_given = 1;
Jeff King3a03cf62011-03-29 20:57:27[diff] [blame]1918 revs->notes_opt.use_default_notes = 1;
Junio C Hamano0c37f1f2011-10-18 22:53:23[diff] [blame]1919 } else if (!strcmp(arg, "--show-signature")) {
1920 revs->show_signature = 1;
Mehul Jainaa379992016-06-22 16:51:25[diff] [blame]1921 } else if (!strcmp(arg, "--no-show-signature")) {
1922 revs->show_signature = 0;
SZEDER Gábor479b3d92017-06-09 18:17:32[diff] [blame]1923 } else if (!strcmp(arg, "--show-linear-break")) {
1924 revs->break_bar = " ..........";
Nguyễn Thái Ngọc Duy1b32dec2014-03-25 13:23:27[diff] [blame]1925 revs->track_linear = 1;
1926 revs->track_first_time = 1;
SZEDER Gábor479b3d92017-06-09 18:17:32[diff] [blame]1927 } else if (skip_prefix(arg, "--show-linear-break=", &optarg)) {
1928 revs->break_bar = xstrdup(optarg);
1929 revs->track_linear = 1;
1930 revs->track_first_time = 1;
1931 } else if (skip_prefix(arg, "--show-notes=", &optarg) ||
1932 skip_prefix(arg, "--notes=", &optarg)) {
Thomas Rast894a9d32010-03-12 17:04:26[diff] [blame]1933 struct strbuf buf = STRBUF_INIT;
1934 revs->show_notes = 1;
1935 revs->show_notes_given = 1;
SZEDER Gábor479b3d92017-06-09 18:17:32[diff] [blame]1936 if (starts_with(arg, "--show-notes=") &&
1937 revs->notes_opt.use_default_notes < 0)
1938 revs->notes_opt.use_default_notes = 1;
1939 strbuf_addstr(&buf, optarg);
Jeff Kingc063f0a2011-03-29 20:56:04[diff] [blame]1940 expand_notes_ref(&buf);
Jeff King304cc112011-03-29 20:56:53[diff] [blame]1941 string_list_append(&revs->notes_opt.extra_notes_refs,
Julian Phillips1d2f80f2010-06-25 23:41:38[diff] [blame]1942 strbuf_detach(&buf, NULL));
Junio C Hamano66b2ed02010-01-20 21:59:36[diff] [blame]1943 } else if (!strcmp(arg, "--no-notes")) {
1944 revs->show_notes = 0;
1945 revs->show_notes_given = 1;
Jeff King92e0d422011-03-29 20:59:42[diff] [blame]1946 revs->notes_opt.use_default_notes = -1;
1947 /* we have been strdup'ing ourselves, so trick
1948 * string_list into free()ing strings */
1949 revs->notes_opt.extra_notes_refs.strdup_strings = 1;
1950 string_list_clear(&revs->notes_opt.extra_notes_refs, 0);
1951 revs->notes_opt.extra_notes_refs.strdup_strings = 0;
Thomas Rast894a9d32010-03-12 17:04:26[diff] [blame]1952 } else if (!strcmp(arg, "--standard-notes")) {
1953 revs->show_notes_given = 1;
Jeff King3a03cf62011-03-29 20:57:27[diff] [blame]1954 revs->notes_opt.use_default_notes = 1;
Thomas Rast894a9d32010-03-12 17:04:26[diff] [blame]1955 } else if (!strcmp(arg, "--no-standard-notes")) {
Jeff King3a03cf62011-03-29 20:57:27[diff] [blame]1956 revs->notes_opt.use_default_notes = 0;
Nanako Shiraishide84acc2009-02-24 09:59:16[diff] [blame]1957 } else if (!strcmp(arg, "--oneline")) {
1958 revs->verbose_header = 1;
1959 get_commit_format("oneline", revs);
Junio C Hamano7dccadf2010-01-21 22:57:41[diff] [blame]1960 revs->pretty_given = 1;
Nanako Shiraishide84acc2009-02-24 09:59:16[diff] [blame]1961 revs->abbrev_commit = 1;
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]1962 } else if (!strcmp(arg, "--graph")) {
1963 revs->topo_order = 1;
1964 revs->rewrite_parents = 1;
1965 revs->graph = graph_init(revs);
1966 } else if (!strcmp(arg, "--root")) {
1967 revs->show_root_diff = 1;
1968 } else if (!strcmp(arg, "--no-commit-id")) {
1969 revs->no_commit_id = 1;
1970 } else if (!strcmp(arg, "--always")) {
1971 revs->always_show_header = 1;
1972 } else if (!strcmp(arg, "--no-abbrev")) {
1973 revs->abbrev = 0;
1974 } else if (!strcmp(arg, "--abbrev")) {
1975 revs->abbrev = DEFAULT_ABBREV;
SZEDER Gábor479b3d92017-06-09 18:17:32[diff] [blame]1976 } else if (skip_prefix(arg, "--abbrev=", &optarg)) {
1977 revs->abbrev = strtoul(optarg, NULL, 10);
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]1978 if (revs->abbrev < MINIMUM_ABBREV)
1979 revs->abbrev = MINIMUM_ABBREV;
1980 else if (revs->abbrev > 40)
1981 revs->abbrev = 40;
1982 } else if (!strcmp(arg, "--abbrev-commit")) {
1983 revs->abbrev_commit = 1;
Jay Soffian0c476952011-05-18 17:56:04[diff] [blame]1984 revs->abbrev_commit_given = 1;
1985 } else if (!strcmp(arg, "--no-abbrev-commit")) {
1986 revs->abbrev_commit = 0;
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]1987 } else if (!strcmp(arg, "--full-diff")) {
1988 revs->diff = 1;
1989 revs->full_diff = 1;
1990 } else if (!strcmp(arg, "--full-history")) {
1991 revs->simplify_history = 0;
1992 } else if (!strcmp(arg, "--relative-date")) {
Jeff Kinga5481a62015-06-25 16:55:02[diff] [blame]1993 revs->date_mode.type = DATE_RELATIVE;
Jeff Kingf4ea32f2009-09-24 08:28:15[diff] [blame]1994 revs->date_mode_explicit = 1;
Matthieu Moy7d7b86f2010-08-05 08:22:55[diff] [blame]1995 } else if ((argcount = parse_long_opt("date", argv, &optarg))) {
Jeff Kinga5481a62015-06-25 16:55:02[diff] [blame]1996 parse_date_format(optarg, &revs->date_mode);
Jeff Kingf4ea32f2009-09-24 08:28:15[diff] [blame]1997 revs->date_mode_explicit = 1;
Matthieu Moy7d7b86f2010-08-05 08:22:55[diff] [blame]1998 return argcount;
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]1999 } else if (!strcmp(arg, "--log-size")) {
2000 revs->show_log_size = 1;
2001 }
2002 /*
2003 * Grepping the commit log
2004 */
Matthieu Moy7d7b86f2010-08-05 08:22:55[diff] [blame]2005 else if ((argcount = parse_long_opt("author", argv, &optarg))) {
2006 add_header_grep(revs, GREP_HEADER_AUTHOR, optarg);
2007 return argcount;
2008 } else if ((argcount = parse_long_opt("committer", argv, &optarg))) {
2009 add_header_grep(revs, GREP_HEADER_COMMITTER, optarg);
2010 return argcount;
Nguyễn Thái Ngọc Duy72fd13f2012-09-29 04:41:28[diff] [blame]2011 } else if ((argcount = parse_long_opt("grep-reflog", argv, &optarg))) {
2012 add_header_grep(revs, GREP_HEADER_REFLOG, optarg);
2013 return argcount;
Matthieu Moy7d7b86f2010-08-05 08:22:55[diff] [blame]2014 } else if ((argcount = parse_long_opt("grep", argv, &optarg))) {
2015 add_message_grep(revs, optarg);
2016 return argcount;
Junio C Hamano17bf35a2012-09-13 21:21:44[diff] [blame]2017 } else if (!strcmp(arg, "--grep-debug")) {
2018 revs->grep_filter.debug = 1;
Junio C Hamano727b6fc2012-10-03 22:01:34[diff] [blame]2019 } else if (!strcmp(arg, "--basic-regexp")) {
Junio C Hamano84655412016-07-22 18:43:14[diff] [blame]2020 revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_BRE;
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]2021 } else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) {
Junio C Hamano84655412016-07-22 18:43:14[diff] [blame]2022 revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_ERE;
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]2023 } else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) {
Jeff King0843acf2008-08-25 06:15:05[diff] [blame]2024 revs->grep_filter.regflags |= REG_ICASE;
Junio C Hamanoaccccde2012-02-21 09:02:46[diff] [blame]2025 DIFF_OPT_SET(&revs->diffopt, PICKAXE_IGNORE_CASE);
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]2026 } else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) {
Junio C Hamano84655412016-07-22 18:43:14[diff] [blame]2027 revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_FIXED;
Junio C Hamano727b6fc2012-10-03 22:01:34[diff] [blame]2028 } else if (!strcmp(arg, "--perl-regexp")) {
Junio C Hamano84655412016-07-22 18:43:14[diff] [blame]2029 revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_PCRE;
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]2030 } else if (!strcmp(arg, "--all-match")) {
Jeff King0843acf2008-08-25 06:15:05[diff] [blame]2031 revs->grep_filter.all_match = 1;
Christoph Junghans22dfa8a2015-01-13 01:33:32[diff] [blame]2032 } else if (!strcmp(arg, "--invert-grep")) {
2033 revs->invert_grep = 1;
Matthieu Moy7d7b86f2010-08-05 08:22:55[diff] [blame]2034 } else if ((argcount = parse_long_opt("encoding", argv, &optarg))) {
2035 if (strcmp(optarg, "none"))
2036 git_log_output_encoding = xstrdup(optarg);
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]2037 else
2038 git_log_output_encoding = "";
Matthieu Moy7d7b86f2010-08-05 08:22:55[diff] [blame]2039 return argcount;
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]2040 } else if (!strcmp(arg, "--reverse")) {
2041 revs->reverse ^= 1;
2042 } else if (!strcmp(arg, "--children")) {
2043 revs->children.name = "children";
2044 revs->limited = 1;
Junio C Hamanocc243c32011-05-19 01:08:09[diff] [blame]2045 } else if (!strcmp(arg, "--ignore-missing")) {
2046 revs->ignore_missing = 1;
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]2047 } else {
Duy Nguyena97262c2016-01-21 11:48:44[diff] [blame]2048 int opts = diff_opt_parse(&revs->diffopt, argv, argc, revs->prefix);
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]2049 if (!opts)
2050 unkv[(*unkc)++] = arg;
2051 return opts;
2052 }
Nguy���n Thái Ngọc Duy1b32dec2014-03-25 13:23:27[diff] [blame]2053 if (revs->graph && revs->track_linear)
2054 die("--show-linear-break and --graph are incompatible");
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]2055
2056 return 1;
2057}
2058
Pierre Habouzit6b61ec02008-07-09 21:38:34[diff] [blame]2059void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
2060 const struct option *options,
2061 const char * const usagestr[])
2062{
2063 int n = handle_revision_opt(revs, ctx->argc, ctx->argv,
2064 &ctx->cpidx, ctx->out);
2065 if (n <= 0) {
2066 error("unknown option `%s'", ctx->argv[0]);
2067 usage_with_options(usagestr, options);
2068 }
2069 ctx->argv += n;
2070 ctx->argc -= n;
2071}
2072
Antoine Delaitecb46d632015-06-29 15:40:30[diff] [blame]2073static int for_each_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data, const char *term) {
2074 struct strbuf bisect_refs = STRBUF_INIT;
2075 int status;
2076 strbuf_addf(&bisect_refs, "refs/bisect/%s", term);
2077 status = for_each_ref_in_submodule(submodule, bisect_refs.buf, fn, cb_data);
2078 strbuf_release(&bisect_refs);
2079 return status;
2080}
2081
Heiko Voigt9ef6aeb2010-07-07 13:39:12[diff] [blame]2082static int for_each_bad_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
Linus Torvaldsad3f9a72009-10-27 18:28:07[diff] [blame]2083{
Antoine Delaitecb46d632015-06-29 15:40:30[diff] [blame]2084 return for_each_bisect_ref(submodule, fn, cb_data, term_bad);
Linus Torvaldsad3f9a72009-10-27 18:28:07[diff] [blame]2085}
2086
Heiko Voigt9ef6aeb2010-07-07 13:39:12[diff] [blame]2087static int for_each_good_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
Linus Torvaldsad3f9a72009-10-27 18:28:07[diff] [blame]2088{
Antoine Delaitecb46d632015-06-29 15:40:30[diff] [blame]2089 return for_each_bisect_ref(submodule, fn, cb_data, term_good);
Linus Torvaldsad3f9a72009-10-27 18:28:07[diff] [blame]2090}
2091
Jonathan Niederf6aca0d2011-04-21 10:45:07[diff] [blame]2092static int handle_revision_pseudo_opt(const char *submodule,
2093 struct rev_info *revs,
2094 int argc, const char **argv, int *flags)
2095{
2096 const char *arg = argv[0];
2097 const char *optarg;
2098 int argcount;
2099
Jonathan Nieder0fc63ec2011-04-21 10:48:24[diff] [blame]2100 /*
2101 * NOTE!
2102 *
2103 * Commands like "git shortlog" will not accept the options below
2104 * unless parse_revision_opt queues them (as opposed to erroring
2105 * out).
2106 *
2107 * When implementing your new pseudo-option, remember to
2108 * register it in the list at the top of handle_revision_opt.
2109 */
Jonathan Niederf6aca0d2011-04-21 10:45:07[diff] [blame]2110 if (!strcmp(arg, "--all")) {
2111 handle_refs(submodule, revs, *flags, for_each_ref_submodule);
2112 handle_refs(submodule, revs, *flags, head_ref_submodule);
Junio C Hamanoff32d342013-11-01 19:02:45[diff] [blame]2113 clear_ref_exclusion(&revs->ref_excludes);
Jonathan Niederf6aca0d2011-04-21 10:45:07[diff] [blame]2114 } else if (!strcmp(arg, "--branches")) {
2115 handle_refs(submodule, revs, *flags, for_each_branch_ref_submodule);
Junio C Hamanoff32d342013-11-01 19:02:45[diff] [blame]2116 clear_ref_exclusion(&revs->ref_excludes);
Jonathan Niederf6aca0d2011-04-21 10:45:07[diff] [blame]2117 } else if (!strcmp(arg, "--bisect")) {
Antoine Delaitecb46d632015-06-29 15:40:30[diff] [blame]2118 read_bisect_terms(&term_bad, &term_good);
Jonathan Niederf6aca0d2011-04-21 10:45:07[diff] [blame]2119 handle_refs(submodule, revs, *flags, for_each_bad_bisect_ref);
Kevin Bracey7f34a462013-05-16 15:32:38[diff] [blame]2120 handle_refs(submodule, revs, *flags ^ (UNINTERESTING | BOTTOM), for_each_good_bisect_ref);
Jonathan Niederf6aca0d2011-04-21 10:45:07[diff] [blame]2121 revs->bisect = 1;
2122 } else if (!strcmp(arg, "--tags")) {
2123 handle_refs(submodule, revs, *flags, for_each_tag_ref_submodule);
Junio C Hamanoff32d342013-11-01 19:02:45[diff] [blame]2124 clear_ref_exclusion(&revs->ref_excludes);
Jonathan Niederf6aca0d2011-04-21 10:45:07[diff] [blame]2125 } else if (!strcmp(arg, "--remotes")) {
2126 handle_refs(submodule, revs, *flags, for_each_remote_ref_submodule);
Junio C Hamanoff32d342013-11-01 19:02:45[diff] [blame]2127 clear_ref_exclusion(&revs->ref_excludes);
Jonathan Niederf6aca0d2011-04-21 10:45:07[diff] [blame]2128 } else if ((argcount = parse_long_opt("glob", argv, &optarg))) {
2129 struct all_refs_cb cb;
2130 init_all_refs_cb(&cb, revs, *flags);
Michael Haggertya217dcb2015-05-25 18:38:30[diff] [blame]2131 for_each_glob_ref(handle_one_ref, optarg, &cb);
Junio C Hamanoff32d342013-11-01 19:02:45[diff] [blame]2132 clear_ref_exclusion(&revs->ref_excludes);
Junio C Hamanoe7b432c2013-08-30 23:37:55[diff] [blame]2133 return argcount;
2134 } else if ((argcount = parse_long_opt("exclude", argv, &optarg))) {
Junio C Hamanoff32d342013-11-01 19:02:45[diff] [blame]2135 add_ref_exclusion(&revs->ref_excludes, optarg);
Jonathan Niederf6aca0d2011-04-21 10:45:07[diff] [blame]2136 return argcount;
SZEDER Gábor8b1d9132017-06-09 18:17:33[diff] [blame]2137 } else if (skip_prefix(arg, "--branches=", &optarg)) {
Jonathan Niederf6aca0d2011-04-21 10:45:07[diff] [blame]2138 struct all_refs_cb cb;
2139 init_all_refs_cb(&cb, revs, *flags);
SZEDER Gábor8b1d9132017-06-09 18:17:33[diff] [blame]2140 for_each_glob_ref_in(handle_one_ref, optarg, "refs/heads/", &cb);
Junio C Hamanoff32d342013-11-01 19:02:45[diff] [blame]2141 clear_ref_exclusion(&revs->ref_excludes);
SZEDER Gábor8b1d9132017-06-09 18:17:33[diff] [blame]2142 } else if (skip_prefix(arg, "--tags=", &optarg)) {
Jonathan Niederf6aca0d2011-04-21 10:45:07[diff] [blame]2143 struct all_refs_cb cb;
2144 init_all_refs_cb(&cb, revs, *flags);
SZEDER Gábor8b1d9132017-06-09 18:17:33[diff] [blame]2145 for_each_glob_ref_in(handle_one_ref, optarg, "refs/tags/", &cb);
Junio C Hamanoff32d342013-11-01 19:02:45[diff] [blame]2146 clear_ref_exclusion(&revs->ref_excludes);
SZEDER Gábor8b1d9132017-06-09 18:17:33[diff] [blame]2147 } else if (skip_prefix(arg, "--remotes=", &optarg)) {
Jonathan Niederf6aca0d2011-04-21 10:45:07[diff] [blame]2148 struct all_refs_cb cb;
2149 init_all_refs_cb(&cb, revs, *flags);
SZEDER Gábor8b1d9132017-06-09 18:17:33[diff] [blame]2150 for_each_glob_ref_in(handle_one_ref, optarg, "refs/remotes/", &cb);
Junio C Hamanoff32d342013-11-01 19:02:45[diff] [blame]2151 clear_ref_exclusion(&revs->ref_excludes);
Jonathan Niederf6aca0d2011-04-21 10:45:07[diff] [blame]2152 } else if (!strcmp(arg, "--reflog")) {
Jeff King718ccc92014-10-15 22:38:31[diff] [blame]2153 add_reflogs_to_pending(revs, *flags);
Jeff King4fe10212014-10-17 00:44:23[diff] [blame]2154 } else if (!strcmp(arg, "--indexed-objects")) {
2155 add_index_objects_to_pending(revs, *flags);
Jonathan Niederf6aca0d2011-04-21 10:45:07[diff] [blame]2156 } else if (!strcmp(arg, "--not")) {
Kevin Bracey7f34a462013-05-16 15:32:38[diff] [blame]2157 *flags ^= UNINTERESTING | BOTTOM;
Jonathan Niederf6aca0d2011-04-21 10:45:07[diff] [blame]2158 } else if (!strcmp(arg, "--no-walk")) {
Martin von Zweigbergkca92e592012-08-29 06:15:54[diff] [blame]2159 revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
SZEDER Gábor8b1d9132017-06-09 18:17:33[diff] [blame]2160 } else if (skip_prefix(arg, "--no-walk=", &optarg)) {
Martin von Zweigbergkca92e592012-08-29 06:15:54[diff] [blame]2161 /*
2162 * Detached form ("--no-walk X" as opposed to "--no-walk=X")
2163 * not allowed, since the argument is optional.
2164 */
SZEDER Gábor8b1d9132017-06-09 18:17:33[diff] [blame]2165 if (!strcmp(optarg, "sorted"))
Martin von Zweigbergkca92e592012-08-29 06:15:54[diff] [blame]2166 revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
SZEDER Gábor8b1d9132017-06-09 18:17:33[diff] [blame]2167 else if (!strcmp(optarg, "unsorted"))
Martin von Zweigbergkca92e592012-08-29 06:15:54[diff] [blame]2168 revs->no_walk = REVISION_WALK_NO_WALK_UNSORTED;
2169 else
2170 return error("invalid argument to --no-walk");
Jonathan Niederf6aca0d2011-04-21 10:45:07[diff] [blame]2171 } else if (!strcmp(arg, "--do-walk")) {
2172 revs->no_walk = 0;
2173 } else {
2174 return 0;
2175 }
2176
2177 return 1;
2178}
2179
Jeff Kingce113602015-08-29 05:04:18[diff] [blame]2180static void NORETURN diagnose_missing_default(const char *def)
2181{
2182 unsigned char sha1[20];
2183 int flags;
2184 const char *refname;
2185
2186 refname = resolve_ref_unsafe(def, 0, sha1, &flags);
2187 if (!refname || !(flags & REF_ISSYMREF) || (flags & REF_ISBROKEN))
2188 die(_("your current branch appears to be broken"));
2189
2190 skip_prefix(refname, "refs/heads/", &refname);
2191 die(_("your current branch '%s' does not have any commits yet"),
2192 refname);
2193}
2194
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]2195/*
2196 * Parse revision information, filling in the "rev_info" structure,
2197 * and removing the used arguments from the argument list.
2198 *
Linus Torvalds765ac8e2006-02-28 23:07:20[diff] [blame]2199 * Returns the number of arguments left that weren't recognized
2200 * (which are also moved to the head of the argument list)
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]2201 */
Junio C Hamano32962c92010-03-09 06:58:09[diff] [blame]2202int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *opt)
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]2203{
Junio C Hamano8e676e82012-07-02 19:33:52[diff] [blame]2204 int i, flags, left, seen_dashdash, read_from_stdin, got_rev_arg = 0, revarg_opt;
Junio C Hamano4da5af32011-05-11 21:01:19[diff] [blame]2205 struct cmdline_pathspec prune_data;
Heiko Voigt9ef6aeb2010-07-07 13:39:12[diff] [blame]2206 const char *submodule = NULL;
2207
Junio C Hamano4da5af32011-05-11 21:01:19[diff] [blame]2208 memset(&prune_data, 0, sizeof(prune_data));
Heiko Voigt9ef6aeb2010-07-07 13:39:12[diff] [blame]2209 if (opt)
2210 submodule = opt->submodule;
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]2211
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]2212 /* First, search for "--" */
Clemens Buchacher6d5b93f2012-04-14 19:04:48[diff] [blame]2213 if (opt && opt->assume_dashdash) {
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]2214 seen_dashdash = 1;
Clemens Buchacher6d5b93f2012-04-14 19:04:48[diff] [blame]2215 } else {
2216 seen_dashdash = 0;
2217 for (i = 1; i < argc; i++) {
2218 const char *arg = argv[i];
2219 if (strcmp(arg, "--"))
2220 continue;
2221 argv[i] = NULL;
2222 argc = i;
2223 if (argv[i + 1])
2224 append_prune_data(&prune_data, argv + i + 1);
2225 seen_dashdash = 1;
2226 break;
2227 }
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]2228 }
2229
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]2230 /* Second, deal with arguments and options */
2231 flags = 0;
Junio C Hamanod5f6b1d2012-07-02 19:43:05[diff] [blame]2232 revarg_opt = opt ? opt->revarg_opt : 0;
2233 if (seen_dashdash)
2234 revarg_opt |= REVARG_CANNOT_BE_FILENAME;
Junio C Hamano8b3dce52009-11-03 14:59:18[diff] [blame]2235 read_from_stdin = 0;
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]2236 for (left = i = 1; i < argc; i++) {
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]2237 const char *arg = argv[i];
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]2238 if (*arg == '-') {
Linus Torvaldscd2bdc52006-04-14 23:52:13[diff] [blame]2239 int opts;
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]2240
Jonathan Niederf6aca0d2011-04-21 10:45:07[diff] [blame]2241 opts = handle_revision_pseudo_opt(submodule,
2242 revs, argc - i, argv + i,
2243 &flags);
2244 if (opts > 0) {
2245 i += opts - 1;
Uwe Kleine-Königa5aa9302008-02-28 07:24:25[diff] [blame]2246 continue;
2247 }
Jonathan Niederf6aca0d2011-04-21 10:45:07[diff] [blame]2248
Junio C Hamano8b3dce52009-11-03 14:59:18[diff] [blame]2249 if (!strcmp(arg, "--stdin")) {
2250 if (revs->disable_stdin) {
2251 argv[left++] = arg;
2252 continue;
2253 }
2254 if (read_from_stdin++)
2255 die("--stdin given twice?");
Junio C Hamano60da8b12009-11-20 10:50:21[diff] [blame]2256 read_revisions_from_stdin(revs, &prune_data);
Junio C Hamano8b3dce52009-11-03 14:59:18[diff] [blame]2257 continue;
2258 }
Junio C Hamano2d10c552006-09-20 20:21:56[diff] [blame]2259
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]2260 opts = handle_revision_opt(revs, argc - i, argv + i, &left, argv);
Linus Torvaldscd2bdc52006-04-14 23:52:13[diff] [blame]2261 if (opts > 0) {
Linus Torvaldscd2bdc52006-04-14 23:52:13[diff] [blame]2262 i += opts - 1;
2263 continue;
2264 }
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]2265 if (opts < 0)
2266 exit(128);
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]2267 continue;
2268 }
Rene Scharfe0d2c9d62006-07-01 23:29:37[diff] [blame]2269
Junio C Hamano8e676e82012-07-02 19:33:52[diff] [blame]2270
2271 if (handle_revision_arg(arg, revs, flags, revarg_opt)) {
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]2272 int j;
Junio C Hamano5d6f0932006-09-06 04:28:36[diff] [blame]2273 if (seen_dashdash || *arg == '^')
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]2274 die("bad revision '%s'", arg);
2275
Junio C Hamanoea92f412006-04-26 22:09:27[diff] [blame]2276 /* If we didn't have a "--":
2277 * (1) all filenames must exist;
2278 * (2) all rev-args must not be interpretable
2279 * as a valid filename.
2280 * but the latter we have checked in the main loop.
2281 */
Linus Torvaldse23d0b42006-04-26 17:15:54[diff] [blame]2282 for (j = i; j < argc; j++)
Matthieu Moy023e37c2012-06-18 18:18:21[diff] [blame]2283 verify_filename(revs->prefix, argv[j], j == i);
Linus Torvaldse23d0b42006-04-26 17:15:54[diff] [blame]2284
Junio C Hamano60da8b12009-11-20 10:50:21[diff] [blame]2285 append_prune_data(&prune_data, argv + i);
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]2286 break;
2287 }
Dave Olszewski8fcaca32010-03-13 22:47:05[diff] [blame]2288 else
2289 got_rev_arg = 1;
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]2290 }
Junio C Hamano5d6f0932006-09-06 04:28:36[diff] [blame]2291
Junio C Hamano4da5af32011-05-11 21:01:19[diff] [blame]2292 if (prune_data.nr) {
Junio C Hamano93e7d672011-05-11 22:23:25[diff] [blame]2293 /*
2294 * If we need to introduce the magic "a lone ':' means no
2295 * pathspec whatsoever", here is the place to do so.
2296 *
2297 * if (prune_data.nr == 1 && !strcmp(prune_data[0], ":")) {
2298 * prune_data.nr = 0;
2299 * prune_data.alloc = 0;
2300 * free(prune_data.path);
2301 * prune_data.path = NULL;
2302 * } else {
2303 * terminate prune_data.alloc with NULL and
2304 * call init_pathspec() to set revs->prune_data here.
2305 * }
2306 */
Felipe Contreras9e57ac52013-10-31 09:25:43[diff] [blame]2307 ALLOC_GROW(prune_data.path, prune_data.nr + 1, prune_data.alloc);
Junio C Hamano4da5af32011-05-11 21:01:19[diff] [blame]2308 prune_data.path[prune_data.nr++] = NULL;
Nguyễn Thái Ngọc Duy0fdc2ae2013-07-14 08:35:31[diff] [blame]2309 parse_pathspec(&revs->prune_data, 0, 0,
2310 revs->prefix, prune_data.path);
Junio C Hamano4da5af32011-05-11 21:01:19[diff] [blame]2311 }
Junio C Hamano5486ef02009-11-20 10:33:28[diff] [blame]2312
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]2313 if (revs->def == NULL)
Junio C Hamano32962c92010-03-09 06:58:09[diff] [blame]2314 revs->def = opt ? opt->def : NULL;
Junio C Hamanob4490052010-03-09 07:27:25[diff] [blame]2315 if (opt && opt->tweak)
2316 opt->tweak(revs, opt);
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]2317 if (revs->show_merge)
Junio C Hamanoae3e5e12006-07-03 09:59:32[diff] [blame]2318 prepare_show_merge(revs);
Dave Olszewski8fcaca32010-03-13 22:47:05[diff] [blame]2319 if (revs->def && !revs->pending.nr && !got_rev_arg) {
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]2320 unsigned char sha1[20];
Linus Torvaldscd2bdc52006-04-14 23:52:13[diff] [blame]2321 struct object *object;
Junio C Hamano249c8f42012-07-02 19:56:44[diff] [blame]2322 struct object_context oc;
Junio C Hamano33bd5982012-07-02 17:32:11[diff] [blame]2323 if (get_sha1_with_context(revs->def, 0, sha1, &oc))
Jeff Kingce113602015-08-29 05:04:18[diff] [blame]2324 diagnose_missing_default(revs->def);
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]2325 object = get_reference(revs, revs->def, sha1, 0);
Junio C Hamano249c8f42012-07-02 19:56:44[diff] [blame]2326 add_pending_object_with_mode(revs, object, revs->def, oc.mode);
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]2327 }
Fredrik Kuivinen8efdc322006-03-10 09:21:39[diff] [blame]2328
Linus Torvaldsb7bb7602007-09-29 16:50:39[diff] [blame]2329 /* Did the user ask for any diff output? Run the diff! */
2330 if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT)
2331 revs->diff = 1;
2332
Arjen Laarhoven0faf2da2007-12-25 11:06:47[diff] [blame]2333 /* Pickaxe, diff-filter and rename following need diffs */
2334 if (revs->diffopt.pickaxe ||
2335 revs->diffopt.filter ||
2336 DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
Linus Torvaldsb7bb7602007-09-29 16:50:39[diff] [blame]2337 revs->diff = 1;
2338
Junio C Hamano9dad9d22006-10-31 02:58:03[diff] [blame]2339 if (revs->topo_order)
Junio C Hamano53069682006-04-02 02:38:25[diff] [blame]2340 revs->limited = 1;
2341
Nguyễn Thái Ngọc Duyafe069d2010-12-17 12:43:06[diff] [blame]2342 if (revs->prune_data.nr) {
Nguyễn Thái Ngọc Duybd1928d2013-07-14 08:35:58[diff] [blame]2343 copy_pathspec(&revs->pruning.pathspec, &revs->prune_data);
Linus Torvalds750f7b62007-06-19 21:22:46[diff] [blame]2344 /* Can't prune commits with rename following: the paths change.. */
Pierre Habouzit8f67f8a2007-11-10 19:05:14[diff] [blame]2345 if (!DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
Linus Torvalds53b2c822007-11-05 21:22:34[diff] [blame]2346 revs->prune = 1;
Linus Torvaldscd2bdc52006-04-14 23:52:13[diff] [blame]2347 if (!revs->full_diff)
Nguyễn Thái Ngọc Duybd1928d2013-07-14 08:35:58[diff] [blame]2348 copy_pathspec(&revs->diffopt.pathspec,
2349 &revs->prune_data);
Fredrik Kuivinen8efdc322006-03-10 09:21:39[diff] [blame]2350 }
Junio C Hamanob4490052010-03-09 07:27:25[diff] [blame]2351 if (revs->combine_merges)
Linus Torvaldscd2bdc52006-04-14 23:52:13[diff] [blame]2352 revs->ignore_merges = 0;
Linus Torvaldscd2bdc52006-04-14 23:52:13[diff] [blame]2353 revs->diffopt.abbrev = revs->abbrev;
Thomas Rast12da1d12013-03-28 16:47:32[diff] [blame]2354
2355 if (revs->line_level_traverse) {
2356 revs->limited = 1;
2357 revs->topo_order = 1;
2358 }
2359
Thomas Rast28452652012-08-03 12:16:24[diff] [blame]2360 diff_setup_done(&revs->diffopt);
Fredrik Kuivinen8efdc322006-03-10 09:21:39[diff] [blame]2361
Junio C Hamano918d4e12012-10-09 23:40:03[diff] [blame]2362 grep_commit_pattern_type(GREP_PATTERN_TYPE_UNSPECIFIED,
2363 &revs->grep_filter);
Jeff King0843acf2008-08-25 06:15:05[diff] [blame]2364 compile_grep_patterns(&revs->grep_filter);
Junio C Hamanobd95fcd2006-09-18 00:23:20[diff] [blame]2365
Shawn O. Pearced56651c2007-08-20 02:33:43[diff] [blame]2366 if (revs->reverse && revs->reflog_info)
2367 die("cannot combine --reverse with --walk-reflogs");
Junio C Hamano8bb65882008-07-08 22:25:44[diff] [blame]2368 if (revs->rewrite_parents && revs->children.name)
Junio C Hamanof35f5602008-04-03 09:12:06[diff] [blame]2369 die("cannot combine --parents and --children");
Shawn O. Pearced56651c2007-08-20 02:33:43[diff] [blame]2370
Adam Simpkins7fefda52008-05-04 10:36:54[diff] [blame]2371 /*
2372 * Limitations on the graph functionality
2373 */
2374 if (revs->reverse && revs->graph)
2375 die("cannot combine --reverse with --graph");
2376
2377 if (revs->reflog_info && revs->graph)
2378 die("cannot combine --walk-reflogs with --graph");
Dongcan Jiang695985f2015-03-11 02:13:02[diff] [blame]2379 if (revs->no_walk && revs->graph)
2380 die("cannot combine --no-walk with --graph");
Junio C Hamanobaa63782012-09-29 18:59:52[diff] [blame]2381 if (!revs->reflog_info && revs->grep_filter.use_reflog_filter)
2382 die("cannot use --grep-reflog without --walk-reflogs");
Adam Simpkins7fefda52008-05-04 10:36:54[diff] [blame]2383
Kevin Daudtf88851c2015-03-19 22:14:08[diff] [blame]2384 if (revs->first_parent_only && revs->bisect)
2385 die(_("--first-parent is incompatible with --bisect"));
2386
Junio C Hamano0893eec2016-03-29 22:49:24[diff] [blame]2387 if (revs->expand_tabs_in_log < 0)
2388 revs->expand_tabs_in_log = revs->expand_tabs_in_log_default;
2389
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]2390 return left;
2391}
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]2392
Junio C Hamanof35f5602008-04-03 09:12:06[diff] [blame]2393static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child)
2394{
2395 struct commit_list *l = xcalloc(1, sizeof(*l));
2396
2397 l->item = child;
2398 l->next = add_decoration(&revs->children, &parent->object, l);
2399}
2400
Kevin Braceyd0af6632013-05-16 15:32:34[diff] [blame]2401static int remove_duplicate_parents(struct rev_info *revs, struct commit *commit)
Junio C Hamano6546b592008-07-31 08:17:41[diff] [blame]2402{
Kevin Braceyd0af6632013-05-16 15:32:34[diff] [blame]2403 struct treesame_state *ts = lookup_decoration(&revs->treesame, &commit->object);
Junio C Hamano6546b592008-07-31 08:17:41[diff] [blame]2404 struct commit_list **pp, *p;
2405 int surviving_parents;
2406
2407 /* Examine existing parents while marking ones we have seen... */
2408 pp = &commit->parents;
Kevin Braceyd0af6632013-05-16 15:32:34[diff] [blame]2409 surviving_parents = 0;
Junio C Hamano6546b592008-07-31 08:17:41[diff] [blame]2410 while ((p = *pp) != NULL) {
2411 struct commit *parent = p->item;
2412 if (parent->object.flags & TMP_MARK) {
2413 *pp = p->next;
Kevin Braceyd0af6632013-05-16 15:32:34[diff] [blame]2414 if (ts)
2415 compact_treesame(revs, commit, surviving_parents);
Junio C Hamano6546b592008-07-31 08:17:41[diff] [blame]2416 continue;
2417 }
2418 parent->object.flags |= TMP_MARK;
Kevin Braceyd0af6632013-05-16 15:32:34[diff] [blame]2419 surviving_parents++;
Junio C Hamano6546b592008-07-31 08:17:41[diff] [blame]2420 pp = &p->next;
2421 }
Kevin Braceyd0af6632013-05-16 15:32:34[diff] [blame]2422 /* clear the temporary mark */
Junio C Hamano6546b592008-07-31 08:17:41[diff] [blame]2423 for (p = commit->parents; p; p = p->next) {
2424 p->item->object.flags &= ~TMP_MARK;
Junio C Hamano6546b592008-07-31 08:17:41[diff] [blame]2425 }
Kevin Braceyd0af6632013-05-16 15:32:34[diff] [blame]2426 /* no update_treesame() - removing duplicates can't affect TREESAME */
Junio C Hamano6546b592008-07-31 08:17:41[diff] [blame]2427 return surviving_parents;
2428}
2429
Junio C Hamanofaf01562008-08-14 17:59:44[diff] [blame]2430struct merge_simplify_state {
2431 struct commit *simplified;
2432};
2433
2434static struct merge_simplify_state *locate_simplify_state(struct rev_info *revs, struct commit *commit)
2435{
2436 struct merge_simplify_state *st;
2437
2438 st = lookup_decoration(&revs->merge_simplification, &commit->object);
2439 if (!st) {
2440 st = xcalloc(1, sizeof(*st));
2441 add_decoration(&revs->merge_simplification, &commit->object, st);
2442 }
2443 return st;
2444}
2445
Kevin Braceyd0af6632013-05-16 15:32:34[diff] [blame]2446static int mark_redundant_parents(struct rev_info *revs, struct commit *commit)
2447{
2448 struct commit_list *h = reduce_heads(commit->parents);
2449 int i = 0, marked = 0;
2450 struct commit_list *po, *pn;
2451
2452 /* Want these for sanity-checking only */
2453 int orig_cnt = commit_list_count(commit->parents);
2454 int cnt = commit_list_count(h);
2455
2456 /*
2457 * Not ready to remove items yet, just mark them for now, based
2458 * on the output of reduce_heads(). reduce_heads outputs the reduced
2459 * set in its original order, so this isn't too hard.
2460 */
2461 po = commit->parents;
2462 pn = h;
2463 while (po) {
2464 if (pn && po->item == pn->item) {
2465 pn = pn->next;
2466 i++;
2467 } else {
2468 po->item->object.flags |= TMP_MARK;
2469 marked++;
2470 }
2471 po=po->next;
2472 }
2473
2474 if (i != cnt || cnt+marked != orig_cnt)
2475 die("mark_redundant_parents %d %d %d %d", orig_cnt, cnt, i, marked);
2476
2477 free_commit_list(h);
2478
2479 return marked;
2480}
2481
Kevin Bracey143f1ea2013-05-16 15:32:37[diff] [blame]2482static int mark_treesame_root_parents(struct rev_info *revs, struct commit *commit)
2483{
2484 struct commit_list *p;
2485 int marked = 0;
2486
2487 for (p = commit->parents; p; p = p->next) {
2488 struct commit *parent = p->item;
2489 if (!parent->parents && (parent->object.flags & TREESAME)) {
2490 parent->object.flags |= TMP_MARK;
2491 marked++;
2492 }
2493 }
2494
2495 return marked;
2496}
2497
Kevin Bracey9c129ea2013-05-16 15:32:36[diff] [blame]2498/*
2499 * Awkward naming - this means one parent we are TREESAME to.
2500 * cf mark_treesame_root_parents: root parents that are TREESAME (to an
2501 * empty tree). Better name suggestions?
2502 */
2503static int leave_one_treesame_to_parent(struct rev_info *revs, struct commit *commit)
2504{
2505 struct treesame_state *ts = lookup_decoration(&revs->treesame, &commit->object);
2506 struct commit *unmarked = NULL, *marked = NULL;
2507 struct commit_list *p;
2508 unsigned n;
2509
2510 for (p = commit->parents, n = 0; p; p = p->next, n++) {
2511 if (ts->treesame[n]) {
2512 if (p->item->object.flags & TMP_MARK) {
2513 if (!marked)
2514 marked = p->item;
2515 } else {
2516 if (!unmarked) {
2517 unmarked = p->item;
2518 break;
2519 }
2520 }
2521 }
2522 }
2523
2524 /*
2525 * If we are TREESAME to a marked-for-deletion parent, but not to any
2526 * unmarked parents, unmark the first TREESAME parent. This is the
2527 * parent that the default simplify_history==1 scan would have followed,
2528 * and it doesn't make sense to omit that path when asking for a
2529 * simplified full history. Retaining it improves the chances of
2530 * understanding odd missed merges that took an old version of a file.
2531 *
2532 * Example:
2533 *
2534 * I--------*X A modified the file, but mainline merge X used
2535 * \ / "-s ours", so took the version from I. X is
2536 * `-*A--' TREESAME to I and !TREESAME to A.
2537 *
2538 * Default log from X would produce "I". Without this check,
2539 * --full-history --simplify-merges would produce "I-A-X", showing
2540 * the merge commit X and that it changed A, but not making clear that
2541 * it had just taken the I version. With this check, the topology above
2542 * is retained.
2543 *
2544 * Note that it is possible that the simplification chooses a different
2545 * TREESAME parent from the default, in which case this test doesn't
2546 * activate, and we _do_ drop the default parent. Example:
2547 *
2548 * I------X A modified the file, but it was reverted in B,
2549 * \ / meaning mainline merge X is TREESAME to both
2550 * *A-*B parents.
2551 *
2552 * Default log would produce "I" by following the first parent;
2553 * --full-history --simplify-merges will produce "I-A-B". But this is a
2554 * reasonable result - it presents a logical full history leading from
2555 * I to X, and X is not an important merge.
2556 */
2557 if (!unmarked && marked) {
2558 marked->object.flags &= ~TMP_MARK;
2559 return 1;
2560 }
2561
2562 return 0;
2563}
2564
Kevin Braceyd0af6632013-05-16 15:32:34[diff] [blame]2565static int remove_marked_parents(struct rev_info *revs, struct commit *commit)
2566{
2567 struct commit_list **pp, *p;
2568 int nth_parent, removed = 0;
2569
2570 pp = &commit->parents;
2571 nth_parent = 0;
2572 while ((p = *pp) != NULL) {
2573 struct commit *parent = p->item;
2574 if (parent->object.flags & TMP_MARK) {
2575 parent->object.flags &= ~TMP_MARK;
2576 *pp = p->next;
2577 free(p);
2578 removed++;
2579 compact_treesame(revs, commit, nth_parent);
2580 continue;
2581 }
2582 pp = &p->next;
2583 nth_parent++;
2584 }
2585
2586 /* Removing parents can only increase TREESAMEness */
2587 if (removed && !(commit->object.flags & TREESAME))
2588 update_treesame(revs, commit);
2589
2590 return nth_parent;
2591}
2592
Junio C Hamanofaf01562008-08-14 17:59:44[diff] [blame]2593static struct commit_list **simplify_one(struct rev_info *revs, struct commit *commit, struct commit_list **tail)
Junio C Hamano6546b592008-07-31 08:17:41[diff] [blame]2594{
2595 struct commit_list *p;
Kevin Bracey4d826602013-05-16 15:32:39[diff] [blame]2596 struct commit *parent;
Junio C Hamanofaf01562008-08-14 17:59:44[diff] [blame]2597 struct merge_simplify_state *st, *pst;
Junio C Hamano6546b592008-07-31 08:17:41[diff] [blame]2598 int cnt;
2599
Junio C Hamanofaf01562008-08-14 17:59:44[diff] [blame]2600 st = locate_simplify_state(revs, commit);
2601
Junio C Hamano6546b592008-07-31 08:17:41[diff] [blame]2602 /*
Junio C Hamano6546b592008-07-31 08:17:41[diff] [blame]2603 * Have we handled this one?
2604 */
Junio C Hamanofaf01562008-08-14 17:59:44[diff] [blame]2605 if (st->simplified)
Junio C Hamano6546b592008-07-31 08:17:41[diff] [blame]2606 return tail;
2607
2608 /*
2609 * An UNINTERESTING commit simplifies to itself, so does a
2610 * root commit. We do not rewrite parents of such commit
2611 * anyway.
2612 */
2613 if ((commit->object.flags & UNINTERESTING) || !commit->parents) {
Junio C Hamanofaf01562008-08-14 17:59:44[diff] [blame]2614 st->simplified = commit;
Junio C Hamano6546b592008-07-31 08:17:41[diff] [blame]2615 return tail;
2616 }
2617
2618 /*
Junio C Hamano6e513ba2012-06-08 21:56:03[diff] [blame]2619 * Do we know what commit all of our parents that matter
2620 * should be rewritten to? Otherwise we are not ready to
2621 * rewrite this one yet.
Junio C Hamano6546b592008-07-31 08:17:41[diff] [blame]2622 */
2623 for (cnt = 0, p = commit->parents; p; p = p->next) {
Junio C Hamanofaf01562008-08-14 17:59:44[diff] [blame]2624 pst = locate_simplify_state(revs, p->item);
2625 if (!pst->simplified) {
Junio C Hamano6546b592008-07-31 08:17:41[diff] [blame]2626 tail = &commit_list_insert(p->item, tail)->next;
2627 cnt++;
2628 }
Junio C Hamano6e513ba2012-06-08 21:56:03[diff] [blame]2629 if (revs->first_parent_only)
2630 break;
Junio C Hamano6546b592008-07-31 08:17:41[diff] [blame]2631 }
Junio C Hamano53030f82008-08-18 07:37:34[diff] [blame]2632 if (cnt) {
2633 tail = &commit_list_insert(commit, tail)->next;
Junio C Hamano6546b592008-07-31 08:17:41[diff] [blame]2634 return tail;
Junio C Hamano53030f82008-08-18 07:37:34[diff] [blame]2635 }
Junio C Hamano6546b592008-07-31 08:17:41[diff] [blame]2636
2637 /*
Kevin Braceyd0af6632013-05-16 15:32:34[diff] [blame]2638 * Rewrite our list of parents. Note that this cannot
2639 * affect our TREESAME flags in any way - a commit is
2640 * always TREESAME to its simplification.
Junio C Hamano6546b592008-07-31 08:17:41[diff] [blame]2641 */
Junio C Hamanofaf01562008-08-14 17:59:44[diff] [blame]2642 for (p = commit->parents; p; p = p->next) {
2643 pst = locate_simplify_state(revs, p->item);
2644 p->item = pst->simplified;
Junio C Hamano6e513ba2012-06-08 21:56:03[diff] [blame]2645 if (revs->first_parent_only)
2646 break;
Junio C Hamanofaf01562008-08-14 17:59:44[diff] [blame]2647 }
Junio C Hamano4b7f53d2013-01-17 22:23:03[diff] [blame]2648
Junio C Hamano0290bf12013-04-08 20:10:27[diff] [blame]2649 if (revs->first_parent_only)
Junio C Hamano6e513ba2012-06-08 21:56:03[diff] [blame]2650 cnt = 1;
Junio C Hamano0290bf12013-04-08 20:10:27[diff] [blame]2651 else
Kevin Braceyd0af6632013-05-16 15:32:34[diff] [blame]2652 cnt = remove_duplicate_parents(revs, commit);
Junio C Hamano6546b592008-07-31 08:17:41[diff] [blame]2653
2654 /*
2655 * It is possible that we are a merge and one side branch
2656 * does not have any commit that touches the given paths;
Kevin Braceyd0af6632013-05-16 15:32:34[diff] [blame]2657 * in such a case, the immediate parent from that branch
2658 * will be rewritten to be the merge base.
Junio C Hamano6546b592008-07-31 08:17:41[diff] [blame]2659 *
2660 * o----X X: the commit we are looking at;
2661 * / / o: a commit that touches the paths;
2662 * ---o----'
2663 *
Kevin Bracey143f1ea2013-05-16 15:32:37[diff] [blame]2664 * Further, a merge of an independent branch that doesn't
2665 * touch the path will reduce to a treesame root parent:
2666 *
2667 * ----o----X X: the commit we are looking at;
2668 * / o: a commit that touches the paths;
2669 * r r: a root commit not touching the paths
2670 *
2671 * Detect and simplify both cases.
Junio C Hamano6546b592008-07-31 08:17:41[diff] [blame]2672 */
2673 if (1 < cnt) {
Kevin Braceyd0af6632013-05-16 15:32:34[diff] [blame]2674 int marked = mark_redundant_parents(revs, commit);
Kevin Bracey143f1ea2013-05-16 15:32:37[diff] [blame]2675 marked += mark_treesame_root_parents(revs, commit);
Kevin Braceyd0af6632013-05-16 15:32:34[diff] [blame]2676 if (marked)
Kevin Bracey9c129ea2013-05-16 15:32:36[diff] [blame]2677 marked -= leave_one_treesame_to_parent(revs, commit);
2678 if (marked)
Kevin Braceyd0af6632013-05-16 15:32:34[diff] [blame]2679 cnt = remove_marked_parents(revs, commit);
Junio C Hamano6546b592008-07-31 08:17:41[diff] [blame]2680 }
2681
2682 /*
2683 * A commit simplifies to itself if it is a root, if it is
2684 * UNINTERESTING, if it touches the given paths, or if it is a
Kevin Bracey4d826602013-05-16 15:32:39[diff] [blame]2685 * merge and its parents don't simplify to one relevant commit
Junio C Hamano6546b592008-07-31 08:17:41[diff] [blame]2686 * (the first two cases are already handled at the beginning of
2687 * this function).
2688 *
Kevin Bracey4d826602013-05-16 15:32:39[diff] [blame]2689 * Otherwise, it simplifies to what its sole relevant parent
2690 * simplifies to.
Junio C Hamano6546b592008-07-31 08:17:41[diff] [blame]2691 */
2692 if (!cnt ||
2693 (commit->object.flags & UNINTERESTING) ||
2694 !(commit->object.flags & TREESAME) ||
Kevin Bracey4d826602013-05-16 15:32:39[diff] [blame]2695 (parent = one_relevant_parent(revs, commit->parents)) == NULL)
Junio C Hamanofaf01562008-08-14 17:59:44[diff] [blame]2696 st->simplified = commit;
2697 else {
Kevin Bracey4d826602013-05-16 15:32:39[diff] [blame]2698 pst = locate_simplify_state(revs, parent);
Junio C Hamanofaf01562008-08-14 17:59:44[diff] [blame]2699 st->simplified = pst->simplified;
2700 }
Junio C Hamano6546b592008-07-31 08:17:41[diff] [blame]2701 return tail;
2702}
2703
2704static void simplify_merges(struct rev_info *revs)
2705{
Junio C Hamanoab9d75a2012-06-08 21:50:22[diff] [blame]2706 struct commit_list *list, *next;
Junio C Hamano6546b592008-07-31 08:17:41[diff] [blame]2707 struct commit_list *yet_to_do, **tail;
Junio C Hamanoab9d75a2012-06-08 21:50:22[diff] [blame]2708 struct commit *commit;
Junio C Hamano6546b592008-07-31 08:17:41[diff] [blame]2709
Junio C Hamano5eac7392008-08-14 20:52:36[diff] [blame]2710 if (!revs->prune)
2711 return;
Junio C Hamano65347032008-08-04 00:47:16[diff] [blame]2712
Junio C Hamano6546b592008-07-31 08:17:41[diff] [blame]2713 /* feed the list reversed */
2714 yet_to_do = NULL;
Junio C Hamanoab9d75a2012-06-08 21:50:22[diff] [blame]2715 for (list = revs->commits; list; list = next) {
2716 commit = list->item;
2717 next = list->next;
2718 /*
2719 * Do not free(list) here yet; the original list
2720 * is used later in this function.
2721 */
2722 commit_list_insert(commit, &yet_to_do);
2723 }
Junio C Hamano6546b592008-07-31 08:17:41[diff] [blame]2724 while (yet_to_do) {
2725 list = yet_to_do;
2726 yet_to_do = NULL;
2727 tail = &yet_to_do;
2728 while (list) {
René Scharfee510ab82015-10-24 16:21:31[diff] [blame]2729 commit = pop_commit(&list);
Junio C Hamanofaf01562008-08-14 17:59:44[diff] [blame]2730 tail = simplify_one(revs, commit, tail);
Junio C Hamano6546b592008-07-31 08:17:41[diff] [blame]2731 }
2732 }
2733
2734 /* clean up the result, removing the simplified ones */
2735 list = revs->commits;
2736 revs->commits = NULL;
2737 tail = &revs->commits;
2738 while (list) {
Junio C Hamanofaf01562008-08-14 17:59:44[diff] [blame]2739 struct merge_simplify_state *st;
Junio C Hamanoab9d75a2012-06-08 21:50:22[diff] [blame]2740
René Scharfee510ab82015-10-24 16:21:31[diff] [blame]2741 commit = pop_commit(&list);
Junio C Hamanofaf01562008-08-14 17:59:44[diff] [blame]2742 st = locate_simplify_state(revs, commit);
2743 if (st->simplified == commit)
Junio C Hamano6546b592008-07-31 08:17:41[diff] [blame]2744 tail = &commit_list_insert(commit, tail)->next;
2745 }
Junio C Hamano6546b592008-07-31 08:17:41[diff] [blame]2746}
2747
Junio C Hamanof35f5602008-04-03 09:12:06[diff] [blame]2748static void set_children(struct rev_info *revs)
2749{
2750 struct commit_list *l;
2751 for (l = revs->commits; l; l = l->next) {
2752 struct commit *commit = l->item;
2753 struct commit_list *p;
2754
2755 for (p = commit->parents; p; p = p->next)
2756 add_child(revs, p->item, commit);
2757 }
2758}
2759
Heiko Voigtbcc0a3e2012-03-29 07:21:21[diff] [blame]2760void reset_revision_walk(void)
2761{
2762 clear_object_flags(SEEN | ADDED | SHOWN);
2763}
2764
Alex Riesencc0e6c52007-05-04 21:54:57[diff] [blame]2765int prepare_revision_walk(struct rev_info *revs)
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]2766{
Jeff King1da1e072014-10-15 22:35:12[diff] [blame]2767 int i;
2768 struct object_array old_pending;
René Scharfe2e7da8e2012-04-25 20:35:41[diff] [blame]2769 struct commit_list **next = &revs->commits;
Linus Torvaldscd2bdc52006-04-14 23:52:13[diff] [blame]2770
Jeff King1da1e072014-10-15 22:35:12[diff] [blame]2771 memcpy(&old_pending, &revs->pending, sizeof(old_pending));
Linus Torvalds1f1e8952006-06-20 00:42:35[diff] [blame]2772 revs->pending.nr = 0;
2773 revs->pending.alloc = 0;
2774 revs->pending.objects = NULL;
Jeff King1da1e072014-10-15 22:35:12[diff] [blame]2775 for (i = 0; i < old_pending.nr; i++) {
2776 struct object_array_entry *e = old_pending.objects + i;
Jeff King20739492014-10-15 22:43:19[diff] [blame]2777 struct commit *commit = handle_commit(revs, e);
Linus Torvaldscd2bdc52006-04-14 23:52:13[diff] [blame]2778 if (commit) {
2779 if (!(commit->object.flags & SEEN)) {
2780 commit->object.flags |= SEEN;
René Scharfe2e7da8e2012-04-25 20:35:41[diff] [blame]2781 next = commit_list_append(commit, next);
Linus Torvaldscd2bdc52006-04-14 23:52:13[diff] [blame]2782 }
2783 }
Linus Torvaldscd2bdc52006-04-14 23:52:13[diff] [blame]2784 }
René Scharfe4a43d372011-10-01 15:56:08[diff] [blame]2785 if (!revs->leak_pending)
Jeff King1da1e072014-10-15 22:35:12[diff] [blame]2786 object_array_clear(&old_pending);
Linus Torvaldscd2bdc52006-04-14 23:52:13[diff] [blame]2787
Kevin Braceyd0af6632013-05-16 15:32:34[diff] [blame]2788 /* Signal whether we need per-parent treesame decoration */
Kevin Bracey4d826602013-05-16 15:32:39[diff] [blame]2789 if (revs->simplify_merges ||
2790 (revs->limited && limiting_can_increase_treesame(revs)))
Kevin Braceyd0af6632013-05-16 15:32:34[diff] [blame]2791 revs->treesame.name = "treesame";
2792
Martin von Zweigbergkca92e592012-08-29 06:15:54[diff] [blame]2793 if (revs->no_walk != REVISION_WALK_NO_WALK_UNSORTED)
2794 commit_list_sort_by_date(&revs->commits);
Linus Torvaldsba1d4502006-04-15 19:09:56[diff] [blame]2795 if (revs->no_walk)
Alex Riesencc0e6c52007-05-04 21:54:57[diff] [blame]2796 return 0;
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]2797 if (revs->limited)
Alex Riesencc0e6c52007-05-04 21:54:57[diff] [blame]2798 if (limit_list(revs) < 0)
2799 return -1;
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]2800 if (revs->topo_order)
Junio C Hamano08f704f2013-06-06 23:07:14[diff] [blame]2801 sort_in_topological_order(&revs->commits, revs->sort_order);
Thomas Rast12da1d12013-03-28 16:47:32[diff] [blame]2802 if (revs->line_level_traverse)
2803 line_log_filter(revs);
Junio C Hamano6546b592008-07-31 08:17:41[diff] [blame]2804 if (revs->simplify_merges)
2805 simplify_merges(revs);
Junio C Hamanof35f5602008-04-03 09:12:06[diff] [blame]2806 if (revs->children.name)
2807 set_children(revs);
Alex Riesencc0e6c52007-05-04 21:54:57[diff] [blame]2808 return 0;
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]2809}
2810
Alex Riesencc0e6c52007-05-04 21:54:57[diff] [blame]2811static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]2812{
Alexander N. Gavrilovfce87ae2008-07-12 18:00:57[diff] [blame]2813 struct commit_list *cache = NULL;
2814
Linus Torvalds765ac8e2006-02-28 23:07:20[diff] [blame]2815 for (;;) {
2816 struct commit *p = *pp;
Linus Torvalds3381c792006-04-09 00:05:58[diff] [blame]2817 if (!revs->limited)
Alexander N. Gavrilovfce87ae2008-07-12 18:00:57[diff] [blame]2818 if (add_parents_to_list(revs, p, &revs->commits, &cache) < 0)
Alex Riesencc0e6c52007-05-04 21:54:57[diff] [blame]2819 return rewrite_one_error;
Linus Torvalds7dc0fe32007-11-13 07:16:08[diff] [blame]2820 if (p->object.flags & UNINTERESTING)
2821 return rewrite_one_ok;
2822 if (!(p->object.flags & TREESAME))
Alex Riesencc0e6c52007-05-04 21:54:57[diff] [blame]2823 return rewrite_one_ok;
Linus Torvalds765ac8e2006-02-28 23:07:20[diff] [blame]2824 if (!p->parents)
Alex Riesencc0e6c52007-05-04 21:54:57[diff] [blame]2825 return rewrite_one_noparents;
Kevin Bracey4d826602013-05-16 15:32:39[diff] [blame]2826 if ((p = one_relevant_parent(revs, p->parents)) == NULL)
2827 return rewrite_one_ok;
2828 *pp = p;
Linus Torvalds765ac8e2006-02-28 23:07:20[diff] [blame]2829 }
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]2830}
2831
Bo Yangc7edcae2013-03-28 16:47:31[diff] [blame]2832int rewrite_parents(struct rev_info *revs, struct commit *commit,
2833 rewrite_parent_fn_t rewrite_parent)
Linus Torvalds765ac8e2006-02-28 23:07:20[diff] [blame]2834{
2835 struct commit_list **pp = &commit->parents;
2836 while (*pp) {
2837 struct commit_list *parent = *pp;
Bo Yangc7edcae2013-03-28 16:47:31[diff] [blame]2838 switch (rewrite_parent(revs, &parent->item)) {
Alex Riesencc0e6c52007-05-04 21:54:57[diff] [blame]2839 case rewrite_one_ok:
2840 break;
2841 case rewrite_one_noparents:
Linus Torvalds765ac8e2006-02-28 23:07:20[diff] [blame]2842 *pp = parent->next;
2843 continue;
Alex Riesencc0e6c52007-05-04 21:54:57[diff] [blame]2844 case rewrite_one_error:
2845 return -1;
Linus Torvalds765ac8e2006-02-28 23:07:20[diff] [blame]2846 }
2847 pp = &parent->next;
2848 }
Kevin Braceyd0af6632013-05-16 15:32:34[diff] [blame]2849 remove_duplicate_parents(revs, commit);
Alex Riesencc0e6c52007-05-04 21:54:57[diff] [blame]2850 return 0;
Linus Torvalds765ac8e2006-02-28 23:07:20[diff] [blame]2851}
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]2852
Antoine Pelissed72fbe82013-01-05 21:26:45[diff] [blame]2853static int commit_rewrite_person(struct strbuf *buf, const char *what, struct string_list *mailmap)
2854{
2855 char *person, *endp;
2856 size_t len, namelen, maillen;
2857 const char *name;
2858 const char *mail;
2859 struct ident_split ident;
2860
2861 person = strstr(buf->buf, what);
2862 if (!person)
2863 return 0;
2864
2865 person += strlen(what);
2866 endp = strchr(person, '\n');
2867 if (!endp)
2868 return 0;
2869
2870 len = endp - person;
2871
2872 if (split_ident_line(&ident, person, len))
2873 return 0;
2874
2875 mail = ident.mail_begin;
2876 maillen = ident.mail_end - ident.mail_begin;
2877 name = ident.name_begin;
2878 namelen = ident.name_end - ident.name_begin;
2879
2880 if (map_user(mailmap, &mail, &maillen, &name, &namelen)) {
2881 struct strbuf namemail = STRBUF_INIT;
2882
2883 strbuf_addf(&namemail, "%.*s <%.*s>",
2884 (int)namelen, name, (int)maillen, mail);
2885
2886 strbuf_splice(buf, ident.name_begin - buf->buf,
2887 ident.mail_end - ident.name_begin + 1,
2888 namemail.buf, namemail.len);
2889
2890 strbuf_release(&namemail);
2891
2892 return 1;
2893 }
2894
2895 return 0;
2896}
2897
Junio C Hamano8ecae9b2006-09-17 22:43:40[diff] [blame]2898static int commit_match(struct commit *commit, struct rev_info *opt)
2899{
Nguyễn Thái Ngọc Duy72fd13f2012-09-29 04:41:28[diff] [blame]2900 int retval;
Jeff King04deccd2013-02-11 20:59:58[diff] [blame]2901 const char *encoding;
Jeff Kingb000c592014-06-10 21:39:30[diff] [blame]2902 const char *message;
Nguyễn Thái Ngọc Duy72fd13f2012-09-29 04:41:28[diff] [blame]2903 struct strbuf buf = STRBUF_INIT;
Jeff King04deccd2013-02-11 20:59:58[diff] [blame]2904
Junio C Hamano80235ba2010-01-18 04:09:06[diff] [blame]2905 if (!opt->grep_filter.pattern_list && !opt->grep_filter.header_list)
Junio C Hamano8ecae9b2006-09-17 22:43:40[diff] [blame]2906 return 1;
Junio C Hamanobaa63782012-09-29 18:59:52[diff] [blame]2907
2908 /* Prepend "fake" headers as needed */
2909 if (opt->grep_filter.use_reflog_filter) {
Nguyễn Thái Ngọc Duy72fd13f2012-09-29 04:41:28[diff] [blame]2910 strbuf_addstr(&buf, "reflog ");
2911 get_reflog_message(&buf, opt->reflog_info);
2912 strbuf_addch(&buf, '\n');
Nguyễn Thái Ngọc Duy72fd13f2012-09-29 04:41:28[diff] [blame]2913 }
Junio C Hamanobaa63782012-09-29 18:59:52[diff] [blame]2914
Jeff King04deccd2013-02-11 20:59:58[diff] [blame]2915 /*
2916 * We grep in the user's output encoding, under the assumption that it
2917 * is the encoding they are most likely to write their grep pattern
2918 * for. In addition, it means we will match the "notes" encoding below,
2919 * so we will not end up with a buffer that has two different encodings
2920 * in it.
2921 */
2922 encoding = get_log_output_encoding();
Nguyễn Thái Ngọc Duy5a10d232013-04-18 23:08:40[diff] [blame]2923 message = logmsg_reencode(commit, NULL, encoding);
Jeff King04deccd2013-02-11 20:59:58[diff] [blame]2924
Junio C Hamanobaa63782012-09-29 18:59:52[diff] [blame]2925 /* Copy the commit to temporary if we are using "fake" headers */
2926 if (buf.len)
Jeff King04deccd2013-02-11 20:59:58[diff] [blame]2927 strbuf_addstr(&buf, message);
Junio C Hamanobaa63782012-09-29 18:59:52[diff] [blame]2928
Junio C Hamanodf874fa2013-01-08 08:02:49[diff] [blame]2929 if (opt->grep_filter.header_list && opt->mailmap) {
Antoine Pelissed72fbe82013-01-05 21:26:45[diff] [blame]2930 if (!buf.len)
Jeff King04deccd2013-02-11 20:59:58[diff] [blame]2931 strbuf_addstr(&buf, message);
Antoine Pelissed72fbe82013-01-05 21:26:45[diff] [blame]2932
2933 commit_rewrite_person(&buf, "\nauthor ", opt->mailmap);
2934 commit_rewrite_person(&buf, "\ncommitter ", opt->mailmap);
2935 }
2936
Nguyễn Thái Ngọc Duy38cfe912012-09-29 04:41:29[diff] [blame]2937 /* Append "fake" message parts as needed */
2938 if (opt->show_notes) {
2939 if (!buf.len)
Jeff King04deccd2013-02-11 20:59:58[diff] [blame]2940 strbuf_addstr(&buf, message);
brian m. carlsoned1c9972015-11-10 02:22:29[diff] [blame]2941 format_display_notes(commit->object.oid.hash, &buf, encoding, 1);
Nguyễn Thái Ngọc Duy38cfe912012-09-29 04:41:29[diff] [blame]2942 }
2943
Jeff Kingb000c592014-06-10 21:39:30[diff] [blame]2944 /*
2945 * Find either in the original commit message, or in the temporary.
2946 * Note that we cast away the constness of "message" here. It is
2947 * const because it may come from the cached commit buffer. That's OK,
2948 * because we know that it is modifiable heap memory, and that while
2949 * grep_buffer may modify it for speed, it will restore any
2950 * changes before returning.
2951 */
Nguyễn Thái Ngọc Duy72fd13f2012-09-29 04:41:28[diff] [blame]2952 if (buf.len)
2953 retval = grep_buffer(&opt->grep_filter, buf.buf, buf.len);
2954 else
2955 retval = grep_buffer(&opt->grep_filter,
Jeff Kingb000c592014-06-10 21:39:30[diff] [blame]2956 (char *)message, strlen(message));
Nguyễn Thái Ngọc Duy72fd13f2012-09-29 04:41:28[diff] [blame]2957 strbuf_release(&buf);
Jeff Kingb66103c2014-06-10 21:41:39[diff] [blame]2958 unuse_commit_buffer(commit, message);
Christoph Junghans22dfa8a2015-01-13 01:33:32[diff] [blame]2959 return opt->invert_grep ? !retval : retval;
Junio C Hamano8ecae9b2006-09-17 22:43:40[diff] [blame]2960}
2961
Thomas Rast53d00b32013-07-31 20:13:20[diff] [blame]2962static inline int want_ancestry(const struct rev_info *revs)
Junio C Hamanof35f5602008-04-03 09:12:06[diff] [blame]2963{
Junio C Hamano8bb65882008-07-08 22:25:44[diff] [blame]2964 return (revs->rewrite_parents || revs->children.name);
Junio C Hamanof35f5602008-04-03 09:12:06[diff] [blame]2965}
2966
Adam Simpkinsbeb5af42009-08-19 02:34:33[diff] [blame]2967enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit)
Linus Torvalds252a7c02007-11-04 20:12:05[diff] [blame]2968{
2969 if (commit->object.flags & SHOWN)
2970 return commit_ignore;
brian m. carlsoned1c9972015-11-10 02:22:29[diff] [blame]2971 if (revs->unpacked && has_sha1_pack(commit->object.oid.hash))
Linus Torvalds252a7c02007-11-04 20:12:05[diff] [blame]2972 return commit_ignore;
Linus Torvalds3131b712008-02-09 22:02:07[diff] [blame]2973 if (revs->show_all)
2974 return commit_show;
Linus Torvalds252a7c02007-11-04 20:12:05[diff] [blame]2975 if (commit->object.flags & UNINTERESTING)
2976 return commit_ignore;
2977 if (revs->min_age != -1 && (commit->date > revs->min_age))
2978 return commit_ignore;
Michael J Gruberad5aeed2011-03-21 10:14:06[diff] [blame]2979 if (revs->min_parents || (revs->max_parents >= 0)) {
Kevin Braceybf3418b2013-05-16 15:32:40[diff] [blame]2980 int n = commit_list_count(commit->parents);
Michael J Gruberad5aeed2011-03-21 10:14:06[diff] [blame]2981 if ((n < revs->min_parents) ||
2982 ((revs->max_parents >= 0) && (n > revs->max_parents)))
2983 return commit_ignore;
2984 }
Linus Torvalds252a7c02007-11-04 20:12:05[diff] [blame]2985 if (!commit_match(commit, revs))
2986 return commit_ignore;
Linus Torvalds53b2c822007-11-05 21:22:34[diff] [blame]2987 if (revs->prune && revs->dense) {
Linus Torvalds252a7c02007-11-04 20:12:05[diff] [blame]2988 /* Commit without changes? */
Linus Torvalds7dc0fe32007-11-13 07:16:08[diff] [blame]2989 if (commit->object.flags & TREESAME) {
Kevin Braceybf3418b2013-05-16 15:32:40[diff] [blame]2990 int n;
2991 struct commit_list *p;
Linus Torvalds252a7c02007-11-04 20:12:05[diff] [blame]2992 /* drop merges unless we want parenthood */
Junio C Hamanof35f5602008-04-03 09:12:06[diff] [blame]2993 if (!want_ancestry(revs))
Linus Torvalds252a7c02007-11-04 20:12:05[diff] [blame]2994 return commit_ignore;
Kevin Braceybf3418b2013-05-16 15:32:40[diff] [blame]2995 /*
2996 * If we want ancestry, then need to keep any merges
2997 * between relevant commits to tie together topology.
2998 * For consistency with TREESAME and simplification
2999 * use "relevant" here rather than just INTERESTING,
3000 * to treat bottom commit(s) as part of the topology.
3001 */
3002 for (n = 0, p = commit->parents; p; p = p->next)
3003 if (relevant_commit(p->item))
3004 if (++n >= 2)
3005 return commit_show;
3006 return commit_ignore;
Linus Torvalds252a7c02007-11-04 20:12:05[diff] [blame]3007 }
Linus Torvalds252a7c02007-11-04 20:12:05[diff] [blame]3008 }
3009 return commit_show;
3010}
3011
Junio C Hamano0131c492015-01-14 22:49:24[diff] [blame]3012define_commit_slab(saved_parents, struct commit_list *);
3013
3014#define EMPTY_PARENT_LIST ((struct commit_list *)-1)
3015
3016/*
3017 * You may only call save_parents() once per commit (this is checked
3018 * for non-root commits).
3019 */
3020static void save_parents(struct rev_info *revs, struct commit *commit)
3021{
3022 struct commit_list **pp;
3023
3024 if (!revs->saved_parents_slab) {
3025 revs->saved_parents_slab = xmalloc(sizeof(struct saved_parents));
3026 init_saved_parents(revs->saved_parents_slab);
3027 }
3028
3029 pp = saved_parents_at(revs->saved_parents_slab, commit);
3030
3031 /*
3032 * When walking with reflogs, we may visit the same commit
3033 * several times: once for each appearance in the reflog.
3034 *
3035 * In this case, save_parents() will be called multiple times.
3036 * We want to keep only the first set of parents. We need to
3037 * store a sentinel value for an empty (i.e., NULL) parent
3038 * list to distinguish it from a not-yet-saved list, however.
3039 */
3040 if (*pp)
3041 return;
3042 if (commit->parents)
3043 *pp = copy_commit_list(commit->parents);
3044 else
3045 *pp = EMPTY_PARENT_LIST;
3046}
3047
3048static void free_saved_parents(struct rev_info *revs)
3049{
3050 if (revs->saved_parents_slab)
3051 clear_saved_parents(revs->saved_parents_slab);
3052}
3053
3054struct commit_list *get_saved_parents(struct rev_info *revs, const struct commit *commit)
3055{
3056 struct commit_list *parents;
3057
3058 if (!revs->saved_parents_slab)
3059 return commit->parents;
3060
3061 parents = *saved_parents_at(revs->saved_parents_slab, commit);
3062 if (parents == EMPTY_PARENT_LIST)
3063 return NULL;
3064 return parents;
3065}
3066
Adam Simpkinsbeb5af42009-08-19 02:34:33[diff] [blame]3067enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
3068{
3069 enum commit_action action = get_commit_action(revs, commit);
3070
3071 if (action == commit_show &&
3072 !revs->show_all &&
3073 revs->prune && revs->dense && want_ancestry(revs)) {
Thomas Rast53d00b32013-07-31 20:13:20[diff] [blame]3074 /*
3075 * --full-diff on simplified parents is no good: it
3076 * will show spurious changes from the commits that
3077 * were elided. So we save the parents on the side
3078 * when --full-diff is in effect.
3079 */
3080 if (revs->full_diff)
3081 save_parents(revs, commit);
Bo Yangc7edcae2013-03-28 16:47:31[diff] [blame]3082 if (rewrite_parents(revs, commit, rewrite_one) < 0)
Adam Simpkinsbeb5af42009-08-19 02:34:33[diff] [blame]3083 return commit_error;
3084 }
3085 return action;
3086}
3087
Nguyễn Thái Ngọc Duy1b32dec2014-03-25 13:23:27[diff] [blame]3088static void track_linear(struct rev_info *revs, struct commit *commit)
3089{
3090 if (revs->track_first_time) {
3091 revs->linear = 1;
3092 revs->track_first_time = 0;
3093 } else {
3094 struct commit_list *p;
3095 for (p = revs->previous_parents; p; p = p->next)
3096 if (p->item == NULL || /* first commit */
brian m. carlsonf2fd0762015-11-10 02:22:28[diff] [blame]3097 !oidcmp(&p->item->object.oid, &commit->object.oid))
Nguyễn Thái Ngọc Duy1b32dec2014-03-25 13:23:27[diff] [blame]3098 break;
3099 revs->linear = p != NULL;
3100 }
3101 if (revs->reverse) {
3102 if (revs->linear)
3103 commit->object.flags |= TRACK_LINEAR;
3104 }
3105 free_commit_list(revs->previous_parents);
3106 revs->previous_parents = copy_commit_list(commit->parents);
3107}
3108
Junio C Hamanod5db6c92006-12-20 02:25:32[diff] [blame]3109static struct commit *get_revision_1(struct rev_info *revs)
Linus Torvalds765ac8e2006-02-28 23:07:20[diff] [blame]3110{
Junio C Hamanod5db6c92006-12-20 02:25:32[diff] [blame]3111 if (!revs->commits)
Linus Torvalds765ac8e2006-02-28 23:07:20[diff] [blame]3112 return NULL;
3113
Linus Torvalds765ac8e2006-02-28 23:07:20[diff] [blame]3114 do {
René Scharfee510ab82015-10-24 16:21:31[diff] [blame]3115 struct commit *commit = pop_commit(&revs->commits);
Linus Torvalds2a0925b2006-03-31 01:05:25[diff] [blame]3116
Jeff Kingffa1eea2010-11-22 04:42:53[diff] [blame]3117 if (revs->reflog_info) {
Thomas Rast838f9a12013-08-03 10:36:15[diff] [blame]3118 save_parents(revs, commit);
Johannes Schindelin8860fd42007-01-11 10:47:48[diff] [blame]3119 fake_reflog_parent(revs->reflog_info, commit);
Jeff Kingffa1eea2010-11-22 04:42:53[diff] [blame]3120 commit->object.flags &= ~(ADDED | SEEN | SHOWN);
3121 }
Johannes Schindelin8860fd42007-01-11 10:47:48[diff] [blame]3122
Linus Torvalds2a0925b2006-03-31 01:05:25[diff] [blame]3123 /*
3124 * If we haven't done the list limiting, we need to look at
Linus Torvaldsbe7db6e2006-04-02 00:35:06[diff] [blame]3125 * the parents here. We also need to do the date-based limiting
3126 * that we'd otherwise have done in limit_list().
Linus Torvalds2a0925b2006-03-31 01:05:25[diff] [blame]3127 */
Linus Torvaldsbe7db6e2006-04-02 00:35:06[diff] [blame]3128 if (!revs->limited) {
Jan Harkes744f4982006-10-31 01:37:49[diff] [blame]3129 if (revs->max_age != -1 &&
Junio C Hamano86ab4902007-03-05 21:10:06[diff] [blame]3130 (commit->date < revs->max_age))
3131 continue;
Vicent Marti2db1a432014-03-28 10:00:43[diff] [blame]3132 if (add_parents_to_list(revs, commit, &revs->commits, NULL) < 0) {
3133 if (!revs->ignore_missing_links)
3134 die("Failed to traverse parents of commit %s",
brian m. carlsonf2fd0762015-11-10 02:22:28[diff] [blame]3135 oid_to_hex(&commit->object.oid));
Vicent Marti2db1a432014-03-28 10:00:43[diff] [blame]3136 }
Linus Torvaldsbe7db6e2006-04-02 00:35:06[diff] [blame]3137 }
Junio C Hamano1b65a5a2006-04-17 01:12:49[diff] [blame]3138
Linus Torvalds252a7c02007-11-04 20:12:05[diff] [blame]3139 switch (simplify_commit(revs, commit)) {
3140 case commit_ignore:
Linus Torvalds2a0925b2006-03-31 01:05:25[diff] [blame]3141 continue;
Linus Torvalds252a7c02007-11-04 20:12:05[diff] [blame]3142 case commit_error:
Junio C Hamanoed620892009-02-11 09:27:43[diff] [blame]3143 die("Failed to simplify parents of commit %s",
brian m. carlsonf2fd0762015-11-10 02:22:28[diff] [blame]3144 oid_to_hex(&commit->object.oid));
Linus Torvalds252a7c02007-11-04 20:12:05[diff] [blame]3145 default:
Nguyễn Thái Ngọc Duy1b32dec2014-03-25 13:23:27[diff] [blame]3146 if (revs->track_linear)
3147 track_linear(revs, commit);
Linus Torvalds252a7c02007-11-04 20:12:05[diff] [blame]3148 return commit;
Junio C Hamano384e99a2006-03-28 07:58:34[diff] [blame]3149 }
Linus Torvalds765ac8e2006-02-28 23:07:20[diff] [blame]3150 } while (revs->commits);
3151 return NULL;
3152}
Junio C Hamanod5db6c92006-12-20 02:25:32[diff] [blame]3153
Michael Haggertybe6754c2013-05-25 09:08:09[diff] [blame]3154/*
3155 * Return true for entries that have not yet been shown. (This is an
3156 * object_array_each_func_t.)
3157 */
3158static int entry_unshown(struct object_array_entry *entry, void *cb_data_unused)
3159{
3160 return !(entry->item->flags & SHOWN);
3161}
3162
3163/*
3164 * If array is on the verge of a realloc, garbage-collect any entries
3165 * that have already been shown to try to free up some space.
3166 */
Junio C Hamano86ab4902007-03-05 21:10:06[diff] [blame]3167static void gc_boundary(struct object_array *array)
3168{
Michael Haggertybe6754c2013-05-25 09:08:09[diff] [blame]3169 if (array->nr == array->alloc)
3170 object_array_filter(array, entry_unshown, NULL);
Junio C Hamano86ab4902007-03-05 21:10:06[diff] [blame]3171}
3172
Adam Simpkins4603ec02008-05-24 23:02:05[diff] [blame]3173static void create_boundary_commit_list(struct rev_info *revs)
3174{
3175 unsigned i;
3176 struct commit *c;
3177 struct object_array *array = &revs->boundary_commits;
3178 struct object_array_entry *objects = array->objects;
3179
3180 /*
3181 * If revs->commits is non-NULL at this point, an error occurred in
3182 * get_revision_1(). Ignore the error and continue printing the
3183 * boundary commits anyway. (This is what the code has always
3184 * done.)
3185 */
3186 if (revs->commits) {
3187 free_commit_list(revs->commits);
3188 revs->commits = NULL;
3189 }
3190
3191 /*
3192 * Put all of the actual boundary commits from revs->boundary_commits
3193 * into revs->commits
3194 */
3195 for (i = 0; i < array->nr; i++) {
3196 c = (struct commit *)(objects[i].item);
3197 if (!c)
3198 continue;
3199 if (!(c->object.flags & CHILD_SHOWN))
3200 continue;
3201 if (c->object.flags & (SHOWN | BOUNDARY))
3202 continue;
3203 c->object.flags |= BOUNDARY;
3204 commit_list_insert(c, &revs->commits);
3205 }
3206
3207 /*
3208 * If revs->topo_order is set, sort the boundary commits
3209 * in topological order
3210 */
Junio C Hamano08f704f2013-06-06 23:07:14[diff] [blame]3211 sort_in_topological_order(&revs->commits, revs->sort_order);
Adam Simpkins4603ec02008-05-24 23:02:05[diff] [blame]3212}
3213
Adam Simpkins7fefda52008-05-04 10:36:54[diff] [blame]3214static struct commit *get_revision_internal(struct rev_info *revs)
Junio C Hamanod5db6c92006-12-20 02:25:32[diff] [blame]3215{
3216 struct commit *c = NULL;
Junio C Hamano86ab4902007-03-05 21:10:06[diff] [blame]3217 struct commit_list *l;
Junio C Hamanod5db6c92006-12-20 02:25:32[diff] [blame]3218
Junio C Hamano86ab4902007-03-05 21:10:06[diff] [blame]3219 if (revs->boundary == 2) {
Adam Simpkins4603ec02008-05-24 23:02:05[diff] [blame]3220 /*
3221 * All of the normal commits have already been returned,
3222 * and we are now returning boundary commits.
3223 * create_boundary_commit_list() has populated
3224 * revs->commits with the remaining commits to return.
3225 */
3226 c = pop_commit(&revs->commits);
3227 if (c)
3228 c->object.flags |= SHOWN;
Johannes Schindelin9c5e66e2007-01-20 22:04:02[diff] [blame]3229 return c;
3230 }
3231
Junio C Hamano86ab4902007-03-05 21:10:06[diff] [blame]3232 /*
Jeff Kingb72a1902012-07-13 07:50:23[diff] [blame]3233 * If our max_count counter has reached zero, then we are done. We
3234 * don't simply return NULL because we still might need to show
3235 * boundary commits. But we want to avoid calling get_revision_1, which
3236 * might do a considerable amount of work finding the next commit only
3237 * for us to throw it away.
3238 *
3239 * If it is non-zero, then either we don't have a max_count at all
3240 * (-1), or it is still counting, in which case we decrement.
Junio C Hamano86ab4902007-03-05 21:10:06[diff] [blame]3241 */
Jeff Kingb72a1902012-07-13 07:50:23[diff] [blame]3242 if (revs->max_count) {
3243 c = get_revision_1(revs);
3244 if (c) {
Felipe Contreras9e57ac52013-10-31 09:25:43[diff] [blame]3245 while (revs->skip_count > 0) {
Jeff Kingb72a1902012-07-13 07:50:23[diff] [blame]3246 revs->skip_count--;
3247 c = get_revision_1(revs);
3248 if (!c)
3249 break;
3250 }
Junio C Hamano8839ac92007-03-06 11:20:55[diff] [blame]3251 }
Junio C Hamano86ab4902007-03-05 21:10:06[diff] [blame]3252
Jeff Kingb72a1902012-07-13 07:50:23[diff] [blame]3253 if (revs->max_count > 0)
3254 revs->max_count--;
Junio C Hamanod5db6c92006-12-20 02:25:32[diff] [blame]3255 }
Junio C Hamano86ab4902007-03-05 21:10:06[diff] [blame]3256
Junio C Hamanoc33d8592007-03-06 02:23:57[diff] [blame]3257 if (c)
3258 c->object.flags |= SHOWN;
3259
Felipe Contreras9e57ac52013-10-31 09:25:43[diff] [blame]3260 if (!revs->boundary)
Junio C Hamanod5db6c92006-12-20 02:25:32[diff] [blame]3261 return c;
Junio C Hamano86ab4902007-03-05 21:10:06[diff] [blame]3262
3263 if (!c) {
3264 /*
3265 * get_revision_1() runs out the commits, and
3266 * we are done computing the boundaries.
3267 * switch to boundary commits output mode.
3268 */
3269 revs->boundary = 2;
Adam Simpkins4603ec02008-05-24 23:02:05[diff] [blame]3270
3271 /*
3272 * Update revs->commits to contain the list of
3273 * boundary commits.
3274 */
3275 create_boundary_commit_list(revs);
3276
Adam Simpkins3c68d672008-05-24 23:02:04[diff] [blame]3277 return get_revision_internal(revs);
Junio C Hamano86ab4902007-03-05 21:10:06[diff] [blame]3278 }
3279
3280 /*
3281 * boundary commits are the commits that are parents of the
3282 * ones we got from get_revision_1() but they themselves are
3283 * not returned from get_revision_1(). Before returning
3284 * 'c', we need to mark its parents that they could be boundaries.
3285 */
3286
3287 for (l = c->parents; l; l = l->next) {
3288 struct object *p;
3289 p = &(l->item->object);
Junio C Hamanoc33d8592007-03-06 02:23:57[diff] [blame]3290 if (p->flags & (CHILD_SHOWN | SHOWN))
Junio C Hamano86ab4902007-03-05 21:10:06[diff] [blame]3291 continue;
3292 p->flags |= CHILD_SHOWN;
3293 gc_boundary(&revs->boundary_commits);
3294 add_object_array(p, NULL, &revs->boundary_commits);
3295 }
3296
3297 return c;
Junio C Hamanod5db6c92006-12-20 02:25:32[diff] [blame]3298}
Adam Simpkins7fefda52008-05-04 10:36:54[diff] [blame]3299
3300struct commit *get_revision(struct rev_info *revs)
3301{
Thomas Rast498bcd32008-08-29 19:18:38[diff] [blame]3302 struct commit *c;
3303 struct commit_list *reversed;
3304
3305 if (revs->reverse) {
3306 reversed = NULL;
Felipe Contreras9e57ac52013-10-31 09:25:43[diff] [blame]3307 while ((c = get_revision_internal(revs)))
Thomas Rast498bcd32008-08-29 19:18:38[diff] [blame]3308 commit_list_insert(c, &reversed);
Thomas Rast498bcd32008-08-29 19:18:38[diff] [blame]3309 revs->commits = reversed;
3310 revs->reverse = 0;
3311 revs->reverse_output_stage = 1;
3312 }
3313
Nguyễn Thái Ngọc Duy1b32dec2014-03-25 13:23:27[diff] [blame]3314 if (revs->reverse_output_stage) {
3315 c = pop_commit(&revs->commits);
3316 if (revs->track_linear)
3317 revs->linear = !!(c && c->object.flags & TRACK_LINEAR);
3318 return c;
3319 }
Thomas Rast498bcd32008-08-29 19:18:38[diff] [blame]3320
3321 c = get_revision_internal(revs);
Adam Simpkins7fefda52008-05-04 10:36:54[diff] [blame]3322 if (c && revs->graph)
3323 graph_update(revs->graph, c);
Nguyễn Thái Ngọc Duy1b32dec2014-03-25 13:23:27[diff] [blame]3324 if (!c) {
Thomas Rast53d00b32013-07-31 20:13:20[diff] [blame]3325 free_saved_parents(revs);
Nguyễn Thái Ngọc Duy1b32dec2014-03-25 13:23:27[diff] [blame]3326 if (revs->previous_parents) {
3327 free_commit_list(revs->previous_parents);
3328 revs->previous_parents = NULL;
3329 }
3330 }
Adam Simpkins7fefda52008-05-04 10:36:54[diff] [blame]3331 return c;
3332}
Michael J Gruber1df2d652011-03-07 12:31:39[diff] [blame]3333
3334char *get_revision_mark(const struct rev_info *revs, const struct commit *commit)
3335{
3336 if (commit->object.flags & BOUNDARY)
3337 return "-";
3338 else if (commit->object.flags & UNINTERESTING)
3339 return "^";
Michael J Gruberadbbb312011-03-07 12:31:40[diff] [blame]3340 else if (commit->object.flags & PATCHSAME)
3341 return "=";
Michael J Gruber1df2d652011-03-07 12:31:39[diff] [blame]3342 else if (!revs || revs->left_right) {
3343 if (commit->object.flags & SYMMETRIC_LEFT)
3344 return "<";
3345 else
3346 return ">";
3347 } else if (revs->graph)
3348 return "*";
Michael J Gruberadbbb312011-03-07 12:31:40[diff] [blame]3349 else if (revs->cherry_mark)
3350 return "+";
Michael J Gruber1df2d652011-03-07 12:31:39[diff] [blame]3351 return "";
3352}
Michael J Gruberb1b47552011-03-10 14:45:03[diff] [blame]3353
3354void put_revision_mark(const struct rev_info *revs, const struct commit *commit)
3355{
3356 char *mark = get_revision_mark(revs, commit);
3357 if (!strlen(mark))
3358 return;
3359 fputs(mark, stdout);
3360 putchar(' ');
3361}