Start moving unpack-trees to "struct tree_desc"
This doesn't actually change any real code, but it changes the interface to unpack_trees() to take an array of "struct tree_desc" entries, the same way the tree-walk.c functions do. The reason for this is that we would be much better off if we can do the tree-unpacking using the generic "traverse_trees()" functionality instead of having to the special "unpack" infrastructure. This really is a pretty minimal diff, just to change the calling convention. It passes all the tests, and looks sane. There were only two users of "unpack_trees()": builtin-read-tree and merge-recursive, and I tried to keep the changes minimal. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Linus Torvalds committed
Aug 9, 2007 at 22:21 UTC
933bf40a5c6328b6c022b636f45a6f2c48c3838e
4 files changed
+39
-30
builtin-read-tree.c
+18
-8
@@ -13,14 +13,19 @@
13
#include "dir.h"
14
#include "builtin.h"
15
16
-static struct object_list *trees;
16
+static int nr_trees;
17
+static struct tree *trees[4];
18
19
static int list_tree(unsigned char *sha1)
20
{
20
- struct tree *tree = parse_tree_indirect(sha1);
21
+ struct tree *tree;
22
+
23
+ if (nr_trees >= 4)
24
+ return -1;
25
+ tree = parse_tree_indirect(sha1);
26
if (!tree)
27
return -1;
23
- object_list_append(&tree->object, &trees);
28
+ trees[nr_trees++] = tree;
29
return 0;
30
}
31
@@ -76,11 +81,10 @@ static void prime_cache_tree_rec(struct cache_tree *it, struct tree *tree)
81
82
static void prime_cache_tree(void)
83
{
79
- struct tree *tree = (struct tree *)trees->item;
80
- if (!tree)
84
+ if (!nr_trees)
85
return;
86
active_cache_tree = cache_tree();
83
- prime_cache_tree_rec(active_cache_tree, tree);
87
+ prime_cache_tree_rec(active_cache_tree, trees[0]);
88
89
}
90
@@ -92,6 +96,7 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
96
{
97
int i, newfd, stage = 0;
98
unsigned char sha1[20];
99
+ struct tree_desc t[3];
100
struct unpack_trees_options opts;
101
102
memset(&opts, 0, sizeof(opts));
@@ -258,7 +263,12 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
263
opts.head_idx = 1;
264
}
265
261
- unpack_trees(trees, &opts);
266
+ for (i = 0; i < nr_trees; i++) {
267
+ struct tree *tree = trees[i];
268
+ parse_tree(tree);
269
+ init_tree_desc(t+i, tree->buffer, tree->size);
270
+ }
271
+ unpack_trees(nr_trees, t, &opts);
272
273
/*
274
* When reading only one tree (either the most basic form,
@@ -266,7 +276,7 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
276
* valid cache-tree because the index must match exactly
277
* what came from the tree.
278
*/
269
- if (trees && trees->item && !opts.prefix && (!opts.merge || (stage == 2))) {
279
+ if (nr_trees && !opts.prefix && (!opts.merge || (stage == 2))) {
280
cache_tree_free(&active_cache_tree);
281
prime_cache_tree();
282
}
merge-recursive.c
+11
-5
@@ -216,13 +216,19 @@ static int add_cacheinfo(unsigned int mode, const unsigned char *sha1,
216
*/
217
static int index_only = 0;
218
219
+static void init_tree_desc_from_tree(struct tree_desc *desc, struct tree *tree)
220
+{
221
+ parse_tree(tree);
222
+ init_tree_desc(desc, tree->buffer, tree->size);
223
+}
224
+
225
static int git_merge_trees(int index_only,
226
struct tree *common,
227
struct tree *head,
228
struct tree *merge)
229
{
230
int rc;
225
- struct object_list *trees = NULL;
231
+ struct tree_desc t[3];
232
struct unpack_trees_options opts;
233
234
memset(&opts, 0, sizeof(opts));
@@ -234,11 +240,11 @@ static int git_merge_trees(int index_only,
240
opts.head_idx = 2;
241
opts.fn = threeway_merge;
242
237
- object_list_append(&common->object, &trees);
238
- object_list_append(&head->object, &trees);
239
- object_list_append(&merge->object, &trees);
243
+ init_tree_desc_from_tree(t+0, common);
244
+ init_tree_desc_from_tree(t+1, head);
245
+ init_tree_desc_from_tree(t+2, merge);
246
241
- rc = unpack_trees(trees, &opts);
247
+ rc = unpack_trees(3, t, &opts);
248
cache_tree_free(&active_cache_tree);
249
return rc;
250
}
unpack-trees.c
+9
-16
@@ -16,19 +16,13 @@ struct tree_entry_list {
16
const unsigned char *sha1;
17
};
18
19
-static struct tree_entry_list *create_tree_entry_list(struct tree *tree)
19
+static struct tree_entry_list *create_tree_entry_list(struct tree_desc *desc)
20
{
21
- struct tree_desc desc;
21
struct name_entry one;
22
struct tree_entry_list *ret = NULL;
23
struct tree_entry_list **list_p = &ret;
24
26
- if (!tree->object.parsed)
27
- parse_tree(tree);
28
-
29
- init_tree_desc(&desc, tree->buffer, tree->size);
30
-
31
- while (tree_entry(&desc, &one)) {
25
+ while (tree_entry(desc, &one)) {
26
struct tree_entry_list *entry;
27
28
entry = xmalloc(sizeof(struct tree_entry_list));
@@ -173,9 +167,11 @@ static int unpack_trees_rec(struct tree_entry_list **posns, int len,
167
168
if (S_ISDIR(posns[i]->mode)) {
169
struct tree *tree = lookup_tree(posns[i]->sha1);
170
+ struct tree_desc t;
171
any_dirs = 1;
172
parse_tree(tree);
178
- subposns[i] = create_tree_entry_list(tree);
173
+ init_tree_desc(&t, tree->buffer, tree->size);
174
+ subposns[i] = create_tree_entry_list(&t);
175
posns[i] = posns[i]->next;
176
src[i + o->merge] = o->df_conflict_entry;
177
continue;
@@ -331,12 +327,10 @@ static void check_updates(struct cache_entry **src, int nr,
327
stop_progress(&progress);;
328
}
329
334
-int unpack_trees(struct object_list *trees, struct unpack_trees_options *o)
330
+int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options *o)
331
{
336
- unsigned len = object_list_length(trees);
332
struct tree_entry_list **posns;
333
int i;
339
- struct object_list *posn = trees;
334
struct tree_entry_list df_conflict_list;
335
static struct cache_entry *dfc;
336
@@ -356,10 +350,9 @@ int unpack_trees(struct object_list *trees, struct unpack_trees_options *o)
350
351
if (len) {
352
posns = xmalloc(len * sizeof(struct tree_entry_list *));
359
- for (i = 0; i < len; i++) {
360
- posns[i] = create_tree_entry_list((struct tree *) posn->item);
361
- posn = posn->next;
362
- }
353
+ for (i = 0; i < len; i++)
354
+ posns[i] = create_tree_entry_list(t+i);
355
+
356
if (unpack_trees_rec(posns, len, o->prefix ? o->prefix : "",
357
o, &df_conflict_list))
358
return -1;
unpack-trees.h
+1
-1
@@ -26,7 +26,7 @@ struct unpack_trees_options {
26
struct cache_entry *df_conflict_entry;
27
};
28
29
-extern int unpack_trees(struct object_list *trees,
29
+extern int unpack_trees(unsigned n, struct tree_desc *t,
30
struct unpack_trees_options *options);
31
32
int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o);