]>
Commit | Line | Data |
---|---|---|
ae563542 | 1 | #include "cache.h" |
cbd53a21 | 2 | #include "object-store.h" |
ae563542 LT |
3 | #include "tag.h" |
4 | #include "blob.h" | |
5 | #include "tree.h" | |
6 | #include "commit.h" | |
a4a88b2b | 7 | #include "diff.h" |
ae563542 LT |
8 | #include "refs.h" |
9 | #include "revision.h" | |
23a3f0cb | 10 | #include "repository.h" |
7fefda5c | 11 | #include "graph.h" |
8ecae9b0 | 12 | #include "grep.h" |
8860fd42 | 13 | #include "reflog-walk.h" |
d7a17cad | 14 | #include "patch-ids.h" |
f35f5603 | 15 | #include "decorate.h" |
78892e32 | 16 | #include "log-tree.h" |
894a9d33 | 17 | #include "string-list.h" |
12da1d1f | 18 | #include "line-log.h" |
d72fbe81 | 19 | #include "mailmap.h" |
53d00b39 | 20 | #include "commit-slab.h" |
429bb40a | 21 | #include "dir.h" |
4fe10219 | 22 | #include "cache-tree.h" |
cb46d630 | 23 | #include "bisect.h" |
150e3001 | 24 | #include "packfile.h" |
be489d02 | 25 | #include "worktree.h" |
dbbcd44f | 26 | #include "strvec.h" |
64043556 | 27 | #include "commit-reach.h" |
f0d9cc41 | 28 | #include "commit-graph.h" |
b4542418 | 29 | #include "prio-queue.h" |
d5d2e935 | 30 | #include "hashmap.h" |
44570188 | 31 | #include "utf8.h" |
a56b9464 | 32 | #include "bloom.h" |
42e50e78 | 33 | #include "json-writer.h" |
ae563542 | 34 | |
cdcefbc9 LT |
35 | volatile show_early_output_fn_t show_early_output; |
36 | ||
cb46d630 AD |
37 | static const char *term_bad; |
38 | static const char *term_good; | |
39 | ||
87be2523 NTND |
40 | implement_shared_commit_slab(revision_sources, char *); |
41 | ||
3cb9d2b6 SG |
42 | static inline int want_ancestry(const struct rev_info *revs); |
43 | ||
de1e67d0 | 44 | void show_object_with_name(FILE *out, struct object *obj, const char *name) |
ae563542 | 45 | { |
de1e67d0 | 46 | const char *p; |
91f17516 | 47 | |
f2fd0760 | 48 | fprintf(out, "%s ", oid_to_hex(&obj->oid)); |
f9fb9d0e JK |
49 | for (p = name; *p && *p != '\n'; p++) |
50 | fputc(*p, out); | |
beba25ab | 51 | fputc('\n', out); |
91f17516 JH |
52 | } |
53 | ||
ae563542 LT |
54 | static void mark_blob_uninteresting(struct blob *blob) |
55 | { | |
c1ee9013 MK |
56 | if (!blob) |
57 | return; | |
ae563542 LT |
58 | if (blob->object.flags & UNINTERESTING) |
59 | return; | |
60 | blob->object.flags |= UNINTERESTING; | |
61 | } | |
62 | ||
b3c7eef9 NTND |
63 | static void mark_tree_contents_uninteresting(struct repository *r, |
64 | struct tree *tree) | |
ae563542 | 65 | { |
f75e53ed | 66 | struct tree_desc desc; |
4c068a98 | 67 | struct name_entry entry; |
ae563542 | 68 | |
a5411df0 | 69 | if (parse_tree_gently(tree, 1) < 0) |
ae563542 | 70 | return; |
f75e53ed | 71 | |
6fda5e51 | 72 | init_tree_desc(&desc, tree->buffer, tree->size); |
4c068a98 | 73 | while (tree_entry(&desc, &entry)) { |
4d1012c3 LT |
74 | switch (object_type(entry.mode)) { |
75 | case OBJ_TREE: | |
ea82b2a0 | 76 | mark_tree_uninteresting(r, lookup_tree(r, &entry.oid)); |
4d1012c3 LT |
77 | break; |
78 | case OBJ_BLOB: | |
ea82b2a0 | 79 | mark_blob_uninteresting(lookup_blob(r, &entry.oid)); |
4d1012c3 LT |
80 | break; |
81 | default: | |
82 | /* Subproject commit - not in this repository */ | |
83 | break; | |
84 | } | |
ae563542 | 85 | } |
f75e53ed LT |
86 | |
87 | /* | |
88 | * We don't care about the tree any more | |
89 | * after it has been marked uninteresting. | |
90 | */ | |
6e454b9a | 91 | free_tree_buffer(tree); |
ae563542 LT |
92 | } |
93 | ||
b3c7eef9 | 94 | void mark_tree_uninteresting(struct repository *r, struct tree *tree) |
2ac5e447 | 95 | { |
a2678df3 | 96 | struct object *obj; |
2ac5e447 JH |
97 | |
98 | if (!tree) | |
99 | return; | |
a2678df3 SN |
100 | |
101 | obj = &tree->object; | |
2ac5e447 JH |
102 | if (obj->flags & UNINTERESTING) |
103 | return; | |
104 | obj->flags |= UNINTERESTING; | |
b3c7eef9 | 105 | mark_tree_contents_uninteresting(r, tree); |
ae563542 LT |
106 | } |
107 | ||
d5d2e935 DS |
108 | struct path_and_oids_entry { |
109 | struct hashmap_entry ent; | |
110 | char *path; | |
111 | struct oidset trees; | |
112 | }; | |
113 | ||
114 | static int path_and_oids_cmp(const void *hashmap_cmp_fn_data, | |
939af16e EW |
115 | const struct hashmap_entry *eptr, |
116 | const struct hashmap_entry *entry_or_key, | |
d5d2e935 DS |
117 | const void *keydata) |
118 | { | |
939af16e EW |
119 | const struct path_and_oids_entry *e1, *e2; |
120 | ||
121 | e1 = container_of(eptr, const struct path_and_oids_entry, ent); | |
122 | e2 = container_of(entry_or_key, const struct path_and_oids_entry, ent); | |
123 | ||
d5d2e935 DS |
124 | return strcmp(e1->path, e2->path); |
125 | } | |
126 | ||
d5d2e935 DS |
127 | static void paths_and_oids_clear(struct hashmap *map) |
128 | { | |
129 | struct hashmap_iter iter; | |
130 | struct path_and_oids_entry *entry; | |
d5d2e935 | 131 | |
23dee69f | 132 | hashmap_for_each_entry(map, &iter, entry, ent /* member name */) { |
d5d2e935 DS |
133 | oidset_clear(&entry->trees); |
134 | free(entry->path); | |
135 | } | |
136 | ||
6da1a258 | 137 | hashmap_clear_and_free(map, struct path_and_oids_entry, ent); |
d5d2e935 DS |
138 | } |
139 | ||
140 | static void paths_and_oids_insert(struct hashmap *map, | |
141 | const char *path, | |
142 | const struct object_id *oid) | |
143 | { | |
144 | int hash = strhash(path); | |
145 | struct path_and_oids_entry key; | |
146 | struct path_and_oids_entry *entry; | |
147 | ||
d22245a2 | 148 | hashmap_entry_init(&key.ent, hash); |
d5d2e935 DS |
149 | |
150 | /* use a shallow copy for the lookup */ | |
151 | key.path = (char *)path; | |
152 | oidset_init(&key.trees, 0); | |
153 | ||
404ab78e | 154 | entry = hashmap_get_entry(map, &key, ent, NULL); |
b6c52416 | 155 | if (!entry) { |
d5d2e935 | 156 | entry = xcalloc(1, sizeof(struct path_and_oids_entry)); |
d22245a2 | 157 | hashmap_entry_init(&entry->ent, hash); |
d5d2e935 DS |
158 | entry->path = xstrdup(key.path); |
159 | oidset_init(&entry->trees, 16); | |
26b455f2 | 160 | hashmap_put(map, &entry->ent); |
d5d2e935 DS |
161 | } |
162 | ||
163 | oidset_insert(&entry->trees, oid); | |
164 | } | |
165 | ||
166 | static void add_children_by_path(struct repository *r, | |
167 | struct tree *tree, | |
168 | struct hashmap *map) | |
169 | { | |
170 | struct tree_desc desc; | |
171 | struct name_entry entry; | |
172 | ||
173 | if (!tree) | |
174 | return; | |
175 | ||
176 | if (parse_tree_gently(tree, 1) < 0) | |
177 | return; | |
178 | ||
179 | init_tree_desc(&desc, tree->buffer, tree->size); | |
180 | while (tree_entry(&desc, &entry)) { | |
181 | switch (object_type(entry.mode)) { | |
182 | case OBJ_TREE: | |
5fda3433 | 183 | paths_and_oids_insert(map, entry.path, &entry.oid); |
d5d2e935 DS |
184 | |
185 | if (tree->object.flags & UNINTERESTING) { | |
5fda3433 | 186 | struct tree *child = lookup_tree(r, &entry.oid); |
d5d2e935 DS |
187 | if (child) |
188 | child->object.flags |= UNINTERESTING; | |
189 | } | |
190 | break; | |
191 | case OBJ_BLOB: | |
192 | if (tree->object.flags & UNINTERESTING) { | |
5fda3433 | 193 | struct blob *child = lookup_blob(r, &entry.oid); |
d5d2e935 DS |
194 | if (child) |
195 | child->object.flags |= UNINTERESTING; | |
196 | } | |
197 | break; | |
198 | default: | |
199 | /* Subproject commit - not in this repository */ | |
200 | break; | |
201 | } | |
202 | } | |
203 | ||
204 | free_tree_buffer(tree); | |
205 | } | |
206 | ||
f1f5de44 DS |
207 | void mark_trees_uninteresting_sparse(struct repository *r, |
208 | struct oidset *trees) | |
209 | { | |
d5d2e935 | 210 | unsigned has_interesting = 0, has_uninteresting = 0; |
b19315d8 | 211 | struct hashmap map = HASHMAP_INIT(path_and_oids_cmp, NULL); |
d5d2e935 DS |
212 | struct hashmap_iter map_iter; |
213 | struct path_and_oids_entry *entry; | |
f1f5de44 DS |
214 | struct object_id *oid; |
215 | struct oidset_iter iter; | |
216 | ||
217 | oidset_iter_init(trees, &iter); | |
d5d2e935 DS |
218 | while ((!has_interesting || !has_uninteresting) && |
219 | (oid = oidset_iter_next(&iter))) { | |
f1f5de44 DS |
220 | struct tree *tree = lookup_tree(r, oid); |
221 | ||
222 | if (!tree) | |
223 | continue; | |
224 | ||
d5d2e935 DS |
225 | if (tree->object.flags & UNINTERESTING) |
226 | has_uninteresting = 1; | |
227 | else | |
228 | has_interesting = 1; | |
f1f5de44 | 229 | } |
d5d2e935 DS |
230 | |
231 | /* Do not walk unless we have both types of trees. */ | |
232 | if (!has_uninteresting || !has_interesting) | |
233 | return; | |
234 | ||
d5d2e935 DS |
235 | oidset_iter_init(trees, &iter); |
236 | while ((oid = oidset_iter_next(&iter))) { | |
237 | struct tree *tree = lookup_tree(r, oid); | |
238 | add_children_by_path(r, tree, &map); | |
239 | } | |
240 | ||
23dee69f | 241 | hashmap_for_each_entry(&map, &map_iter, entry, ent /* member name */) |
d5d2e935 DS |
242 | mark_trees_uninteresting_sparse(r, &entry->trees); |
243 | ||
244 | paths_and_oids_clear(&map); | |
f1f5de44 DS |
245 | } |
246 | ||
43fc643b JK |
247 | struct commit_stack { |
248 | struct commit **items; | |
249 | size_t nr, alloc; | |
250 | }; | |
251 | #define COMMIT_STACK_INIT { NULL, 0, 0 } | |
252 | ||
253 | static void commit_stack_push(struct commit_stack *stack, struct commit *commit) | |
254 | { | |
255 | ALLOC_GROW(stack->items, stack->nr + 1, stack->alloc); | |
256 | stack->items[stack->nr++] = commit; | |
257 | } | |
258 | ||
259 | static struct commit *commit_stack_pop(struct commit_stack *stack) | |
260 | { | |
261 | return stack->nr ? stack->items[--stack->nr] : NULL; | |
262 | } | |
263 | ||
264 | static void commit_stack_clear(struct commit_stack *stack) | |
265 | { | |
266 | FREE_AND_NULL(stack->items); | |
267 | stack->nr = stack->alloc = 0; | |
268 | } | |
269 | ||
8702b30f JK |
270 | static void mark_one_parent_uninteresting(struct commit *commit, |
271 | struct commit_stack *pending) | |
272 | { | |
273 | struct commit_list *l; | |
274 | ||
275 | if (commit->object.flags & UNINTERESTING) | |
276 | return; | |
277 | commit->object.flags |= UNINTERESTING; | |
278 | ||
279 | /* | |
280 | * Normally we haven't parsed the parent | |
281 | * yet, so we won't have a parent of a parent | |
282 | * here. However, it may turn out that we've | |
283 | * reached this commit some other way (where it | |
284 | * wasn't uninteresting), in which case we need | |
285 | * to mark its parents recursively too.. | |
286 | */ | |
287 | for (l = commit->parents; l; l = l->next) | |
288 | commit_stack_push(pending, l->item); | |
289 | } | |
290 | ||
ae563542 LT |
291 | void mark_parents_uninteresting(struct commit *commit) |
292 | { | |
43fc643b JK |
293 | struct commit_stack pending = COMMIT_STACK_INIT; |
294 | struct commit_list *l; | |
941ba8db NTND |
295 | |
296 | for (l = commit->parents; l; l = l->next) | |
8702b30f JK |
297 | mark_one_parent_uninteresting(l->item, &pending); |
298 | ||
299 | while (pending.nr > 0) | |
300 | mark_one_parent_uninteresting(commit_stack_pop(&pending), | |
301 | &pending); | |
43fc643b JK |
302 | |
303 | commit_stack_clear(&pending); | |
ae563542 LT |
304 | } |
305 | ||
20739490 | 306 | static void add_pending_object_with_path(struct rev_info *revs, |
ff5f5f26 | 307 | struct object *obj, |
20739490 JK |
308 | const char *name, unsigned mode, |
309 | const char *path) | |
ae563542 | 310 | { |
a4f66a78 | 311 | struct interpret_branch_name_options options = { 0 }; |
cc243c3c JH |
312 | if (!obj) |
313 | return; | |
aa27e461 | 314 | if (revs->no_walk && (obj->flags & UNINTERESTING)) |
f222abde | 315 | revs->no_walk = 0; |
105e4733 JH |
316 | if (revs->reflog_info && obj->type == OBJ_COMMIT) { |
317 | struct strbuf buf = STRBUF_INIT; | |
a4f66a78 | 318 | int len = interpret_branch_name(name, 0, &buf, &options); |
105e4733 JH |
319 | |
320 | if (0 < len && name[len] && buf.len) | |
321 | strbuf_addstr(&buf, name + len); | |
d08565bf JK |
322 | add_reflog_for_walk(revs->reflog_info, |
323 | (struct commit *)obj, | |
324 | buf.buf[0] ? buf.buf: name); | |
105e4733 | 325 | strbuf_release(&buf); |
d08565bf | 326 | return; /* do not add the commit itself */ |
105e4733 | 327 | } |
20739490 JK |
328 | add_object_array_with_path(obj, name, &revs->pending, mode, path); |
329 | } | |
330 | ||
331 | static void add_pending_object_with_mode(struct rev_info *revs, | |
332 | struct object *obj, | |
333 | const char *name, unsigned mode) | |
334 | { | |
335 | add_pending_object_with_path(revs, obj, name, mode, NULL); | |
ae563542 LT |
336 | } |
337 | ||
ff5f5f26 MH |
338 | void add_pending_object(struct rev_info *revs, |
339 | struct object *obj, const char *name) | |
2d93b9fa JH |
340 | { |
341 | add_pending_object_with_mode(revs, obj, name, S_IFINVALID); | |
342 | } | |
343 | ||
3384a2df JH |
344 | void add_head_to_pending(struct rev_info *revs) |
345 | { | |
654b9a90 | 346 | struct object_id oid; |
3384a2df | 347 | struct object *obj; |
654b9a90 | 348 | if (get_oid("HEAD", &oid)) |
3384a2df | 349 | return; |
b3c7eef9 | 350 | obj = parse_object(revs->repo, &oid); |
3384a2df JH |
351 | if (!obj) |
352 | return; | |
353 | add_pending_object(revs, obj, "HEAD"); | |
354 | } | |
355 | ||
ff5f5f26 | 356 | static struct object *get_reference(struct rev_info *revs, const char *name, |
654b9a90 | 357 | const struct object_id *oid, |
ff5f5f26 | 358 | unsigned int flags) |
ae563542 LT |
359 | { |
360 | struct object *object; | |
361 | ||
ec0c5798 JT |
362 | /* |
363 | * If the repository has commit graphs, repo_parse_commit() avoids | |
364 | * reading the object buffer, so use it whenever possible. | |
365 | */ | |
366 | if (oid_object_info(revs->repo, oid, NULL) == OBJ_COMMIT) { | |
367 | struct commit *c = lookup_commit(revs->repo, oid); | |
368 | if (!repo_parse_commit(revs->repo, c)) | |
369 | object = (struct object *) c; | |
370 | else | |
371 | object = NULL; | |
372 | } else { | |
373 | object = parse_object(revs->repo, oid); | |
374 | } | |
375 | ||
cc243c3c JH |
376 | if (!object) { |
377 | if (revs->ignore_missing) | |
378 | return object; | |
df11e196 JT |
379 | if (revs->exclude_promisor_objects && is_promisor_object(oid)) |
380 | return NULL; | |
ae563542 | 381 | die("bad object %s", name); |
cc243c3c | 382 | } |
cd2bdc53 LT |
383 | object->flags |= flags; |
384 | return object; | |
385 | } | |
386 | ||
a58a1b01 | 387 | void add_pending_oid(struct rev_info *revs, const char *name, |
388 | const struct object_id *oid, unsigned int flags) | |
26c3177e | 389 | { |
654b9a90 | 390 | struct object *object = get_reference(revs, name, oid, flags); |
26c3177e RS |
391 | add_pending_object(revs, object, name); |
392 | } | |
393 | ||
ff5f5f26 | 394 | static struct commit *handle_commit(struct rev_info *revs, |
20739490 | 395 | struct object_array_entry *entry) |
cd2bdc53 | 396 | { |
20739490 JK |
397 | struct object *object = entry->item; |
398 | const char *name = entry->name; | |
399 | const char *path = entry->path; | |
400 | unsigned int mode = entry->mode; | |
cd2bdc53 | 401 | unsigned long flags = object->flags; |
ae563542 LT |
402 | |
403 | /* | |
404 | * Tag object? Look what it points to.. | |
405 | */ | |
1974632c | 406 | while (object->type == OBJ_TAG) { |
ae563542 | 407 | struct tag *tag = (struct tag *) object; |
cd2bdc53 | 408 | if (revs->tag_objects && !(flags & UNINTERESTING)) |
ae563542 | 409 | add_pending_object(revs, object, tag->tag); |
dad3f060 | 410 | object = parse_object(revs->repo, get_tagged_oid(tag)); |
aeeae1b7 | 411 | if (!object) { |
a3ba6bf1 | 412 | if (revs->ignore_missing_links || (flags & UNINTERESTING)) |
aeeae1b7 | 413 | return NULL; |
dc0a13f6 JT |
414 | if (revs->exclude_promisor_objects && |
415 | is_promisor_object(&tag->tagged->oid)) | |
416 | return NULL; | |
f2fd0760 | 417 | die("bad object %s", oid_to_hex(&tag->tagged->oid)); |
aeeae1b7 | 418 | } |
a7435286 | 419 | object->flags |= flags; |
20739490 JK |
420 | /* |
421 | * We'll handle the tagged object by looping or dropping | |
422 | * through to the non-tag handlers below. Do not | |
728350b7 | 423 | * propagate path data from the tag's pending entry. |
20739490 | 424 | */ |
20739490 JK |
425 | path = NULL; |
426 | mode = 0; | |
ae563542 LT |
427 | } |
428 | ||
429 | /* | |
430 | * Commit object? Just return it, we'll do all the complex | |
431 | * reachability crud. | |
432 | */ | |
1974632c | 433 | if (object->type == OBJ_COMMIT) { |
ae563542 | 434 | struct commit *commit = (struct commit *)object; |
87be2523 | 435 | |
ea3f7e59 | 436 | if (repo_parse_commit(revs->repo, commit) < 0) |
ae563542 | 437 | die("unable to parse commit %s", name); |
d9a83684 | 438 | if (flags & UNINTERESTING) { |
ae563542 | 439 | mark_parents_uninteresting(commit); |
1b4d8827 DS |
440 | |
441 | if (!revs->topo_order || !generation_numbers_enabled(the_repository)) | |
442 | revs->limited = 1; | |
d9a83684 | 443 | } |
87be2523 NTND |
444 | if (revs->sources) { |
445 | char **slot = revision_sources_at(revs->sources, commit); | |
446 | ||
447 | if (!*slot) | |
448 | *slot = xstrdup(name); | |
449 | } | |
ae563542 LT |
450 | return commit; |
451 | } | |
452 | ||
453 | /* | |
3ea3c215 | 454 | * Tree object? Either mark it uninteresting, or add it |
ae563542 LT |
455 | * to the list of objects to look at later.. |
456 | */ | |
1974632c | 457 | if (object->type == OBJ_TREE) { |
ae563542 LT |
458 | struct tree *tree = (struct tree *)object; |
459 | if (!revs->tree_objects) | |
460 | return NULL; | |
461 | if (flags & UNINTERESTING) { | |
b3c7eef9 | 462 | mark_tree_contents_uninteresting(revs->repo, tree); |
ae563542 LT |
463 | return NULL; |
464 | } | |
20739490 | 465 | add_pending_object_with_path(revs, object, name, mode, path); |
ae563542 LT |
466 | return NULL; |
467 | } | |
468 | ||
469 | /* | |
470 | * Blob object? You know the drill by now.. | |
471 | */ | |
1974632c | 472 | if (object->type == OBJ_BLOB) { |
ae563542 LT |
473 | if (!revs->blob_objects) |
474 | return NULL; | |
a7435286 | 475 | if (flags & UNINTERESTING) |
ae563542 | 476 | return NULL; |
20739490 | 477 | add_pending_object_with_path(revs, object, name, mode, path); |
ae563542 LT |
478 | return NULL; |
479 | } | |
480 | die("%s is unknown object", name); | |
481 | } | |
482 | ||
b6e8a3b5 JK |
483 | static int everybody_uninteresting(struct commit_list *orig, |
484 | struct commit **interesting_cache) | |
a4a88b2b LT |
485 | { |
486 | struct commit_list *list = orig; | |
b6e8a3b5 JK |
487 | |
488 | if (*interesting_cache) { | |
489 | struct commit *commit = *interesting_cache; | |
490 | if (!(commit->object.flags & UNINTERESTING)) | |
491 | return 0; | |
492 | } | |
493 | ||
a4a88b2b LT |
494 | while (list) { |
495 | struct commit *commit = list->item; | |
496 | list = list->next; | |
497 | if (commit->object.flags & UNINTERESTING) | |
498 | continue; | |
ae40ebda SB |
499 | |
500 | *interesting_cache = commit; | |
a4a88b2b LT |
501 | return 0; |
502 | } | |
503 | return 1; | |
504 | } | |
505 | ||
4d826608 KB |
506 | /* |
507 | * A definition of "relevant" commit that we can use to simplify limited graphs | |
508 | * by eliminating side branches. | |
509 | * | |
510 | * A "relevant" commit is one that is !UNINTERESTING (ie we are including it | |
511 | * in our list), or that is a specified BOTTOM commit. Then after computing | |
512 | * a limited list, during processing we can generally ignore boundary merges | |
513 | * coming from outside the graph, (ie from irrelevant parents), and treat | |
514 | * those merges as if they were single-parent. TREESAME is defined to consider | |
515 | * only relevant parents, if any. If we are TREESAME to our on-graph parents, | |
516 | * we don't care if we were !TREESAME to non-graph parents. | |
517 | * | |
518 | * Treating bottom commits as relevant ensures that a limited graph's | |
519 | * connection to the actual bottom commit is not viewed as a side branch, but | |
520 | * treated as part of the graph. For example: | |
521 | * | |
522 | * ....Z...A---X---o---o---B | |
523 | * . / | |
524 | * W---Y | |
525 | * | |
526 | * When computing "A..B", the A-X connection is at least as important as | |
527 | * Y-X, despite A being flagged UNINTERESTING. | |
528 | * | |
529 | * And when computing --ancestry-path "A..B", the A-X connection is more | |
530 | * important than Y-X, despite both A and Y being flagged UNINTERESTING. | |
531 | */ | |
532 | static inline int relevant_commit(struct commit *commit) | |
533 | { | |
534 | return (commit->object.flags & (UNINTERESTING | BOTTOM)) != UNINTERESTING; | |
535 | } | |
536 | ||
537 | /* | |
538 | * Return a single relevant commit from a parent list. If we are a TREESAME | |
539 | * commit, and this selects one of our parents, then we can safely simplify to | |
540 | * that parent. | |
541 | */ | |
542 | static struct commit *one_relevant_parent(const struct rev_info *revs, | |
543 | struct commit_list *orig) | |
544 | { | |
545 | struct commit_list *list = orig; | |
546 | struct commit *relevant = NULL; | |
547 | ||
548 | if (!orig) | |
549 | return NULL; | |
550 | ||
551 | /* | |
552 | * For 1-parent commits, or if first-parent-only, then return that | |
553 | * first parent (even if not "relevant" by the above definition). | |
554 | * TREESAME will have been set purely on that parent. | |
555 | */ | |
556 | if (revs->first_parent_only || !orig->next) | |
557 | return orig->item; | |
558 | ||
559 | /* | |
560 | * For multi-parent commits, identify a sole relevant parent, if any. | |
561 | * If we have only one relevant parent, then TREESAME will be set purely | |
562 | * with regard to that parent, and we can simplify accordingly. | |
563 | * | |
564 | * If we have more than one relevant parent, or no relevant parents | |
565 | * (and multiple irrelevant ones), then we can't select a parent here | |
566 | * and return NULL. | |
567 | */ | |
568 | while (list) { | |
569 | struct commit *commit = list->item; | |
570 | list = list->next; | |
571 | if (relevant_commit(commit)) { | |
572 | if (relevant) | |
573 | return NULL; | |
574 | relevant = commit; | |
575 | } | |
576 | } | |
577 | return relevant; | |
578 | } | |
579 | ||
0a4ba7f8 JH |
580 | /* |
581 | * The goal is to get REV_TREE_NEW as the result only if the | |
ceff8e7a LT |
582 | * diff consists of all '+' (and no other changes), REV_TREE_OLD |
583 | * if the whole diff is removal of old data, and otherwise | |
584 | * REV_TREE_DIFFERENT (of course if the trees are the same we | |
585 | * want REV_TREE_SAME). | |
a937b37e JK |
586 | * |
587 | * The only time we care about the distinction is when | |
588 | * remove_empty_trees is in effect, in which case we care only about | |
589 | * whether the whole change is REV_TREE_NEW, or if there's another type | |
590 | * of change. Which means we can stop the diff early in either of these | |
591 | * cases: | |
592 | * | |
593 | * 1. We're not using remove_empty_trees at all. | |
594 | * | |
595 | * 2. We saw anything except REV_TREE_NEW. | |
0a4ba7f8 | 596 | */ |
8efdc326 | 597 | static int tree_difference = REV_TREE_SAME; |
a4a88b2b LT |
598 | |
599 | static void file_add_remove(struct diff_options *options, | |
600 | int addremove, unsigned mode, | |
c26022ea BW |
601 | const struct object_id *oid, |
602 | int oid_valid, | |
e3d42c47 | 603 | const char *fullpath, unsigned dirty_submodule) |
a4a88b2b | 604 | { |
ceff8e7a | 605 | int diff = addremove == '+' ? REV_TREE_NEW : REV_TREE_OLD; |
a937b37e | 606 | struct rev_info *revs = options->change_fn_data; |
a4a88b2b | 607 | |
ceff8e7a | 608 | tree_difference |= diff; |
a937b37e | 609 | if (!revs->remove_empty_trees || tree_difference != REV_TREE_NEW) |
0d1e0e78 | 610 | options->flags.has_changes = 1; |
a4a88b2b LT |
611 | } |
612 | ||
613 | static void file_change(struct diff_options *options, | |
614 | unsigned old_mode, unsigned new_mode, | |
94a0097a BW |
615 | const struct object_id *old_oid, |
616 | const struct object_id *new_oid, | |
617 | int old_oid_valid, int new_oid_valid, | |
e3d42c47 JL |
618 | const char *fullpath, |
619 | unsigned old_dirty_submodule, unsigned new_dirty_submodule) | |
a4a88b2b | 620 | { |
8efdc326 | 621 | tree_difference = REV_TREE_DIFFERENT; |
0d1e0e78 | 622 | options->flags.has_changes = 1; |
a4a88b2b LT |
623 | } |
624 | ||
42e50e78 GS |
625 | static int bloom_filter_atexit_registered; |
626 | static unsigned int count_bloom_filter_maybe; | |
627 | static unsigned int count_bloom_filter_definitely_not; | |
628 | static unsigned int count_bloom_filter_false_positive; | |
629 | static unsigned int count_bloom_filter_not_present; | |
42e50e78 GS |
630 | |
631 | static void trace2_bloom_filter_statistics_atexit(void) | |
632 | { | |
633 | struct json_writer jw = JSON_WRITER_INIT; | |
634 | ||
635 | jw_object_begin(&jw, 0); | |
636 | jw_object_intmax(&jw, "filter_not_present", count_bloom_filter_not_present); | |
42e50e78 GS |
637 | jw_object_intmax(&jw, "maybe", count_bloom_filter_maybe); |
638 | jw_object_intmax(&jw, "definitely_not", count_bloom_filter_definitely_not); | |
639 | jw_object_intmax(&jw, "false_positive", count_bloom_filter_false_positive); | |
640 | jw_end(&jw); | |
641 | ||
642 | trace2_data_json("bloom", the_repository, "statistics", &jw); | |
643 | ||
644 | jw_release(&jw); | |
645 | } | |
646 | ||
8918e379 DS |
647 | static int forbid_bloom_filters(struct pathspec *spec) |
648 | { | |
649 | if (spec->has_wildcard) | |
650 | return 1; | |
651 | if (spec->nr > 1) | |
652 | return 1; | |
653 | if (spec->magic & ~PATHSPEC_LITERAL) | |
654 | return 1; | |
655 | if (spec->nr && (spec->items[0].magic & ~PATHSPEC_LITERAL)) | |
656 | return 1; | |
657 | ||
658 | return 0; | |
659 | } | |
660 | ||
a56b9464 GS |
661 | static void prepare_to_use_bloom_filter(struct rev_info *revs) |
662 | { | |
663 | struct pathspec_item *pi; | |
664 | char *path_alloc = NULL; | |
c525ce95 | 665 | const char *path, *p; |
c525ce95 SG |
666 | size_t len; |
667 | int path_component_nr = 1; | |
a56b9464 GS |
668 | |
669 | if (!revs->commits) | |
8918e379 DS |
670 | return; |
671 | ||
672 | if (forbid_bloom_filters(&revs->prune_data)) | |
673 | return; | |
a56b9464 GS |
674 | |
675 | repo_parse_commit(revs->repo, revs->commits->item); | |
676 | ||
4f364405 | 677 | revs->bloom_filter_settings = get_bloom_filter_settings(revs->repo); |
a56b9464 GS |
678 | if (!revs->bloom_filter_settings) |
679 | return; | |
680 | ||
f32dde8c DS |
681 | if (!revs->pruning.pathspec.nr) |
682 | return; | |
683 | ||
a56b9464 | 684 | pi = &revs->pruning.pathspec.items[0]; |
a56b9464 GS |
685 | |
686 | /* remove single trailing slash from path, if needed */ | |
fd9a631c JK |
687 | if (pi->len > 0 && pi->match[pi->len - 1] == '/') { |
688 | path_alloc = xmemdupz(pi->match, pi->len - 1); | |
dc8e95ba | 689 | path = path_alloc; |
a56b9464 | 690 | } else |
dc8e95ba | 691 | path = pi->match; |
a56b9464 GS |
692 | |
693 | len = strlen(path); | |
f3c2a368 TB |
694 | if (!len) { |
695 | revs->bloom_filter_settings = NULL; | |
398e659e | 696 | free(path_alloc); |
f3c2a368 TB |
697 | return; |
698 | } | |
a56b9464 | 699 | |
c525ce95 SG |
700 | p = path; |
701 | while (*p) { | |
702 | /* | |
703 | * At this point, the path is normalized to use Unix-style | |
704 | * path separators. This is required due to how the | |
705 | * changed-path Bloom filters store the paths. | |
706 | */ | |
707 | if (*p == '/') | |
708 | path_component_nr++; | |
709 | p++; | |
710 | } | |
711 | ||
712 | revs->bloom_keys_nr = path_component_nr; | |
713 | ALLOC_ARRAY(revs->bloom_keys, revs->bloom_keys_nr); | |
a56b9464 | 714 | |
c525ce95 SG |
715 | fill_bloom_key(path, len, &revs->bloom_keys[0], |
716 | revs->bloom_filter_settings); | |
717 | path_component_nr = 1; | |
718 | ||
719 | p = path + len - 1; | |
720 | while (p > path) { | |
721 | if (*p == '/') | |
722 | fill_bloom_key(path, p - path, | |
723 | &revs->bloom_keys[path_component_nr++], | |
724 | revs->bloom_filter_settings); | |
725 | p--; | |
726 | } | |
a56b9464 | 727 | |
42e50e78 GS |
728 | if (trace2_is_enabled() && !bloom_filter_atexit_registered) { |
729 | atexit(trace2_bloom_filter_statistics_atexit); | |
730 | bloom_filter_atexit_registered = 1; | |
731 | } | |
732 | ||
a56b9464 GS |
733 | free(path_alloc); |
734 | } | |
735 | ||
736 | static int check_maybe_different_in_bloom_filter(struct rev_info *revs, | |
737 | struct commit *commit) | |
738 | { | |
739 | struct bloom_filter *filter; | |
c525ce95 | 740 | int result = 1, j; |
a56b9464 GS |
741 | |
742 | if (!revs->repo->objects->commit_graph) | |
743 | return -1; | |
744 | ||
c49c82aa | 745 | if (commit_graph_generation(commit) == GENERATION_NUMBER_INFINITY) |
a56b9464 GS |
746 | return -1; |
747 | ||
312cff52 | 748 | filter = get_bloom_filter(revs->repo, commit); |
a56b9464 GS |
749 | |
750 | if (!filter) { | |
42e50e78 | 751 | count_bloom_filter_not_present++; |
a56b9464 GS |
752 | return -1; |
753 | } | |
754 | ||
c525ce95 SG |
755 | for (j = 0; result && j < revs->bloom_keys_nr; j++) { |
756 | result = bloom_filter_contains(filter, | |
757 | &revs->bloom_keys[j], | |
758 | revs->bloom_filter_settings); | |
a56b9464 GS |
759 | } |
760 | ||
42e50e78 GS |
761 | if (result) |
762 | count_bloom_filter_maybe++; | |
763 | else | |
764 | count_bloom_filter_definitely_not++; | |
765 | ||
a56b9464 GS |
766 | return result; |
767 | } | |
768 | ||
ff5f5f26 | 769 | static int rev_compare_tree(struct rev_info *revs, |
a56b9464 | 770 | struct commit *parent, struct commit *commit, int nth_parent) |
a4a88b2b | 771 | { |
2e27bd77 DS |
772 | struct tree *t1 = get_commit_tree(parent); |
773 | struct tree *t2 = get_commit_tree(commit); | |
a56b9464 | 774 | int bloom_ret = 1; |
3a5e8608 | 775 | |
a4a88b2b | 776 | if (!t1) |
8efdc326 | 777 | return REV_TREE_NEW; |
ceff8e7a LT |
778 | if (!t2) |
779 | return REV_TREE_OLD; | |
78892e32 LT |
780 | |
781 | if (revs->simplify_by_decoration) { | |
782 | /* | |
783 | * If we are simplifying by decoration, then the commit | |
784 | * is worth showing if it has a tag pointing at it. | |
785 | */ | |
2608c249 | 786 | if (get_name_decoration(&commit->object)) |
78892e32 LT |
787 | return REV_TREE_DIFFERENT; |
788 | /* | |
789 | * A commit that is not pointed by a tag is uninteresting | |
790 | * if we are not limited by path. This means that you will | |
791 | * see the usual "commits that touch the paths" plus any | |
792 | * tagged commit by specifying both --simplify-by-decoration | |
793 | * and pathspec. | |
794 | */ | |
afe069d1 | 795 | if (!revs->prune_data.nr) |
78892e32 LT |
796 | return REV_TREE_SAME; |
797 | } | |
ceff8e7a | 798 | |
c525ce95 | 799 | if (revs->bloom_keys_nr && !nth_parent) { |
a56b9464 GS |
800 | bloom_ret = check_maybe_different_in_bloom_filter(revs, commit); |
801 | ||
802 | if (bloom_ret == 0) | |
803 | return REV_TREE_SAME; | |
804 | } | |
805 | ||
8efdc326 | 806 | tree_difference = REV_TREE_SAME; |
0d1e0e78 | 807 | revs->pruning.flags.has_changes = 0; |
0ee3cb88 | 808 | diff_tree_oid(&t1->object.oid, &t2->object.oid, "", &revs->pruning); |
a56b9464 | 809 | |
42e50e78 GS |
810 | if (!nth_parent) |
811 | if (bloom_ret == 1 && tree_difference == REV_TREE_SAME) | |
812 | count_bloom_filter_false_positive++; | |
813 | ||
a4a88b2b LT |
814 | return tree_difference; |
815 | } | |
816 | ||
3a5e8608 | 817 | static int rev_same_tree_as_empty(struct rev_info *revs, struct commit *commit) |
a4a88b2b | 818 | { |
2e27bd77 | 819 | struct tree *t1 = get_commit_tree(commit); |
a4a88b2b LT |
820 | |
821 | if (!t1) | |
822 | return 0; | |
823 | ||
0a4ba7f8 | 824 | tree_difference = REV_TREE_SAME; |
0d1e0e78 | 825 | revs->pruning.flags.has_changes = 0; |
0ee3cb88 | 826 | diff_tree_oid(NULL, &t1->object.oid, "", &revs->pruning); |
a4a88b2b | 827 | |
0ee3cb88 | 828 | return tree_difference == REV_TREE_SAME; |
a4a88b2b LT |
829 | } |
830 | ||
d0af663e KB |
831 | struct treesame_state { |
832 | unsigned int nparents; | |
833 | unsigned char treesame[FLEX_ARRAY]; | |
834 | }; | |
835 | ||
836 | static struct treesame_state *initialise_treesame(struct rev_info *revs, struct commit *commit) | |
837 | { | |
838 | unsigned n = commit_list_count(commit->parents); | |
50a6c8ef | 839 | struct treesame_state *st = xcalloc(1, st_add(sizeof(*st), n)); |
d0af663e KB |
840 | st->nparents = n; |
841 | add_decoration(&revs->treesame, &commit->object, st); | |
842 | return st; | |
843 | } | |
844 | ||
845 | /* | |
846 | * Must be called immediately after removing the nth_parent from a commit's | |
847 | * parent list, if we are maintaining the per-parent treesame[] decoration. | |
848 | * This does not recalculate the master TREESAME flag - update_treesame() | |
849 | * should be called to update it after a sequence of treesame[] modifications | |
850 | * that may have affected it. | |
851 | */ | |
852 | static int compact_treesame(struct rev_info *revs, struct commit *commit, unsigned nth_parent) | |
853 | { | |
854 | struct treesame_state *st; | |
855 | int old_same; | |
856 | ||
857 | if (!commit->parents) { | |
858 | /* | |
859 | * Have just removed the only parent from a non-merge. | |
860 | * Different handling, as we lack decoration. | |
861 | */ | |
862 | if (nth_parent != 0) | |
863 | die("compact_treesame %u", nth_parent); | |
864 | old_same = !!(commit->object.flags & TREESAME); | |
865 | if (rev_same_tree_as_empty(revs, commit)) | |
866 | commit->object.flags |= TREESAME; | |
867 | else | |
868 | commit->object.flags &= ~TREESAME; | |
869 | return old_same; | |
870 | } | |
871 | ||
872 | st = lookup_decoration(&revs->treesame, &commit->object); | |
873 | if (!st || nth_parent >= st->nparents) | |
874 | die("compact_treesame %u", nth_parent); | |
875 | ||
876 | old_same = st->treesame[nth_parent]; | |
877 | memmove(st->treesame + nth_parent, | |
878 | st->treesame + nth_parent + 1, | |
879 | st->nparents - nth_parent - 1); | |
880 | ||
881 | /* | |
882 | * If we've just become a non-merge commit, update TREESAME | |
883 | * immediately, and remove the no-longer-needed decoration. | |
884 | * If still a merge, defer update until update_treesame(). | |
885 | */ | |
886 | if (--st->nparents == 1) { | |
887 | if (commit->parents->next) | |
888 | die("compact_treesame parents mismatch"); | |
889 | if (st->treesame[0] && revs->dense) | |
890 | commit->object.flags |= TREESAME; | |
891 | else | |
892 | commit->object.flags &= ~TREESAME; | |
893 | free(add_decoration(&revs->treesame, &commit->object, NULL)); | |
894 | } | |
895 | ||
896 | return old_same; | |
897 | } | |
898 | ||
899 | static unsigned update_treesame(struct rev_info *revs, struct commit *commit) | |
900 | { | |
901 | if (commit->parents && commit->parents->next) { | |
902 | unsigned n; | |
903 | struct treesame_state *st; | |
4d826608 KB |
904 | struct commit_list *p; |
905 | unsigned relevant_parents; | |
906 | unsigned relevant_change, irrelevant_change; | |
d0af663e KB |
907 | |
908 | st = lookup_decoration(&revs->treesame, &commit->object); | |
909 | if (!st) | |
f2fd0760 | 910 | die("update_treesame %s", oid_to_hex(&commit->object.oid)); |
4d826608 KB |
911 | relevant_parents = 0; |
912 | relevant_change = irrelevant_change = 0; | |
913 | for (p = commit->parents, n = 0; p; n++, p = p->next) { | |
914 | if (relevant_commit(p->item)) { | |
915 | relevant_change |= !st->treesame[n]; | |
916 | relevant_parents++; | |
917 | } else | |
918 | irrelevant_change |= !st->treesame[n]; | |
d0af663e | 919 | } |
4d826608 KB |
920 | if (relevant_parents ? relevant_change : irrelevant_change) |
921 | commit->object.flags &= ~TREESAME; | |
922 | else | |
923 | commit->object.flags |= TREESAME; | |
d0af663e KB |
924 | } |
925 | ||
926 | return commit->object.flags & TREESAME; | |
927 | } | |
928 | ||
4d826608 KB |
929 | static inline int limiting_can_increase_treesame(const struct rev_info *revs) |
930 | { | |
931 | /* | |
932 | * TREESAME is irrelevant unless prune && dense; | |
933 | * if simplify_history is set, we can't have a mixture of TREESAME and | |
934 | * !TREESAME INTERESTING parents (and we don't have treesame[] | |
935 | * decoration anyway); | |
936 | * if first_parent_only is set, then the TREESAME flag is locked | |
937 | * against the first parent (and again we lack treesame[] decoration). | |
938 | */ | |
939 | return revs->prune && revs->dense && | |
940 | !revs->simplify_history && | |
941 | !revs->first_parent_only; | |
942 | } | |
943 | ||
a4a88b2b LT |
944 | static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit) |
945 | { | |
946 | struct commit_list **pp, *parent; | |
d0af663e | 947 | struct treesame_state *ts = NULL; |
4d826608 KB |
948 | int relevant_change = 0, irrelevant_change = 0; |
949 | int relevant_parents, nth_parent; | |
a4a88b2b | 950 | |
53b2c823 LT |
951 | /* |
952 | * If we don't do pruning, everything is interesting | |
953 | */ | |
7dc0fe3b | 954 | if (!revs->prune) |
53b2c823 | 955 | return; |
53b2c823 | 956 | |
2e27bd77 | 957 | if (!get_commit_tree(commit)) |
a4a88b2b LT |
958 | return; |
959 | ||
960 | if (!commit->parents) { | |
3a5e8608 | 961 | if (rev_same_tree_as_empty(revs, commit)) |
7dc0fe3b | 962 | commit->object.flags |= TREESAME; |
a4a88b2b LT |
963 | return; |
964 | } | |
965 | ||
53b2c823 LT |
966 | /* |
967 | * Normal non-merge commit? If we don't want to make the | |
968 | * history dense, we consider it always to be a change.. | |
969 | */ | |
7dc0fe3b | 970 | if (!revs->dense && !commit->parents->next) |
53b2c823 | 971 | return; |
53b2c823 | 972 | |
4d826608 | 973 | for (pp = &commit->parents, nth_parent = 0, relevant_parents = 0; |
d0af663e KB |
974 | (parent = *pp) != NULL; |
975 | pp = &parent->next, nth_parent++) { | |
a4a88b2b | 976 | struct commit *p = parent->item; |
4d826608 KB |
977 | if (relevant_commit(p)) |
978 | relevant_parents++; | |
a4a88b2b | 979 | |
d0af663e KB |
980 | if (nth_parent == 1) { |
981 | /* | |
982 | * This our second loop iteration - so we now know | |
983 | * we're dealing with a merge. | |
984 | * | |
985 | * Do not compare with later parents when we care only about | |
986 | * the first parent chain, in order to avoid derailing the | |
987 | * traversal to follow a side branch that brought everything | |
988 | * in the path we are limited to by the pathspec. | |
989 | */ | |
990 | if (revs->first_parent_only) | |
991 | break; | |
992 | /* | |
993 | * If this will remain a potentially-simplifiable | |
994 | * merge, remember per-parent treesame if needed. | |
995 | * Initialise the array with the comparison from our | |
996 | * first iteration. | |
997 | */ | |
998 | if (revs->treesame.name && | |
999 | !revs->simplify_history && | |
1000 | !(commit->object.flags & UNINTERESTING)) { | |
1001 | ts = initialise_treesame(revs, commit); | |
4d826608 | 1002 | if (!(irrelevant_change || relevant_change)) |
d0af663e KB |
1003 | ts->treesame[0] = 1; |
1004 | } | |
1005 | } | |
ea3f7e59 | 1006 | if (repo_parse_commit(revs->repo, p) < 0) |
cc0e6c5a | 1007 | die("cannot simplify commit %s (because of %s)", |
f2fd0760 | 1008 | oid_to_hex(&commit->object.oid), |
1009 | oid_to_hex(&p->object.oid)); | |
a56b9464 | 1010 | switch (rev_compare_tree(revs, p, commit, nth_parent)) { |
8efdc326 | 1011 | case REV_TREE_SAME: |
141efdba | 1012 | if (!revs->simplify_history || !relevant_commit(p)) { |
f3219fbb JH |
1013 | /* Even if a merge with an uninteresting |
1014 | * side branch brought the entire change | |
1015 | * we are interested in, we do not want | |
1016 | * to lose the other branches of this | |
1017 | * merge, so we just keep going. | |
1018 | */ | |
d0af663e KB |
1019 | if (ts) |
1020 | ts->treesame[nth_parent] = 1; | |
f3219fbb JH |
1021 | continue; |
1022 | } | |
a4a88b2b LT |
1023 | parent->next = NULL; |
1024 | commit->parents = parent; | |
8d049e18 DS |
1025 | |
1026 | /* | |
1027 | * A merge commit is a "diversion" if it is not | |
1028 | * TREESAME to its first parent but is TREESAME | |
1029 | * to a later parent. In the simplified history, | |
1030 | * we "divert" the history walk to the later | |
1031 | * parent. These commits are shown when "show_pulls" | |
1032 | * is enabled, so do not mark the object as | |
1033 | * TREESAME here. | |
1034 | */ | |
1035 | if (!revs->show_pulls || !nth_parent) | |
1036 | commit->object.flags |= TREESAME; | |
1037 | ||
a4a88b2b LT |
1038 | return; |
1039 | ||
8efdc326 FK |
1040 | case REV_TREE_NEW: |
1041 | if (revs->remove_empty_trees && | |
3a5e8608 | 1042 | rev_same_tree_as_empty(revs, p)) { |
c348f31a JH |
1043 | /* We are adding all the specified |
1044 | * paths from this parent, so the | |
1045 | * history beyond this parent is not | |
1046 | * interesting. Remove its parents | |
1047 | * (they are grandparents for us). | |
1048 | * IOW, we pretend this parent is a | |
1049 | * "root" commit. | |
a41e109c | 1050 | */ |
ea3f7e59 | 1051 | if (repo_parse_commit(revs->repo, p) < 0) |
cc0e6c5a | 1052 | die("cannot simplify commit %s (invalid %s)", |
f2fd0760 | 1053 | oid_to_hex(&commit->object.oid), |
1054 | oid_to_hex(&p->object.oid)); | |
c348f31a | 1055 | p->parents = NULL; |
a4a88b2b LT |
1056 | } |
1057 | /* fallthrough */ | |
ceff8e7a | 1058 | case REV_TREE_OLD: |
8efdc326 | 1059 | case REV_TREE_DIFFERENT: |
4d826608 KB |
1060 | if (relevant_commit(p)) |
1061 | relevant_change = 1; | |
1062 | else | |
1063 | irrelevant_change = 1; | |
8d049e18 DS |
1064 | |
1065 | if (!nth_parent) | |
1066 | commit->object.flags |= PULL_MERGE; | |
1067 | ||
a4a88b2b LT |
1068 | continue; |
1069 | } | |
f2fd0760 | 1070 | die("bad tree compare for commit %s", oid_to_hex(&commit->object.oid)); |
a4a88b2b | 1071 | } |
4d826608 KB |
1072 | |
1073 | /* | |
1074 | * TREESAME is straightforward for single-parent commits. For merge | |
1075 | * commits, it is most useful to define it so that "irrelevant" | |
1076 | * parents cannot make us !TREESAME - if we have any relevant | |
1077 | * parents, then we only consider TREESAMEness with respect to them, | |
1078 | * allowing irrelevant merges from uninteresting branches to be | |
1079 | * simplified away. Only if we have only irrelevant parents do we | |
1080 | * base TREESAME on them. Note that this logic is replicated in | |
1081 | * update_treesame, which should be kept in sync. | |
1082 | */ | |
1083 | if (relevant_parents ? !relevant_change : !irrelevant_change) | |
1084 | commit->object.flags |= TREESAME; | |
a4a88b2b LT |
1085 | } |
1086 | ||
5284fc5c | 1087 | static int process_parents(struct rev_info *revs, struct commit *commit, |
8320b1db | 1088 | struct commit_list **list, struct prio_queue *queue) |
a4a88b2b LT |
1089 | { |
1090 | struct commit_list *parent = commit->parents; | |
577ed5c2 | 1091 | unsigned left_flag; |
a4a88b2b | 1092 | |
3381c790 | 1093 | if (commit->object.flags & ADDED) |
cc0e6c5a | 1094 | return 0; |
3381c790 LT |
1095 | commit->object.flags |= ADDED; |
1096 | ||
a330de31 VM |
1097 | if (revs->include_check && |
1098 | !revs->include_check(commit, revs->include_check_data)) | |
1099 | return 0; | |
1100 | ||
a4a88b2b LT |
1101 | /* |
1102 | * If the commit is uninteresting, don't try to | |
1103 | * prune parents - we want the maximal uninteresting | |
1104 | * set. | |
1105 | * | |
1106 | * Normally we haven't parsed the parent | |
1107 | * yet, so we won't have a parent of a parent | |
1108 | * here. However, it may turn out that we've | |
1109 | * reached this commit some other way (where it | |
1110 | * wasn't uninteresting), in which case we need | |
1111 | * to mark its parents recursively too.. | |
1112 | */ | |
1113 | if (commit->object.flags & UNINTERESTING) { | |
1114 | while (parent) { | |
1115 | struct commit *p = parent->item; | |
1116 | parent = parent->next; | |
aeeae1b7 JH |
1117 | if (p) |
1118 | p->object.flags |= UNINTERESTING; | |
ea3f7e59 | 1119 | if (repo_parse_commit_gently(revs->repo, p, 1) < 0) |
aeeae1b7 | 1120 | continue; |
a4a88b2b LT |
1121 | if (p->parents) |
1122 | mark_parents_uninteresting(p); | |
1123 | if (p->object.flags & SEEN) | |
1124 | continue; | |
1125 | p->object.flags |= SEEN; | |
5284fc5c | 1126 | if (list) |
8320b1db JK |
1127 | commit_list_insert_by_date(p, list); |
1128 | if (queue) | |
1129 | prio_queue_put(queue, p); | |
a4a88b2b | 1130 | } |
cc0e6c5a | 1131 | return 0; |
a4a88b2b LT |
1132 | } |
1133 | ||
1134 | /* | |
1135 | * Ok, the commit wasn't uninteresting. Try to | |
1136 | * simplify the commit history and find the parent | |
1137 | * that has no differences in the path set if one exists. | |
1138 | */ | |
53b2c823 | 1139 | try_to_simplify_commit(revs, commit); |
a4a88b2b | 1140 | |
ba1d4505 | 1141 | if (revs->no_walk) |
cc0e6c5a | 1142 | return 0; |
ba1d4505 | 1143 | |
577ed5c2 | 1144 | left_flag = (commit->object.flags & SYMMETRIC_LEFT); |
0053e902 | 1145 | |
d9c292e8 | 1146 | for (parent = commit->parents; parent; parent = parent->next) { |
a4a88b2b | 1147 | struct commit *p = parent->item; |
df11e196 JT |
1148 | int gently = revs->ignore_missing_links || |
1149 | revs->exclude_promisor_objects; | |
ea3f7e59 | 1150 | if (repo_parse_commit_gently(revs->repo, p, gently) < 0) { |
df11e196 JT |
1151 | if (revs->exclude_promisor_objects && |
1152 | is_promisor_object(&p->object.oid)) { | |
1153 | if (revs->first_parent_only) | |
1154 | break; | |
1155 | continue; | |
1156 | } | |
cc0e6c5a | 1157 | return -1; |
df11e196 | 1158 | } |
87be2523 NTND |
1159 | if (revs->sources) { |
1160 | char **slot = revision_sources_at(revs->sources, p); | |
1161 | ||
1162 | if (!*slot) | |
1163 | *slot = *revision_sources_at(revs->sources, commit); | |
1164 | } | |
577ed5c2 | 1165 | p->object.flags |= left_flag; |
ad1012eb LH |
1166 | if (!(p->object.flags & SEEN)) { |
1167 | p->object.flags |= SEEN; | |
5284fc5c | 1168 | if (list) |
8320b1db JK |
1169 | commit_list_insert_by_date(p, list); |
1170 | if (queue) | |
1171 | prio_queue_put(queue, p); | |
ad1012eb | 1172 | } |
60d30b02 | 1173 | if (revs->first_parent_only) |
d9c292e8 | 1174 | break; |
a4a88b2b | 1175 | } |
cc0e6c5a | 1176 | return 0; |
a4a88b2b LT |
1177 | } |
1178 | ||
36d56de6 | 1179 | static void cherry_pick_list(struct commit_list *list, struct rev_info *revs) |
d7a17cad JH |
1180 | { |
1181 | struct commit_list *p; | |
1182 | int left_count = 0, right_count = 0; | |
1183 | int left_first; | |
1184 | struct patch_ids ids; | |
adbbb31e | 1185 | unsigned cherry_flag; |
d7a17cad JH |
1186 | |
1187 | /* First count the commits on the left and on the right */ | |
1188 | for (p = list; p; p = p->next) { | |
1189 | struct commit *commit = p->item; | |
1190 | unsigned flags = commit->object.flags; | |
1191 | if (flags & BOUNDARY) | |
1192 | ; | |
1193 | else if (flags & SYMMETRIC_LEFT) | |
1194 | left_count++; | |
1195 | else | |
1196 | right_count++; | |
1197 | } | |
1198 | ||
36c07975 TR |
1199 | if (!left_count || !right_count) |
1200 | return; | |
1201 | ||
d7a17cad | 1202 | left_first = left_count < right_count; |
2abf3503 | 1203 | init_patch_ids(revs->repo, &ids); |
66f13625 | 1204 | ids.diffopts.pathspec = revs->diffopt.pathspec; |
d7a17cad JH |
1205 | |
1206 | /* Compute patch-ids for one side */ | |
1207 | for (p = list; p; p = p->next) { | |
1208 | struct commit *commit = p->item; | |
1209 | unsigned flags = commit->object.flags; | |
1210 | ||
1211 | if (flags & BOUNDARY) | |
1212 | continue; | |
1213 | /* | |
1214 | * If we have fewer left, left_first is set and we omit | |
1215 | * commits on the right branch in this loop. If we have | |
1216 | * fewer right, we skip the left ones. | |
1217 | */ | |
1218 | if (left_first != !!(flags & SYMMETRIC_LEFT)) | |
1219 | continue; | |
683f17ec | 1220 | add_commit_patch_id(commit, &ids); |
d7a17cad JH |
1221 | } |
1222 | ||
adbbb31e MG |
1223 | /* either cherry_mark or cherry_pick are true */ |
1224 | cherry_flag = revs->cherry_mark ? PATCHSAME : SHOWN; | |
1225 | ||
d7a17cad JH |
1226 | /* Check the other side */ |
1227 | for (p = list; p; p = p->next) { | |
1228 | struct commit *commit = p->item; | |
1229 | struct patch_id *id; | |
1230 | unsigned flags = commit->object.flags; | |
1231 | ||
1232 | if (flags & BOUNDARY) | |
1233 | continue; | |
1234 | /* | |
1235 | * If we have fewer left, left_first is set and we omit | |
1236 | * commits on the left branch in this loop. | |
1237 | */ | |
1238 | if (left_first == !!(flags & SYMMETRIC_LEFT)) | |
1239 | continue; | |
1240 | ||
1241 | /* | |
1242 | * Have we seen the same patch id? | |
1243 | */ | |
1244 | id = has_commit_patch_id(commit, &ids); | |
1245 | if (!id) | |
1246 | continue; | |
d7a17cad | 1247 | |
683f17ec KW |
1248 | commit->object.flags |= cherry_flag; |
1249 | id->commit->object.flags |= cherry_flag; | |
d7a17cad JH |
1250 | } |
1251 | ||
1252 | free_patch_ids(&ids); | |
1253 | } | |
1254 | ||
7d004199 LT |
1255 | /* How many extra uninteresting commits we want to see.. */ |
1256 | #define SLOP 5 | |
1257 | ||
dddbad72 | 1258 | static int still_interesting(struct commit_list *src, timestamp_t date, int slop, |
b6e8a3b5 | 1259 | struct commit **interesting_cache) |
3131b713 | 1260 | { |
7d004199 LT |
1261 | /* |
1262 | * No source list at all? We're definitely done.. | |
1263 | */ | |
1264 | if (!src) | |
1265 | return 0; | |
1266 | ||
1267 | /* | |
1268 | * Does the destination list contain entries with a date | |
1269 | * before the source list? Definitely _not_ done. | |
1270 | */ | |
c19d1b4e | 1271 | if (date <= src->item->date) |
7d004199 LT |
1272 | return SLOP; |
1273 | ||
1274 | /* | |
1275 | * Does the source list still have interesting commits in | |
1276 | * it? Definitely not done.. | |
1277 | */ | |
b6e8a3b5 | 1278 | if (!everybody_uninteresting(src, interesting_cache)) |
7d004199 LT |
1279 | return SLOP; |
1280 | ||
1281 | /* Ok, we're closing in.. */ | |
1282 | return slop-1; | |
3131b713 LT |
1283 | } |
1284 | ||
ebdc94f3 JH |
1285 | /* |
1286 | * "rev-list --ancestry-path A..B" computes commits that are ancestors | |
1287 | * of B but not ancestors of A but further limits the result to those | |
1288 | * that are descendants of A. This takes the list of bottom commits and | |
1289 | * the result of "A..B" without --ancestry-path, and limits the latter | |
1290 | * further to the ones that can reach one of the commits in "bottom". | |
1291 | */ | |
1292 | static void limit_to_ancestry(struct commit_list *bottom, struct commit_list *list) | |
1293 | { | |
1294 | struct commit_list *p; | |
1295 | struct commit_list *rlist = NULL; | |
1296 | int made_progress; | |
1297 | ||
1298 | /* | |
1299 | * Reverse the list so that it will be likely that we would | |
1300 | * process parents before children. | |
1301 | */ | |
1302 | for (p = list; p; p = p->next) | |
1303 | commit_list_insert(p->item, &rlist); | |
1304 | ||
1305 | for (p = bottom; p; p = p->next) | |
1306 | p->item->object.flags |= TMP_MARK; | |
1307 | ||
1308 | /* | |
1309 | * Mark the ones that can reach bottom commits in "list", | |
1310 | * in a bottom-up fashion. | |
1311 | */ | |
1312 | do { | |
1313 | made_progress = 0; | |
1314 | for (p = rlist; p; p = p->next) { | |
1315 | struct commit *c = p->item; | |
1316 | struct commit_list *parents; | |
1317 | if (c->object.flags & (TMP_MARK | UNINTERESTING)) | |
1318 | continue; | |
1319 | for (parents = c->parents; | |
1320 | parents; | |
1321 | parents = parents->next) { | |
1322 | if (!(parents->item->object.flags & TMP_MARK)) | |
1323 | continue; | |
1324 | c->object.flags |= TMP_MARK; | |
1325 | made_progress = 1; | |
1326 | break; | |
1327 | } | |
1328 | } | |
1329 | } while (made_progress); | |
1330 | ||
1331 | /* | |
1332 | * NEEDSWORK: decide if we want to remove parents that are | |
1333 | * not marked with TMP_MARK from commit->parents for commits | |
1334 | * in the resulting list. We may not want to do that, though. | |
1335 | */ | |
1336 | ||
1337 | /* | |
1338 | * The ones that are not marked with TMP_MARK are uninteresting | |
1339 | */ | |
1340 | for (p = list; p; p = p->next) { | |
1341 | struct commit *c = p->item; | |
1342 | if (c->object.flags & TMP_MARK) | |
1343 | continue; | |
1344 | c->object.flags |= UNINTERESTING; | |
1345 | } | |
1346 | ||
1347 | /* We are done with the TMP_MARK */ | |
1348 | for (p = list; p; p = p->next) | |
1349 | p->item->object.flags &= ~TMP_MARK; | |
1350 | for (p = bottom; p; p = p->next) | |
1351 | p->item->object.flags &= ~TMP_MARK; | |
1352 | free_commit_list(rlist); | |
1353 | } | |
1354 | ||
1355 | /* | |
1356 | * Before walking the history, keep the set of "negative" refs the | |
1357 | * caller has asked to exclude. | |
1358 | * | |
1359 | * This is used to compute "rev-list --ancestry-path A..B", as we need | |
1360 | * to filter the result of "A..B" further to the ones that can actually | |
1361 | * reach A. | |
1362 | */ | |
7f34a46f | 1363 | static struct commit_list *collect_bottom_commits(struct commit_list *list) |
ebdc94f3 | 1364 | { |
7f34a46f KB |
1365 | struct commit_list *elem, *bottom = NULL; |
1366 | for (elem = list; elem; elem = elem->next) | |
1367 | if (elem->item->object.flags & BOTTOM) | |
1368 | commit_list_insert(elem->item, &bottom); | |
ebdc94f3 JH |
1369 | return bottom; |
1370 | } | |
1371 | ||
60adf7d7 MG |
1372 | /* Assumes either left_only or right_only is set */ |
1373 | static void limit_left_right(struct commit_list *list, struct rev_info *revs) | |
1374 | { | |
1375 | struct commit_list *p; | |
1376 | ||
1377 | for (p = list; p; p = p->next) { | |
1378 | struct commit *commit = p->item; | |
1379 | ||
1380 | if (revs->right_only) { | |
1381 | if (commit->object.flags & SYMMETRIC_LEFT) | |
1382 | commit->object.flags |= SHOWN; | |
1383 | } else /* revs->left_only is set */ | |
1384 | if (!(commit->object.flags & SYMMETRIC_LEFT)) | |
1385 | commit->object.flags |= SHOWN; | |
1386 | } | |
1387 | } | |
1388 | ||
cc0e6c5a | 1389 | static int limit_list(struct rev_info *revs) |
a4a88b2b | 1390 | { |
7d004199 | 1391 | int slop = SLOP; |
dddbad72 | 1392 | timestamp_t date = TIME_MAX; |
a4a88b2b LT |
1393 | struct commit_list *list = revs->commits; |
1394 | struct commit_list *newlist = NULL; | |
1395 | struct commit_list **p = &newlist; | |
ebdc94f3 | 1396 | struct commit_list *bottom = NULL; |
b6e8a3b5 | 1397 | struct commit *interesting_cache = NULL; |
ebdc94f3 JH |
1398 | |
1399 | if (revs->ancestry_path) { | |
7f34a46f | 1400 | bottom = collect_bottom_commits(list); |
ebdc94f3 | 1401 | if (!bottom) |
97b03c35 | 1402 | die("--ancestry-path given but there are no bottom commits"); |
ebdc94f3 | 1403 | } |
a4a88b2b LT |
1404 | |
1405 | while (list) { | |
e510ab89 | 1406 | struct commit *commit = pop_commit(&list); |
a4a88b2b | 1407 | struct object *obj = &commit->object; |
cdcefbc9 | 1408 | show_early_output_fn_t show; |
a4a88b2b | 1409 | |
b6e8a3b5 JK |
1410 | if (commit == interesting_cache) |
1411 | interesting_cache = NULL; | |
1412 | ||
a4a88b2b LT |
1413 | if (revs->max_age != -1 && (commit->date < revs->max_age)) |
1414 | obj->flags |= UNINTERESTING; | |
5284fc5c | 1415 | if (process_parents(revs, commit, &list, NULL) < 0) |
cc0e6c5a | 1416 | return -1; |
a4a88b2b LT |
1417 | if (obj->flags & UNINTERESTING) { |
1418 | mark_parents_uninteresting(commit); | |
b6e8a3b5 | 1419 | slop = still_interesting(list, date, slop, &interesting_cache); |
7d004199 | 1420 | if (slop) |
3131b713 | 1421 | continue; |
7d004199 | 1422 | break; |
a4a88b2b | 1423 | } |
01faa91c RS |
1424 | if (revs->min_age != -1 && (commit->date > revs->min_age) && |
1425 | !revs->line_level_traverse) | |
a4a88b2b | 1426 | continue; |
7d004199 | 1427 | date = commit->date; |
a4a88b2b | 1428 | p = &commit_list_insert(commit, p)->next; |
cdcefbc9 LT |
1429 | |
1430 | show = show_early_output; | |
1431 | if (!show) | |
1432 | continue; | |
1433 | ||
1434 | show(revs, newlist); | |
1435 | show_early_output = NULL; | |
a4a88b2b | 1436 | } |
adbbb31e | 1437 | if (revs->cherry_pick || revs->cherry_mark) |
36d56de6 | 1438 | cherry_pick_list(newlist, revs); |
d7a17cad | 1439 | |
60adf7d7 MG |
1440 | if (revs->left_only || revs->right_only) |
1441 | limit_left_right(newlist, revs); | |
1442 | ||
ebdc94f3 JH |
1443 | if (bottom) { |
1444 | limit_to_ancestry(bottom, newlist); | |
1445 | free_commit_list(bottom); | |
1446 | } | |
1447 | ||
4d826608 KB |
1448 | /* |
1449 | * Check if any commits have become TREESAME by some of their parents | |
1450 | * becoming UNINTERESTING. | |
1451 | */ | |
1452 | if (limiting_can_increase_treesame(revs)) | |
1453 | for (list = newlist; list; list = list->next) { | |
1454 | struct commit *c = list->item; | |
1455 | if (c->object.flags & (UNINTERESTING | TREESAME)) | |
1456 | continue; | |
1457 | update_treesame(revs, c); | |
1458 | } | |
1459 | ||
a4a88b2b | 1460 | revs->commits = newlist; |
cc0e6c5a | 1461 | return 0; |
a4a88b2b LT |
1462 | } |
1463 | ||
df835d3a MH |
1464 | /* |
1465 | * Add an entry to refs->cmdline with the specified information. | |
1466 | * *name is copied. | |
1467 | */ | |
281eee47 JH |
1468 | static void add_rev_cmdline(struct rev_info *revs, |
1469 | struct object *item, | |
1470 | const char *name, | |
1471 | int whence, | |
1472 | unsigned flags) | |
1473 | { | |
1474 | struct rev_cmdline_info *info = &revs->cmdline; | |
071bcaab | 1475 | unsigned int nr = info->nr; |
281eee47 JH |
1476 | |
1477 | ALLOC_GROW(info->rev, nr + 1, info->alloc); | |
1478 | info->rev[nr].item = item; | |
df835d3a | 1479 | info->rev[nr].name = xstrdup(name); |
281eee47 JH |
1480 | info->rev[nr].whence = whence; |
1481 | info->rev[nr].flags = flags; | |
1482 | info->nr++; | |
1483 | } | |
1484 | ||
a765499a KB |
1485 | static void add_rev_cmdline_list(struct rev_info *revs, |
1486 | struct commit_list *commit_list, | |
1487 | int whence, | |
1488 | unsigned flags) | |
1489 | { | |
1490 | while (commit_list) { | |
1491 | struct object *object = &commit_list->item->object; | |
f2fd0760 | 1492 | add_rev_cmdline(revs, object, oid_to_hex(&object->oid), |
a765499a KB |
1493 | whence, flags); |
1494 | commit_list = commit_list->next; | |
1495 | } | |
1496 | } | |
1497 | ||
63049292 JH |
1498 | struct all_refs_cb { |
1499 | int all_flags; | |
71b03b42 | 1500 | int warned_bad_reflog; |
63049292 JH |
1501 | struct rev_info *all_revs; |
1502 | const char *name_for_errormsg; | |
ab3e1f78 | 1503 | struct worktree *wt; |
63049292 | 1504 | }; |
ae563542 | 1505 | |
ff32d342 | 1506 | int ref_excluded(struct string_list *ref_excludes, const char *path) |
e7b432c5 JH |
1507 | { |
1508 | struct string_list_item *item; | |
1509 | ||
ff32d342 | 1510 | if (!ref_excludes) |
e7b432c5 | 1511 | return 0; |
ff32d342 | 1512 | for_each_string_list_item(item, ref_excludes) { |
55d34269 | 1513 | if (!wildmatch(item->string, path, 0)) |
e7b432c5 JH |
1514 | return 1; |
1515 | } | |
1516 | return 0; | |
1517 | } | |
1518 | ||
a217dcbd MH |
1519 | static int handle_one_ref(const char *path, const struct object_id *oid, |
1520 | int flag, void *cb_data) | |
ae563542 | 1521 | { |
63049292 | 1522 | struct all_refs_cb *cb = cb_data; |
e7b432c5 JH |
1523 | struct object *object; |
1524 | ||
ff32d342 | 1525 | if (ref_excluded(cb->all_revs->ref_excludes, path)) |
e7b432c5 JH |
1526 | return 0; |
1527 | ||
654b9a90 | 1528 | object = get_reference(cb->all_revs, path, oid, cb->all_flags); |
281eee47 | 1529 | add_rev_cmdline(cb->all_revs, object, path, REV_CMD_REF, cb->all_flags); |
a58a1b01 | 1530 | add_pending_oid(cb->all_revs, path, oid, cb->all_flags); |
ae563542 LT |
1531 | return 0; |
1532 | } | |
1533 | ||
d08bae7e IL |
1534 | static void init_all_refs_cb(struct all_refs_cb *cb, struct rev_info *revs, |
1535 | unsigned flags) | |
1536 | { | |
1537 | cb->all_revs = revs; | |
1538 | cb->all_flags = flags; | |
7ba82629 | 1539 | revs->rev_input_given = 1; |
ab3e1f78 | 1540 | cb->wt = NULL; |
d08bae7e IL |
1541 | } |
1542 | ||
ff32d342 | 1543 | void clear_ref_exclusion(struct string_list **ref_excludes_p) |
e7b432c5 | 1544 | { |
ff32d342 JH |
1545 | if (*ref_excludes_p) { |
1546 | string_list_clear(*ref_excludes_p, 0); | |
1547 | free(*ref_excludes_p); | |
e7b432c5 | 1548 | } |
ff32d342 | 1549 | *ref_excludes_p = NULL; |
e7b432c5 JH |
1550 | } |
1551 | ||
ff32d342 | 1552 | void add_ref_exclusion(struct string_list **ref_excludes_p, const char *exclude) |
e7b432c5 | 1553 | { |
ff32d342 JH |
1554 | if (!*ref_excludes_p) { |
1555 | *ref_excludes_p = xcalloc(1, sizeof(**ref_excludes_p)); | |
1556 | (*ref_excludes_p)->strdup_strings = 1; | |
e7b432c5 | 1557 | } |
ff32d342 | 1558 | string_list_append(*ref_excludes_p, exclude); |
e7b432c5 JH |
1559 | } |
1560 | ||
073cf63c NTND |
1561 | static void handle_refs(struct ref_store *refs, |
1562 | struct rev_info *revs, unsigned flags, | |
1563 | int (*for_each)(struct ref_store *, each_ref_fn, void *)) | |
ae563542 | 1564 | { |
63049292 | 1565 | struct all_refs_cb cb; |
073cf63c NTND |
1566 | |
1567 | if (!refs) { | |
1568 | /* this could happen with uninitialized submodules */ | |
1569 | return; | |
1570 | } | |
1571 | ||
d08bae7e | 1572 | init_all_refs_cb(&cb, revs, flags); |
073cf63c | 1573 | for_each(refs, handle_one_ref, &cb); |
63049292 JH |
1574 | } |
1575 | ||
9461d272 | 1576 | static void handle_one_reflog_commit(struct object_id *oid, void *cb_data) |
63049292 JH |
1577 | { |
1578 | struct all_refs_cb *cb = cb_data; | |
9461d272 | 1579 | if (!is_null_oid(oid)) { |
b3c7eef9 | 1580 | struct object *o = parse_object(cb->all_revs->repo, oid); |
71b03b42 SP |
1581 | if (o) { |
1582 | o->flags |= cb->all_flags; | |
281eee47 | 1583 | /* ??? CMDLINEFLAGS ??? */ |
71b03b42 SP |
1584 | add_pending_object(cb->all_revs, o, ""); |
1585 | } | |
1586 | else if (!cb->warned_bad_reflog) { | |
46efd2d9 | 1587 | warning("reflog of '%s' references pruned commits", |
71b03b42 SP |
1588 | cb->name_for_errormsg); |
1589 | cb->warned_bad_reflog = 1; | |
1590 | } | |
63049292 | 1591 | } |
71b03b42 SP |
1592 | } |
1593 | ||
9461d272 | 1594 | static int handle_one_reflog_ent(struct object_id *ooid, struct object_id *noid, |
dddbad72 | 1595 | const char *email, timestamp_t timestamp, int tz, |
883d60fa | 1596 | const char *message, void *cb_data) |
71b03b42 | 1597 | { |
9461d272 | 1598 | handle_one_reflog_commit(ooid, cb_data); |
1599 | handle_one_reflog_commit(noid, cb_data); | |
63049292 JH |
1600 | return 0; |
1601 | } | |
1602 | ||
ab3e1f78 | 1603 | static int handle_one_reflog(const char *refname_in_wt, |
061e420a | 1604 | const struct object_id *oid, |
a89caf4b | 1605 | int flag, void *cb_data) |
63049292 JH |
1606 | { |
1607 | struct all_refs_cb *cb = cb_data; | |
ab3e1f78 NTND |
1608 | struct strbuf refname = STRBUF_INIT; |
1609 | ||
71b03b42 | 1610 | cb->warned_bad_reflog = 0; |
ab3e1f78 NTND |
1611 | strbuf_worktree_ref(cb->wt, &refname, refname_in_wt); |
1612 | cb->name_for_errormsg = refname.buf; | |
1613 | refs_for_each_reflog_ent(get_main_ref_store(the_repository), | |
1614 | refname.buf, | |
acd9544a | 1615 | handle_one_reflog_ent, cb_data); |
ab3e1f78 | 1616 | strbuf_release(&refname); |
63049292 JH |
1617 | return 0; |
1618 | } | |
1619 | ||
acd9544a NTND |
1620 | static void add_other_reflogs_to_pending(struct all_refs_cb *cb) |
1621 | { | |
1622 | struct worktree **worktrees, **p; | |
1623 | ||
03f2465b | 1624 | worktrees = get_worktrees(); |
acd9544a NTND |
1625 | for (p = worktrees; *p; p++) { |
1626 | struct worktree *wt = *p; | |
1627 | ||
1628 | if (wt->is_current) | |
1629 | continue; | |
1630 | ||
ab3e1f78 NTND |
1631 | cb->wt = wt; |
1632 | refs_for_each_reflog(get_worktree_ref_store(wt), | |
acd9544a NTND |
1633 | handle_one_reflog, |
1634 | cb); | |
1635 | } | |
1636 | free_worktrees(worktrees); | |
1637 | } | |
1638 | ||
718ccc97 | 1639 | void add_reflogs_to_pending(struct rev_info *revs, unsigned flags) |
63049292 JH |
1640 | { |
1641 | struct all_refs_cb cb; | |
2b2a5be3 | 1642 | |
63049292 JH |
1643 | cb.all_revs = revs; |
1644 | cb.all_flags = flags; | |
ab3e1f78 | 1645 | cb.wt = NULL; |
a89caf4b | 1646 | for_each_reflog(handle_one_reflog, &cb); |
acd9544a NTND |
1647 | |
1648 | if (!revs->single_worktree) | |
1649 | add_other_reflogs_to_pending(&cb); | |
ae563542 LT |
1650 | } |
1651 | ||
4fe10219 | 1652 | static void add_cache_tree(struct cache_tree *it, struct rev_info *revs, |
b4cfcde4 | 1653 | struct strbuf *path, unsigned int flags) |
4fe10219 JK |
1654 | { |
1655 | size_t baselen = path->len; | |
1656 | int i; | |
1657 | ||
1658 | if (it->entry_count >= 0) { | |
b3c7eef9 | 1659 | struct tree *tree = lookup_tree(revs->repo, &it->oid); |
b4cfcde4 | 1660 | tree->object.flags |= flags; |
4fe10219 JK |
1661 | add_pending_object_with_path(revs, &tree->object, "", |
1662 | 040000, path->buf); | |
1663 | } | |
1664 | ||
1665 | for (i = 0; i < it->subtree_nr; i++) { | |
1666 | struct cache_tree_sub *sub = it->down[i]; | |
1667 | strbuf_addf(path, "%s%s", baselen ? "/" : "", sub->name); | |
b4cfcde4 | 1668 | add_cache_tree(sub->cache_tree, revs, path, flags); |
4fe10219 JK |
1669 | strbuf_setlen(path, baselen); |
1670 | } | |
1671 | ||
1672 | } | |
1673 | ||
6c3d8181 | 1674 | static void do_add_index_objects_to_pending(struct rev_info *revs, |
b4cfcde4 JK |
1675 | struct index_state *istate, |
1676 | unsigned int flags) | |
4fe10219 JK |
1677 | { |
1678 | int i; | |
1679 | ||
6c3d8181 NTND |
1680 | for (i = 0; i < istate->cache_nr; i++) { |
1681 | struct cache_entry *ce = istate->cache[i]; | |
4fe10219 JK |
1682 | struct blob *blob; |
1683 | ||
1684 | if (S_ISGITLINK(ce->ce_mode)) | |
1685 | continue; | |
1686 | ||
b3c7eef9 | 1687 | blob = lookup_blob(revs->repo, &ce->oid); |
4fe10219 JK |
1688 | if (!blob) |
1689 | die("unable to add index blob to traversal"); | |
b4cfcde4 | 1690 | blob->object.flags |= flags; |
4fe10219 JK |
1691 | add_pending_object_with_path(revs, &blob->object, "", |
1692 | ce->ce_mode, ce->name); | |
1693 | } | |
1694 | ||
6c3d8181 | 1695 | if (istate->cache_tree) { |
4fe10219 | 1696 | struct strbuf path = STRBUF_INIT; |
b4cfcde4 | 1697 | add_cache_tree(istate->cache_tree, revs, &path, flags); |
4fe10219 JK |
1698 | strbuf_release(&path); |
1699 | } | |
1700 | } | |
1701 | ||
6c3d8181 NTND |
1702 | void add_index_objects_to_pending(struct rev_info *revs, unsigned int flags) |
1703 | { | |
be489d02 NTND |
1704 | struct worktree **worktrees, **p; |
1705 | ||
e1ff0a32 | 1706 | repo_read_index(revs->repo); |
b4cfcde4 | 1707 | do_add_index_objects_to_pending(revs, revs->repo->index, flags); |
be489d02 NTND |
1708 | |
1709 | if (revs->single_worktree) | |
1710 | return; | |
1711 | ||
03f2465b | 1712 | worktrees = get_worktrees(); |
be489d02 NTND |
1713 | for (p = worktrees; *p; p++) { |
1714 | struct worktree *wt = *p; | |
1715 | struct index_state istate = { NULL }; | |
1716 | ||
1717 | if (wt->is_current) | |
1718 | continue; /* current index already taken care of */ | |
1719 | ||
1720 | if (read_index_from(&istate, | |
a125a223 TG |
1721 | worktree_git_path(wt, "index"), |
1722 | get_worktree_git_dir(wt)) > 0) | |
b4cfcde4 | 1723 | do_add_index_objects_to_pending(revs, &istate, flags); |
be489d02 NTND |
1724 | discard_index(&istate); |
1725 | } | |
1726 | free_worktrees(worktrees); | |
6c3d8181 NTND |
1727 | } |
1728 | ||
39b44ba7 JK |
1729 | struct add_alternate_refs_data { |
1730 | struct rev_info *revs; | |
1731 | unsigned int flags; | |
1732 | }; | |
1733 | ||
1734 | static void add_one_alternate_ref(const struct object_id *oid, | |
1735 | void *vdata) | |
1736 | { | |
1737 | const char *name = ".alternate"; | |
1738 | struct add_alternate_refs_data *data = vdata; | |
1739 | struct object *obj; | |
1740 | ||
1741 | obj = get_reference(data->revs, name, oid, data->flags); | |
1742 | add_rev_cmdline(data->revs, obj, name, REV_CMD_REV, data->flags); | |
1743 | add_pending_object(data->revs, obj, name); | |
1744 | } | |
1745 | ||
1746 | static void add_alternate_refs_to_pending(struct rev_info *revs, | |
1747 | unsigned int flags) | |
1748 | { | |
1749 | struct add_alternate_refs_data data; | |
1750 | data.revs = revs; | |
1751 | data.flags = flags; | |
1752 | for_each_alternate_ref(add_one_alternate_ref, &data); | |
1753 | } | |
1754 | ||
8779351d VN |
1755 | static int add_parents_only(struct rev_info *revs, const char *arg_, int flags, |
1756 | int exclude_parent) | |
ea4a19e1 | 1757 | { |
654b9a90 | 1758 | struct object_id oid; |
ea4a19e1 JH |
1759 | struct object *it; |
1760 | struct commit *commit; | |
1761 | struct commit_list *parents; | |
8779351d | 1762 | int parent_number; |
281eee47 | 1763 | const char *arg = arg_; |
ea4a19e1 JH |
1764 | |
1765 | if (*arg == '^') { | |
7f34a46f | 1766 | flags ^= UNINTERESTING | BOTTOM; |
ea4a19e1 JH |
1767 | arg++; |
1768 | } | |
e82caf38 | 1769 | if (get_oid_committish(arg, &oid)) |
ea4a19e1 JH |
1770 | return 0; |
1771 | while (1) { | |
654b9a90 | 1772 | it = get_reference(revs, arg, &oid, 0); |
cc243c3c JH |
1773 | if (!it && revs->ignore_missing) |
1774 | return 0; | |
1974632c | 1775 | if (it->type != OBJ_TAG) |
ea4a19e1 | 1776 | break; |
9684afd9 MK |
1777 | if (!((struct tag*)it)->tagged) |
1778 | return 0; | |
654b9a90 | 1779 | oidcpy(&oid, &((struct tag*)it)->tagged->oid); |
ea4a19e1 | 1780 | } |
1974632c | 1781 | if (it->type != OBJ_COMMIT) |
ea4a19e1 JH |
1782 | return 0; |
1783 | commit = (struct commit *)it; | |
8779351d VN |
1784 | if (exclude_parent && |
1785 | exclude_parent > commit_list_count(commit->parents)) | |
1786 | return 0; | |
1787 | for (parents = commit->parents, parent_number = 1; | |
1788 | parents; | |
1789 | parents = parents->next, parent_number++) { | |
1790 | if (exclude_parent && parent_number != exclude_parent) | |
1791 | continue; | |
1792 | ||
ea4a19e1 JH |
1793 | it = &parents->item->object; |
1794 | it->flags |= flags; | |
281eee47 | 1795 | add_rev_cmdline(revs, it, arg_, REV_CMD_PARENTS_ONLY, flags); |
ea4a19e1 JH |
1796 | add_pending_object(revs, it, arg); |
1797 | } | |
1798 | return 1; | |
1799 | } | |
1800 | ||
2abf3503 NTND |
1801 | void repo_init_revisions(struct repository *r, |
1802 | struct rev_info *revs, | |
1803 | const char *prefix) | |
8efdc326 FK |
1804 | { |
1805 | memset(revs, 0, sizeof(*revs)); | |
8e8f9987 | 1806 | |
2abf3503 | 1807 | revs->repo = r; |
6b9c58f4 | 1808 | revs->abbrev = DEFAULT_ABBREV; |
6fae74b4 | 1809 | revs->ignore_merges = -1; |
9202434c | 1810 | revs->simplify_history = 1; |
67022e02 | 1811 | revs->pruning.repo = r; |
0d1e0e78 BW |
1812 | revs->pruning.flags.recursive = 1; |
1813 | revs->pruning.flags.quick = 1; | |
cd2bdc53 LT |
1814 | revs->pruning.add_remove = file_add_remove; |
1815 | revs->pruning.change = file_change; | |
a937b37e | 1816 | revs->pruning.change_fn_data = revs; |
08f704f2 | 1817 | revs->sort_order = REV_SORT_IN_GRAPH_ORDER; |
8efdc326 | 1818 | revs->dense = 1; |
db6296a5 | 1819 | revs->prefix = prefix; |
8efdc326 FK |
1820 | revs->max_age = -1; |
1821 | revs->min_age = -1; | |
d5db6c9e | 1822 | revs->skip_count = -1; |
8efdc326 | 1823 | revs->max_count = -1; |
ad5aeede | 1824 | revs->max_parents = -1; |
0893eec8 | 1825 | revs->expand_tabs_in_log = -1; |
8efdc326 | 1826 | |
cd2bdc53 | 1827 | revs->commit_format = CMIT_FMT_DEFAULT; |
fe37a9c5 | 1828 | revs->expand_tabs_in_log_default = 8; |
cd2bdc53 | 1829 | |
2abf3503 | 1830 | grep_init(&revs->grep_filter, revs->repo, prefix); |
0843acfd | 1831 | revs->grep_filter.status_only = 1; |
0843acfd | 1832 | |
2abf3503 | 1833 | repo_diff_setup(revs->repo, &revs->diffopt); |
c0cb4a06 | 1834 | if (prefix && !revs->diffopt.prefix) { |
cd676a51 JH |
1835 | revs->diffopt.prefix = prefix; |
1836 | revs->diffopt.prefix_length = strlen(prefix); | |
1837 | } | |
3a03cf6b | 1838 | |
e6e230ee | 1839 | init_display_notes(&revs->notes_opt); |
8efdc326 FK |
1840 | } |
1841 | ||
0d2c9d67 | 1842 | static void add_pending_commit_list(struct rev_info *revs, |
ec36c42a NTND |
1843 | struct commit_list *commit_list, |
1844 | unsigned int flags) | |
0d2c9d67 RS |
1845 | { |
1846 | while (commit_list) { | |
1847 | struct object *object = &commit_list->item->object; | |
1848 | object->flags |= flags; | |
f2fd0760 | 1849 | add_pending_object(revs, object, oid_to_hex(&object->oid)); |
0d2c9d67 RS |
1850 | commit_list = commit_list->next; |
1851 | } | |
1852 | } | |
1853 | ||
ae3e5e1e JH |
1854 | static void prepare_show_merge(struct rev_info *revs) |
1855 | { | |
1856 | struct commit_list *bases; | |
1857 | struct commit *head, *other; | |
68ab61dd | 1858 | struct object_id oid; |
ae3e5e1e JH |
1859 | const char **prune = NULL; |
1860 | int i, prune_num = 1; /* counting terminating NULL */ | |
2abf3503 | 1861 | struct index_state *istate = revs->repo->index; |
ae3e5e1e | 1862 | |
68ab61dd | 1863 | if (get_oid("HEAD", &oid)) |
ae3e5e1e | 1864 | die("--merge without HEAD?"); |
bc83266a | 1865 | head = lookup_commit_or_die(&oid, "HEAD"); |
68ab61dd | 1866 | if (get_oid("MERGE_HEAD", &oid)) |
ae3e5e1e | 1867 | die("--merge without MERGE_HEAD?"); |
bc83266a | 1868 | other = lookup_commit_or_die(&oid, "MERGE_HEAD"); |
ae3e5e1e JH |
1869 | add_pending_object(revs, &head->object, "HEAD"); |
1870 | add_pending_object(revs, &other->object, "MERGE_HEAD"); | |
2ce406cc | 1871 | bases = get_merge_bases(head, other); |
7f34a46f KB |
1872 | add_rev_cmdline_list(revs, bases, REV_CMD_MERGE_BASE, UNINTERESTING | BOTTOM); |
1873 | add_pending_commit_list(revs, bases, UNINTERESTING | BOTTOM); | |
e82447b1 JH |
1874 | free_commit_list(bases); |
1875 | head->object.flags |= SYMMETRIC_LEFT; | |
ae3e5e1e | 1876 | |
2abf3503 | 1877 | if (!istate->cache_nr) |
e1ff0a32 | 1878 | repo_read_index(revs->repo); |
2abf3503 NTND |
1879 | for (i = 0; i < istate->cache_nr; i++) { |
1880 | const struct cache_entry *ce = istate->cache[i]; | |
ae3e5e1e JH |
1881 | if (!ce_stage(ce)) |
1882 | continue; | |
2abf3503 | 1883 | if (ce_path_match(istate, ce, &revs->prune_data, NULL)) { |
ae3e5e1e | 1884 | prune_num++; |
2756ca43 | 1885 | REALLOC_ARRAY(prune, prune_num); |
ae3e5e1e JH |
1886 | prune[prune_num-2] = ce->name; |
1887 | prune[prune_num-1] = NULL; | |
1888 | } | |
2abf3503 NTND |
1889 | while ((i+1 < istate->cache_nr) && |
1890 | ce_same_name(ce, istate->cache[i+1])) | |
ae3e5e1e JH |
1891 | i++; |
1892 | } | |
ed6e8038 | 1893 | clear_pathspec(&revs->prune_data); |
4a2d5ae2 | 1894 | parse_pathspec(&revs->prune_data, PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL, |
c6f1b920 | 1895 | PATHSPEC_PREFER_FULL | PATHSPEC_LITERAL_PATH, "", prune); |
e82447b1 | 1896 | revs->limited = 1; |
ae3e5e1e JH |
1897 | } |
1898 | ||
62faad5a JK |
1899 | static int dotdot_missing(const char *arg, char *dotdot, |
1900 | struct rev_info *revs, int symmetric) | |
1901 | { | |
1902 | if (revs->ignore_missing) | |
1903 | return 0; | |
1904 | /* de-munge so we report the full argument */ | |
1905 | *dotdot = '.'; | |
1906 | die(symmetric | |
1907 | ? "Invalid symmetric difference expression %s" | |
1908 | : "Invalid revision range %s", arg); | |
1909 | } | |
1910 | ||
1911 | static int handle_dotdot_1(const char *arg, char *dotdot, | |
1912 | struct rev_info *revs, int flags, | |
18f1ad76 JK |
1913 | int cant_be_filename, |
1914 | struct object_context *a_oc, | |
1915 | struct object_context *b_oc) | |
62faad5a JK |
1916 | { |
1917 | const char *a_name, *b_name; | |
1918 | struct object_id a_oid, b_oid; | |
1919 | struct object *a_obj, *b_obj; | |
1920 | unsigned int a_flags, b_flags; | |
1921 | int symmetric = 0; | |
1922 | unsigned int flags_exclude = flags ^ (UNINTERESTING | BOTTOM); | |
321c89bf | 1923 | unsigned int oc_flags = GET_OID_COMMITTISH | GET_OID_RECORD_PATH; |
62faad5a JK |
1924 | |
1925 | a_name = arg; | |
1926 | if (!*a_name) | |
1927 | a_name = "HEAD"; | |
1928 | ||
1929 | b_name = dotdot + 2; | |
1930 | if (*b_name == '.') { | |
1931 | symmetric = 1; | |
1932 | b_name++; | |
1933 | } | |
1934 | if (!*b_name) | |
1935 | b_name = "HEAD"; | |
1936 | ||
3a7a698e NTND |
1937 | if (get_oid_with_context(revs->repo, a_name, oc_flags, &a_oid, a_oc) || |
1938 | get_oid_with_context(revs->repo, b_name, oc_flags, &b_oid, b_oc)) | |
62faad5a JK |
1939 | return -1; |
1940 | ||
1941 | if (!cant_be_filename) { | |
1942 | *dotdot = '.'; | |
1943 | verify_non_filename(revs->prefix, arg); | |
1944 | *dotdot = '\0'; | |
1945 | } | |
1946 | ||
b3c7eef9 NTND |
1947 | a_obj = parse_object(revs->repo, &a_oid); |
1948 | b_obj = parse_object(revs->repo, &b_oid); | |
62faad5a JK |
1949 | if (!a_obj || !b_obj) |
1950 | return dotdot_missing(arg, dotdot, revs, symmetric); | |
1951 | ||
1952 | if (!symmetric) { | |
1953 | /* just A..B */ | |
1954 | b_flags = flags; | |
1955 | a_flags = flags_exclude; | |
1956 | } else { | |
1957 | /* A...B -- find merge bases between the two */ | |
1958 | struct commit *a, *b; | |
1959 | struct commit_list *exclude; | |
1960 | ||
b3c7eef9 NTND |
1961 | a = lookup_commit_reference(revs->repo, &a_obj->oid); |
1962 | b = lookup_commit_reference(revs->repo, &b_obj->oid); | |
62faad5a JK |
1963 | if (!a || !b) |
1964 | return dotdot_missing(arg, dotdot, revs, symmetric); | |
1965 | ||
1966 | exclude = get_merge_bases(a, b); | |
1967 | add_rev_cmdline_list(revs, exclude, REV_CMD_MERGE_BASE, | |
1968 | flags_exclude); | |
1969 | add_pending_commit_list(revs, exclude, flags_exclude); | |
1970 | free_commit_list(exclude); | |
1971 | ||
1972 | b_flags = flags; | |
1973 | a_flags = flags | SYMMETRIC_LEFT; | |
1974 | } | |
1975 | ||
1976 | a_obj->flags |= a_flags; | |
1977 | b_obj->flags |= b_flags; | |
1978 | add_rev_cmdline(revs, a_obj, a_name, REV_CMD_LEFT, a_flags); | |
1979 | add_rev_cmdline(revs, b_obj, b_name, REV_CMD_RIGHT, b_flags); | |
18f1ad76 JK |
1980 | add_pending_object_with_path(revs, a_obj, a_name, a_oc->mode, a_oc->path); |
1981 | add_pending_object_with_path(revs, b_obj, b_name, b_oc->mode, b_oc->path); | |
62faad5a JK |
1982 | return 0; |
1983 | } | |
1984 | ||
1985 | static int handle_dotdot(const char *arg, | |
1986 | struct rev_info *revs, int flags, | |
1987 | int cant_be_filename) | |
1988 | { | |
18f1ad76 | 1989 | struct object_context a_oc, b_oc; |
62faad5a JK |
1990 | char *dotdot = strstr(arg, ".."); |
1991 | int ret; | |
1992 | ||
1993 | if (!dotdot) | |
1994 | return -1; | |
1995 | ||
18f1ad76 JK |
1996 | memset(&a_oc, 0, sizeof(a_oc)); |
1997 | memset(&b_oc, 0, sizeof(b_oc)); | |
1998 | ||
62faad5a | 1999 | *dotdot = '\0'; |
18f1ad76 JK |
2000 | ret = handle_dotdot_1(arg, dotdot, revs, flags, cant_be_filename, |
2001 | &a_oc, &b_oc); | |
62faad5a JK |
2002 | *dotdot = '.'; |
2003 | ||
18f1ad76 JK |
2004 | free(a_oc.path); |
2005 | free(b_oc.path); | |
2006 | ||
62faad5a JK |
2007 | return ret; |
2008 | } | |
2009 | ||
04a0e985 | 2010 | static int handle_revision_arg_1(const char *arg_, struct rev_info *revs, int flags, unsigned revarg_opt) |
5d6f0935 | 2011 | { |
249c8f4a | 2012 | struct object_context oc; |
f632dedd | 2013 | char *mark; |
5d6f0935 | 2014 | struct object *object; |
654b9a90 | 2015 | struct object_id oid; |
5d6f0935 | 2016 | int local_flags; |
281eee47 | 2017 | const char *arg = arg_; |
8e676e8b | 2018 | int cant_be_filename = revarg_opt & REVARG_CANNOT_BE_FILENAME; |
321c89bf | 2019 | unsigned get_sha1_flags = GET_OID_RECORD_PATH; |
5d6f0935 | 2020 | |
7f34a46f KB |
2021 | flags = flags & UNINTERESTING ? flags | BOTTOM : flags & ~BOTTOM; |
2022 | ||
d89797fe JK |
2023 | if (!cant_be_filename && !strcmp(arg, "..")) { |
2024 | /* | |
2025 | * Just ".."? That is not a range but the | |
2026 | * pathspec for the parent directory. | |
2027 | */ | |
2028 | return -1; | |
5d6f0935 | 2029 | } |
8779351d | 2030 | |
62faad5a JK |
2031 | if (!handle_dotdot(arg, revs, flags, revarg_opt)) |
2032 | return 0; | |
8779351d | 2033 | |
f632dedd JK |
2034 | mark = strstr(arg, "^@"); |
2035 | if (mark && !mark[2]) { | |
2036 | *mark = 0; | |
8779351d | 2037 | if (add_parents_only(revs, arg, flags, 0)) |
5d6f0935 | 2038 | return 0; |
f632dedd | 2039 | *mark = '^'; |
5d6f0935 | 2040 | } |
f632dedd JK |
2041 | mark = strstr(arg, "^!"); |
2042 | if (mark && !mark[2]) { | |
2043 | *mark = 0; | |
8779351d | 2044 | if (!add_parents_only(revs, arg, flags ^ (UNINTERESTING | BOTTOM), 0)) |
f632dedd | 2045 | *mark = '^'; |
8779351d | 2046 | } |
f632dedd JK |
2047 | mark = strstr(arg, "^-"); |
2048 | if (mark) { | |
8779351d VN |
2049 | int exclude_parent = 1; |
2050 | ||
f632dedd | 2051 | if (mark[2]) { |
8779351d | 2052 | char *end; |
f632dedd | 2053 | exclude_parent = strtoul(mark + 2, &end, 10); |
8779351d VN |
2054 | if (*end != '\0' || !exclude_parent) |
2055 | return -1; | |
2056 | } | |
2057 | ||
f632dedd | 2058 | *mark = 0; |
8779351d | 2059 | if (!add_parents_only(revs, arg, flags ^ (UNINTERESTING | BOTTOM), exclude_parent)) |
f632dedd | 2060 | *mark = '^'; |
62476c8e JH |
2061 | } |
2062 | ||
5d6f0935 JH |
2063 | local_flags = 0; |
2064 | if (*arg == '^') { | |
7f34a46f | 2065 | local_flags = UNINTERESTING | BOTTOM; |
5d6f0935 JH |
2066 | arg++; |
2067 | } | |
d5f6b1d7 JH |
2068 | |
2069 | if (revarg_opt & REVARG_COMMITTISH) | |
321c89bf | 2070 | get_sha1_flags |= GET_OID_COMMITTISH; |
d5f6b1d7 | 2071 | |
3a7a698e | 2072 | if (get_oid_with_context(revs->repo, arg, get_sha1_flags, &oid, &oc)) |
cc243c3c | 2073 | return revs->ignore_missing ? 0 : -1; |
5d6f0935 JH |
2074 | if (!cant_be_filename) |
2075 | verify_non_filename(revs->prefix, arg); | |
654b9a90 | 2076 | object = get_reference(revs, arg, &oid, flags ^ local_flags); |
4cf67869 MD |
2077 | if (!object) |
2078 | return revs->ignore_missing ? 0 : -1; | |
281eee47 | 2079 | add_rev_cmdline(revs, object, arg_, REV_CMD_REV, flags ^ local_flags); |
18f1ad76 JK |
2080 | add_pending_object_with_path(revs, object, arg, oc.mode, oc.path); |
2081 | free(oc.path); | |
5d6f0935 JH |
2082 | return 0; |
2083 | } | |
2084 | ||
04a0e985 JK |
2085 | int handle_revision_arg(const char *arg, struct rev_info *revs, int flags, unsigned revarg_opt) |
2086 | { | |
2087 | int ret = handle_revision_arg_1(arg, revs, flags, revarg_opt); | |
2088 | if (!ret) | |
2089 | revs->rev_input_given = 1; | |
2090 | return ret; | |
2091 | } | |
2092 | ||
91633995 | 2093 | static void read_pathspec_from_stdin(struct strbuf *sb, |
c972bf4c | 2094 | struct strvec *prune) |
4da5af31 | 2095 | { |
7fa3c2ad | 2096 | while (strbuf_getline(sb, stdin) != EOF) |
c972bf4c | 2097 | strvec_push(prune, sb->buf); |
60da8b15 JH |
2098 | } |
2099 | ||
4da5af31 | 2100 | static void read_revisions_from_stdin(struct rev_info *revs, |
c972bf4c | 2101 | struct strvec *prune) |
1fc561d1 | 2102 | { |
63d564b3 | 2103 | struct strbuf sb; |
60da8b15 | 2104 | int seen_dashdash = 0; |
4c30d504 JK |
2105 | int save_warning; |
2106 | ||
2107 | save_warning = warn_on_object_refname_ambiguity; | |
2108 | warn_on_object_refname_ambiguity = 0; | |
1fc561d1 | 2109 | |
63d564b3 | 2110 | strbuf_init(&sb, 1000); |
6e8d46f9 | 2111 | while (strbuf_getline(&sb, stdin) != EOF) { |
63d564b3 | 2112 | int len = sb.len; |
1fc561d1 AB |
2113 | if (!len) |
2114 | break; | |
60da8b15 JH |
2115 | if (sb.buf[0] == '-') { |
2116 | if (len == 2 && sb.buf[1] == '-') { | |
2117 | seen_dashdash = 1; | |
2118 | break; | |
2119 | } | |
1fc561d1 | 2120 | die("options not supported in --stdin mode"); |
60da8b15 | 2121 | } |
31faeb20 | 2122 | if (handle_revision_arg(sb.buf, revs, 0, |
70d26c6e | 2123 | REVARG_CANNOT_BE_FILENAME)) |
63d564b3 | 2124 | die("bad revision '%s'", sb.buf); |
1fc561d1 | 2125 | } |
60da8b15 | 2126 | if (seen_dashdash) |
91633995 | 2127 | read_pathspec_from_stdin(&sb, prune); |
4c30d504 | 2128 | |
63d564b3 | 2129 | strbuf_release(&sb); |
4c30d504 | 2130 | warn_on_object_refname_ambiguity = save_warning; |
1fc561d1 AB |
2131 | } |
2132 | ||
2d10c555 | 2133 | static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what) |
bd95fcd3 | 2134 | { |
0843acfd | 2135 | append_grep_pattern(&revs->grep_filter, ptn, "command line", 0, what); |
2d10c555 JH |
2136 | } |
2137 | ||
a4d7d2c6 | 2138 | static void add_header_grep(struct rev_info *revs, enum grep_header_field field, const char *pattern) |
2d10c555 | 2139 | { |
a4d7d2c6 | 2140 | append_header_grep_pattern(&revs->grep_filter, field, pattern); |
bd95fcd3 JH |
2141 | } |
2142 | ||
2143 | static void add_message_grep(struct rev_info *revs, const char *pattern) | |
2144 | { | |
2d10c555 | 2145 | add_grep(revs, pattern, GREP_PATTERN_BODY); |
bd95fcd3 JH |
2146 | } |
2147 | ||
6b61ec05 | 2148 | static int handle_revision_opt(struct rev_info *revs, int argc, const char **argv, |
bbcde41a MD |
2149 | int *unkc, const char **unkv, |
2150 | const struct setup_revision_opt* opt) | |
02e54220 PH |
2151 | { |
2152 | const char *arg = argv[0]; | |
7d7b86f7 MM |
2153 | const char *optarg; |
2154 | int argcount; | |
fd521245 | 2155 | const unsigned hexsz = the_hash_algo->hexsz; |
02e54220 PH |
2156 | |
2157 | /* pseudo revision arguments */ | |
2158 | if (!strcmp(arg, "--all") || !strcmp(arg, "--branches") || | |
2159 | !strcmp(arg, "--tags") || !strcmp(arg, "--remotes") || | |
2160 | !strcmp(arg, "--reflog") || !strcmp(arg, "--not") || | |
ad3f9a71 | 2161 | !strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk") || |
59556548 | 2162 | !strcmp(arg, "--bisect") || starts_with(arg, "--glob=") || |
4fe10219 | 2163 | !strcmp(arg, "--indexed-objects") || |
39b44ba7 | 2164 | !strcmp(arg, "--alternate-refs") || |
07768e03 | 2165 | starts_with(arg, "--exclude=") || |
59556548 CC |
2166 | starts_with(arg, "--branches=") || starts_with(arg, "--tags=") || |
2167 | starts_with(arg, "--remotes=") || starts_with(arg, "--no-walk=")) | |
02e54220 PH |
2168 | { |
2169 | unkv[(*unkc)++] = arg; | |
0fe8c138 | 2170 | return 1; |
02e54220 PH |
2171 | } |
2172 | ||
7d7b86f7 MM |
2173 | if ((argcount = parse_long_opt("max-count", argv, &optarg))) { |
2174 | revs->max_count = atoi(optarg); | |
5853caec | 2175 | revs->no_walk = 0; |
7d7b86f7 MM |
2176 | return argcount; |
2177 | } else if ((argcount = parse_long_opt("skip", argv, &optarg))) { | |
2178 | revs->skip_count = atoi(optarg); | |
2179 | return argcount; | |
02e54220 | 2180 | } else if ((*arg == '-') && isdigit(arg[1])) { |
e3fa568c JH |
2181 | /* accept -<digit>, like traditional "head" */ |
2182 | if (strtol_i(arg + 1, 10, &revs->max_count) < 0 || | |
2183 | revs->max_count < 0) | |
2184 | die("'%s': not a non-negative integer", arg + 1); | |
5853caec | 2185 | revs->no_walk = 0; |
02e54220 PH |
2186 | } else if (!strcmp(arg, "-n")) { |
2187 | if (argc <= 1) | |
2188 | return error("-n requires an argument"); | |
2189 | revs->max_count = atoi(argv[1]); | |
5853caec | 2190 | revs->no_walk = 0; |
02e54220 | 2191 | return 2; |
479b3d97 SG |
2192 | } else if (skip_prefix(arg, "-n", &optarg)) { |
2193 | revs->max_count = atoi(optarg); | |
5853caec | 2194 | revs->no_walk = 0; |
7d7b86f7 MM |
2195 | } else if ((argcount = parse_long_opt("max-age", argv, &optarg))) { |
2196 | revs->max_age = atoi(optarg); | |
2197 | return argcount; | |
2198 | } else if ((argcount = parse_long_opt("since", argv, &optarg))) { | |
2199 | revs->max_age = approxidate(optarg); | |
2200 | return argcount; | |
2201 | } else if ((argcount = parse_long_opt("after", argv, &optarg))) { | |
2202 | revs->max_age = approxidate(optarg); | |
2203 | return argcount; | |
2204 | } else if ((argcount = parse_long_opt("min-age", argv, &optarg))) { | |
2205 | revs->min_age = atoi(optarg); | |
2206 | return argcount; | |
2207 | } else if ((argcount = parse_long_opt("before", argv, &optarg))) { | |
2208 | revs->min_age = approxidate(optarg); | |
2209 | return argcount; | |
2210 | } else if ((argcount = parse_long_opt("until", argv, &optarg))) { | |
2211 | revs->min_age = approxidate(optarg); | |
2212 | return argcount; | |
02e54220 PH |
2213 | } else if (!strcmp(arg, "--first-parent")) { |
2214 | revs->first_parent_only = 1; | |
ebdc94f3 JH |
2215 | } else if (!strcmp(arg, "--ancestry-path")) { |
2216 | revs->ancestry_path = 1; | |
cb7529e1 | 2217 | revs->simplify_history = 0; |
ebdc94f3 | 2218 | revs->limited = 1; |
02e54220 PH |
2219 | } else if (!strcmp(arg, "-g") || !strcmp(arg, "--walk-reflogs")) { |
2220 | init_reflog_walk(&revs->reflog_info); | |
2221 | } else if (!strcmp(arg, "--default")) { | |
2222 | if (argc <= 1) | |
2223 | return error("bad --default argument"); | |
2224 | revs->def = argv[1]; | |
2225 | return 2; | |
2226 | } else if (!strcmp(arg, "--merge")) { | |
2227 | revs->show_merge = 1; | |
2228 | } else if (!strcmp(arg, "--topo-order")) { | |
08f704f2 | 2229 | revs->sort_order = REV_SORT_IN_GRAPH_ORDER; |
02e54220 | 2230 | revs->topo_order = 1; |
6546b593 JH |
2231 | } else if (!strcmp(arg, "--simplify-merges")) { |
2232 | revs->simplify_merges = 1; | |
a52f0071 | 2233 | revs->topo_order = 1; |
6546b593 JH |
2234 | revs->rewrite_parents = 1; |
2235 | revs->simplify_history = 0; | |
2236 | revs->limited = 1; | |
78892e32 LT |
2237 | } else if (!strcmp(arg, "--simplify-by-decoration")) { |
2238 | revs->simplify_merges = 1; | |
a52f0071 | 2239 | revs->topo_order = 1; |
78892e32 LT |
2240 | revs->rewrite_parents = 1; |
2241 | revs->simplify_history = 0; | |
2242 | revs->simplify_by_decoration = 1; | |
2243 | revs->limited = 1; | |
2244 | revs->prune = 1; | |
02e54220 | 2245 | } else if (!strcmp(arg, "--date-order")) { |
08f704f2 | 2246 | revs->sort_order = REV_SORT_BY_COMMIT_DATE; |
02e54220 | 2247 | revs->topo_order = 1; |
81c6b38b JH |
2248 | } else if (!strcmp(arg, "--author-date-order")) { |
2249 | revs->sort_order = REV_SORT_BY_AUTHOR_DATE; | |
02e54220 | 2250 | revs->topo_order = 1; |
dffc651e SG |
2251 | } else if (!strcmp(arg, "--early-output")) { |
2252 | revs->early_output = 100; | |
2253 | revs->topo_order = 1; | |
2254 | } else if (skip_prefix(arg, "--early-output=", &optarg)) { | |
2255 | if (strtoul_ui(optarg, 10, &revs->early_output) < 0) | |
2256 | die("'%s': not a non-negative integer", optarg); | |
2257 | revs->topo_order = 1; | |
02e54220 PH |
2258 | } else if (!strcmp(arg, "--parents")) { |
2259 | revs->rewrite_parents = 1; | |
2260 | revs->print_parents = 1; | |
2261 | } else if (!strcmp(arg, "--dense")) { | |
2262 | revs->dense = 1; | |
2263 | } else if (!strcmp(arg, "--sparse")) { | |
2264 | revs->dense = 0; | |
ce5b6f9b SB |
2265 | } else if (!strcmp(arg, "--in-commit-order")) { |
2266 | revs->tree_blobs_in_commit_order = 1; | |
02e54220 PH |
2267 | } else if (!strcmp(arg, "--remove-empty")) { |
2268 | revs->remove_empty_trees = 1; | |
b8e8db28 | 2269 | } else if (!strcmp(arg, "--merges")) { |
ad5aeede | 2270 | revs->min_parents = 2; |
02e54220 | 2271 | } else if (!strcmp(arg, "--no-merges")) { |
ad5aeede | 2272 | revs->max_parents = 1; |
479b3d97 SG |
2273 | } else if (skip_prefix(arg, "--min-parents=", &optarg)) { |
2274 | revs->min_parents = atoi(optarg); | |
9ada7aee | 2275 | } else if (!strcmp(arg, "--no-min-parents")) { |
ad5aeede | 2276 | revs->min_parents = 0; |
479b3d97 SG |
2277 | } else if (skip_prefix(arg, "--max-parents=", &optarg)) { |
2278 | revs->max_parents = atoi(optarg); | |
9ada7aee | 2279 | } else if (!strcmp(arg, "--no-max-parents")) { |
ad5aeede | 2280 | revs->max_parents = -1; |
02e54220 PH |
2281 | } else if (!strcmp(arg, "--boundary")) { |
2282 | revs->boundary = 1; | |
2283 | } else if (!strcmp(arg, "--left-right")) { | |
2284 | revs->left_right = 1; | |
60adf7d7 | 2285 | } else if (!strcmp(arg, "--left-only")) { |
24852d91 | 2286 | if (revs->right_only) |
94f605ec MG |
2287 | die("--left-only is incompatible with --right-only" |
2288 | " or --cherry"); | |
60adf7d7 MG |
2289 | revs->left_only = 1; |
2290 | } else if (!strcmp(arg, "--right-only")) { | |
24852d91 JH |
2291 | if (revs->left_only) |
2292 | die("--right-only is incompatible with --left-only"); | |
60adf7d7 | 2293 | revs->right_only = 1; |
94f605ec MG |
2294 | } else if (!strcmp(arg, "--cherry")) { |
2295 | if (revs->left_only) | |
2296 | die("--cherry is incompatible with --left-only"); | |
2297 | revs->cherry_mark = 1; | |
2298 | revs->right_only = 1; | |
ad5aeede | 2299 | revs->max_parents = 1; |
94f605ec | 2300 | revs->limited = 1; |
f69c5018 TR |
2301 | } else if (!strcmp(arg, "--count")) { |
2302 | revs->count = 1; | |
adbbb31e MG |
2303 | } else if (!strcmp(arg, "--cherry-mark")) { |
2304 | if (revs->cherry_pick) | |
2305 | die("--cherry-mark is incompatible with --cherry-pick"); | |
2306 | revs->cherry_mark = 1; | |
2307 | revs->limited = 1; /* needs limit_list() */ | |
02e54220 | 2308 | } else if (!strcmp(arg, "--cherry-pick")) { |
adbbb31e MG |
2309 | if (revs->cherry_mark) |
2310 | die("--cherry-pick is incompatible with --cherry-mark"); | |
02e54220 PH |
2311 | revs->cherry_pick = 1; |
2312 | revs->limited = 1; | |
2313 | } else if (!strcmp(arg, "--objects")) { | |
2314 | revs->tag_objects = 1; | |
2315 | revs->tree_objects = 1; | |
2316 | revs->blob_objects = 1; | |
2317 | } else if (!strcmp(arg, "--objects-edge")) { | |
2318 | revs->tag_objects = 1; | |
2319 | revs->tree_objects = 1; | |
2320 | revs->blob_objects = 1; | |
2321 | revs->edge_hint = 1; | |
1684c1b2 | 2322 | } else if (!strcmp(arg, "--objects-edge-aggressive")) { |
2323 | revs->tag_objects = 1; | |
2324 | revs->tree_objects = 1; | |
2325 | revs->blob_objects = 1; | |
2326 | revs->edge_hint = 1; | |
2327 | revs->edge_hint_aggressive = 1; | |
5a48d240 JH |
2328 | } else if (!strcmp(arg, "--verify-objects")) { |
2329 | revs->tag_objects = 1; | |
2330 | revs->tree_objects = 1; | |
2331 | revs->blob_objects = 1; | |
2332 | revs->verify_objects = 1; | |
02e54220 PH |
2333 | } else if (!strcmp(arg, "--unpacked")) { |
2334 | revs->unpacked = 1; | |
59556548 | 2335 | } else if (starts_with(arg, "--unpacked=")) { |
f649aaaf | 2336 | die(_("--unpacked=<packfile> no longer supported")); |
02e54220 PH |
2337 | } else if (!strcmp(arg, "-r")) { |
2338 | revs->diff = 1; | |
0d1e0e78 | 2339 | revs->diffopt.flags.recursive = 1; |
02e54220 PH |
2340 | } else if (!strcmp(arg, "-t")) { |
2341 | revs->diff = 1; | |
0d1e0e78 BW |
2342 | revs->diffopt.flags.recursive = 1; |
2343 | revs->diffopt.flags.tree_in_recursive = 1; | |
6501580f | 2344 | } else if (!strcmp(arg, "-m")) { |
572fc9aa SO |
2345 | /* |
2346 | * To "diff-index", "-m" means "match missing", and to the "log" | |
2347 | * family of commands, it means "show full diff for merges". Set | |
2348 | * both fields appropriately. | |
2349 | */ | |
02e54220 | 2350 | revs->ignore_merges = 0; |
572fc9aa | 2351 | revs->match_missing = 1; |
6501580f SO |
2352 | } else if ((argcount = parse_long_opt("diff-merges", argv, &optarg))) { |
2353 | if (!strcmp(optarg, "off")) { | |
2354 | revs->ignore_merges = 1; | |
2355 | } else { | |
2356 | die(_("unknown value for --diff-merges: %s"), optarg); | |
2357 | } | |
2358 | return argcount; | |
6fae74b4 JK |
2359 | } else if (!strcmp(arg, "--no-diff-merges")) { |
2360 | revs->ignore_merges = 1; | |
02e54220 PH |
2361 | } else if (!strcmp(arg, "-c")) { |
2362 | revs->diff = 1; | |
2363 | revs->dense_combined_merges = 0; | |
2364 | revs->combine_merges = 1; | |
d76ce4f7 EN |
2365 | } else if (!strcmp(arg, "--combined-all-paths")) { |
2366 | revs->diff = 1; | |
2367 | revs->combined_all_paths = 1; | |
02e54220 PH |
2368 | } else if (!strcmp(arg, "--cc")) { |
2369 | revs->diff = 1; | |
2370 | revs->dense_combined_merges = 1; | |
2371 | revs->combine_merges = 1; | |
2372 | } else if (!strcmp(arg, "-v")) { | |
2373 | revs->verbose_header = 1; | |
2374 | } else if (!strcmp(arg, "--pretty")) { | |
2375 | revs->verbose_header = 1; | |
66b2ed09 | 2376 | revs->pretty_given = 1; |
ae18165f | 2377 | get_commit_format(NULL, revs); |
479b3d97 SG |
2378 | } else if (skip_prefix(arg, "--pretty=", &optarg) || |
2379 | skip_prefix(arg, "--format=", &optarg)) { | |
7d7b86f7 MM |
2380 | /* |
2381 | * Detached form ("--pretty X" as opposed to "--pretty=X") | |
2382 | * not allowed, since the argument is optional. | |
2383 | */ | |
02e54220 | 2384 | revs->verbose_header = 1; |
66b2ed09 | 2385 | revs->pretty_given = 1; |
479b3d97 | 2386 | get_commit_format(optarg, revs); |
7cc13c71 | 2387 | } else if (!strcmp(arg, "--expand-tabs")) { |
fe37a9c5 | 2388 | revs->expand_tabs_in_log = 8; |
0893eec8 JH |
2389 | } else if (!strcmp(arg, "--no-expand-tabs")) { |
2390 | revs->expand_tabs_in_log = 0; | |
fe37a9c5 JH |
2391 | } else if (skip_prefix(arg, "--expand-tabs=", &arg)) { |
2392 | int val; | |
2393 | if (strtol_i(arg, 10, &val) < 0 || val < 0) | |
2394 | die("'%s': not a non-negative integer", arg); | |
2395 | revs->expand_tabs_in_log = val; | |
7249e912 | 2396 | } else if (!strcmp(arg, "--show-notes") || !strcmp(arg, "--notes")) { |
1d729751 | 2397 | enable_default_display_notes(&revs->notes_opt, &revs->show_notes); |
66b2ed09 | 2398 | revs->show_notes_given = 1; |
0c37f1fc JH |
2399 | } else if (!strcmp(arg, "--show-signature")) { |
2400 | revs->show_signature = 1; | |
aa379999 MJ |
2401 | } else if (!strcmp(arg, "--no-show-signature")) { |
2402 | revs->show_signature = 0; | |
479b3d97 SG |
2403 | } else if (!strcmp(arg, "--show-linear-break")) { |
2404 | revs->break_bar = " .........."; | |
1b32dece NTND |
2405 | revs->track_linear = 1; |
2406 | revs->track_first_time = 1; | |
479b3d97 SG |
2407 | } else if (skip_prefix(arg, "--show-linear-break=", &optarg)) { |
2408 | revs->break_bar = xstrdup(optarg); | |
1b32dece NTND |
2409 | revs->track_linear = 1; |
2410 | revs->track_first_time = 1; | |
479b3d97 SG |
2411 | } else if (skip_prefix(arg, "--show-notes=", &optarg) || |
2412 | skip_prefix(arg, "--notes=", &optarg)) { | |
479b3d97 SG |
2413 | if (starts_with(arg, "--show-notes=") && |
2414 | revs->notes_opt.use_default_notes < 0) | |
2415 | revs->notes_opt.use_default_notes = 1; | |
1d729751 | 2416 | enable_ref_display_notes(&revs->notes_opt, &revs->show_notes, optarg); |
452538c3 | 2417 | revs->show_notes_given = 1; |
66b2ed09 | 2418 | } else if (!strcmp(arg, "--no-notes")) { |
1d729751 | 2419 | disable_display_notes(&revs->notes_opt, &revs->show_notes); |
66b2ed09 | 2420 | revs->show_notes_given = 1; |
894a9d33 TR |
2421 | } else if (!strcmp(arg, "--standard-notes")) { |
2422 | revs->show_notes_given = 1; | |
3a03cf6b | 2423 | revs->notes_opt.use_default_notes = 1; |
894a9d33 | 2424 | } else if (!strcmp(arg, "--no-standard-notes")) { |
3a03cf6b | 2425 | revs->notes_opt.use_default_notes = 0; |
de84accc NS |
2426 | } else if (!strcmp(arg, "--oneline")) { |
2427 | revs->verbose_header = 1; | |
2428 | get_commit_format("oneline", revs); | |
7dccadf3 | 2429 | revs->pretty_given = 1; |
de84accc | 2430 | revs->abbrev_commit = 1; |
02e54220 PH |
2431 | } else if (!strcmp(arg, "--graph")) { |
2432 | revs->topo_order = 1; | |
2433 | revs->rewrite_parents = 1; | |
2434 | revs->graph = graph_init(revs); | |
19d097e3 EB |
2435 | } else if (!strcmp(arg, "--encode-email-headers")) { |
2436 | revs->encode_email_headers = 1; | |
2437 | } else if (!strcmp(arg, "--no-encode-email-headers")) { | |
2438 | revs->encode_email_headers = 0; | |
02e54220 PH |
2439 | } else if (!strcmp(arg, "--root")) { |
2440 | revs->show_root_diff = 1; | |
2441 | } else if (!strcmp(arg, "--no-commit-id")) { | |
2442 | revs->no_commit_id = 1; | |
2443 | } else if (!strcmp(arg, "--always")) { | |
2444 | revs->always_show_header = 1; | |
2445 | } else if (!strcmp(arg, "--no-abbrev")) { | |
2446 | revs->abbrev = 0; | |
2447 | } else if (!strcmp(arg, "--abbrev")) { | |
2448 | revs->abbrev = DEFAULT_ABBREV; | |
479b3d97 SG |
2449 | } else if (skip_prefix(arg, "--abbrev=", &optarg)) { |
2450 | revs->abbrev = strtoul(optarg, NULL, 10); | |
02e54220 PH |
2451 | if (revs->abbrev < MINIMUM_ABBREV) |
2452 | revs->abbrev = MINIMUM_ABBREV; | |
fd521245 | 2453 | else if (revs->abbrev > hexsz) |
2454 | revs->abbrev = hexsz; | |
02e54220 PH |
2455 | } else if (!strcmp(arg, "--abbrev-commit")) { |
2456 | revs->abbrev_commit = 1; | |
0c47695a JS |
2457 | revs->abbrev_commit_given = 1; |
2458 | } else if (!strcmp(arg, "--no-abbrev-commit")) { | |
2459 | revs->abbrev_commit = 0; | |
02e54220 PH |
2460 | } else if (!strcmp(arg, "--full-diff")) { |
2461 | revs->diff = 1; | |
2462 | revs->full_diff = 1; | |
8d049e18 DS |
2463 | } else if (!strcmp(arg, "--show-pulls")) { |
2464 | revs->show_pulls = 1; | |
02e54220 PH |
2465 | } else if (!strcmp(arg, "--full-history")) { |
2466 | revs->simplify_history = 0; | |
2467 | } else if (!strcmp(arg, "--relative-date")) { | |
a5481a6c | 2468 | revs->date_mode.type = DATE_RELATIVE; |
f4ea32f0 | 2469 | revs->date_mode_explicit = 1; |
7d7b86f7 | 2470 | } else if ((argcount = parse_long_opt("date", argv, &optarg))) { |
a5481a6c | 2471 | parse_date_format(optarg, &revs->date_mode); |
f4ea32f0 | 2472 | revs->date_mode_explicit = 1; |
7d7b86f7 | 2473 | return argcount; |
02e54220 PH |
2474 | } else if (!strcmp(arg, "--log-size")) { |
2475 | revs->show_log_size = 1; | |
2476 | } | |
2477 | /* | |
2478 | * Grepping the commit log | |
2479 | */ | |
7d7b86f7 MM |
2480 | else if ((argcount = parse_long_opt("author", argv, &optarg))) { |
2481 | add_header_grep(revs, GREP_HEADER_AUTHOR, optarg); | |
2482 | return argcount; | |
2483 | } else if ((argcount = parse_long_opt("committer", argv, &optarg))) { | |
2484 | add_header_grep(revs, GREP_HEADER_COMMITTER, optarg); | |
2485 | return argcount; | |
72fd13f7 NTND |
2486 | } else if ((argcount = parse_long_opt("grep-reflog", argv, &optarg))) { |
2487 | add_header_grep(revs, GREP_HEADER_REFLOG, optarg); | |
2488 | return argcount; | |
7d7b86f7 MM |
2489 | } else if ((argcount = parse_long_opt("grep", argv, &optarg))) { |
2490 | add_message_grep(revs, optarg); | |
2491 | return argcount; | |
17bf35a3 JH |
2492 | } else if (!strcmp(arg, "--grep-debug")) { |
2493 | revs->grep_filter.debug = 1; | |
727b6fc3 | 2494 | } else if (!strcmp(arg, "--basic-regexp")) { |
8465541e | 2495 | revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_BRE; |
02e54220 | 2496 | } else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) { |
8465541e | 2497 | revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_ERE; |
02e54220 | 2498 | } else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) { |
9e3cbc59 | 2499 | revs->grep_filter.ignore_case = 1; |
c1ddc461 | 2500 | revs->diffopt.pickaxe_opts |= DIFF_PICKAXE_IGNORE_CASE; |
02e54220 | 2501 | } else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) { |
8465541e | 2502 | revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_FIXED; |
7531a2dd | 2503 | } else if (!strcmp(arg, "--perl-regexp") || !strcmp(arg, "-P")) { |
8465541e | 2504 | revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_PCRE; |
02e54220 | 2505 | } else if (!strcmp(arg, "--all-match")) { |
0843acfd | 2506 | revs->grep_filter.all_match = 1; |
22dfa8a2 CJ |
2507 | } else if (!strcmp(arg, "--invert-grep")) { |
2508 | revs->invert_grep = 1; | |
7d7b86f7 MM |
2509 | } else if ((argcount = parse_long_opt("encoding", argv, &optarg))) { |
2510 | if (strcmp(optarg, "none")) | |
2511 | git_log_output_encoding = xstrdup(optarg); | |
02e54220 PH |
2512 | else |
2513 | git_log_output_encoding = ""; | |
7d7b86f7 | 2514 | return argcount; |
02e54220 PH |
2515 | } else if (!strcmp(arg, "--reverse")) { |
2516 | revs->reverse ^= 1; | |
2517 | } else if (!strcmp(arg, "--children")) { | |
2518 | revs->children.name = "children"; | |
2519 | revs->limited = 1; | |
cc243c3c JH |
2520 | } else if (!strcmp(arg, "--ignore-missing")) { |
2521 | revs->ignore_missing = 1; | |
bbcde41a | 2522 | } else if (opt && opt->allow_exclude_promisor_objects && |
669b1d2a | 2523 | !strcmp(arg, "--exclude-promisor-objects")) { |
df11e196 | 2524 | if (fetch_if_missing) |
033abf97 | 2525 | BUG("exclude_promisor_objects can only be used when fetch_if_missing is 0"); |
df11e196 | 2526 | revs->exclude_promisor_objects = 1; |
02e54220 | 2527 | } else { |
a97262c6 | 2528 | int opts = diff_opt_parse(&revs->diffopt, argv, argc, revs->prefix); |
02e54220 PH |
2529 | if (!opts) |
2530 | unkv[(*unkc)++] = arg; | |
2531 | return opts; | |
2532 | } | |
1b32dece NTND |
2533 | if (revs->graph && revs->track_linear) |
2534 | die("--show-linear-break and --graph are incompatible"); | |
02e54220 PH |
2535 | |
2536 | return 1; | |
2537 | } | |
2538 | ||
6b61ec05 PH |
2539 | void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx, |
2540 | const struct option *options, | |
2541 | const char * const usagestr[]) | |
2542 | { | |
2543 | int n = handle_revision_opt(revs, ctx->argc, ctx->argv, | |
bbcde41a | 2544 | &ctx->cpidx, ctx->out, NULL); |
6b61ec05 PH |
2545 | if (n <= 0) { |
2546 | error("unknown option `%s'", ctx->argv[0]); | |
2547 | usage_with_options(usagestr, options); | |
2548 | } | |
2549 | ctx->argv += n; | |
2550 | ctx->argc -= n; | |
2551 | } | |
2552 | ||
073cf63c NTND |
2553 | static int for_each_bisect_ref(struct ref_store *refs, each_ref_fn fn, |
2554 | void *cb_data, const char *term) | |
2555 | { | |
cb46d630 AD |
2556 | struct strbuf bisect_refs = STRBUF_INIT; |
2557 | int status; | |
2558 | strbuf_addf(&bisect_refs, "refs/bisect/%s", term); | |
073cf63c | 2559 | status = refs_for_each_fullref_in(refs, bisect_refs.buf, fn, cb_data, 0); |
cb46d630 AD |
2560 | strbuf_release(&bisect_refs); |
2561 | return status; | |
2562 | } | |
2563 | ||
073cf63c | 2564 | static int for_each_bad_bisect_ref(struct ref_store *refs, each_ref_fn fn, void *cb_data) |
ad3f9a71 | 2565 | { |
073cf63c | 2566 | return for_each_bisect_ref(refs, fn, cb_data, term_bad); |
ad3f9a71 LT |
2567 | } |
2568 | ||
073cf63c | 2569 | static int for_each_good_bisect_ref(struct ref_store *refs, each_ref_fn fn, void *cb_data) |
ad3f9a71 | 2570 | { |
073cf63c | 2571 | return for_each_bisect_ref(refs, fn, cb_data, term_good); |
ad3f9a71 LT |
2572 | } |
2573 | ||
f6aca0dc | 2574 | static int handle_revision_pseudo_opt(const char *submodule, |
e885a84f JK |
2575 | struct rev_info *revs, |
2576 | const char **argv, int *flags) | |
f6aca0dc JN |
2577 | { |
2578 | const char *arg = argv[0]; | |
2579 | const char *optarg; | |
073cf63c | 2580 | struct ref_store *refs; |
f6aca0dc JN |
2581 | int argcount; |
2582 | ||
073cf63c | 2583 | if (submodule) { |
d0c39a49 NTND |
2584 | /* |
2585 | * We need some something like get_submodule_worktrees() | |
2586 | * before we can go through all worktrees of a submodule, | |
2587 | * .e.g with adding all HEADs from --all, which is not | |
2588 | * supported right now, so stick to single worktree. | |
2589 | */ | |
2590 | if (!revs->single_worktree) | |
033abf97 | 2591 | BUG("--single-worktree cannot be used together with submodule"); |
073cf63c NTND |
2592 | refs = get_submodule_ref_store(submodule); |
2593 | } else | |
b3c7eef9 | 2594 | refs = get_main_ref_store(revs->repo); |
073cf63c | 2595 | |
0fc63ec4 JN |
2596 | /* |
2597 | * NOTE! | |
2598 | * | |
2599 | * Commands like "git shortlog" will not accept the options below | |
2600 | * unless parse_revision_opt queues them (as opposed to erroring | |
2601 | * out). | |
2602 | * | |
2603 | * When implementing your new pseudo-option, remember to | |
2604 | * register it in the list at the top of handle_revision_opt. | |
2605 | */ | |
f6aca0dc | 2606 | if (!strcmp(arg, "--all")) { |
073cf63c NTND |
2607 | handle_refs(refs, revs, *flags, refs_for_each_ref); |
2608 | handle_refs(refs, revs, *flags, refs_head_ref); | |
d0c39a49 NTND |
2609 | if (!revs->single_worktree) { |
2610 | struct all_refs_cb cb; | |
2611 | ||
2612 | init_all_refs_cb(&cb, revs, *flags); | |
2613 | other_head_refs(handle_one_ref, &cb); | |
2614 | } | |
ff32d342 | 2615 | clear_ref_exclusion(&revs->ref_excludes); |
f6aca0dc | 2616 | } else if (!strcmp(arg, "--branches")) { |
073cf63c | 2617 | handle_refs(refs, revs, *flags, refs_for_each_branch_ref); |
ff32d342 | 2618 | clear_ref_exclusion(&revs->ref_excludes); |
f6aca0dc | 2619 | } else if (!strcmp(arg, "--bisect")) { |
cb46d630 | 2620 | read_bisect_terms(&term_bad, &term_good); |
073cf63c NTND |
2621 | handle_refs(refs, revs, *flags, for_each_bad_bisect_ref); |
2622 | handle_refs(refs, revs, *flags ^ (UNINTERESTING | BOTTOM), | |
2623 | for_each_good_bisect_ref); | |
f6aca0dc JN |
2624 | revs->bisect = 1; |
2625 | } else if (!strcmp(arg, "--tags")) { | |
073cf63c | 2626 | handle_refs(refs, revs, *flags, refs_for_each_tag_ref); |
ff32d342 | 2627 | clear_ref_exclusion(&revs->ref_excludes); |
f6aca0dc | 2628 | } else if (!strcmp(arg, "--remotes")) { |
073cf63c | 2629 | handle_refs(refs, revs, *flags, refs_for_each_remote_ref); |
ff32d342 | 2630 | clear_ref_exclusion(&revs->ref_excludes); |
f6aca0dc JN |
2631 | } else if ((argcount = parse_long_opt("glob", argv, &optarg))) { |
2632 | struct all_refs_cb cb; | |
2633 | init_all_refs_cb(&cb, revs, *flags); | |
a217dcbd | 2634 | for_each_glob_ref(handle_one_ref, optarg, &cb); |
ff32d342 | 2635 | clear_ref_exclusion(&revs->ref_excludes); |
e7b432c5 JH |
2636 | return argcount; |
2637 | } else if ((argcount = parse_long_opt("exclude", argv, &optarg))) { | |
ff32d342 | 2638 | add_ref_exclusion(&revs->ref_excludes, optarg); |
f6aca0dc | 2639 | return argcount; |
8b1d9136 | 2640 | } else if (skip_prefix(arg, "--branches=", &optarg)) { |
f6aca0dc JN |
2641 | struct all_refs_cb cb; |
2642 | init_all_refs_cb(&cb, revs, *flags); | |
8b1d9136 | 2643 | for_each_glob_ref_in(handle_one_ref, optarg, "refs/heads/", &cb); |
ff32d342 | 2644 | clear_ref_exclusion(&revs->ref_excludes); |
8b1d9136 | 2645 | } else if (skip_prefix(arg, "--tags=", &optarg)) { |
f6aca0dc JN |
2646 | struct all_refs_cb cb; |
2647 | init_all_refs_cb(&cb, revs, *flags); | |
8b1d9136 | 2648 | for_each_glob_ref_in(handle_one_ref, optarg, "refs/tags/", &cb); |
ff32d342 | 2649 | clear_ref_exclusion(&revs->ref_excludes); |
8b1d9136 | 2650 | } else if (skip_prefix(arg, "--remotes=", &optarg)) { |
f6aca0dc JN |
2651 | struct all_refs_cb cb; |
2652 | init_all_refs_cb(&cb, revs, *flags); | |
8b1d9136 | 2653 | for_each_glob_ref_in(handle_one_ref, optarg, "refs/remotes/", &cb); |
ff32d342 | 2654 | clear_ref_exclusion(&revs->ref_excludes); |
f6aca0dc | 2655 | } else if (!strcmp(arg, "--reflog")) { |
718ccc97 | 2656 | add_reflogs_to_pending(revs, *flags); |
4fe10219 JK |
2657 | } else if (!strcmp(arg, "--indexed-objects")) { |
2658 | add_index_objects_to_pending(revs, *flags); | |
39b44ba7 JK |
2659 | } else if (!strcmp(arg, "--alternate-refs")) { |
2660 | add_alternate_refs_to_pending(revs, *flags); | |
f6aca0dc | 2661 | } else if (!strcmp(arg, "--not")) { |
7f34a46f | 2662 | *flags ^= UNINTERESTING | BOTTOM; |
f6aca0dc | 2663 | } else if (!strcmp(arg, "--no-walk")) { |
ca92e59e | 2664 | revs->no_walk = REVISION_WALK_NO_WALK_SORTED; |
8b1d9136 | 2665 | } else if (skip_prefix(arg, "--no-walk=", &optarg)) { |
ca92e59e MZ |
2666 | /* |
2667 | * Detached form ("--no-walk X" as opposed to "--no-walk=X") | |
2668 | * not allowed, since the argument is optional. | |
2669 | */ | |
8b1d9136 | 2670 | if (!strcmp(optarg, "sorted")) |
ca92e59e | 2671 | revs->no_walk = REVISION_WALK_NO_WALK_SORTED; |
8b1d9136 | 2672 | else if (!strcmp(optarg, "unsorted")) |
ca92e59e MZ |
2673 | revs->no_walk = REVISION_WALK_NO_WALK_UNSORTED; |
2674 | else | |
2675 | return error("invalid argument to --no-walk"); | |
f6aca0dc JN |
2676 | } else if (!strcmp(arg, "--do-walk")) { |
2677 | revs->no_walk = 0; | |
32619f99 NTND |
2678 | } else if (!strcmp(arg, "--single-worktree")) { |
2679 | revs->single_worktree = 1; | |
f6aca0dc JN |
2680 | } else { |
2681 | return 0; | |
2682 | } | |
2683 | ||
2684 | return 1; | |
2685 | } | |
2686 | ||
ce113604 JK |
2687 | static void NORETURN diagnose_missing_default(const char *def) |
2688 | { | |
ce113604 JK |
2689 | int flags; |
2690 | const char *refname; | |
2691 | ||
744c040b | 2692 | refname = resolve_ref_unsafe(def, 0, NULL, &flags); |
ce113604 JK |
2693 | if (!refname || !(flags & REF_ISSYMREF) || (flags & REF_ISBROKEN)) |
2694 | die(_("your current branch appears to be broken")); | |
2695 | ||
2696 | skip_prefix(refname, "refs/heads/", &refname); | |
2697 | die(_("your current branch '%s' does not have any commits yet"), | |
2698 | refname); | |
2699 | } | |
2700 | ||
ae563542 LT |
2701 | /* |
2702 | * Parse revision information, filling in the "rev_info" structure, | |
2703 | * and removing the used arguments from the argument list. | |
2704 | * | |
765ac8ec LT |
2705 | * Returns the number of arguments left that weren't recognized |
2706 | * (which are also moved to the head of the argument list) | |
ae563542 | 2707 | */ |
32962c9b | 2708 | int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *opt) |
ae563542 | 2709 | { |
04a0e985 | 2710 | int i, flags, left, seen_dashdash, revarg_opt; |
c972bf4c | 2711 | struct strvec prune_data = STRVEC_INIT; |
9ef6aeb0 | 2712 | const char *submodule = NULL; |
19e8789b | 2713 | int seen_end_of_options = 0; |
9ef6aeb0 HV |
2714 | |
2715 | if (opt) | |
2716 | submodule = opt->submodule; | |
ae563542 | 2717 | |
ae563542 | 2718 | /* First, search for "--" */ |
6d5b93f2 | 2719 | if (opt && opt->assume_dashdash) { |
ae563542 | 2720 | seen_dashdash = 1; |
6d5b93f2 CB |
2721 | } else { |
2722 | seen_dashdash = 0; | |
2723 | for (i = 1; i < argc; i++) { | |
2724 | const char *arg = argv[i]; | |
2725 | if (strcmp(arg, "--")) | |
2726 | continue; | |
2727 | argv[i] = NULL; | |
2728 | argc = i; | |
2729 | if (argv[i + 1]) | |
c972bf4c | 2730 | strvec_pushv(&prune_data, argv + i + 1); |
6d5b93f2 CB |
2731 | seen_dashdash = 1; |
2732 | break; | |
2733 | } | |
ae563542 LT |
2734 | } |
2735 | ||
02e54220 PH |
2736 | /* Second, deal with arguments and options */ |
2737 | flags = 0; | |
d5f6b1d7 JH |
2738 | revarg_opt = opt ? opt->revarg_opt : 0; |
2739 | if (seen_dashdash) | |
2740 | revarg_opt |= REVARG_CANNOT_BE_FILENAME; | |
02e54220 | 2741 | for (left = i = 1; i < argc; i++) { |
ae563542 | 2742 | const char *arg = argv[i]; |
19e8789b | 2743 | if (!seen_end_of_options && *arg == '-') { |
cd2bdc53 | 2744 | int opts; |
02e54220 | 2745 | |
f6aca0dc | 2746 | opts = handle_revision_pseudo_opt(submodule, |
e885a84f | 2747 | revs, argv + i, |
f6aca0dc JN |
2748 | &flags); |
2749 | if (opts > 0) { | |
2750 | i += opts - 1; | |
8e64006e JS |
2751 | continue; |
2752 | } | |
f6aca0dc | 2753 | |
8b3dce56 JH |
2754 | if (!strcmp(arg, "--stdin")) { |
2755 | if (revs->disable_stdin) { | |
2756 | argv[left++] = arg; | |
2757 | continue; | |
2758 | } | |
a12cbe23 | 2759 | if (revs->read_from_stdin++) |
8b3dce56 | 2760 | die("--stdin given twice?"); |
60da8b15 | 2761 | read_revisions_from_stdin(revs, &prune_data); |
8b3dce56 JH |
2762 | continue; |
2763 | } | |
2d10c555 | 2764 | |
19e8789b JK |
2765 | if (!strcmp(arg, "--end-of-options")) { |
2766 | seen_end_of_options = 1; | |
2767 | continue; | |
2768 | } | |
2769 | ||
bbcde41a MD |
2770 | opts = handle_revision_opt(revs, argc - i, argv + i, |
2771 | &left, argv, opt); | |
cd2bdc53 | 2772 | if (opts > 0) { |
cd2bdc53 LT |
2773 | i += opts - 1; |
2774 | continue; | |
2775 | } | |
02e54220 PH |
2776 | if (opts < 0) |
2777 | exit(128); | |
ae563542 LT |
2778 | continue; |
2779 | } | |
ae563542 | 2780 | |
8e676e8b JH |
2781 | |
2782 | if (handle_revision_arg(arg, revs, flags, revarg_opt)) { | |
5d6f0935 JH |
2783 | int j; |
2784 | if (seen_dashdash || *arg == '^') | |
ae563542 LT |
2785 | die("bad revision '%s'", arg); |
2786 | ||
ea92f41f JH |
2787 | /* If we didn't have a "--": |
2788 | * (1) all filenames must exist; | |
2789 | * (2) all rev-args must not be interpretable | |
2790 | * as a valid filename. | |
2791 | * but the latter we have checked in the main loop. | |
2792 | */ | |
e23d0b4a | 2793 | for (j = i; j < argc; j++) |
023e37c3 | 2794 | verify_filename(revs->prefix, argv[j], j == i); |
e23d0b4a | 2795 | |
c972bf4c | 2796 | strvec_pushv(&prune_data, argv + i); |
ae563542 LT |
2797 | break; |
2798 | } | |
ae563542 | 2799 | } |
5d6f0935 | 2800 | |
d70a9eb6 | 2801 | if (prune_data.nr) { |
93e7d672 JH |
2802 | /* |
2803 | * If we need to introduce the magic "a lone ':' means no | |
2804 | * pathspec whatsoever", here is the place to do so. | |
2805 | * | |
2806 | * if (prune_data.nr == 1 && !strcmp(prune_data[0], ":")) { | |
2807 | * prune_data.nr = 0; | |
2808 | * prune_data.alloc = 0; | |
2809 | * free(prune_data.path); | |
2810 | * prune_data.path = NULL; | |
2811 | * } else { | |
2812 | * terminate prune_data.alloc with NULL and | |
2813 | * call init_pathspec() to set revs->prune_data here. | |
2814 | * } | |
2815 | */ | |
0fdc2ae5 | 2816 | parse_pathspec(&revs->prune_data, 0, 0, |
d70a9eb6 | 2817 | revs->prefix, prune_data.v); |
4da5af31 | 2818 | } |
c972bf4c | 2819 | strvec_clear(&prune_data); |
5486ef0e | 2820 | |
02e54220 | 2821 | if (revs->def == NULL) |
32962c9b | 2822 | revs->def = opt ? opt->def : NULL; |
b4490059 JH |
2823 | if (opt && opt->tweak) |
2824 | opt->tweak(revs, opt); | |
02e54220 | 2825 | if (revs->show_merge) |
ae3e5e1e | 2826 | prepare_show_merge(revs); |
04a0e985 | 2827 | if (revs->def && !revs->pending.nr && !revs->rev_input_given) { |
654b9a90 | 2828 | struct object_id oid; |
cd2bdc53 | 2829 | struct object *object; |
249c8f4a | 2830 | struct object_context oc; |
3a7a698e | 2831 | if (get_oid_with_context(revs->repo, revs->def, 0, &oid, &oc)) |
ce113604 | 2832 | diagnose_missing_default(revs->def); |
654b9a90 | 2833 | object = get_reference(revs, revs->def, &oid, 0); |
249c8f4a | 2834 | add_pending_object_with_mode(revs, object, revs->def, oc.mode); |
ae563542 | 2835 | } |
8efdc326 | 2836 | |
b7bb760d LT |
2837 | /* Did the user ask for any diff output? Run the diff! */ |
2838 | if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT) | |
2839 | revs->diff = 1; | |
2840 | ||
0faf2da7 | 2841 | /* Pickaxe, diff-filter and rename following need diffs */ |
cf63051a | 2842 | if ((revs->diffopt.pickaxe_opts & DIFF_PICKAXE_KINDS_MASK) || |
0faf2da7 | 2843 | revs->diffopt.filter || |
0d1e0e78 | 2844 | revs->diffopt.flags.follow_renames) |
b7bb760d LT |
2845 | revs->diff = 1; |
2846 | ||
15af58c1 SB |
2847 | if (revs->diffopt.objfind) |
2848 | revs->simplify_history = 0; | |
2849 | ||
002933f3 SG |
2850 | if (revs->line_level_traverse) { |
2851 | if (want_ancestry(revs)) | |
2852 | revs->limited = 1; | |
2853 | revs->topo_order = 1; | |
2854 | } | |
2855 | ||
f0d9cc41 | 2856 | if (revs->topo_order && !generation_numbers_enabled(the_repository)) |
53069686 JH |
2857 | revs->limited = 1; |
2858 | ||
afe069d1 | 2859 | if (revs->prune_data.nr) { |
bd1928df | 2860 | copy_pathspec(&revs->pruning.pathspec, &revs->prune_data); |
750f7b66 | 2861 | /* Can't prune commits with rename following: the paths change.. */ |
0d1e0e78 | 2862 | if (!revs->diffopt.flags.follow_renames) |
53b2c823 | 2863 | revs->prune = 1; |
cd2bdc53 | 2864 | if (!revs->full_diff) |
bd1928df NTND |
2865 | copy_pathspec(&revs->diffopt.pathspec, |
2866 | &revs->prune_data); | |
8efdc326 | 2867 | } |
6fae74b4 | 2868 | if (revs->combine_merges && revs->ignore_merges < 0) |
cd2bdc53 | 2869 | revs->ignore_merges = 0; |
6fae74b4 JK |
2870 | if (revs->ignore_merges < 0) |
2871 | revs->ignore_merges = 1; | |
d76ce4f7 EN |
2872 | if (revs->combined_all_paths && !revs->combine_merges) |
2873 | die("--combined-all-paths makes no sense without -c or --cc"); | |
2874 | ||
cd2bdc53 | 2875 | revs->diffopt.abbrev = revs->abbrev; |
12da1d1f | 2876 | |
28452655 | 2877 | diff_setup_done(&revs->diffopt); |
8efdc326 | 2878 | |
918d4e1c JH |
2879 | grep_commit_pattern_type(GREP_PATTERN_TYPE_UNSPECIFIED, |
2880 | &revs->grep_filter); | |
44570188 ÆAB |
2881 | if (!is_encoding_utf8(get_log_output_encoding())) |
2882 | revs->grep_filter.ignore_locale = 1; | |
0843acfd | 2883 | compile_grep_patterns(&revs->grep_filter); |
bd95fcd3 | 2884 | |
d56651c0 SP |
2885 | if (revs->reverse && revs->reflog_info) |
2886 | die("cannot combine --reverse with --walk-reflogs"); | |
82fd0f4a JK |
2887 | if (revs->reflog_info && revs->limited) |
2888 | die("cannot combine --walk-reflogs with history-limiting options"); | |
8bb65883 | 2889 | if (revs->rewrite_parents && revs->children.name) |
f35f5603 | 2890 | die("cannot combine --parents and --children"); |
d56651c0 | 2891 | |
7fefda5c AS |
2892 | /* |
2893 | * Limitations on the graph functionality | |
2894 | */ | |
2895 | if (revs->reverse && revs->graph) | |
2896 | die("cannot combine --reverse with --graph"); | |
2897 | ||
2898 | if (revs->reflog_info && revs->graph) | |
2899 | die("cannot combine --walk-reflogs with --graph"); | |
695985f4 DJ |
2900 | if (revs->no_walk && revs->graph) |
2901 | die("cannot combine --no-walk with --graph"); | |
baa6378f JH |
2902 | if (!revs->reflog_info && revs->grep_filter.use_reflog_filter) |
2903 | die("cannot use --grep-reflog without --walk-reflogs"); | |
7fefda5c | 2904 | |
05314efa JK |
2905 | if (revs->line_level_traverse && |
2906 | (revs->diffopt.output_format & ~(DIFF_FORMAT_PATCH | DIFF_FORMAT_NO_OUTPUT))) | |
2907 | die(_("-L does not yet support diff formats besides -p and -s")); | |
2908 | ||
0893eec8 JH |
2909 | if (revs->expand_tabs_in_log < 0) |
2910 | revs->expand_tabs_in_log = revs->expand_tabs_in_log_default; | |
2911 | ||
ae563542 LT |
2912 | return left; |
2913 | } | |
a4a88b2b | 2914 | |
f35f5603 JH |
2915 | static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child) |
2916 | { | |
2917 | struct commit_list *l = xcalloc(1, sizeof(*l)); | |
2918 | ||
2919 | l->item = child; | |
2920 | l->next = add_decoration(&revs->children, &parent->object, l); | |
2921 | } | |
2922 | ||
d0af663e | 2923 | static int remove_duplicate_parents(struct rev_info *revs, struct commit *commit) |
6546b593 | 2924 | { |
d0af663e | 2925 | struct treesame_state *ts = lookup_decoration(&revs->treesame, &commit->object); |
6546b593 JH |
2926 | struct commit_list **pp, *p; |
2927 | int surviving_parents; | |
2928 | ||
2929 | /* Examine existing parents while marking ones we have seen... */ | |
2930 | pp = &commit->parents; | |
d0af663e | 2931 | surviving_parents = 0; |
6546b593 JH |
2932 | while ((p = *pp) != NULL) { |
2933 | struct commit *parent = p->item; | |
2934 | if (parent->object.flags & TMP_MARK) { | |
2935 | *pp = p->next; | |
d0af663e KB |
2936 | if (ts) |
2937 | compact_treesame(revs, commit, surviving_parents); | |
6546b593 JH |
2938 | continue; |
2939 | } | |
2940 | parent->object.flags |= TMP_MARK; | |
d0af663e | 2941 | surviving_parents++; |
6546b593 JH |
2942 | pp = &p->next; |
2943 | } | |
d0af663e | 2944 | /* clear the temporary mark */ |
6546b593 JH |
2945 | for (p = commit->parents; p; p = p->next) { |
2946 | p->item->object.flags &= ~TMP_MARK; | |
6546b593 | 2947 | } |
d0af663e | 2948 | /* no update_treesame() - removing duplicates can't affect TREESAME */ |
6546b593 JH |
2949 | return surviving_parents; |
2950 | } | |
2951 | ||
faf0156b JH |
2952 | struct merge_simplify_state { |
2953 | struct commit *simplified; | |
2954 | }; | |
2955 | ||
2956 | static struct merge_simplify_state *locate_simplify_state(struct rev_info *revs, struct commit *commit) | |
2957 | { | |
2958 | struct merge_simplify_state *st; | |
2959 | ||
2960 | st = lookup_decoration(&revs->merge_simplification, &commit->object); | |
2961 | if (!st) { | |
2962 | st = xcalloc(1, sizeof(*st)); | |
2963 | add_decoration(&revs->merge_simplification, &commit->object, st); | |
2964 | } | |
2965 | return st; | |
2966 | } | |
2967 | ||
91633995 | 2968 | static int mark_redundant_parents(struct commit *commit) |
d0af663e KB |
2969 | { |
2970 | struct commit_list *h = reduce_heads(commit->parents); | |
2971 | int i = 0, marked = 0; | |
2972 | struct commit_list *po, *pn; | |
2973 | ||
2974 | /* Want these for sanity-checking only */ | |
2975 | int orig_cnt = commit_list_count(commit->parents); | |
2976 | int cnt = commit_list_count(h); | |
2977 | ||
2978 | /* | |
2979 | * Not ready to remove items yet, just mark them for now, based | |
2980 | * on the output of reduce_heads(). reduce_heads outputs the reduced | |
2981 | * set in its original order, so this isn't too hard. | |
2982 | */ | |
2983 | po = commit->parents; | |
2984 | pn = h; | |
2985 | while (po) { | |
2986 | if (pn && po->item == pn->item) { | |
2987 | pn = pn->next; | |
2988 | i++; | |
2989 | } else { | |
2990 | po->item->object.flags |= TMP_MARK; | |
2991 | marked++; | |
2992 | } | |
2993 | po=po->next; | |
2994 | } | |
2995 | ||
2996 | if (i != cnt || cnt+marked != orig_cnt) | |
2997 | die("mark_redundant_parents %d %d %d %d", orig_cnt, cnt, i, marked); | |
2998 | ||
2999 | free_commit_list(h); | |
3000 | ||
3001 | return marked; | |
3002 | } | |
3003 | ||
91633995 | 3004 | static int mark_treesame_root_parents(struct commit *commit) |
143f1eaf KB |
3005 | { |
3006 | struct commit_list *p; | |
3007 | int marked = 0; | |
3008 | ||
3009 | for (p = commit->parents; p; p = p->next) { | |
3010 | struct commit *parent = p->item; | |
3011 | if (!parent->parents && (parent->object.flags & TREESAME)) { | |
3012 | parent->object.flags |= TMP_MARK; | |
3013 | marked++; | |
3014 | } | |
3015 | } | |
3016 | ||
3017 | return marked; | |
3018 | } | |
3019 | ||
9c129eab KB |
3020 | /* |
3021 | * Awkward naming - this means one parent we are TREESAME to. | |
3022 | * cf mark_treesame_root_parents: root parents that are TREESAME (to an | |
3023 | * empty tree). Better name suggestions? | |
3024 | */ | |
3025 | static int leave_one_treesame_to_parent(struct rev_info *revs, struct commit *commit) | |
3026 | { | |
3027 | struct treesame_state *ts = lookup_decoration(&revs->treesame, &commit->object); | |
3028 | struct commit *unmarked = NULL, *marked = NULL; | |
3029 | struct commit_list *p; | |
3030 | unsigned n; | |
3031 | ||
3032 | for (p = commit->parents, n = 0; p; p = p->next, n++) { | |
3033 | if (ts->treesame[n]) { | |
3034 | if (p->item->object.flags & TMP_MARK) { | |
3035 | if (!marked) | |
3036 | marked = p->item; | |
3037 | } else { | |
3038 | if (!unmarked) { | |
3039 | unmarked = p->item; | |
3040 | break; | |
3041 | } | |
3042 | } | |
3043 | } | |
3044 | } | |
3045 | ||
3046 | /* | |
3047 | * If we are TREESAME to a marked-for-deletion parent, but not to any | |
3048 | * unmarked parents, unmark the first TREESAME parent. This is the | |
3049 | * parent that the default simplify_history==1 scan would have followed, | |
3050 | * and it doesn't make sense to omit that path when asking for a | |
3051 | * simplified full history. Retaining it improves the chances of | |
3052 | * understanding odd missed merges that took an old version of a file. | |
3053 | * | |
3054 | * Example: | |
3055 | * | |
3056 | * I--------*X A modified the file, but mainline merge X used | |
3057 | * \ / "-s ours", so took the version from I. X is | |
3058 | * `-*A--' TREESAME to I and !TREESAME to A. | |
3059 | * | |
3060 | * Default log from X would produce "I". Without this check, | |
3061 | * --full-history --simplify-merges would produce "I-A-X", showing | |
3062 | * the merge commit X and that it changed A, but not making clear that | |
3063 | * it had just taken the I version. With this check, the topology above | |
3064 | * is retained. | |
3065 | * | |
3066 | * Note that it is possible that the simplification chooses a different | |
3067 | * TREESAME parent from the default, in which case this test doesn't | |
3068 | * activate, and we _do_ drop the default parent. Example: | |
3069 | * | |
3070 | * I------X A modified the file, but it was reverted in B, | |
3071 | * \ / meaning mainline merge X is TREESAME to both | |
3072 | * *A-*B parents. | |
3073 | * | |
3074 | * Default log would produce "I" by following the first parent; | |
3075 | * --full-history --simplify-merges will produce "I-A-B". But this is a | |
3076 | * reasonable result - it presents a logical full history leading from | |
3077 | * I to X, and X is not an important merge. | |
3078 | */ | |
3079 | if (!unmarked && marked) { | |
3080 | marked->object.flags &= ~TMP_MARK; | |
3081 | return 1; | |
3082 | } | |
3083 | ||
3084 | return 0; | |
3085 | } | |
3086 | ||
d0af663e KB |
3087 | static int remove_marked_parents(struct rev_info *revs, struct commit *commit) |
3088 | { | |
3089 | struct commit_list **pp, *p; | |
3090 | int nth_parent, removed = 0; | |
3091 | ||
3092 | pp = &commit->parents; | |
3093 | nth_parent = 0; | |
3094 | while ((p = *pp) != NULL) { | |
3095 | struct commit *parent = p->item; | |
3096 | if (parent->object.flags & TMP_MARK) { | |
3097 | parent->object.flags &= ~TMP_MARK; | |
3098 | *pp = p->next; | |
3099 | free(p); | |
3100 | removed++; | |
3101 | compact_treesame(revs, commit, nth_parent); | |
3102 | continue; | |
3103 | } | |
3104 | pp = &p->next; | |
3105 | nth_parent++; | |
3106 | } | |
3107 | ||
3108 | /* Removing parents can only increase TREESAMEness */ | |
3109 | if (removed && !(commit->object.flags & TREESAME)) | |
3110 | update_treesame(revs, commit); | |
3111 | ||
3112 | return nth_parent; | |
3113 | } | |
3114 | ||
faf0156b | 3115 | static struct commit_list **simplify_one(struct rev_info *revs, struct commit *commit, struct commit_list **tail) |
6546b593 JH |
3116 | { |
3117 | struct commit_list *p; | |
4d826608 | 3118 | struct commit *parent; |
faf0156b | 3119 | struct merge_simplify_state *st, *pst; |
6546b593 JH |
3120 | int cnt; |
3121 | ||
faf0156b JH |
3122 | st = locate_simplify_state(revs, commit); |
3123 | ||
6546b593 | 3124 | /* |
6546b593 JH |
3125 | * Have we handled this one? |
3126 | */ | |
faf0156b | 3127 | if (st->simplified) |
6546b593 JH |
3128 | return tail; |
3129 | ||
3130 | /* | |
3131 | * An UNINTERESTING commit simplifies to itself, so does a | |
3132 | * root commit. We do not rewrite parents of such commit | |
3133 | * anyway. | |
3134 | */ | |
3135 | if ((commit->object.flags & UNINTERESTING) || !commit->parents) { | |
faf0156b | 3136 | st->simplified = commit; |
6546b593 JH |
3137 | return tail; |
3138 | } | |
3139 | ||
3140 | /* | |
6e513ba3 JH |
3141 | * Do we know what commit all of our parents that matter |
3142 | * should be rewritten to? Otherwise we are not ready to | |
3143 | * rewrite this one yet. | |
6546b593 JH |
3144 | */ |
3145 | for (cnt = 0, p = commit->parents; p; p = p->next) { | |
faf0156b JH |
3146 | pst = locate_simplify_state(revs, p->item); |
3147 | if (!pst->simplified) { | |
6546b593 JH |
3148 | tail = &commit_list_insert(p->item, tail)->next; |
3149 | cnt++; | |
3150 | } | |
6e513ba3 JH |
3151 | if (revs->first_parent_only) |
3152 | break; | |
6546b593 | 3153 | } |
53030f8d JH |
3154 | if (cnt) { |
3155 | tail = &commit_list_insert(commit, tail)->next; | |
6546b593 | 3156 | return tail; |
53030f8d | 3157 | } |
6546b593 JH |
3158 | |
3159 | /* | |
d0af663e KB |
3160 | * Rewrite our list of parents. Note that this cannot |
3161 | * affect our TREESAME flags in any way - a commit is | |
3162 | * always TREESAME to its simplification. | |
6546b593 | 3163 | */ |
faf0156b JH |
3164 | for (p = commit->parents; p; p = p->next) { |
3165 | pst = locate_simplify_state(revs, p->item); | |
3166 | p->item = pst->simplified; | |
6e513ba3 JH |
3167 | if (revs->first_parent_only) |
3168 | break; | |
faf0156b | 3169 | } |
4b7f53da | 3170 | |
0290bf12 | 3171 | if (revs->first_parent_only) |
6e513ba3 | 3172 | cnt = 1; |
0290bf12 | 3173 | else |
d0af663e | 3174 | cnt = remove_duplicate_parents(revs, commit); |
6546b593 JH |
3175 | |
3176 | /* | |
3177 | * It is possible that we are a merge and one side branch | |
3178 | * does not have any commit that touches the given paths; | |
d0af663e KB |
3179 | * in such a case, the immediate parent from that branch |
3180 | * will be rewritten to be the merge base. | |
6546b593 JH |
3181 | * |
3182 | * o----X X: the commit we are looking at; | |
3183 | * / / o: a commit that touches the paths; | |
3184 | * ---o----' | |
3185 | * | |
143f1eaf KB |
3186 | * Further, a merge of an independent branch that doesn't |
3187 | * touch the path will reduce to a treesame root parent: | |
3188 | * | |
3189 | * ----o----X X: the commit we are looking at; | |
3190 | * / o: a commit that touches the paths; | |
3191 | * r r: a root commit not touching the paths | |
3192 | * | |
3193 | * Detect and simplify both cases. | |
6546b593 JH |
3194 | */ |
3195 | if (1 < cnt) { | |
91633995 JK |
3196 | int marked = mark_redundant_parents(commit); |
3197 | marked += mark_treesame_root_parents(commit); | |
9c129eab KB |
3198 | if (marked) |
3199 | marked -= leave_one_treesame_to_parent(revs, commit); | |
d0af663e KB |
3200 | if (marked) |
3201 | cnt = remove_marked_parents(revs, commit); | |
6546b593 JH |
3202 | } |
3203 | ||
3204 | /* | |
3205 | * A commit simplifies to itself if it is a root, if it is | |
3206 | * UNINTERESTING, if it touches the given paths, or if it is a | |
4d826608 | 3207 | * merge and its parents don't simplify to one relevant commit |
6546b593 JH |
3208 | * (the first two cases are already handled at the beginning of |
3209 | * this function). | |
3210 | * | |
4d826608 KB |
3211 | * Otherwise, it simplifies to what its sole relevant parent |
3212 | * simplifies to. | |
6546b593 JH |
3213 | */ |
3214 | if (!cnt || | |
3215 | (commit->object.flags & UNINTERESTING) || | |
3216 | !(commit->object.flags & TREESAME) || | |
8d049e18 DS |
3217 | (parent = one_relevant_parent(revs, commit->parents)) == NULL || |
3218 | (revs->show_pulls && (commit->object.flags & PULL_MERGE))) | |
faf0156b JH |
3219 | st->simplified = commit; |
3220 | else { | |
4d826608 | 3221 | pst = locate_simplify_state(revs, parent); |
faf0156b JH |
3222 | st->simplified = pst->simplified; |
3223 | } | |
6546b593 JH |
3224 | return tail; |
3225 | } | |
3226 | ||
3227 | static void simplify_merges(struct rev_info *revs) | |
3228 | { | |
ab9d75a8 | 3229 | struct commit_list *list, *next; |
6546b593 | 3230 | struct commit_list *yet_to_do, **tail; |
ab9d75a8 | 3231 | struct commit *commit; |
6546b593 | 3232 | |
5eac739e JH |
3233 | if (!revs->prune) |
3234 | return; | |
65347030 | 3235 | |
6546b593 JH |
3236 | /* feed the list reversed */ |
3237 | yet_to_do = NULL; | |
ab9d75a8 JH |
3238 | for (list = revs->commits; list; list = next) { |
3239 | commit = list->item; | |
3240 | next = list->next; | |
3241 | /* | |
3242 | * Do not free(list) here yet; the original list | |
3243 | * is used later in this function. | |
3244 | */ | |
3245 | commit_list_insert(commit, &yet_to_do); | |
3246 | } | |
6546b593 JH |
3247 | while (yet_to_do) { |
3248 | list = yet_to_do; | |
3249 | yet_to_do = NULL; | |
3250 | tail = &yet_to_do; | |
3251 | while (list) { | |
e510ab89 | 3252 | commit = pop_commit(&list); |
faf0156b | 3253 | tail = simplify_one(revs, commit, tail); |
6546b593 JH |
3254 | } |
3255 | } | |
3256 | ||
3257 | /* clean up the result, removing the simplified ones */ | |
3258 | list = revs->commits; | |
3259 | revs->commits = NULL; | |
3260 | tail = &revs->commits; | |
3261 | while (list) { | |
faf0156b | 3262 | struct merge_simplify_state *st; |
ab9d75a8 | 3263 | |
e510ab89 | 3264 | commit = pop_commit(&list); |
faf0156b JH |
3265 | st = locate_simplify_state(revs, commit); |
3266 | if (st->simplified == commit) | |
6546b593 JH |
3267 | tail = &commit_list_insert(commit, tail)->next; |
3268 | } | |
6546b593 JH |
3269 | } |
3270 | ||
f35f5603 JH |
3271 | static void set_children(struct rev_info *revs) |
3272 | { | |
3273 | struct commit_list *l; | |
3274 | for (l = revs->commits; l; l = l->next) { | |
3275 | struct commit *commit = l->item; | |
3276 | struct commit_list *p; | |
3277 | ||
3278 | for (p = commit->parents; p; p = p->next) | |
3279 | add_child(revs, p->item, commit); | |
3280 | } | |
3281 | } | |
3282 | ||
bcc0a3ea HV |
3283 | void reset_revision_walk(void) |
3284 | { | |
ffa1f28f | 3285 | clear_object_flags(SEEN | ADDED | SHOWN | TOPO_WALK_EXPLORED | TOPO_WALK_INDEGREE); |
bcc0a3ea HV |
3286 | } |
3287 | ||
df11e196 JT |
3288 | static int mark_uninteresting(const struct object_id *oid, |
3289 | struct packed_git *pack, | |
3290 | uint32_t pos, | |
b3c7eef9 | 3291 | void *cb) |
df11e196 | 3292 | { |
b3c7eef9 NTND |
3293 | struct rev_info *revs = cb; |
3294 | struct object *o = parse_object(revs->repo, oid); | |
df11e196 JT |
3295 | o->flags |= UNINTERESTING | SEEN; |
3296 | return 0; | |
3297 | } | |
3298 | ||
b4542418 DS |
3299 | define_commit_slab(indegree_slab, int); |
3300 | define_commit_slab(author_date_slab, timestamp_t); | |
3301 | ||
3302 | struct topo_walk_info { | |
3303 | uint32_t min_generation; | |
3304 | struct prio_queue explore_queue; | |
3305 | struct prio_queue indegree_queue; | |
3306 | struct prio_queue topo_queue; | |
3307 | struct indegree_slab indegree; | |
3308 | struct author_date_slab author_date; | |
3309 | }; | |
3310 | ||
90b666da DS |
3311 | static int topo_walk_atexit_registered; |
3312 | static unsigned int count_explore_walked; | |
3313 | static unsigned int count_indegree_walked; | |
3314 | static unsigned int count_topo_walked; | |
3315 | ||
3316 | static void trace2_topo_walk_statistics_atexit(void) | |
3317 | { | |
3318 | struct json_writer jw = JSON_WRITER_INIT; | |
3319 | ||
3320 | jw_object_begin(&jw, 0); | |
3321 | jw_object_intmax(&jw, "count_explore_walked", count_explore_walked); | |
3322 | jw_object_intmax(&jw, "count_indegree_walked", count_indegree_walked); | |
3323 | jw_object_intmax(&jw, "count_topo_walked", count_topo_walked); | |
3324 | jw_end(&jw); | |
3325 | ||
3326 | trace2_data_json("topo_walk", the_repository, "statistics", &jw); | |
3327 | ||
3328 | jw_release(&jw); | |
3329 | } | |
3330 | ||
b4542418 DS |
3331 | static inline void test_flag_and_insert(struct prio_queue *q, struct commit *c, int flag) |
3332 | { | |
3333 | if (c->object.flags & flag) | |
3334 | return; | |
3335 | ||
3336 | c->object.flags |= flag; | |
3337 | prio_queue_put(q, c); | |
3338 | } | |
3339 | ||
3340 | static void explore_walk_step(struct rev_info *revs) | |
3341 | { | |
3342 | struct topo_walk_info *info = revs->topo_walk_info; | |
3343 | struct commit_list *p; | |
3344 | struct commit *c = prio_queue_get(&info->explore_queue); | |
3345 | ||
3346 | if (!c) | |
3347 | return; | |
3348 | ||
ea3f7e59 | 3349 | if (repo_parse_commit_gently(revs->repo, c, 1) < 0) |
b4542418 DS |
3350 | return; |
3351 | ||
90b666da DS |
3352 | count_explore_walked++; |
3353 | ||
b4542418 DS |
3354 | if (revs->sort_order == REV_SORT_BY_AUTHOR_DATE) |
3355 | record_author_date(&info->author_date, c); | |
3356 | ||
3357 | if (revs->max_age != -1 && (c->date < revs->max_age)) | |
3358 | c->object.flags |= UNINTERESTING; | |
3359 | ||
3360 | if (process_parents(revs, c, NULL, NULL) < 0) | |
3361 | return; | |
3362 | ||
3363 | if (c->object.flags & UNINTERESTING) | |
3364 | mark_parents_uninteresting(c); | |
3365 | ||
3366 | for (p = c->parents; p; p = p->next) | |
3367 | test_flag_and_insert(&info->explore_queue, p->item, TOPO_WALK_EXPLORED); | |
3368 | } | |
3369 | ||
3370 | static void explore_to_depth(struct rev_info *revs, | |
3371 | uint32_t gen_cutoff) | |
3372 | { | |
3373 | struct topo_walk_info *info = revs->topo_walk_info; | |
3374 | struct commit *c; | |
3375 | while ((c = prio_queue_peek(&info->explore_queue)) && | |
c49c82aa | 3376 | commit_graph_generation(c) >= gen_cutoff) |
b4542418 DS |
3377 | explore_walk_step(revs); |
3378 | } | |
3379 | ||
3380 | static void indegree_walk_step(struct rev_info *revs) | |
3381 | { | |
3382 | struct commit_list *p; | |
3383 | struct topo_walk_info *info = revs->topo_walk_info; | |
3384 | struct commit *c = prio_queue_get(&info->indegree_queue); | |
3385 | ||
3386 | if (!c) | |
3387 | return; | |
3388 | ||
ea3f7e59 | 3389 | if (repo_parse_commit_gently(revs->repo, c, 1) < 0) |
b4542418 DS |
3390 | return; |
3391 | ||
90b666da DS |
3392 | count_indegree_walked++; |
3393 | ||
c49c82aa | 3394 | explore_to_depth(revs, commit_graph_generation(c)); |
b4542418 DS |
3395 | |
3396 | for (p = c->parents; p; p = p->next) { | |
3397 | struct commit *parent = p->item; | |
3398 | int *pi = indegree_slab_at(&info->indegree, parent); | |
3399 | ||
3400 | if (*pi) | |
3401 | (*pi)++; | |
3402 | else | |
3403 | *pi = 2; | |
3404 | ||
3405 | test_flag_and_insert(&info->indegree_queue, parent, TOPO_WALK_INDEGREE); | |
3406 | ||
3407 | if (revs->first_parent_only) | |
3408 | return; | |
3409 | } | |
3410 | } | |
3411 | ||
3412 | static void compute_indegrees_to_depth(struct rev_info *revs, | |
3413 | uint32_t gen_cutoff) | |
3414 | { | |
3415 | struct topo_walk_info *info = revs->topo_walk_info; | |
3416 | struct commit *c; | |
3417 | while ((c = prio_queue_peek(&info->indegree_queue)) && | |
c49c82aa | 3418 | commit_graph_generation(c) >= gen_cutoff) |
b4542418 DS |
3419 | indegree_walk_step(revs); |
3420 | } | |
f0d9cc41 | 3421 | |
0aa0c2b2 MH |
3422 | static void reset_topo_walk(struct rev_info *revs) |
3423 | { | |
3424 | struct topo_walk_info *info = revs->topo_walk_info; | |
3425 | ||
3426 | clear_prio_queue(&info->explore_queue); | |
3427 | clear_prio_queue(&info->indegree_queue); | |
3428 | clear_prio_queue(&info->topo_queue); | |
3429 | clear_indegree_slab(&info->indegree); | |
3430 | clear_author_date_slab(&info->author_date); | |
3431 | ||
3432 | FREE_AND_NULL(revs->topo_walk_info); | |
3433 | } | |
3434 | ||
f0d9cc41 DS |
3435 | static void init_topo_walk(struct rev_info *revs) |
3436 | { | |
3437 | struct topo_walk_info *info; | |
b4542418 | 3438 | struct commit_list *list; |
0aa0c2b2 MH |
3439 | if (revs->topo_walk_info) |
3440 | reset_topo_walk(revs); | |
3441 | ||
f0d9cc41 DS |
3442 | revs->topo_walk_info = xmalloc(sizeof(struct topo_walk_info)); |
3443 | info = revs->topo_walk_info; | |
3444 | memset(info, 0, sizeof(struct topo_walk_info)); | |
3445 | ||
b4542418 DS |
3446 | init_indegree_slab(&info->indegree); |
3447 | memset(&info->explore_queue, 0, sizeof(info->explore_queue)); | |
3448 | memset(&info->indegree_queue, 0, sizeof(info->indegree_queue)); | |
3449 | memset(&info->topo_queue, 0, sizeof(info->topo_queue)); | |
3450 | ||
3451 | switch (revs->sort_order) { | |
3452 | default: /* REV_SORT_IN_GRAPH_ORDER */ | |
3453 | info->topo_queue.compare = NULL; | |
3454 | break; | |
3455 | case REV_SORT_BY_COMMIT_DATE: | |
3456 | info->topo_queue.compare = compare_commits_by_commit_date; | |
3457 | break; | |
3458 | case REV_SORT_BY_AUTHOR_DATE: | |
3459 | init_author_date_slab(&info->author_date); | |
3460 | info->topo_queue.compare = compare_commits_by_author_date; | |
3461 | info->topo_queue.cb_data = &info->author_date; | |
3462 | break; | |
3463 | } | |
3464 | ||
3465 | info->explore_queue.compare = compare_commits_by_gen_then_commit_date; | |
3466 | info->indegree_queue.compare = compare_commits_by_gen_then_commit_date; | |
3467 | ||
3468 | info->min_generation = GENERATION_NUMBER_INFINITY; | |
3469 | for (list = revs->commits; list; list = list->next) { | |
3470 | struct commit *c = list->item; | |
c752ad09 | 3471 | uint32_t generation; |
b4542418 | 3472 | |
ea3f7e59 | 3473 | if (repo_parse_commit_gently(revs->repo, c, 1)) |
b4542418 DS |
3474 | continue; |
3475 | ||
3476 | test_flag_and_insert(&info->explore_queue, c, TOPO_WALK_EXPLORED); | |
3477 | test_flag_and_insert(&info->indegree_queue, c, TOPO_WALK_INDEGREE); | |
3478 | ||
c752ad09 AK |
3479 | generation = commit_graph_generation(c); |
3480 | if (generation < info->min_generation) | |
3481 | info->min_generation = generation; | |
b4542418 DS |
3482 | |
3483 | *(indegree_slab_at(&info->indegree, c)) = 1; | |
3484 | ||
3485 | if (revs->sort_order == REV_SORT_BY_AUTHOR_DATE) | |
3486 | record_author_date(&info->author_date, c); | |
3487 | } | |
3488 | compute_indegrees_to_depth(revs, info->min_generation); | |
3489 | ||
3490 | for (list = revs->commits; list; list = list->next) { | |
3491 | struct commit *c = list->item; | |
3492 | ||
3493 | if (*(indegree_slab_at(&info->indegree, c)) == 1) | |
3494 | prio_queue_put(&info->topo_queue, c); | |
3495 | } | |
3496 | ||
3497 | /* | |
3498 | * This is unfortunate; the initial tips need to be shown | |
3499 | * in the order given from the revision traversal machinery. | |
3500 | */ | |
3501 | if (revs->sort_order == REV_SORT_IN_GRAPH_ORDER) | |
3502 | prio_queue_reverse(&info->topo_queue); | |
90b666da DS |
3503 | |
3504 | if (trace2_is_enabled() && !topo_walk_atexit_registered) { | |
3505 | atexit(trace2_topo_walk_statistics_atexit); | |
3506 | topo_walk_atexit_registered = 1; | |
3507 | } | |
f0d9cc41 DS |
3508 | } |
3509 | ||
3510 | static struct commit *next_topo_commit(struct rev_info *revs) | |
3511 | { | |
b4542418 DS |
3512 | struct commit *c; |
3513 | struct topo_walk_info *info = revs->topo_walk_info; | |
3514 | ||
3515 | /* pop next off of topo_queue */ | |
3516 | c = prio_queue_get(&info->topo_queue); | |
3517 | ||
3518 | if (c) | |
3519 | *(indegree_slab_at(&info->indegree, c)) = 0; | |
3520 | ||
3521 | return c; | |
f0d9cc41 DS |
3522 | } |
3523 | ||
3524 | static void expand_topo_walk(struct rev_info *revs, struct commit *commit) | |
3525 | { | |
b4542418 DS |
3526 | struct commit_list *p; |
3527 | struct topo_walk_info *info = revs->topo_walk_info; | |
3528 | if (process_parents(revs, commit, NULL, NULL) < 0) { | |
f0d9cc41 DS |
3529 | if (!revs->ignore_missing_links) |
3530 | die("Failed to traverse parents of commit %s", | |
3531 | oid_to_hex(&commit->object.oid)); | |
3532 | } | |
b4542418 | 3533 | |
90b666da DS |
3534 | count_topo_walked++; |
3535 | ||
b4542418 DS |
3536 | for (p = commit->parents; p; p = p->next) { |
3537 | struct commit *parent = p->item; | |
3538 | int *pi; | |
c752ad09 | 3539 | uint32_t generation; |
b4542418 | 3540 | |
1d8e31a3 DS |
3541 | if (parent->object.flags & UNINTERESTING) |
3542 | continue; | |
3543 | ||
ea3f7e59 | 3544 | if (repo_parse_commit_gently(revs->repo, parent, 1) < 0) |
b4542418 DS |
3545 | continue; |
3546 | ||
c752ad09 AK |
3547 | generation = commit_graph_generation(parent); |
3548 | if (generation < info->min_generation) { | |
3549 | info->min_generation = generation; | |
b4542418 DS |
3550 | compute_indegrees_to_depth(revs, info->min_generation); |
3551 | } | |
3552 | ||
3553 | pi = indegree_slab_at(&info->indegree, parent); | |
3554 | ||
3555 | (*pi)--; | |
3556 | if (*pi == 1) | |
3557 | prio_queue_put(&info->topo_queue, parent); | |
3558 | ||
3559 | if (revs->first_parent_only) | |
3560 | return; | |
3561 | } | |
f0d9cc41 DS |
3562 | } |
3563 | ||
cc0e6c5a | 3564 | int prepare_revision_walk(struct rev_info *revs) |
a4a88b2b | 3565 | { |
1da1e07c JK |
3566 | int i; |
3567 | struct object_array old_pending; | |
2e7da8e9 | 3568 | struct commit_list **next = &revs->commits; |
cd2bdc53 | 3569 | |
1da1e07c | 3570 | memcpy(&old_pending, &revs->pending, sizeof(old_pending)); |
1f1e895f LT |
3571 | revs->pending.nr = 0; |
3572 | revs->pending.alloc = 0; | |
3573 | revs->pending.objects = NULL; | |
1da1e07c JK |
3574 | for (i = 0; i < old_pending.nr; i++) { |
3575 | struct object_array_entry *e = old_pending.objects + i; | |
20739490 | 3576 | struct commit *commit = handle_commit(revs, e); |
cd2bdc53 LT |
3577 | if (commit) { |
3578 | if (!(commit->object.flags & SEEN)) { | |
3579 | commit->object.flags |= SEEN; | |
2e7da8e9 | 3580 | next = commit_list_append(commit, next); |
cd2bdc53 LT |
3581 | } |
3582 | } | |
cd2bdc53 | 3583 | } |
f1230fb5 | 3584 | object_array_clear(&old_pending); |
cd2bdc53 | 3585 | |
d0af663e | 3586 | /* Signal whether we need per-parent treesame decoration */ |
4d826608 KB |
3587 | if (revs->simplify_merges || |
3588 | (revs->limited && limiting_can_increase_treesame(revs))) | |
d0af663e KB |
3589 | revs->treesame.name = "treesame"; |
3590 | ||
df11e196 | 3591 | if (revs->exclude_promisor_objects) { |
b3c7eef9 | 3592 | for_each_packed_object(mark_uninteresting, revs, |
df11e196 JT |
3593 | FOR_EACH_OBJECT_PROMISOR_ONLY); |
3594 | } | |
3595 | ||
f32dde8c | 3596 | if (!revs->reflog_info) |
a56b9464 | 3597 | prepare_to_use_bloom_filter(revs); |
ca92e59e MZ |
3598 | if (revs->no_walk != REVISION_WALK_NO_WALK_UNSORTED) |
3599 | commit_list_sort_by_date(&revs->commits); | |
ba1d4505 | 3600 | if (revs->no_walk) |
cc0e6c5a | 3601 | return 0; |
f0d9cc41 | 3602 | if (revs->limited) { |
cc0e6c5a AR |
3603 | if (limit_list(revs) < 0) |
3604 | return -1; | |
f0d9cc41 DS |
3605 | if (revs->topo_order) |
3606 | sort_in_topological_order(&revs->commits, revs->sort_order); | |
3607 | } else if (revs->topo_order) | |
3608 | init_topo_walk(revs); | |
3cb9d2b6 SG |
3609 | if (revs->line_level_traverse && want_ancestry(revs)) |
3610 | /* | |
3611 | * At the moment we can only do line-level log with parent | |
3612 | * rewriting by performing this expensive pre-filtering step. | |
3613 | * If parent rewriting is not requested, then we rather | |
3614 | * perform the line-level log filtering during the regular | |
3615 | * history traversal. | |
3616 | */ | |
12da1d1f | 3617 | line_log_filter(revs); |
6546b593 JH |
3618 | if (revs->simplify_merges) |
3619 | simplify_merges(revs); | |
f35f5603 JH |
3620 | if (revs->children.name) |
3621 | set_children(revs); | |
a56b9464 | 3622 | |
cc0e6c5a | 3623 | return 0; |
a4a88b2b LT |
3624 | } |
3625 | ||
8320b1db JK |
3626 | static enum rewrite_result rewrite_one_1(struct rev_info *revs, |
3627 | struct commit **pp, | |
3628 | struct prio_queue *queue) | |
765ac8ec LT |
3629 | { |
3630 | for (;;) { | |
3631 | struct commit *p = *pp; | |
3381c790 | 3632 | if (!revs->limited) |
8320b1db | 3633 | if (process_parents(revs, p, NULL, queue) < 0) |
cc0e6c5a | 3634 | return rewrite_one_error; |
7dc0fe3b LT |
3635 | if (p->object.flags & UNINTERESTING) |
3636 | return rewrite_one_ok; | |
3637 | if (!(p->object.flags & TREESAME)) | |
cc0e6c5a | 3638 | return rewrite_one_ok; |
765ac8ec | 3639 | if (!p->parents) |
cc0e6c5a | 3640 | return rewrite_one_noparents; |
4d826608 KB |
3641 | if ((p = one_relevant_parent(revs, p->parents)) == NULL) |
3642 | return rewrite_one_ok; | |
3643 | *pp = p; | |
765ac8ec LT |
3644 | } |
3645 | } | |
3646 | ||
8320b1db JK |
3647 | static void merge_queue_into_list(struct prio_queue *q, struct commit_list **list) |
3648 | { | |
3649 | while (q->nr) { | |
3650 | struct commit *item = prio_queue_peek(q); | |
3651 | struct commit_list *p = *list; | |
3652 | ||
3653 | if (p && p->item->date >= item->date) | |
3654 | list = &p->next; | |
3655 | else { | |
3656 | p = commit_list_insert(item, list); | |
3657 | list = &p->next; /* skip newly added item */ | |
3658 | prio_queue_get(q); /* pop item */ | |
3659 | } | |
3660 | } | |
3661 | } | |
3662 | ||
3663 | static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp) | |
3664 | { | |
3665 | struct prio_queue queue = { compare_commits_by_commit_date }; | |
3666 | enum rewrite_result ret = rewrite_one_1(revs, pp, &queue); | |
3667 | merge_queue_into_list(&queue, &revs->commits); | |
3668 | clear_prio_queue(&queue); | |
3669 | return ret; | |
3670 | } | |
3671 | ||
c7edcae0 BY |
3672 | int rewrite_parents(struct rev_info *revs, struct commit *commit, |
3673 | rewrite_parent_fn_t rewrite_parent) | |
765ac8ec LT |
3674 | { |
3675 | struct commit_list **pp = &commit->parents; | |
3676 | while (*pp) { | |
3677 | struct commit_list *parent = *pp; | |
c7edcae0 | 3678 | switch (rewrite_parent(revs, &parent->item)) { |
cc0e6c5a AR |
3679 | case rewrite_one_ok: |
3680 | break; | |
3681 | case rewrite_one_noparents: | |
765ac8ec LT |
3682 | *pp = parent->next; |
3683 | continue; | |
cc0e6c5a AR |
3684 | case rewrite_one_error: |
3685 | return -1; | |
765ac8ec LT |
3686 | } |
3687 | pp = &parent->next; | |
3688 | } | |
d0af663e | 3689 | remove_duplicate_parents(revs, commit); |
cc0e6c5a | 3690 | return 0; |
765ac8ec LT |
3691 | } |
3692 | ||
d72fbe81 AP |
3693 | static int commit_rewrite_person(struct strbuf *buf, const char *what, struct string_list *mailmap) |
3694 | { | |
3695 | char *person, *endp; | |
3696 | size_t len, namelen, maillen; | |
3697 | const char *name; | |
3698 | const char *mail; | |
3699 | struct ident_split ident; | |
3700 | ||
3701 | person = strstr(buf->buf, what); | |
3702 | if (!person) | |
3703 | return 0; | |
3704 | ||
3705 | person += strlen(what); | |
3706 | endp = strchr(person, '\n'); | |
3707 | if (!endp) | |
3708 | return 0; | |
3709 | ||
3710 | len = endp - person; | |
3711 | ||
3712 | if (split_ident_line(&ident, person, len)) | |
3713 | return 0; | |
3714 | ||
3715 | mail = ident.mail_begin; | |
3716 | maillen = ident.mail_end - ident.mail_begin; | |
3717 | name = ident.name_begin; | |
3718 | namelen = ident.name_end - ident.name_begin; | |
3719 | ||
3720 | if (map_user(mailmap, &mail, &maillen, &name, &namelen)) { | |
3721 | struct strbuf namemail = STRBUF_INIT; | |
3722 | ||
3723 | strbuf_addf(&namemail, "%.*s <%.*s>", | |
3724 | (int)namelen, name, (int)maillen, mail); | |
3725 | ||
3726 | strbuf_splice(buf, ident.name_begin - buf->buf, | |
3727 | ident.mail_end - ident.name_begin + 1, | |
3728 | namemail.buf, namemail.len); | |
3729 | ||
3730 | strbuf_release(&namemail); | |
3731 | ||
3732 | return 1; | |
3733 | } | |
3734 | ||
3735 | return 0; | |
3736 | } | |
3737 | ||
8ecae9b0 JH |
3738 | static int commit_match(struct commit *commit, struct rev_info *opt) |
3739 | { | |
72fd13f7 | 3740 | int retval; |
04deccda | 3741 | const char *encoding; |
b000c59b | 3742 | const char *message; |
72fd13f7 | 3743 | struct strbuf buf = STRBUF_INIT; |
04deccda | 3744 | |
80235ba7 | 3745 | if (!opt->grep_filter.pattern_list && !opt->grep_filter.header_list) |
8ecae9b0 | 3746 | return 1; |
baa6378f JH |
3747 | |
3748 | /* Prepend "fake" headers as needed */ | |
3749 | if (opt->grep_filter.use_reflog_filter) { | |
72fd13f7 NTND |
3750 | strbuf_addstr(&buf, "reflog "); |
3751 | get_reflog_message(&buf, opt->reflog_info); | |
3752 | strbuf_addch(&buf, '\n'); | |
72fd13f7 | 3753 | } |
baa6378f | 3754 | |
04deccda JK |
3755 | /* |
3756 | * We grep in the user's output encoding, under the assumption that it | |
3757 | * is the encoding they are most likely to write their grep pattern | |
3758 | * for. In addition, it means we will match the "notes" encoding below, | |
3759 | * so we will not end up with a buffer that has two different encodings | |
3760 | * in it. | |
3761 | */ | |
3762 | encoding = get_log_output_encoding(); | |
5a10d236 | 3763 | message = logmsg_reencode(commit, NULL, encoding); |
04deccda | 3764 | |
baa6378f JH |
3765 | /* Copy the commit to temporary if we are using "fake" headers */ |
3766 | if (buf.len) | |
04deccda | 3767 | strbuf_addstr(&buf, message); |
baa6378f | 3768 | |
df874fa8 | 3769 | if (opt->grep_filter.header_list && opt->mailmap) { |
d72fbe81 | 3770 | if (!buf.len) |
04deccda | 3771 | strbuf_addstr(&buf, message); |
d72fbe81 AP |
3772 | |
3773 | commit_rewrite_person(&buf, "\nauthor ", opt->mailmap); | |
3774 | commit_rewrite_person(&buf, "\ncommitter ", opt->mailmap); | |
3775 | } | |
3776 | ||
38cfe915 NTND |
3777 | /* Append "fake" message parts as needed */ |
3778 | if (opt->show_notes) { | |
3779 | if (!buf.len) | |
04deccda | 3780 | strbuf_addstr(&buf, message); |
fb61e4d3 | 3781 | format_display_notes(&commit->object.oid, &buf, encoding, 1); |
38cfe915 NTND |
3782 | } |
3783 | ||
b000c59b JK |
3784 | /* |
3785 | * Find either in the original commit message, or in the temporary. | |
3786 | * Note that we cast away the constness of "message" here. It is | |
3787 | * const because it may come from the cached commit buffer. That's OK, | |
3788 | * because we know that it is modifiable heap memory, and that while | |
3789 | * grep_buffer may modify it for speed, it will restore any | |
3790 | * changes before returning. | |
3791 | */ | |
72fd13f7 NTND |
3792 | if (buf.len) |
3793 | retval = grep_buffer(&opt->grep_filter, buf.buf, buf.len); | |
3794 | else | |
3795 | retval = grep_buffer(&opt->grep_filter, | |
b000c59b | 3796 | (char *)message, strlen(message)); |
72fd13f7 | 3797 | strbuf_release(&buf); |
b66103c3 | 3798 | unuse_commit_buffer(commit, message); |
22dfa8a2 | 3799 | return opt->invert_grep ? !retval : retval; |
8ecae9b0 JH |
3800 | } |
3801 | ||
53d00b39 | 3802 | static inline int want_ancestry(const struct rev_info *revs) |
f35f5603 | 3803 | { |
8bb65883 | 3804 | return (revs->rewrite_parents || revs->children.name); |
f35f5603 JH |
3805 | } |
3806 | ||
de239446 JK |
3807 | /* |
3808 | * Return a timestamp to be used for --since/--until comparisons for this | |
3809 | * commit, based on the revision options. | |
3810 | */ | |
3811 | static timestamp_t comparison_date(const struct rev_info *revs, | |
3812 | struct commit *commit) | |
3813 | { | |
3814 | return revs->reflog_info ? | |
3815 | get_reflog_timestamp(revs->reflog_info) : | |
3816 | commit->date; | |
3817 | } | |
3818 | ||
beb5af43 | 3819 | enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit) |
252a7c02 LT |
3820 | { |
3821 | if (commit->object.flags & SHOWN) | |
3822 | return commit_ignore; | |
14c3c80c | 3823 | if (revs->unpacked && has_object_pack(&commit->object.oid)) |
252a7c02 LT |
3824 | return commit_ignore; |
3825 | if (commit->object.flags & UNINTERESTING) | |
3826 | return commit_ignore; | |
3cb9d2b6 SG |
3827 | if (revs->line_level_traverse && !want_ancestry(revs)) { |
3828 | /* | |
3829 | * In case of line-level log with parent rewriting | |
3830 | * prepare_revision_walk() already took care of all line-level | |
3831 | * log filtering, and there is nothing left to do here. | |
3832 | * | |
3833 | * If parent rewriting was not requested, then this is the | |
3834 | * place to perform the line-level log filtering. Notably, | |
3835 | * this check, though expensive, must come before the other, | |
3836 | * cheaper filtering conditions, because the tracked line | |
3837 | * ranges must be adjusted even when the commit will end up | |
3838 | * being ignored based on other conditions. | |
3839 | */ | |
3840 | if (!line_log_process_ranges_arbitrary_commit(revs, commit)) | |
3841 | return commit_ignore; | |
3842 | } | |
de239446 JK |
3843 | if (revs->min_age != -1 && |
3844 | comparison_date(revs, commit) > revs->min_age) | |
3845 | return commit_ignore; | |
ad5aeede | 3846 | if (revs->min_parents || (revs->max_parents >= 0)) { |
bf3418b0 | 3847 | int n = commit_list_count(commit->parents); |
ad5aeede MG |
3848 | if ((n < revs->min_parents) || |
3849 | ((revs->max_parents >= 0) && (n > revs->max_parents))) | |
3850 | return commit_ignore; | |
3851 | } | |
252a7c02 LT |
3852 | if (!commit_match(commit, revs)) |
3853 | return commit_ignore; | |
53b2c823 | 3854 | if (revs->prune && revs->dense) { |
252a7c02 | 3855 | /* Commit without changes? */ |
7dc0fe3b | 3856 | if (commit->object.flags & TREESAME) { |
bf3418b0 KB |
3857 | int n; |
3858 | struct commit_list *p; | |
252a7c02 | 3859 | /* drop merges unless we want parenthood */ |
f35f5603 | 3860 | if (!want_ancestry(revs)) |
252a7c02 | 3861 | return commit_ignore; |
8d049e18 DS |
3862 | |
3863 | if (revs->show_pulls && (commit->object.flags & PULL_MERGE)) | |
3864 | return commit_show; | |
3865 | ||
bf3418b0 KB |
3866 | /* |
3867 | * If we want ancestry, then need to keep any merges | |
3868 | * between relevant commits to tie together topology. | |
3869 | * For consistency with TREESAME and simplification | |
3870 | * use "relevant" here rather than just INTERESTING, | |
3871 | * to treat bottom commit(s) as part of the topology. | |
3872 | */ | |
3873 | for (n = 0, p = commit->parents; p; p = p->next) | |
3874 | if (relevant_commit(p->item)) | |
3875 | if (++n >= 2) | |
3876 | return commit_show; | |
3877 | return commit_ignore; | |
252a7c02 | 3878 | } |
252a7c02 LT |
3879 | } |
3880 | return commit_show; | |
3881 | } | |
3882 | ||
0131c490 JH |
3883 | define_commit_slab(saved_parents, struct commit_list *); |
3884 | ||
3885 | #define EMPTY_PARENT_LIST ((struct commit_list *)-1) | |
3886 | ||
3887 | /* | |
3888 | * You may only call save_parents() once per commit (this is checked | |
3889 | * for non-root commits). | |
3890 | */ | |
3891 | static void save_parents(struct rev_info *revs, struct commit *commit) | |
3892 | { | |
3893 | struct commit_list **pp; | |
3894 | ||
3895 | if (!revs->saved_parents_slab) { | |
3896 | revs->saved_parents_slab = xmalloc(sizeof(struct saved_parents)); | |
3897 | init_saved_parents(revs->saved_parents_slab); | |
3898 | } | |
3899 | ||
3900 | pp = saved_parents_at(revs->saved_parents_slab, commit); | |
3901 | ||
3902 | /* | |
3903 | * When walking with reflogs, we may visit the same commit | |
3904 | * several times: once for each appearance in the reflog. | |
3905 | * | |
3906 | * In this case, save_parents() will be called multiple times. | |
3907 | * We want to keep only the first set of parents. We need to | |
3908 | * store a sentinel value for an empty (i.e., NULL) parent | |
3909 | * list to distinguish it from a not-yet-saved list, however. | |
3910 | */ | |
3911 | if (*pp) | |
3912 | return; | |
3913 | if (commit->parents) | |
3914 | *pp = copy_commit_list(commit->parents); | |
3915 | else | |
3916 | *pp = EMPTY_PARENT_LIST; | |
3917 | } | |
3918 | ||
3919 | static void free_saved_parents(struct rev_info *revs) | |
3920 | { | |
3921 | if (revs->saved_parents_slab) | |
3922 | clear_saved_parents(revs->saved_parents_slab); | |
3923 | } | |
3924 | ||
3925 | struct commit_list *get_saved_parents(struct rev_info *revs, const struct commit *commit) | |
3926 | { | |
3927 | struct commit_list *parents; | |
3928 | ||
3929 | if (!revs->saved_parents_slab) | |
3930 | return commit->parents; | |
3931 | ||
3932 | parents = *saved_parents_at(revs->saved_parents_slab, commit); | |
3933 | if (parents == EMPTY_PARENT_LIST) | |
3934 | return NULL; | |
3935 | return parents; | |
3936 | } | |
3937 | ||
beb5af43 AS |
3938 | enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit) |
3939 | { | |
3940 | enum commit_action action = get_commit_action(revs, commit); | |
3941 | ||
3942 | if (action == commit_show && | |
beb5af43 | 3943 | revs->prune && revs->dense && want_ancestry(revs)) { |
53d00b39 TR |
3944 | /* |
3945 | * --full-diff on simplified parents is no good: it | |
3946 | * will show spurious changes from the commits that | |
3947 | * were elided. So we save the parents on the side | |
3948 | * when --full-diff is in effect. | |
3949 | */ | |
3950 | if (revs->full_diff) | |
3951 | save_parents(revs, commit); | |
c7edcae0 | 3952 | if (rewrite_parents(revs, commit, rewrite_one) < 0) |
beb5af43 AS |
3953 | return commit_error; |
3954 | } | |
3955 | return action; | |
3956 | } | |
3957 | ||
1b32dece NTND |
3958 | static void track_linear(struct rev_info *revs, struct commit *commit) |
3959 | { | |
3960 | if (revs->track_first_time) { | |
3961 | revs->linear = 1; | |
3962 | revs->track_first_time = 0; | |
3963 | } else { | |
3964 | struct commit_list *p; | |
3965 | for (p = revs->previous_parents; p; p = p->next) | |
3966 | if (p->item == NULL || /* first commit */ | |
4a7e27e9 | 3967 | oideq(&p->item->object.oid, &commit->object.oid)) |
1b32dece NTND |
3968 | break; |
3969 | revs->linear = p != NULL; | |
3970 | } | |
3971 | if (revs->reverse) { | |
3972 | if (revs->linear) | |
3973 | commit->object.flags |= TRACK_LINEAR; | |
3974 | } | |
3975 | free_commit_list(revs->previous_parents); | |
3976 | revs->previous_parents = copy_commit_list(commit->parents); | |
3977 | } | |
3978 | ||
d5db6c9e | 3979 | static struct commit *get_revision_1(struct rev_info *revs) |
a4a88b2b | 3980 | { |
7c2f08aa | 3981 | while (1) { |
d08565bf | 3982 | struct commit *commit; |
a4a88b2b | 3983 | |
d08565bf JK |
3984 | if (revs->reflog_info) |
3985 | commit = next_reflog_entry(revs->reflog_info); | |
f0d9cc41 DS |
3986 | else if (revs->topo_walk_info) |
3987 | commit = next_topo_commit(revs); | |
d08565bf JK |
3988 | else |
3989 | commit = pop_commit(&revs->commits); | |
2a0925be | 3990 | |
7c2f08aa JK |
3991 | if (!commit) |
3992 | return NULL; | |
3993 | ||
d08565bf | 3994 | if (revs->reflog_info) |
ffa1eeae | 3995 | commit->object.flags &= ~(ADDED | SEEN | SHOWN); |
8860fd42 | 3996 | |
2a0925be LT |
3997 | /* |
3998 | * If we haven't done the list limiting, we need to look at | |
be7db6e5 LT |
3999 | * the parents here. We also need to do the date-based limiting |
4000 | * that we'd otherwise have done in limit_list(). | |
2a0925be | 4001 | */ |
be7db6e5 | 4002 | if (!revs->limited) { |
744f4985 | 4003 | if (revs->max_age != -1 && |
de239446 | 4004 | comparison_date(revs, commit) < revs->max_age) |
86ab4906 | 4005 | continue; |
d08565bf JK |
4006 | |
4007 | if (revs->reflog_info) | |
4008 | try_to_simplify_commit(revs, commit); | |
f0d9cc41 DS |
4009 | else if (revs->topo_walk_info) |
4010 | expand_topo_walk(revs, commit); | |
5284fc5c | 4011 | else if (process_parents(revs, commit, &revs->commits, NULL) < 0) { |
2db1a43f VM |
4012 | if (!revs->ignore_missing_links) |
4013 | die("Failed to traverse parents of commit %s", | |
f2fd0760 | 4014 | oid_to_hex(&commit->object.oid)); |
2db1a43f | 4015 | } |
be7db6e5 | 4016 | } |
744f4985 | 4017 | |
252a7c02 LT |
4018 | switch (simplify_commit(revs, commit)) { |
4019 | case commit_ignore: | |
8ecae9b0 | 4020 | continue; |
252a7c02 | 4021 | case commit_error: |
ed62089c | 4022 | die("Failed to simplify parents of commit %s", |
f2fd0760 | 4023 | oid_to_hex(&commit->object.oid)); |
252a7c02 | 4024 | default: |
1b32dece NTND |
4025 | if (revs->track_linear) |
4026 | track_linear(revs, commit); | |
252a7c02 | 4027 | return commit; |
384e99a4 | 4028 | } |
7c2f08aa | 4029 | } |
765ac8ec | 4030 | } |
d5db6c9e | 4031 | |
be6754c6 MH |
4032 | /* |
4033 | * Return true for entries that have not yet been shown. (This is an | |
4034 | * object_array_each_func_t.) | |
4035 | */ | |
4036 | static int entry_unshown(struct object_array_entry *entry, void *cb_data_unused) | |
86ab4906 | 4037 | { |
be6754c6 MH |
4038 | return !(entry->item->flags & SHOWN); |
4039 | } | |
86ab4906 | 4040 | |
be6754c6 MH |
4041 | /* |
4042 | * If array is on the verge of a realloc, garbage-collect any entries | |
4043 | * that have already been shown to try to free up some space. | |
4044 | */ | |
4045 | static void gc_boundary(struct object_array *array) | |
4046 | { | |
4047 | if (array->nr == array->alloc) | |
4048 | object_array_filter(array, entry_unshown, NULL); | |
86ab4906 JH |
4049 | } |
4050 | ||
4603ec0f AS |
4051 | static void create_boundary_commit_list(struct rev_info *revs) |
4052 | { | |
4053 | unsigned i; | |
4054 | struct commit *c; | |
4055 | struct object_array *array = &revs->boundary_commits; | |
4056 | struct object_array_entry *objects = array->objects; | |
4057 | ||
4058 | /* | |
4059 | * If revs->commits is non-NULL at this point, an error occurred in | |
4060 | * get_revision_1(). Ignore the error and continue printing the | |
4061 | * boundary commits anyway. (This is what the code has always | |
4062 | * done.) | |
4063 | */ | |
4064 | if (revs->commits) { | |
4065 | free_commit_list(revs->commits); | |
4066 | revs->commits = NULL; | |
4067 | } | |
4068 | ||
4069 | /* | |
4070 | * Put all of the actual boundary commits from revs->boundary_commits | |
4071 | * into revs->commits | |
4072 | */ | |
4073 | for (i = 0; i < array->nr; i++) { | |
4074 | c = (struct commit *)(objects[i].item); | |
4075 | if (!c) | |
4076 | continue; | |
4077 | if (!(c->object.flags & CHILD_SHOWN)) | |
4078 | continue; | |
4079 | if (c->object.flags & (SHOWN | BOUNDARY)) | |
4080 | continue; | |
4081 | c->object.flags |= BOUNDARY; | |
4082 | commit_list_insert(c, &revs->commits); | |
4083 | } | |
4084 | ||
4085 | /* | |
4086 | * If revs->topo_order is set, sort the boundary commits | |
4087 | * in topological order | |
4088 | */ | |
08f704f2 | 4089 | sort_in_topological_order(&revs->commits, revs->sort_order); |
4603ec0f AS |
4090 | } |
4091 | ||
7fefda5c | 4092 | static struct commit *get_revision_internal(struct rev_info *revs) |
d5db6c9e JH |
4093 | { |
4094 | struct commit *c = NULL; | |
86ab4906 JH |
4095 | struct commit_list *l; |
4096 | ||
4097 | if (revs->boundary == 2) { | |
4603ec0f AS |
4098 | /* |
4099 | * All of the normal commits have already been returned, | |
4100 | * and we are now returning boundary commits. | |
4101 | * create_boundary_commit_list() has populated | |
4102 | * revs->commits with the remaining commits to return. | |
4103 | */ | |
4104 | c = pop_commit(&revs->commits); | |
4105 | if (c) | |
4106 | c->object.flags |= SHOWN; | |
9c5e66e9 JS |
4107 | return c; |
4108 | } | |
4109 | ||
86ab4906 | 4110 | /* |
b72a1904 JK |
4111 | * If our max_count counter has reached zero, then we are done. We |
4112 | * don't simply return NULL because we still might need to show | |
4113 | * boundary commits. But we want to avoid calling get_revision_1, which | |
4114 | * might do a considerable amount of work finding the next commit only | |
4115 | * for us to throw it away. | |
4116 | * | |
4117 | * If it is non-zero, then either we don't have a max_count at all | |
4118 | * (-1), or it is still counting, in which case we decrement. | |
86ab4906 | 4119 | */ |
b72a1904 JK |
4120 | if (revs->max_count) { |
4121 | c = get_revision_1(revs); | |
4122 | if (c) { | |
9e57ac55 | 4123 | while (revs->skip_count > 0) { |
b72a1904 JK |
4124 | revs->skip_count--; |
4125 | c = get_revision_1(revs); | |
4126 | if (!c) | |
4127 | break; | |
4128 | } | |
8839ac94 | 4129 | } |
86ab4906 | 4130 | |
b72a1904 JK |
4131 | if (revs->max_count > 0) |
4132 | revs->max_count--; | |
d5db6c9e | 4133 | } |
86ab4906 | 4134 | |
c33d8593 JH |
4135 | if (c) |
4136 | c->object.flags |= SHOWN; | |
4137 | ||
9e57ac55 | 4138 | if (!revs->boundary) |
d5db6c9e | 4139 | return c; |
86ab4906 JH |
4140 | |
4141 | if (!c) { | |
4142 | /* | |
4143 | * get_revision_1() runs out the commits, and | |
4144 | * we are done computing the boundaries. | |
4145 | * switch to boundary commits output mode. | |
4146 | */ | |
4147 | revs->boundary = 2; | |
4603ec0f AS |
4148 | |
4149 | /* | |
4150 | * Update revs->commits to contain the list of | |
4151 | * boundary commits. | |
4152 | */ | |
4153 | create_boundary_commit_list(revs); | |
4154 | ||
3c68d67b | 4155 | return get_revision_internal(revs); |
86ab4906 JH |
4156 | } |
4157 | ||
4158 | /* | |
4159 | * boundary commits are the commits that are parents of the | |
4160 | * ones we got from get_revision_1() but they themselves are | |
4161 | * not returned from get_revision_1(). Before returning | |
4162 | * 'c', we need to mark its parents that they could be boundaries. | |
4163 | */ | |
4164 | ||
4165 | for (l = c->parents; l; l = l->next) { | |
4166 | struct object *p; | |
4167 | p = &(l->item->object); | |
c33d8593 | 4168 | if (p->flags & (CHILD_SHOWN | SHOWN)) |
86ab4906 JH |
4169 | continue; |
4170 | p->flags |= CHILD_SHOWN; | |
4171 | gc_boundary(&revs->boundary_commits); | |
4172 | add_object_array(p, NULL, &revs->boundary_commits); | |
4173 | } | |
4174 | ||
4175 | return c; | |
d5db6c9e | 4176 | } |
7fefda5c AS |
4177 | |
4178 | struct commit *get_revision(struct rev_info *revs) | |
4179 | { | |
498bcd31 TR |
4180 | struct commit *c; |
4181 | struct commit_list *reversed; | |
4182 | ||
4183 | if (revs->reverse) { | |
4184 | reversed = NULL; | |
9e57ac55 | 4185 | while ((c = get_revision_internal(revs))) |
498bcd31 | 4186 | commit_list_insert(c, &reversed); |
498bcd31 TR |
4187 | revs->commits = reversed; |
4188 | revs->reverse = 0; | |
4189 | revs->reverse_output_stage = 1; | |
4190 | } | |
4191 | ||
1b32dece NTND |
4192 | if (revs->reverse_output_stage) { |
4193 | c = pop_commit(&revs->commits); | |
4194 | if (revs->track_linear) | |
4195 | revs->linear = !!(c && c->object.flags & TRACK_LINEAR); | |
4196 | return c; | |
4197 | } | |
498bcd31 TR |
4198 | |
4199 | c = get_revision_internal(revs); | |
7fefda5c AS |
4200 | if (c && revs->graph) |
4201 | graph_update(revs->graph, c); | |
1b32dece | 4202 | if (!c) { |
53d00b39 | 4203 | free_saved_parents(revs); |
1b32dece NTND |
4204 | if (revs->previous_parents) { |
4205 | free_commit_list(revs->previous_parents); | |
4206 | revs->previous_parents = NULL; | |
4207 | } | |
4208 | } | |
7fefda5c AS |
4209 | return c; |
4210 | } | |
1df2d656 | 4211 | |
49825164 | 4212 | const char *get_revision_mark(const struct rev_info *revs, const struct commit *commit) |
1df2d656 MG |
4213 | { |
4214 | if (commit->object.flags & BOUNDARY) | |
4215 | return "-"; | |
4216 | else if (commit->object.flags & UNINTERESTING) | |
4217 | return "^"; | |
adbbb31e MG |
4218 | else if (commit->object.flags & PATCHSAME) |
4219 | return "="; | |
1df2d656 MG |
4220 | else if (!revs || revs->left_right) { |
4221 | if (commit->object.flags & SYMMETRIC_LEFT) | |
4222 | return "<"; | |
4223 | else | |
4224 | return ">"; | |
4225 | } else if (revs->graph) | |
4226 | return "*"; | |
adbbb31e MG |
4227 | else if (revs->cherry_mark) |
4228 | return "+"; | |
1df2d656 MG |
4229 | return ""; |
4230 | } | |
b1b47554 MG |
4231 | |
4232 | void put_revision_mark(const struct rev_info *revs, const struct commit *commit) | |
4233 | { | |
49825164 | 4234 | const char *mark = get_revision_mark(revs, commit); |
b1b47554 MG |
4235 | if (!strlen(mark)) |
4236 | return; | |
4237 | fputs(mark, stdout); | |
4238 | putchar(' '); | |
4239 | } |