]>
Commit | Line | Data |
---|---|---|
c64ed70d JH |
1 | #include "cache.h" |
2 | #include "tag.h" | |
3 | #include "commit.h" | |
4 | #include "tree.h" | |
5 | #include "blob.h" | |
6 | #include "diff.h" | |
7 | #include "tree-walk.h" | |
8 | #include "revision.h" | |
9 | #include "list-objects.h" | |
10 | ||
11 | static void process_blob(struct rev_info *revs, | |
12 | struct blob *blob, | |
8d2dfc49 | 13 | show_object_fn show, |
bd64516a | 14 | struct strbuf *path, |
49473672 JH |
15 | const char *name, |
16 | void *cb_data) | |
c64ed70d JH |
17 | { |
18 | struct object *obj = &blob->object; | |
de1e67d0 | 19 | size_t pathlen; |
c64ed70d JH |
20 | |
21 | if (!revs->blob_objects) | |
22 | return; | |
a301b0c8 MK |
23 | if (!obj) |
24 | die("bad blob object"); | |
c64ed70d JH |
25 | if (obj->flags & (UNINTERESTING | SEEN)) |
26 | return; | |
27 | obj->flags |= SEEN; | |
de1e67d0 JK |
28 | |
29 | pathlen = path->len; | |
30 | strbuf_addstr(path, name); | |
31 | show(obj, path->buf, cb_data); | |
32 | strbuf_setlen(path, pathlen); | |
c64ed70d JH |
33 | } |
34 | ||
6e2f441b LT |
35 | /* |
36 | * Processing a gitlink entry currently does nothing, since | |
37 | * we do not recurse into the subproject. | |
38 | * | |
39 | * We *could* eventually add a flag that actually does that, | |
40 | * which would involve: | |
41 | * - is the subproject actually checked out? | |
42 | * - if so, see if the subproject has already been added | |
43 | * to the alternates list, and add it if not. | |
44 | * - process the commit (or tag) the gitlink points to | |
45 | * recursively. | |
46 | * | |
47 | * However, it's unclear whether there is really ever any | |
48 | * reason to see superprojects and subprojects as such a | |
49 | * "unified" object pool (potentially resulting in a totally | |
50 | * humongous pack - avoiding which was the whole point of | |
51 | * having gitlinks in the first place!). | |
52 | * | |
53 | * So for now, there is just a note that we *could* follow | |
54 | * the link, and how to do it. Whether it necessarily makes | |
55 | * any sense what-so-ever to ever do that is another issue. | |
56 | */ | |
57 | static void process_gitlink(struct rev_info *revs, | |
58 | const unsigned char *sha1, | |
8d2dfc49 | 59 | show_object_fn show, |
bd64516a | 60 | struct strbuf *path, |
49473672 JH |
61 | const char *name, |
62 | void *cb_data) | |
6e2f441b LT |
63 | { |
64 | /* Nothing to do */ | |
65 | } | |
66 | ||
c64ed70d JH |
67 | static void process_tree(struct rev_info *revs, |
68 | struct tree *tree, | |
8d2dfc49 | 69 | show_object_fn show, |
cc5fa2fd | 70 | struct strbuf *base, |
49473672 JH |
71 | const char *name, |
72 | void *cb_data) | |
c64ed70d JH |
73 | { |
74 | struct object *obj = &tree->object; | |
75 | struct tree_desc desc; | |
76 | struct name_entry entry; | |
d688cf07 NTND |
77 | enum interesting match = revs->diffopt.pathspec.nr == 0 ? |
78 | all_entries_interesting: entry_not_interesting; | |
cc5fa2fd | 79 | int baselen = base->len; |
c64ed70d JH |
80 | |
81 | if (!revs->tree_objects) | |
82 | return; | |
a301b0c8 MK |
83 | if (!obj) |
84 | die("bad tree object"); | |
c64ed70d JH |
85 | if (obj->flags & (UNINTERESTING | SEEN)) |
86 | return; | |
daf7d867 | 87 | if (parse_tree_gently(tree, revs->ignore_missing_links) < 0) { |
2db1a43f VM |
88 | if (revs->ignore_missing_links) |
89 | return; | |
f2fd0760 | 90 | die("bad tree object %s", oid_to_hex(&obj->oid)); |
2db1a43f | 91 | } |
13528ab3 | 92 | |
c64ed70d | 93 | obj->flags |= SEEN; |
13528ab3 | 94 | strbuf_addstr(base, name); |
de1e67d0 | 95 | show(obj, base->buf, cb_data); |
13528ab3 JK |
96 | if (base->len) |
97 | strbuf_addch(base, '/'); | |
cc5fa2fd | 98 | |
6fda5e51 | 99 | init_tree_desc(&desc, tree->buffer, tree->size); |
c64ed70d JH |
100 | |
101 | while (tree_entry(&desc, &entry)) { | |
d688cf07 | 102 | if (match != all_entries_interesting) { |
97d0b74a NTND |
103 | match = tree_entry_interesting(&entry, base, 0, |
104 | &revs->diffopt.pathspec); | |
d688cf07 | 105 | if (match == all_entries_not_interesting) |
cc5fa2fd | 106 | break; |
d688cf07 | 107 | if (match == entry_not_interesting) |
cc5fa2fd | 108 | continue; |
cc5fa2fd EN |
109 | } |
110 | ||
c64ed70d JH |
111 | if (S_ISDIR(entry.mode)) |
112 | process_tree(revs, | |
7d924c91 | 113 | lookup_tree(entry.oid->hash), |
13528ab3 | 114 | show, base, entry.path, |
49473672 | 115 | cb_data); |
302b9282 | 116 | else if (S_ISGITLINK(entry.mode)) |
7d924c91 | 117 | process_gitlink(revs, entry.oid->hash, |
bd64516a | 118 | show, base, entry.path, |
49473672 | 119 | cb_data); |
c64ed70d JH |
120 | else |
121 | process_blob(revs, | |
7d924c91 | 122 | lookup_blob(entry.oid->hash), |
bd64516a | 123 | show, base, entry.path, |
49473672 | 124 | cb_data); |
c64ed70d | 125 | } |
cc5fa2fd | 126 | strbuf_setlen(base, baselen); |
6e454b9a | 127 | free_tree_buffer(tree); |
c64ed70d JH |
128 | } |
129 | ||
8d1d8f83 JH |
130 | static void mark_edge_parents_uninteresting(struct commit *commit, |
131 | struct rev_info *revs, | |
132 | show_edge_fn show_edge) | |
133 | { | |
134 | struct commit_list *parents; | |
135 | ||
136 | for (parents = commit->parents; parents; parents = parents->next) { | |
137 | struct commit *parent = parents->item; | |
138 | if (!(parent->object.flags & UNINTERESTING)) | |
139 | continue; | |
140 | mark_tree_uninteresting(parent->tree); | |
141 | if (revs->edge_hint && !(parent->object.flags & SHOWN)) { | |
142 | parent->object.flags |= SHOWN; | |
143 | show_edge(parent); | |
144 | } | |
145 | } | |
146 | } | |
147 | ||
e76a5fb4 | 148 | void mark_edges_uninteresting(struct rev_info *revs, show_edge_fn show_edge) |
8d1d8f83 | 149 | { |
e76a5fb4 | 150 | struct commit_list *list; |
fbd4a703 NTND |
151 | int i; |
152 | ||
e76a5fb4 | 153 | for (list = revs->commits; list; list = list->next) { |
8d1d8f83 JH |
154 | struct commit *commit = list->item; |
155 | ||
156 | if (commit->object.flags & UNINTERESTING) { | |
157 | mark_tree_uninteresting(commit->tree); | |
1684c1b2 | 158 | if (revs->edge_hint_aggressive && !(commit->object.flags & SHOWN)) { |
fbd4a703 NTND |
159 | commit->object.flags |= SHOWN; |
160 | show_edge(commit); | |
161 | } | |
8d1d8f83 JH |
162 | continue; |
163 | } | |
164 | mark_edge_parents_uninteresting(commit, revs, show_edge); | |
165 | } | |
1684c1b2 | 166 | if (revs->edge_hint_aggressive) { |
200abe74 JK |
167 | for (i = 0; i < revs->cmdline.nr; i++) { |
168 | struct object *obj = revs->cmdline.rev[i].item; | |
169 | struct commit *commit = (struct commit *)obj; | |
170 | if (obj->type != OBJ_COMMIT || !(obj->flags & UNINTERESTING)) | |
171 | continue; | |
172 | mark_tree_uninteresting(commit->tree); | |
173 | if (!(obj->flags & SHOWN)) { | |
174 | obj->flags |= SHOWN; | |
175 | show_edge(commit); | |
176 | } | |
fbd4a703 NTND |
177 | } |
178 | } | |
8d1d8f83 JH |
179 | } |
180 | ||
8d2dfc49 LT |
181 | static void add_pending_tree(struct rev_info *revs, struct tree *tree) |
182 | { | |
183 | add_pending_object(revs, &tree->object, ""); | |
184 | } | |
185 | ||
c64ed70d | 186 | void traverse_commit_list(struct rev_info *revs, |
11c211fa CC |
187 | show_commit_fn show_commit, |
188 | show_object_fn show_object, | |
189 | void *data) | |
c64ed70d JH |
190 | { |
191 | int i; | |
192 | struct commit *commit; | |
cc5fa2fd | 193 | struct strbuf base; |
c64ed70d | 194 | |
cc5fa2fd | 195 | strbuf_init(&base, PATH_MAX); |
c64ed70d | 196 | while ((commit = get_revision(revs)) != NULL) { |
6e7d0efa JH |
197 | /* |
198 | * an uninteresting boundary commit may not have its tree | |
199 | * parsed yet, but we are not going to show them anyway | |
200 | */ | |
201 | if (commit->tree) | |
202 | add_pending_tree(revs, commit->tree); | |
11c211fa | 203 | show_commit(commit, data); |
c64ed70d JH |
204 | } |
205 | for (i = 0; i < revs->pending.nr; i++) { | |
206 | struct object_array_entry *pending = revs->pending.objects + i; | |
207 | struct object *obj = pending->item; | |
208 | const char *name = pending->name; | |
20739490 | 209 | const char *path = pending->path; |
c64ed70d JH |
210 | if (obj->flags & (UNINTERESTING | SEEN)) |
211 | continue; | |
212 | if (obj->type == OBJ_TAG) { | |
213 | obj->flags |= SEEN; | |
de1e67d0 | 214 | show_object(obj, name, data); |
c64ed70d JH |
215 | continue; |
216 | } | |
20739490 JK |
217 | if (!path) |
218 | path = ""; | |
c64ed70d | 219 | if (obj->type == OBJ_TREE) { |
8d2dfc49 | 220 | process_tree(revs, (struct tree *)obj, show_object, |
13528ab3 | 221 | &base, path, data); |
c64ed70d JH |
222 | continue; |
223 | } | |
224 | if (obj->type == OBJ_BLOB) { | |
8d2dfc49 | 225 | process_blob(revs, (struct blob *)obj, show_object, |
de1e67d0 | 226 | &base, path, data); |
c64ed70d JH |
227 | continue; |
228 | } | |
229 | die("unknown pending object %s (%s)", | |
f2fd0760 | 230 | oid_to_hex(&obj->oid), name); |
c64ed70d | 231 | } |
46be8231 | 232 | object_array_clear(&revs->pending); |
cc5fa2fd | 233 | strbuf_release(&base); |
c64ed70d | 234 | } |