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