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