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