Fix git-rebase -i to allow squashing of fast-forwardable commits
[git/gitweb.git] / tree.c
blob04fe653a8e25feb0fc15f76ba487d0f8dbd52f82
1 #include "cache.h"
2 #include "tree.h"
3 #include "blob.h"
4 #include "commit.h"
5 #include "tag.h"
6 #include "tree-walk.h"
8 const char *tree_type = "tree";
10 static int read_one_entry(const unsigned char *sha1, const char *base, int baselen, const char *pathname, unsigned mode, int stage)
12 int len;
13 unsigned int size;
14 struct cache_entry *ce;
16 if (S_ISDIR(mode))
17 return READ_TREE_RECURSIVE;
19 len = strlen(pathname);
20 size = cache_entry_size(baselen + len);
21 ce = xcalloc(1, size);
23 ce->ce_mode = create_ce_mode(mode);
24 ce->ce_flags = create_ce_flags(baselen + len, stage);
25 memcpy(ce->name, base, baselen);
26 memcpy(ce->name + baselen, pathname, len+1);
27 hashcpy(ce->sha1, sha1);
28 return add_cache_entry(ce, ADD_CACHE_OK_TO_ADD|ADD_CACHE_SKIP_DFCHECK);
31 static int match_tree_entry(const char *base, int baselen, const char *path, unsigned int mode, const char **paths)
33 const char *match;
34 int pathlen;
36 if (!paths)
37 return 1;
38 pathlen = strlen(path);
39 while ((match = *paths++) != NULL) {
40 int matchlen = strlen(match);
42 if (baselen >= matchlen) {
43 /* If it doesn't match, move along... */
44 if (strncmp(base, match, matchlen))
45 continue;
46 /* The base is a subdirectory of a path which was specified. */
47 return 1;
50 /* Does the base match? */
51 if (strncmp(base, match, baselen))
52 continue;
54 match += baselen;
55 matchlen -= baselen;
57 if (pathlen > matchlen)
58 continue;
60 if (matchlen > pathlen) {
61 if (match[pathlen] != '/')
62 continue;
63 if (!S_ISDIR(mode))
64 continue;
67 if (strncmp(path, match, pathlen))
68 continue;
70 return 1;
72 return 0;
75 int read_tree_recursive(struct tree *tree,
76 const char *base, int baselen,
77 int stage, const char **match,
78 read_tree_fn_t fn)
80 struct tree_desc desc;
81 struct name_entry entry;
83 if (parse_tree(tree))
84 return -1;
86 init_tree_desc(&desc, tree->buffer, tree->size);
88 while (tree_entry(&desc, &entry)) {
89 if (!match_tree_entry(base, baselen, entry.path, entry.mode, match))
90 continue;
92 switch (fn(entry.sha1, base, baselen, entry.path, entry.mode, stage)) {
93 case 0:
94 continue;
95 case READ_TREE_RECURSIVE:
96 break;;
97 default:
98 return -1;
100 if (S_ISDIR(entry.mode)) {
101 int retval;
102 char *newbase;
103 unsigned int pathlen = tree_entry_len(entry.path, entry.sha1);
105 newbase = xmalloc(baselen + 1 + pathlen);
106 memcpy(newbase, base, baselen);
107 memcpy(newbase + baselen, entry.path, pathlen);
108 newbase[baselen + pathlen] = '/';
109 retval = read_tree_recursive(lookup_tree(entry.sha1),
110 newbase,
111 baselen + pathlen + 1,
112 stage, match, fn);
113 free(newbase);
114 if (retval)
115 return -1;
116 continue;
119 return 0;
122 int read_tree(struct tree *tree, int stage, const char **match)
124 return read_tree_recursive(tree, "", 0, stage, match, read_one_entry);
127 struct tree *lookup_tree(const unsigned char *sha1)
129 struct object *obj = lookup_object(sha1);
130 if (!obj)
131 return create_object(sha1, OBJ_TREE, alloc_tree_node());
132 if (!obj->type)
133 obj->type = OBJ_TREE;
134 if (obj->type != OBJ_TREE) {
135 error("Object %s is a %s, not a tree",
136 sha1_to_hex(sha1), typename(obj->type));
137 return NULL;
139 return (struct tree *) obj;
143 * NOTE! Tree refs to external git repositories
144 * (ie gitlinks) do not count as real references.
146 * You don't have to have those repositories
147 * available at all, much less have the objects
148 * accessible from the current repository.
150 static void track_tree_refs(struct tree *item)
152 int n_refs = 0, i;
153 struct object_refs *refs;
154 struct tree_desc desc;
155 struct name_entry entry;
157 /* Count how many entries there are.. */
158 init_tree_desc(&desc, item->buffer, item->size);
159 while (tree_entry(&desc, &entry)) {
160 if (S_ISGITLINK(entry.mode))
161 continue;
162 n_refs++;
165 /* Allocate object refs and walk it again.. */
166 i = 0;
167 refs = alloc_object_refs(n_refs);
168 init_tree_desc(&desc, item->buffer, item->size);
169 while (tree_entry(&desc, &entry)) {
170 struct object *obj;
172 if (S_ISGITLINK(entry.mode))
173 continue;
174 if (S_ISDIR(entry.mode))
175 obj = &lookup_tree(entry.sha1)->object;
176 else if (S_ISREG(entry.mode) || S_ISLNK(entry.mode))
177 obj = &lookup_blob(entry.sha1)->object;
178 else {
179 warning("in tree %s: entry %s has bad mode %.6o\n",
180 sha1_to_hex(item->object.sha1), entry.path, entry.mode);
181 obj = lookup_unknown_object(entry.sha1);
183 refs->ref[i++] = obj;
185 set_object_refs(&item->object, refs);
188 int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size)
190 if (item->object.parsed)
191 return 0;
192 item->object.parsed = 1;
193 item->buffer = buffer;
194 item->size = size;
196 if (track_object_refs)
197 track_tree_refs(item);
198 return 0;
201 int parse_tree(struct tree *item)
203 enum object_type type;
204 void *buffer;
205 unsigned long size;
207 if (item->object.parsed)
208 return 0;
209 buffer = read_sha1_file(item->object.sha1, &type, &size);
210 if (!buffer)
211 return error("Could not read %s",
212 sha1_to_hex(item->object.sha1));
213 if (type != OBJ_TREE) {
214 free(buffer);
215 return error("Object %s not a tree",
216 sha1_to_hex(item->object.sha1));
218 return parse_tree_buffer(item, buffer, size);
221 struct tree *parse_tree_indirect(const unsigned char *sha1)
223 struct object *obj = parse_object(sha1);
224 do {
225 if (!obj)
226 return NULL;
227 if (obj->type == OBJ_TREE)
228 return (struct tree *) obj;
229 else if (obj->type == OBJ_COMMIT)
230 obj = &(((struct commit *) obj)->tree->object);
231 else if (obj->type == OBJ_TAG)
232 obj = ((struct tag *) obj)->tagged;
233 else
234 return NULL;
235 if (!obj->parsed)
236 parse_object(obj->sha1);
237 } while (1);