Add --oneline that is a synonym to "--pretty=oneline --abbrev-commit"
[git/spearce.git] / tree.c
blob25d2e29fa8b1dfb964b97a10898c77d8fe86ef78
1 #include "cache.h"
2 #include "cache-tree.h"
3 #include "tree.h"
4 #include "blob.h"
5 #include "commit.h"
6 #include "tag.h"
7 #include "tree-walk.h"
9 const char *tree_type = "tree";
11 static int read_one_entry_opt(const unsigned char *sha1, const char *base, int baselen, const char *pathname, unsigned mode, int stage, int opt)
13 int len;
14 unsigned int size;
15 struct cache_entry *ce;
17 if (S_ISDIR(mode))
18 return READ_TREE_RECURSIVE;
20 len = strlen(pathname);
21 size = cache_entry_size(baselen + len);
22 ce = xcalloc(1, size);
24 ce->ce_mode = create_ce_mode(mode);
25 ce->ce_flags = create_ce_flags(baselen + len, stage);
26 memcpy(ce->name, base, baselen);
27 memcpy(ce->name + baselen, pathname, len+1);
28 hashcpy(ce->sha1, sha1);
29 return add_cache_entry(ce, opt);
32 static int read_one_entry(const unsigned char *sha1, const char *base, int baselen, const char *pathname, unsigned mode, int stage, void *context)
34 return read_one_entry_opt(sha1, base, baselen, pathname, mode, stage,
35 ADD_CACHE_OK_TO_ADD|ADD_CACHE_SKIP_DFCHECK);
39 * This is used when the caller knows there is no existing entries at
40 * the stage that will conflict with the entry being added.
42 static int read_one_entry_quick(const unsigned char *sha1, const char *base, int baselen, const char *pathname, unsigned mode, int stage, void *context)
44 return read_one_entry_opt(sha1, base, baselen, pathname, mode, stage,
45 ADD_CACHE_JUST_APPEND);
48 static int match_tree_entry(const char *base, int baselen, const char *path, unsigned int mode, const char **paths)
50 const char *match;
51 int pathlen;
53 if (!paths)
54 return 1;
55 pathlen = strlen(path);
56 while ((match = *paths++) != NULL) {
57 int matchlen = strlen(match);
59 if (baselen >= matchlen) {
60 /* If it doesn't match, move along... */
61 if (strncmp(base, match, matchlen))
62 continue;
63 /* The base is a subdirectory of a path which was specified. */
64 return 1;
67 /* Does the base match? */
68 if (strncmp(base, match, baselen))
69 continue;
71 match += baselen;
72 matchlen -= baselen;
74 if (pathlen > matchlen)
75 continue;
77 if (matchlen > pathlen) {
78 if (match[pathlen] != '/')
79 continue;
80 if (!S_ISDIR(mode))
81 continue;
84 if (strncmp(path, match, pathlen))
85 continue;
87 return 1;
89 return 0;
92 int read_tree_recursive(struct tree *tree,
93 const char *base, int baselen,
94 int stage, const char **match,
95 read_tree_fn_t fn, void *context)
97 struct tree_desc desc;
98 struct name_entry entry;
100 if (parse_tree(tree))
101 return -1;
103 init_tree_desc(&desc, tree->buffer, tree->size);
105 while (tree_entry(&desc, &entry)) {
106 if (!match_tree_entry(base, baselen, entry.path, entry.mode, match))
107 continue;
109 switch (fn(entry.sha1, base, baselen, entry.path, entry.mode, stage, context)) {
110 case 0:
111 continue;
112 case READ_TREE_RECURSIVE:
113 break;
114 default:
115 return -1;
117 if (S_ISDIR(entry.mode)) {
118 int retval;
119 char *newbase;
120 unsigned int pathlen = tree_entry_len(entry.path, entry.sha1);
122 newbase = xmalloc(baselen + 1 + pathlen);
123 memcpy(newbase, base, baselen);
124 memcpy(newbase + baselen, entry.path, pathlen);
125 newbase[baselen + pathlen] = '/';
126 retval = read_tree_recursive(lookup_tree(entry.sha1),
127 newbase,
128 baselen + pathlen + 1,
129 stage, match, fn, context);
130 free(newbase);
131 if (retval)
132 return -1;
133 continue;
134 } else if (S_ISGITLINK(entry.mode)) {
135 int retval;
136 struct strbuf path;
137 unsigned int entrylen;
138 struct commit *commit;
140 entrylen = tree_entry_len(entry.path, entry.sha1);
141 strbuf_init(&path, baselen + entrylen + 1);
142 strbuf_add(&path, base, baselen);
143 strbuf_add(&path, entry.path, entrylen);
144 strbuf_addch(&path, '/');
146 commit = lookup_commit(entry.sha1);
147 if (!commit)
148 die("Commit %s in submodule path %s not found",
149 sha1_to_hex(entry.sha1), path.buf);
151 if (parse_commit(commit))
152 die("Invalid commit %s in submodule path %s",
153 sha1_to_hex(entry.sha1), path.buf);
155 retval = read_tree_recursive(commit->tree,
156 path.buf, path.len,
157 stage, match, fn, context);
158 strbuf_release(&path);
159 if (retval)
160 return -1;
161 continue;
164 return 0;
167 static int cmp_cache_name_compare(const void *a_, const void *b_)
169 const struct cache_entry *ce1, *ce2;
171 ce1 = *((const struct cache_entry **)a_);
172 ce2 = *((const struct cache_entry **)b_);
173 return cache_name_compare(ce1->name, ce1->ce_flags,
174 ce2->name, ce2->ce_flags);
177 int read_tree(struct tree *tree, int stage, const char **match)
179 read_tree_fn_t fn = NULL;
180 int i, err;
183 * Currently the only existing callers of this function all
184 * call it with stage=1 and after making sure there is nothing
185 * at that stage; we could always use read_one_entry_quick().
187 * But when we decide to straighten out git-read-tree not to
188 * use unpack_trees() in some cases, this will probably start
189 * to matter.
193 * See if we have cache entry at the stage. If so,
194 * do it the original slow way, otherwise, append and then
195 * sort at the end.
197 for (i = 0; !fn && i < active_nr; i++) {
198 struct cache_entry *ce = active_cache[i];
199 if (ce_stage(ce) == stage)
200 fn = read_one_entry;
203 if (!fn)
204 fn = read_one_entry_quick;
205 err = read_tree_recursive(tree, "", 0, stage, match, fn, NULL);
206 if (fn == read_one_entry || err)
207 return err;
210 * Sort the cache entry -- we need to nuke the cache tree, though.
212 cache_tree_free(&active_cache_tree);
213 qsort(active_cache, active_nr, sizeof(active_cache[0]),
214 cmp_cache_name_compare);
215 return 0;
218 struct tree *lookup_tree(const unsigned char *sha1)
220 struct object *obj = lookup_object(sha1);
221 if (!obj)
222 return create_object(sha1, OBJ_TREE, alloc_tree_node());
223 if (!obj->type)
224 obj->type = OBJ_TREE;
225 if (obj->type != OBJ_TREE) {
226 error("Object %s is a %s, not a tree",
227 sha1_to_hex(sha1), typename(obj->type));
228 return NULL;
230 return (struct tree *) obj;
233 int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size)
235 if (item->object.parsed)
236 return 0;
237 item->object.parsed = 1;
238 item->buffer = buffer;
239 item->size = size;
241 return 0;
244 int parse_tree(struct tree *item)
246 enum object_type type;
247 void *buffer;
248 unsigned long size;
250 if (item->object.parsed)
251 return 0;
252 buffer = read_sha1_file(item->object.sha1, &type, &size);
253 if (!buffer)
254 return error("Could not read %s",
255 sha1_to_hex(item->object.sha1));
256 if (type != OBJ_TREE) {
257 free(buffer);
258 return error("Object %s not a tree",
259 sha1_to_hex(item->object.sha1));
261 return parse_tree_buffer(item, buffer, size);
264 struct tree *parse_tree_indirect(const unsigned char *sha1)
266 struct object *obj = parse_object(sha1);
267 do {
268 if (!obj)
269 return NULL;
270 if (obj->type == OBJ_TREE)
271 return (struct tree *) obj;
272 else if (obj->type == OBJ_COMMIT)
273 obj = &(((struct commit *) obj)->tree->object);
274 else if (obj->type == OBJ_TAG)
275 obj = ((struct tag *) obj)->tagged;
276 else
277 return NULL;
278 if (!obj->parsed)
279 parse_object(obj->sha1);
280 } while (1);