Elijah Newren | d812c3b | 2023-04-11 00:41:56 -0700 | [diff] [blame] | 1 | #include "git-compat-util.h" |
Junio C Hamano | c64ed70 | 2006-09-04 21:50:12 -0700 | [diff] [blame] | 2 | #include "tag.h" |
| 3 | #include "commit.h" |
Elijah Newren | f394e09 | 2023-03-21 06:25:54 +0000 | [diff] [blame] | 4 | #include "gettext.h" |
Elijah Newren | 41771fa | 2023-02-24 00:09:27 +0000 | [diff] [blame] | 5 | #include "hex.h" |
Junio C Hamano | c64ed70 | 2006-09-04 21:50:12 -0700 | [diff] [blame] | 6 | #include "tree.h" |
| 7 | #include "blob.h" |
| 8 | #include "diff.h" |
| 9 | #include "tree-walk.h" |
| 10 | #include "revision.h" |
| 11 | #include "list-objects.h" |
Jeff Hostetler | 25ec7bc | 2017-11-21 20:58:50 +0000 | [diff] [blame] | 12 | #include "list-objects-filter.h" |
| 13 | #include "list-objects-filter-options.h" |
Jonathan Tan | df11e19 | 2017-12-08 15:27:15 +0000 | [diff] [blame] | 14 | #include "packfile.h" |
Elijah Newren | a034e91 | 2023-05-16 06:34:06 +0000 | [diff] [blame] | 15 | #include "object-store-ll.h" |
Matthew DeVore | 8b10a20 | 2018-10-17 17:39:15 -0700 | [diff] [blame] | 16 | #include "trace.h" |
Jeff King | 670a1da | 2023-08-31 02:22:03 -0400 | [diff] [blame] | 17 | #include "environment.h" |
Junio C Hamano | c64ed70 | 2006-09-04 21:50:12 -0700 | [diff] [blame] | 18 | |
Matthew DeVore | f447a49 | 2018-08-13 11:14:28 -0700 | [diff] [blame] | 19 | struct traversal_context { |
| 20 | struct rev_info *revs; |
| 21 | show_object_fn show_object; |
| 22 | show_commit_fn show_commit; |
| 23 | void *show_data; |
Matthew DeVore | 9430147 | 2019-06-27 15:54:05 -0700 | [diff] [blame] | 24 | struct filter *filter; |
Jeff King | 670a1da | 2023-08-31 02:22:03 -0400 | [diff] [blame] | 25 | int depth; |
Matthew DeVore | f447a49 | 2018-08-13 11:14:28 -0700 | [diff] [blame] | 26 | }; |
| 27 | |
Ævar Arnfjörð Bjarmason | 4f33a63 | 2022-03-09 16:01:38 +0000 | [diff] [blame] | 28 | static void show_commit(struct traversal_context *ctx, |
| 29 | struct commit *commit) |
| 30 | { |
| 31 | if (!ctx->show_commit) |
| 32 | return; |
| 33 | ctx->show_commit(commit, ctx->show_data); |
| 34 | } |
| 35 | |
| 36 | static void show_object(struct traversal_context *ctx, |
| 37 | struct object *object, |
| 38 | const char *name) |
| 39 | { |
| 40 | if (!ctx->show_object) |
| 41 | return; |
Taylor Blau | 4263f92 | 2023-11-06 17:56:30 -0500 | [diff] [blame] | 42 | if (ctx->revs->unpacked && has_object_pack(&object->oid)) |
| 43 | return; |
| 44 | |
Ævar Arnfjörð Bjarmason | 4f33a63 | 2022-03-09 16:01:38 +0000 | [diff] [blame] | 45 | ctx->show_object(object, name, ctx->show_data); |
| 46 | } |
| 47 | |
Matthew DeVore | f447a49 | 2018-08-13 11:14:28 -0700 | [diff] [blame] | 48 | static void process_blob(struct traversal_context *ctx, |
Junio C Hamano | c64ed70 | 2006-09-04 21:50:12 -0700 | [diff] [blame] | 49 | struct blob *blob, |
Jeff King | bd64516 | 2016-02-11 17:26:44 -0500 | [diff] [blame] | 50 | struct strbuf *path, |
Matthew DeVore | f447a49 | 2018-08-13 11:14:28 -0700 | [diff] [blame] | 51 | const char *name) |
Junio C Hamano | c64ed70 | 2006-09-04 21:50:12 -0700 | [diff] [blame] | 52 | { |
| 53 | struct object *obj = &blob->object; |
Jeff King | de1e67d | 2016-02-11 17:28:36 -0500 | [diff] [blame] | 54 | size_t pathlen; |
Matthew DeVore | 9430147 | 2019-06-27 15:54:05 -0700 | [diff] [blame] | 55 | enum list_objects_filter_result r; |
Junio C Hamano | c64ed70 | 2006-09-04 21:50:12 -0700 | [diff] [blame] | 56 | |
Matthew DeVore | f447a49 | 2018-08-13 11:14:28 -0700 | [diff] [blame] | 57 | if (!ctx->revs->blob_objects) |
Junio C Hamano | c64ed70 | 2006-09-04 21:50:12 -0700 | [diff] [blame] | 58 | return; |
Martin Koegler | a301b0c | 2008-02-18 21:47:56 +0100 | [diff] [blame] | 59 | if (!obj) |
| 60 | die("bad blob object"); |
Junio C Hamano | c64ed70 | 2006-09-04 21:50:12 -0700 | [diff] [blame] | 61 | if (obj->flags & (UNINTERESTING | SEEN)) |
| 62 | return; |
Jeff King | de1e67d | 2016-02-11 17:28:36 -0500 | [diff] [blame] | 63 | |
Jonathan Tan | df11e19 | 2017-12-08 15:27:15 +0000 | [diff] [blame] | 64 | /* |
| 65 | * Pre-filter known-missing objects when explicitly requested. |
| 66 | * Otherwise, a missing object error message may be reported |
| 67 | * later (depending on other filtering criteria). |
| 68 | * |
| 69 | * Note that this "--exclude-promisor-objects" pre-filtering |
| 70 | * may cause the actual filter to report an incomplete list |
| 71 | * of missing objects. |
| 72 | */ |
Matthew DeVore | f447a49 | 2018-08-13 11:14:28 -0700 | [diff] [blame] | 73 | if (ctx->revs->exclude_promisor_objects && |
Ævar Arnfjörð Bjarmason | bc726bd | 2023-03-28 15:58:50 +0200 | [diff] [blame] | 74 | !repo_has_object_file(the_repository, &obj->oid) && |
Jonathan Tan | df11e19 | 2017-12-08 15:27:15 +0000 | [diff] [blame] | 75 | is_promisor_object(&obj->oid)) |
| 76 | return; |
| 77 | |
Jeff King | de1e67d | 2016-02-11 17:28:36 -0500 | [diff] [blame] | 78 | pathlen = path->len; |
| 79 | strbuf_addstr(path, name); |
Matthew DeVore | 9430147 | 2019-06-27 15:54:05 -0700 | [diff] [blame] | 80 | r = list_objects_filter__filter_object(ctx->revs->repo, |
| 81 | LOFS_BLOB, obj, |
| 82 | path->buf, &path->buf[pathlen], |
| 83 | ctx->filter); |
Jeff Hostetler | 25ec7bc | 2017-11-21 20:58:50 +0000 | [diff] [blame] | 84 | if (r & LOFR_MARK_SEEN) |
| 85 | obj->flags |= SEEN; |
| 86 | if (r & LOFR_DO_SHOW) |
Ævar Arnfjörð Bjarmason | 4f33a63 | 2022-03-09 16:01:38 +0000 | [diff] [blame] | 87 | show_object(ctx, obj, path->buf); |
Jeff King | de1e67d | 2016-02-11 17:28:36 -0500 | [diff] [blame] | 88 | strbuf_setlen(path, pathlen); |
Junio C Hamano | c64ed70 | 2006-09-04 21:50:12 -0700 | [diff] [blame] | 89 | } |
| 90 | |
Matthew DeVore | f447a49 | 2018-08-13 11:14:28 -0700 | [diff] [blame] | 91 | static void process_tree(struct traversal_context *ctx, |
Junio C Hamano | c64ed70 | 2006-09-04 21:50:12 -0700 | [diff] [blame] | 92 | struct tree *tree, |
Elijah Newren | cc5fa2f | 2010-12-17 20:26:47 +0700 | [diff] [blame] | 93 | struct strbuf *base, |
Matthew DeVore | 9202489 | 2018-08-13 11:14:29 -0700 | [diff] [blame] | 94 | const char *name); |
| 95 | |
| 96 | static void process_tree_contents(struct traversal_context *ctx, |
| 97 | struct tree *tree, |
| 98 | struct strbuf *base) |
Junio C Hamano | c64ed70 | 2006-09-04 21:50:12 -0700 | [diff] [blame] | 99 | { |
Junio C Hamano | c64ed70 | 2006-09-04 21:50:12 -0700 | [diff] [blame] | 100 | struct tree_desc desc; |
| 101 | struct name_entry entry; |
Matthew DeVore | 9202489 | 2018-08-13 11:14:29 -0700 | [diff] [blame] | 102 | enum interesting match = ctx->revs->diffopt.pathspec.nr == 0 ? |
| 103 | all_entries_interesting : entry_not_interesting; |
| 104 | |
Eric W. Biederman | efed687 | 2023-10-01 21:40:28 -0500 | [diff] [blame] | 105 | init_tree_desc(&desc, &tree->object.oid, tree->buffer, tree->size); |
Matthew DeVore | 9202489 | 2018-08-13 11:14:29 -0700 | [diff] [blame] | 106 | |
| 107 | while (tree_entry(&desc, &entry)) { |
| 108 | if (match != all_entries_interesting) { |
Nguyễn Thái Ngọc Duy | 67022e0 | 2018-11-18 17:47:57 +0100 | [diff] [blame] | 109 | match = tree_entry_interesting(ctx->revs->repo->index, |
Junio C Hamano | 0ad927e | 2023-07-07 15:21:15 -0700 | [diff] [blame] | 110 | &entry, base, |
Matthew DeVore | 9202489 | 2018-08-13 11:14:29 -0700 | [diff] [blame] | 111 | &ctx->revs->diffopt.pathspec); |
| 112 | if (match == all_entries_not_interesting) |
| 113 | break; |
| 114 | if (match == entry_not_interesting) |
| 115 | continue; |
| 116 | } |
| 117 | |
Matthew DeVore | 99c9aa9 | 2018-10-05 14:31:24 -0700 | [diff] [blame] | 118 | if (S_ISDIR(entry.mode)) { |
brian m. carlson | ea82b2a | 2019-01-15 00:39:44 +0000 | [diff] [blame] | 119 | struct tree *t = lookup_tree(ctx->revs->repo, &entry.oid); |
Taylor Blau | b49e74e | 2019-04-09 19:13:19 -0700 | [diff] [blame] | 120 | if (!t) { |
| 121 | die(_("entry '%s' in tree %s has tree mode, " |
| 122 | "but is not a tree"), |
| 123 | entry.path, oid_to_hex(&tree->object.oid)); |
| 124 | } |
Matthew DeVore | 99c9aa9 | 2018-10-05 14:31:24 -0700 | [diff] [blame] | 125 | t->object.flags |= NOT_USER_GIVEN; |
Jeff King | 670a1da | 2023-08-31 02:22:03 -0400 | [diff] [blame] | 126 | ctx->depth++; |
Matthew DeVore | 99c9aa9 | 2018-10-05 14:31:24 -0700 | [diff] [blame] | 127 | process_tree(ctx, t, base, entry.path); |
Jeff King | 670a1da | 2023-08-31 02:22:03 -0400 | [diff] [blame] | 128 | ctx->depth--; |
Matthew DeVore | 99c9aa9 | 2018-10-05 14:31:24 -0700 | [diff] [blame] | 129 | } |
Matthew DeVore | 9202489 | 2018-08-13 11:14:29 -0700 | [diff] [blame] | 130 | else if (S_ISGITLINK(entry.mode)) |
Jeff King | 0027148 | 2022-12-13 06:12:09 -0500 | [diff] [blame] | 131 | ; /* ignore gitlink */ |
Matthew DeVore | 99c9aa9 | 2018-10-05 14:31:24 -0700 | [diff] [blame] | 132 | else { |
brian m. carlson | ea82b2a | 2019-01-15 00:39:44 +0000 | [diff] [blame] | 133 | struct blob *b = lookup_blob(ctx->revs->repo, &entry.oid); |
Taylor Blau | 23c2044 | 2019-04-09 19:13:17 -0700 | [diff] [blame] | 134 | if (!b) { |
| 135 | die(_("entry '%s' in tree %s has blob mode, " |
| 136 | "but is not a blob"), |
| 137 | entry.path, oid_to_hex(&tree->object.oid)); |
| 138 | } |
Matthew DeVore | 99c9aa9 | 2018-10-05 14:31:24 -0700 | [diff] [blame] | 139 | b->object.flags |= NOT_USER_GIVEN; |
| 140 | process_blob(ctx, b, base, entry.path); |
| 141 | } |
Matthew DeVore | 9202489 | 2018-08-13 11:14:29 -0700 | [diff] [blame] | 142 | } |
| 143 | } |
| 144 | |
| 145 | static void process_tree(struct traversal_context *ctx, |
| 146 | struct tree *tree, |
| 147 | struct strbuf *base, |
Matthew DeVore | f447a49 | 2018-08-13 11:14:28 -0700 | [diff] [blame] | 148 | const char *name) |
Junio C Hamano | c64ed70 | 2006-09-04 21:50:12 -0700 | [diff] [blame] | 149 | { |
| 150 | struct object *obj = &tree->object; |
Matthew DeVore | f447a49 | 2018-08-13 11:14:28 -0700 | [diff] [blame] | 151 | struct rev_info *revs = ctx->revs; |
Elijah Newren | cc5fa2f | 2010-12-17 20:26:47 +0700 | [diff] [blame] | 152 | int baselen = base->len; |
Matthew DeVore | 9430147 | 2019-06-27 15:54:05 -0700 | [diff] [blame] | 153 | enum list_objects_filter_result r; |
Matthew DeVore | 7c0fe33 | 2018-10-05 14:31:23 -0700 | [diff] [blame] | 154 | int failed_parse; |
Junio C Hamano | c64ed70 | 2006-09-04 21:50:12 -0700 | [diff] [blame] | 155 | |
| 156 | if (!revs->tree_objects) |
| 157 | return; |
Martin Koegler | a301b0c | 2008-02-18 21:47:56 +0100 | [diff] [blame] | 158 | if (!obj) |
| 159 | die("bad tree object"); |
Junio C Hamano | c64ed70 | 2006-09-04 21:50:12 -0700 | [diff] [blame] | 160 | if (obj->flags & (UNINTERESTING | SEEN)) |
| 161 | return; |
Jeff King | aa9ad6f | 2021-06-14 08:05:44 -0400 | [diff] [blame] | 162 | if (revs->include_check_obj && |
| 163 | !revs->include_check_obj(&tree->object, revs->include_check_data)) |
| 164 | return; |
Matthew DeVore | 7c0fe33 | 2018-10-05 14:31:23 -0700 | [diff] [blame] | 165 | |
Jeff King | 670a1da | 2023-08-31 02:22:03 -0400 | [diff] [blame] | 166 | if (ctx->depth > max_allowed_tree_depth) |
| 167 | die("exceeded maximum allowed tree depth"); |
| 168 | |
Matthew DeVore | 7c0fe33 | 2018-10-05 14:31:23 -0700 | [diff] [blame] | 169 | failed_parse = parse_tree_gently(tree, 1); |
| 170 | if (failed_parse) { |
Vicent Marti | 2db1a43 | 2014-03-28 06:00:43 -0400 | [diff] [blame] | 171 | if (revs->ignore_missing_links) |
| 172 | return; |
Jonathan Tan | df11e19 | 2017-12-08 15:27:15 +0000 | [diff] [blame] | 173 | |
| 174 | /* |
| 175 | * Pre-filter known-missing tree objects when explicitly |
| 176 | * requested. This may cause the actual filter to report |
| 177 | * an incomplete list of missing objects. |
| 178 | */ |
| 179 | if (revs->exclude_promisor_objects && |
| 180 | is_promisor_object(&obj->oid)) |
| 181 | return; |
| 182 | |
Karthik Nayak | ca556f4 | 2023-10-26 12:11:07 +0200 | [diff] [blame] | 183 | if (!revs->do_not_die_on_missing_objects) |
Matthew DeVore | 7c0fe33 | 2018-10-05 14:31:23 -0700 | [diff] [blame] | 184 | die("bad tree object %s", oid_to_hex(&obj->oid)); |
Vicent Marti | 2db1a43 | 2014-03-28 06:00:43 -0400 | [diff] [blame] | 185 | } |
Junio C Hamano | c64ed70 | 2006-09-04 21:50:12 -0700 | [diff] [blame] | 186 | |
Jeff King | 13528ab | 2016-02-11 17:26:18 -0500 | [diff] [blame] | 187 | strbuf_addstr(base, name); |
Matthew DeVore | 9430147 | 2019-06-27 15:54:05 -0700 | [diff] [blame] | 188 | r = list_objects_filter__filter_object(ctx->revs->repo, |
| 189 | LOFS_BEGIN_TREE, obj, |
| 190 | base->buf, &base->buf[baselen], |
| 191 | ctx->filter); |
Jeff Hostetler | 25ec7bc | 2017-11-21 20:58:50 +0000 | [diff] [blame] | 192 | if (r & LOFR_MARK_SEEN) |
| 193 | obj->flags |= SEEN; |
| 194 | if (r & LOFR_DO_SHOW) |
Ævar Arnfjörð Bjarmason | 4f33a63 | 2022-03-09 16:01:38 +0000 | [diff] [blame] | 195 | show_object(ctx, obj, base->buf); |
Jeff King | 13528ab | 2016-02-11 17:26:18 -0500 | [diff] [blame] | 196 | if (base->len) |
| 197 | strbuf_addch(base, '/'); |
Elijah Newren | cc5fa2f | 2010-12-17 20:26:47 +0700 | [diff] [blame] | 198 | |
Matthew DeVore | 8b10a20 | 2018-10-17 17:39:15 -0700 | [diff] [blame] | 199 | if (r & LOFR_SKIP_TREE) |
| 200 | trace_printf("Skipping contents of tree %s...\n", base->buf); |
| 201 | else if (!failed_parse) |
Matthew DeVore | 7c0fe33 | 2018-10-05 14:31:23 -0700 | [diff] [blame] | 202 | process_tree_contents(ctx, tree, base); |
Junio C Hamano | c64ed70 | 2006-09-04 21:50:12 -0700 | [diff] [blame] | 203 | |
Matthew DeVore | 9430147 | 2019-06-27 15:54:05 -0700 | [diff] [blame] | 204 | r = list_objects_filter__filter_object(ctx->revs->repo, |
| 205 | LOFS_END_TREE, obj, |
| 206 | base->buf, &base->buf[baselen], |
| 207 | ctx->filter); |
| 208 | if (r & LOFR_MARK_SEEN) |
| 209 | obj->flags |= SEEN; |
| 210 | if (r & LOFR_DO_SHOW) |
Ævar Arnfjörð Bjarmason | 4f33a63 | 2022-03-09 16:01:38 +0000 | [diff] [blame] | 211 | show_object(ctx, obj, base->buf); |
Jeff Hostetler | 25ec7bc | 2017-11-21 20:58:50 +0000 | [diff] [blame] | 212 | |
Elijah Newren | cc5fa2f | 2010-12-17 20:26:47 +0700 | [diff] [blame] | 213 | strbuf_setlen(base, baselen); |
Jeff King | 6e454b9 | 2013-06-05 18:37:39 -0400 | [diff] [blame] | 214 | free_tree_buffer(tree); |
Junio C Hamano | c64ed70 | 2006-09-04 21:50:12 -0700 | [diff] [blame] | 215 | } |
| 216 | |
Patrick Steinhardt | 628d81b | 2021-04-09 13:28:02 +0200 | [diff] [blame] | 217 | static void process_tag(struct traversal_context *ctx, |
| 218 | struct tag *tag, |
| 219 | const char *name) |
| 220 | { |
Patrick Steinhardt | 9a2a4f9 | 2021-04-12 15:37:35 +0200 | [diff] [blame] | 221 | enum list_objects_filter_result r; |
| 222 | |
| 223 | r = list_objects_filter__filter_object(ctx->revs->repo, LOFS_TAG, |
| 224 | &tag->object, NULL, NULL, |
| 225 | ctx->filter); |
| 226 | if (r & LOFR_MARK_SEEN) |
| 227 | tag->object.flags |= SEEN; |
| 228 | if (r & LOFR_DO_SHOW) |
Ævar Arnfjörð Bjarmason | 4f33a63 | 2022-03-09 16:01:38 +0000 | [diff] [blame] | 229 | show_object(ctx, &tag->object, name); |
Patrick Steinhardt | 628d81b | 2021-04-09 13:28:02 +0200 | [diff] [blame] | 230 | } |
| 231 | |
Junio C Hamano | 8d1d8f8 | 2006-09-06 01:42:23 -0700 | [diff] [blame] | 232 | static void mark_edge_parents_uninteresting(struct commit *commit, |
| 233 | struct rev_info *revs, |
| 234 | show_edge_fn show_edge) |
| 235 | { |
| 236 | struct commit_list *parents; |
| 237 | |
| 238 | for (parents = commit->parents; parents; parents = parents->next) { |
| 239 | struct commit *parent = parents->item; |
| 240 | if (!(parent->object.flags & UNINTERESTING)) |
| 241 | continue; |
Ævar Arnfjörð Bjarmason | ecb5091 | 2023-03-28 15:58:48 +0200 | [diff] [blame] | 242 | mark_tree_uninteresting(revs->repo, |
| 243 | repo_get_commit_tree(the_repository, parent)); |
Junio C Hamano | 8d1d8f8 | 2006-09-06 01:42:23 -0700 | [diff] [blame] | 244 | if (revs->edge_hint && !(parent->object.flags & SHOWN)) { |
| 245 | parent->object.flags |= SHOWN; |
| 246 | show_edge(parent); |
| 247 | } |
| 248 | } |
| 249 | } |
| 250 | |
Derrick Stolee | 4f6d26b | 2019-01-16 10:25:58 -0800 | [diff] [blame] | 251 | static void add_edge_parents(struct commit *commit, |
| 252 | struct rev_info *revs, |
| 253 | show_edge_fn show_edge, |
| 254 | struct oidset *set) |
| 255 | { |
| 256 | struct commit_list *parents; |
| 257 | |
| 258 | for (parents = commit->parents; parents; parents = parents->next) { |
| 259 | struct commit *parent = parents->item; |
Ævar Arnfjörð Bjarmason | ecb5091 | 2023-03-28 15:58:48 +0200 | [diff] [blame] | 260 | struct tree *tree = repo_get_commit_tree(the_repository, |
| 261 | parent); |
Derrick Stolee | 4f6d26b | 2019-01-16 10:25:58 -0800 | [diff] [blame] | 262 | |
| 263 | if (!tree) |
| 264 | continue; |
| 265 | |
| 266 | oidset_insert(set, &tree->object.oid); |
| 267 | |
| 268 | if (!(parent->object.flags & UNINTERESTING)) |
| 269 | continue; |
| 270 | tree->object.flags |= UNINTERESTING; |
| 271 | |
| 272 | if (revs->edge_hint && !(parent->object.flags & SHOWN)) { |
| 273 | parent->object.flags |= SHOWN; |
| 274 | show_edge(parent); |
| 275 | } |
| 276 | } |
| 277 | } |
| 278 | |
| 279 | void mark_edges_uninteresting(struct rev_info *revs, |
| 280 | show_edge_fn show_edge, |
| 281 | int sparse) |
Junio C Hamano | 8d1d8f8 | 2006-09-06 01:42:23 -0700 | [diff] [blame] | 282 | { |
Nguyễn Thái Ngọc Duy | e76a5fb | 2013-08-16 16:52:06 +0700 | [diff] [blame] | 283 | struct commit_list *list; |
Nguyễn Thái Ngọc Duy | fbd4a70 | 2013-08-16 16:52:07 +0700 | [diff] [blame] | 284 | int i; |
| 285 | |
Derrick Stolee | 4f6d26b | 2019-01-16 10:25:58 -0800 | [diff] [blame] | 286 | if (sparse) { |
| 287 | struct oidset set; |
| 288 | oidset_init(&set, 16); |
Junio C Hamano | 8d1d8f8 | 2006-09-06 01:42:23 -0700 | [diff] [blame] | 289 | |
Derrick Stolee | 4f6d26b | 2019-01-16 10:25:58 -0800 | [diff] [blame] | 290 | for (list = revs->commits; list; list = list->next) { |
| 291 | struct commit *commit = list->item; |
Ævar Arnfjörð Bjarmason | ecb5091 | 2023-03-28 15:58:48 +0200 | [diff] [blame] | 292 | struct tree *tree = repo_get_commit_tree(the_repository, |
| 293 | commit); |
Derrick Stolee | 4f6d26b | 2019-01-16 10:25:58 -0800 | [diff] [blame] | 294 | |
| 295 | if (commit->object.flags & UNINTERESTING) |
| 296 | tree->object.flags |= UNINTERESTING; |
| 297 | |
| 298 | oidset_insert(&set, &tree->object.oid); |
| 299 | add_edge_parents(commit, revs, show_edge, &set); |
Junio C Hamano | 8d1d8f8 | 2006-09-06 01:42:23 -0700 | [diff] [blame] | 300 | } |
Derrick Stolee | 4f6d26b | 2019-01-16 10:25:58 -0800 | [diff] [blame] | 301 | |
| 302 | mark_trees_uninteresting_sparse(revs->repo, &set); |
| 303 | oidset_clear(&set); |
| 304 | } else { |
| 305 | for (list = revs->commits; list; list = list->next) { |
| 306 | struct commit *commit = list->item; |
| 307 | if (commit->object.flags & UNINTERESTING) { |
| 308 | mark_tree_uninteresting(revs->repo, |
Ævar Arnfjörð Bjarmason | ecb5091 | 2023-03-28 15:58:48 +0200 | [diff] [blame] | 309 | repo_get_commit_tree(the_repository, commit)); |
Derrick Stolee | 4f6d26b | 2019-01-16 10:25:58 -0800 | [diff] [blame] | 310 | if (revs->edge_hint_aggressive && !(commit->object.flags & SHOWN)) { |
| 311 | commit->object.flags |= SHOWN; |
| 312 | show_edge(commit); |
| 313 | } |
| 314 | continue; |
| 315 | } |
| 316 | mark_edge_parents_uninteresting(commit, revs, show_edge); |
| 317 | } |
Junio C Hamano | 8d1d8f8 | 2006-09-06 01:42:23 -0700 | [diff] [blame] | 318 | } |
Derrick Stolee | 4f6d26b | 2019-01-16 10:25:58 -0800 | [diff] [blame] | 319 | |
brian m. carlson | 1684c1b | 2014-12-24 23:05:39 +0000 | [diff] [blame] | 320 | if (revs->edge_hint_aggressive) { |
Jeff King | 200abe7 | 2014-01-20 21:25:40 -0500 | [diff] [blame] | 321 | for (i = 0; i < revs->cmdline.nr; i++) { |
| 322 | struct object *obj = revs->cmdline.rev[i].item; |
| 323 | struct commit *commit = (struct commit *)obj; |
| 324 | if (obj->type != OBJ_COMMIT || !(obj->flags & UNINTERESTING)) |
| 325 | continue; |
Nguyễn Thái Ngọc Duy | b3c7eef | 2018-09-21 17:57:39 +0200 | [diff] [blame] | 326 | mark_tree_uninteresting(revs->repo, |
Ævar Arnfjörð Bjarmason | ecb5091 | 2023-03-28 15:58:48 +0200 | [diff] [blame] | 327 | repo_get_commit_tree(the_repository, commit)); |
Jeff King | 200abe7 | 2014-01-20 21:25:40 -0500 | [diff] [blame] | 328 | if (!(obj->flags & SHOWN)) { |
| 329 | obj->flags |= SHOWN; |
| 330 | show_edge(commit); |
| 331 | } |
Nguyễn Thái Ngọc Duy | fbd4a70 | 2013-08-16 16:52:07 +0700 | [diff] [blame] | 332 | } |
| 333 | } |
Junio C Hamano | 8d1d8f8 | 2006-09-06 01:42:23 -0700 | [diff] [blame] | 334 | } |
| 335 | |
Linus Torvalds | 8d2dfc4 | 2009-04-10 17:27:58 -0700 | [diff] [blame] | 336 | static void add_pending_tree(struct rev_info *revs, struct tree *tree) |
| 337 | { |
| 338 | add_pending_object(revs, &tree->object, ""); |
| 339 | } |
| 340 | |
Teng Long | b3e36df | 2021-08-12 16:59:31 +0800 | [diff] [blame] | 341 | static void traverse_non_commits(struct traversal_context *ctx, |
| 342 | struct strbuf *base) |
Junio C Hamano | c64ed70 | 2006-09-04 21:50:12 -0700 | [diff] [blame] | 343 | { |
| 344 | int i; |
Junio C Hamano | c64ed70 | 2006-09-04 21:50:12 -0700 | [diff] [blame] | 345 | |
Stefan Beller | 91904f5 | 2017-11-02 12:41:43 -0700 | [diff] [blame] | 346 | assert(base->len == 0); |
| 347 | |
Matthew DeVore | f447a49 | 2018-08-13 11:14:28 -0700 | [diff] [blame] | 348 | for (i = 0; i < ctx->revs->pending.nr; i++) { |
| 349 | struct object_array_entry *pending = ctx->revs->pending.objects + i; |
Junio C Hamano | c64ed70 | 2006-09-04 21:50:12 -0700 | [diff] [blame] | 350 | struct object *obj = pending->item; |
| 351 | const char *name = pending->name; |
Jeff King | 2073949 | 2014-10-15 18:43:19 -0400 | [diff] [blame] | 352 | const char *path = pending->path; |
Junio C Hamano | c64ed70 | 2006-09-04 21:50:12 -0700 | [diff] [blame] | 353 | if (obj->flags & (UNINTERESTING | SEEN)) |
| 354 | continue; |
| 355 | if (obj->type == OBJ_TAG) { |
Patrick Steinhardt | 628d81b | 2021-04-09 13:28:02 +0200 | [diff] [blame] | 356 | process_tag(ctx, (struct tag *)obj, name); |
Junio C Hamano | c64ed70 | 2006-09-04 21:50:12 -0700 | [diff] [blame] | 357 | continue; |
| 358 | } |
Jeff King | 2073949 | 2014-10-15 18:43:19 -0400 | [diff] [blame] | 359 | if (!path) |
| 360 | path = ""; |
Junio C Hamano | c64ed70 | 2006-09-04 21:50:12 -0700 | [diff] [blame] | 361 | if (obj->type == OBJ_TREE) { |
Jeff King | 670a1da | 2023-08-31 02:22:03 -0400 | [diff] [blame] | 362 | ctx->depth = 0; |
Matthew DeVore | f447a49 | 2018-08-13 11:14:28 -0700 | [diff] [blame] | 363 | process_tree(ctx, (struct tree *)obj, base, path); |
Junio C Hamano | c64ed70 | 2006-09-04 21:50:12 -0700 | [diff] [blame] | 364 | continue; |
| 365 | } |
| 366 | if (obj->type == OBJ_BLOB) { |
Matthew DeVore | f447a49 | 2018-08-13 11:14:28 -0700 | [diff] [blame] | 367 | process_blob(ctx, (struct blob *)obj, base, path); |
Junio C Hamano | c64ed70 | 2006-09-04 21:50:12 -0700 | [diff] [blame] | 368 | continue; |
| 369 | } |
| 370 | die("unknown pending object %s (%s)", |
brian m. carlson | f2fd076 | 2015-11-10 02:22:28 +0000 | [diff] [blame] | 371 | oid_to_hex(&obj->oid), name); |
Junio C Hamano | c64ed70 | 2006-09-04 21:50:12 -0700 | [diff] [blame] | 372 | } |
Matthew DeVore | f447a49 | 2018-08-13 11:14:28 -0700 | [diff] [blame] | 373 | object_array_clear(&ctx->revs->pending); |
Stefan Beller | 91904f5 | 2017-11-02 12:41:43 -0700 | [diff] [blame] | 374 | } |
| 375 | |
Matthew DeVore | f447a49 | 2018-08-13 11:14:28 -0700 | [diff] [blame] | 376 | static void do_traverse(struct traversal_context *ctx) |
Stefan Beller | 91904f5 | 2017-11-02 12:41:43 -0700 | [diff] [blame] | 377 | { |
| 378 | struct commit *commit; |
| 379 | struct strbuf csp; /* callee's scratch pad */ |
| 380 | strbuf_init(&csp, PATH_MAX); |
| 381 | |
Matthew DeVore | f447a49 | 2018-08-13 11:14:28 -0700 | [diff] [blame] | 382 | while ((commit = get_revision(ctx->revs)) != NULL) { |
Patrick Steinhardt | 9a2a4f9 | 2021-04-12 15:37:35 +0200 | [diff] [blame] | 383 | enum list_objects_filter_result r; |
| 384 | |
| 385 | r = list_objects_filter__filter_object(ctx->revs->repo, |
| 386 | LOFS_COMMIT, &commit->object, |
| 387 | NULL, NULL, ctx->filter); |
| 388 | |
Stefan Beller | 91904f5 | 2017-11-02 12:41:43 -0700 | [diff] [blame] | 389 | /* |
| 390 | * an uninteresting boundary commit may not have its tree |
| 391 | * parsed yet, but we are not going to show them anyway |
| 392 | */ |
Jeff King | 72ed80c | 2019-09-11 21:11:37 -0400 | [diff] [blame] | 393 | if (!ctx->revs->tree_objects) |
| 394 | ; /* do not bother loading tree */ |
Karthik Nayak | 9830926 | 2023-10-27 09:59:29 +0200 | [diff] [blame] | 395 | else if (ctx->revs->do_not_die_on_missing_objects && |
| 396 | oidset_contains(&ctx->revs->missing_commits, &commit->object.oid)) |
| 397 | ; |
Ævar Arnfjörð Bjarmason | ecb5091 | 2023-03-28 15:58:48 +0200 | [diff] [blame] | 398 | else if (repo_get_commit_tree(the_repository, commit)) { |
| 399 | struct tree *tree = repo_get_commit_tree(the_repository, |
| 400 | commit); |
Matthew DeVore | 99c9aa9 | 2018-10-05 14:31:24 -0700 | [diff] [blame] | 401 | tree->object.flags |= NOT_USER_GIVEN; |
| 402 | add_pending_tree(ctx->revs, tree); |
Jeff King | 97dd512 | 2019-04-09 19:13:25 -0700 | [diff] [blame] | 403 | } else if (commit->object.parsed) { |
| 404 | die(_("unable to load root tree for commit %s"), |
| 405 | oid_to_hex(&commit->object.oid)); |
Matthew DeVore | 99c9aa9 | 2018-10-05 14:31:24 -0700 | [diff] [blame] | 406 | } |
Patrick Steinhardt | 9a2a4f9 | 2021-04-12 15:37:35 +0200 | [diff] [blame] | 407 | |
| 408 | if (r & LOFR_MARK_SEEN) |
| 409 | commit->object.flags |= SEEN; |
| 410 | if (r & LOFR_DO_SHOW) |
Ævar Arnfjörð Bjarmason | 4f33a63 | 2022-03-09 16:01:38 +0000 | [diff] [blame] | 411 | show_commit(ctx, commit); |
Stefan Beller | ce5b6f9 | 2017-11-15 18:00:35 -0800 | [diff] [blame] | 412 | |
Matthew DeVore | f447a49 | 2018-08-13 11:14:28 -0700 | [diff] [blame] | 413 | if (ctx->revs->tree_blobs_in_commit_order) |
Stefan Beller | ce5b6f9 | 2017-11-15 18:00:35 -0800 | [diff] [blame] | 414 | /* |
| 415 | * NEEDSWORK: Adding the tree and then flushing it here |
| 416 | * needs a reallocation for each commit. Can we pass the |
| 417 | * tree directory without allocation churn? |
| 418 | */ |
Teng Long | b3e36df | 2021-08-12 16:59:31 +0800 | [diff] [blame] | 419 | traverse_non_commits(ctx, &csp); |
Stefan Beller | 91904f5 | 2017-11-02 12:41:43 -0700 | [diff] [blame] | 420 | } |
Teng Long | b3e36df | 2021-08-12 16:59:31 +0800 | [diff] [blame] | 421 | traverse_non_commits(ctx, &csp); |
Stefan Beller | 91904f5 | 2017-11-02 12:41:43 -0700 | [diff] [blame] | 422 | strbuf_release(&csp); |
Junio C Hamano | c64ed70 | 2006-09-04 21:50:12 -0700 | [diff] [blame] | 423 | } |
Jeff Hostetler | 25ec7bc | 2017-11-21 20:58:50 +0000 | [diff] [blame] | 424 | |
Jeff Hostetler | 25ec7bc | 2017-11-21 20:58:50 +0000 | [diff] [blame] | 425 | void traverse_commit_list_filtered( |
Jeff Hostetler | 25ec7bc | 2017-11-21 20:58:50 +0000 | [diff] [blame] | 426 | struct rev_info *revs, |
| 427 | show_commit_fn show_commit, |
| 428 | show_object_fn show_object, |
| 429 | void *show_data, |
| 430 | struct oidset *omitted) |
| 431 | { |
Derrick Stolee | 3e0370a | 2022-03-09 16:01:36 +0000 | [diff] [blame] | 432 | struct traversal_context ctx = { |
| 433 | .revs = revs, |
| 434 | .show_object = show_object, |
| 435 | .show_commit = show_commit, |
| 436 | .show_data = show_data, |
| 437 | }; |
Jeff Hostetler | 25ec7bc | 2017-11-21 20:58:50 +0000 | [diff] [blame] | 438 | |
Derrick Stolee | 3e0370a | 2022-03-09 16:01:36 +0000 | [diff] [blame] | 439 | if (revs->filter.choice) |
| 440 | ctx.filter = list_objects_filter__init(omitted, &revs->filter); |
| 441 | |
Matthew DeVore | f447a49 | 2018-08-13 11:14:28 -0700 | [diff] [blame] | 442 | do_traverse(&ctx); |
Derrick Stolee | 3e0370a | 2022-03-09 16:01:36 +0000 | [diff] [blame] | 443 | |
| 444 | if (ctx.filter) |
| 445 | list_objects_filter__free(ctx.filter); |
Jeff Hostetler | 25ec7bc | 2017-11-21 20:58:50 +0000 | [diff] [blame] | 446 | } |