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