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