Use git-merge in git-pull (second try).
[git/jnareb-git.git] / tree.c
blob315b6a5d1ce0e83fc75a399a3b74e51f46c5b392
1 #include "tree.h"
2 #include "blob.h"
3 #include "commit.h"
4 #include "tag.h"
5 #include "cache.h"
6 #include <stdlib.h>
8 const char *tree_type = "tree";
10 static int read_one_entry(unsigned char *sha1, const char *base, int baselen, const char *pathname, unsigned mode, int stage)
12 int len = strlen(pathname);
13 unsigned int size = cache_entry_size(baselen + len);
14 struct cache_entry *ce = xmalloc(size);
16 memset(ce, 0, size);
18 ce->ce_mode = create_ce_mode(mode);
19 ce->ce_flags = create_ce_flags(baselen + len, stage);
20 memcpy(ce->name, base, baselen);
21 memcpy(ce->name + baselen, pathname, len+1);
22 memcpy(ce->sha1, sha1, 20);
23 return add_cache_entry(ce, ADD_CACHE_OK_TO_ADD|ADD_CACHE_SKIP_DFCHECK);
26 static int match_tree_entry(const char *base, int baselen, const char *path, unsigned int mode, const char **paths)
28 const char *match;
29 int pathlen;
31 if (!paths)
32 return 1;
33 pathlen = strlen(path);
34 while ((match = *paths++) != NULL) {
35 int matchlen = strlen(match);
37 if (baselen >= matchlen) {
38 /* If it doesn't match, move along... */
39 if (strncmp(base, match, matchlen))
40 continue;
41 /* The base is a subdirectory of a path which was specified. */
42 return 1;
45 /* Does the base match? */
46 if (strncmp(base, match, baselen))
47 continue;
49 match += baselen;
50 matchlen -= baselen;
52 if (pathlen > matchlen)
53 continue;
55 if (matchlen > pathlen) {
56 if (match[pathlen] != '/')
57 continue;
58 if (!S_ISDIR(mode))
59 continue;
62 if (strncmp(path, match, pathlen))
63 continue;
65 return 1;
67 return 0;
70 static int read_tree_recursive(void *buffer, unsigned long size,
71 const char *base, int baselen,
72 int stage, const char **match)
74 while (size) {
75 int len = strlen(buffer)+1;
76 unsigned char *sha1 = buffer + len;
77 char *path = strchr(buffer, ' ')+1;
78 unsigned int mode;
80 if (size < len + 20 || sscanf(buffer, "%o", &mode) != 1)
81 return -1;
83 buffer = sha1 + 20;
84 size -= len + 20;
86 if (!match_tree_entry(base, baselen, path, mode, match))
87 continue;
89 if (S_ISDIR(mode)) {
90 int retval;
91 int pathlen = strlen(path);
92 char *newbase;
93 void *eltbuf;
94 char elttype[20];
95 unsigned long eltsize;
97 eltbuf = read_sha1_file(sha1, elttype, &eltsize);
98 if (!eltbuf || strcmp(elttype, "tree")) {
99 if (eltbuf) free(eltbuf);
100 return -1;
102 newbase = xmalloc(baselen + 1 + pathlen);
103 memcpy(newbase, base, baselen);
104 memcpy(newbase + baselen, path, pathlen);
105 newbase[baselen + pathlen] = '/';
106 retval = read_tree_recursive(eltbuf, eltsize,
107 newbase,
108 baselen + pathlen + 1,
109 stage, match);
110 free(eltbuf);
111 free(newbase);
112 if (retval)
113 return -1;
114 continue;
116 if (read_one_entry(sha1, base, baselen, path, mode, stage) < 0)
117 return -1;
119 return 0;
122 int read_tree(void *buffer, unsigned long size, int stage, const char **match)
124 return read_tree_recursive(buffer, size, "", 0, stage, match);
127 struct tree *lookup_tree(const unsigned char *sha1)
129 struct object *obj = lookup_object(sha1);
130 if (!obj) {
131 struct tree *ret = xmalloc(sizeof(struct tree));
132 memset(ret, 0, sizeof(struct tree));
133 created_object(sha1, &ret->object);
134 ret->object.type = tree_type;
135 return ret;
137 if (!obj->type)
138 obj->type = tree_type;
139 if (obj->type != tree_type) {
140 error("Object %s is a %s, not a tree",
141 sha1_to_hex(sha1), obj->type);
142 return NULL;
144 return (struct tree *) obj;
147 int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size)
149 void *bufptr = buffer;
150 struct tree_entry_list **list_p;
152 if (item->object.parsed)
153 return 0;
154 item->object.parsed = 1;
155 list_p = &item->entries;
156 while (size) {
157 struct object *obj;
158 struct tree_entry_list *entry;
159 int len = 1+strlen(bufptr);
160 unsigned char *file_sha1 = bufptr + len;
161 char *path = strchr(bufptr, ' ');
162 unsigned int mode;
163 if (size < len + 20 || !path ||
164 sscanf(bufptr, "%o", &mode) != 1)
165 return -1;
167 entry = xmalloc(sizeof(struct tree_entry_list));
168 entry->name = strdup(path + 1);
169 entry->directory = S_ISDIR(mode) != 0;
170 entry->executable = (mode & S_IXUSR) != 0;
171 entry->symlink = S_ISLNK(mode) != 0;
172 entry->zeropad = *(char *)bufptr == '0';
173 entry->mode = mode;
174 entry->next = NULL;
176 bufptr += len + 20;
177 size -= len + 20;
179 if (entry->directory) {
180 entry->item.tree = lookup_tree(file_sha1);
181 obj = &entry->item.tree->object;
182 } else {
183 entry->item.blob = lookup_blob(file_sha1);
184 obj = &entry->item.blob->object;
186 if (obj)
187 add_ref(&item->object, obj);
188 entry->parent = NULL; /* needs to be filled by the user */
189 *list_p = entry;
190 list_p = &entry->next;
192 return 0;
195 int parse_tree(struct tree *item)
197 char type[20];
198 void *buffer;
199 unsigned long size;
200 int ret;
202 if (item->object.parsed)
203 return 0;
204 buffer = read_sha1_file(item->object.sha1, type, &size);
205 if (!buffer)
206 return error("Could not read %s",
207 sha1_to_hex(item->object.sha1));
208 if (strcmp(type, tree_type)) {
209 free(buffer);
210 return error("Object %s not a tree",
211 sha1_to_hex(item->object.sha1));
213 ret = parse_tree_buffer(item, buffer, size);
214 free(buffer);
215 return ret;
218 struct tree *parse_tree_indirect(const unsigned char *sha1)
220 struct object *obj = parse_object(sha1);
221 do {
222 if (!obj)
223 return NULL;
224 if (obj->type == tree_type)
225 return (struct tree *) obj;
226 else if (obj->type == commit_type)
227 obj = &(((struct commit *) obj)->tree->object);
228 else if (obj->type == tag_type)
229 obj = ((struct tag *) obj)->tagged;
230 else
231 return NULL;
232 if (!obj->parsed)
233 parse_object(obj->sha1);
234 } while (1);