summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-04-20 10:58:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-04-20 11:16:41 (GMT)
commitb9d37a5420446d0db2dc0dc5458a5e50656a4852 (patch)
tree1544417a886e6fd46ea5f786c8ac74744719ba56
parent8cc21ce78c2f3781024117047c0650861f890213 (diff)
downloadgit-b9d37a5420446d0db2dc0dc5458a5e50656a4852.zip
git-b9d37a5420446d0db2dc0dc5458a5e50656a4852.tar.gz
git-b9d37a5420446d0db2dc0dc5458a5e50656a4852.tar.bz2
Move prime_cache_tree() to cache-tree.c
The interface to build cache-tree belongs there. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin-checkout.c1
-rw-r--r--builtin-read-tree.c37
-rw-r--r--cache-tree.c34
-rw-r--r--cache-tree.h4
4 files changed, 40 insertions, 36 deletions
diff --git a/builtin-checkout.c b/builtin-checkout.c
index b121fe5..ffdb33a 100644
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@ -5,6 +5,7 @@
#include "commit.h"
#include "tree.h"
#include "tree-walk.h"
+#include "cache-tree.h"
#include "unpack-trees.h"
#include "dir.h"
#include "run-command.h"
diff --git a/builtin-read-tree.c b/builtin-read-tree.c
index e4e0e71..9cd7d07 100644
--- a/builtin-read-tree.c
+++ b/builtin-read-tree.c
@@ -29,41 +29,6 @@ static int list_tree(unsigned char *sha1)
return 0;
}
-static void prime_cache_tree_rec(struct cache_tree *it, struct tree *tree)
-{
- struct tree_desc desc;
- struct name_entry entry;
- int cnt;
-
- hashcpy(it->sha1, tree->object.sha1);
- init_tree_desc(&desc, tree->buffer, tree->size);
- cnt = 0;
- while (tree_entry(&desc, &entry)) {
- if (!S_ISDIR(entry.mode))
- cnt++;
- else {
- struct cache_tree_sub *sub;
- struct tree *subtree = lookup_tree(entry.sha1);
- if (!subtree->object.parsed)
- parse_tree(subtree);
- sub = cache_tree_sub(it, entry.path);
- sub->cache_tree = cache_tree();
- prime_cache_tree_rec(sub->cache_tree, subtree);
- cnt += sub->cache_tree->entry_count;
- }
- }
- it->entry_count = cnt;
-}
-
-static void prime_cache_tree(void)
-{
- if (!nr_trees)
- return;
- active_cache_tree = cache_tree();
- prime_cache_tree_rec(active_cache_tree, trees[0]);
-
-}
-
static const char read_tree_usage[] = "git read-tree (<sha> | [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] [-u | -i]] [--exclude-per-directory=<gitignore>] [--index-output=<file>] <sha1> [<sha2> [<sha3>]])";
static struct lock_file lock_file;
@@ -236,7 +201,7 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
* what came from the tree.
*/
if (nr_trees == 1 && !opts.prefix)
- prime_cache_tree();
+ prime_cache_tree(&active_cache_tree, trees[0]);
if (write_cache(newfd, active_cache, active_nr) ||
commit_locked_index(&lock_file))
diff --git a/cache-tree.c b/cache-tree.c
index 3d8f218..37bf35e 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -1,5 +1,6 @@
#include "cache.h"
#include "tree.h"
+#include "tree-walk.h"
#include "cache-tree.h"
#ifndef DEBUG
@@ -591,3 +592,36 @@ int write_cache_as_tree(unsigned char *sha1, int missing_ok, const char *prefix)
return 0;
}
+
+static void prime_cache_tree_rec(struct cache_tree *it, struct tree *tree)
+{
+ struct tree_desc desc;
+ struct name_entry entry;
+ int cnt;
+
+ hashcpy(it->sha1, tree->object.sha1);
+ init_tree_desc(&desc, tree->buffer, tree->size);
+ cnt = 0;
+ while (tree_entry(&desc, &entry)) {
+ if (!S_ISDIR(entry.mode))
+ cnt++;
+ else {
+ struct cache_tree_sub *sub;
+ struct tree *subtree = lookup_tree(entry.sha1);
+ if (!subtree->object.parsed)
+ parse_tree(subtree);
+ sub = cache_tree_sub(it, entry.path);
+ sub->cache_tree = cache_tree();
+ prime_cache_tree_rec(sub->cache_tree, subtree);
+ cnt += sub->cache_tree->entry_count;
+ }
+ }
+ it->entry_count = cnt;
+}
+
+void prime_cache_tree(struct cache_tree **it, struct tree *tree)
+{
+ cache_tree_free(it);
+ *it = cache_tree();
+ prime_cache_tree_rec(*it, tree);
+}
diff --git a/cache-tree.h b/cache-tree.h
index cf8b790..e958835 100644
--- a/cache-tree.h
+++ b/cache-tree.h
@@ -1,6 +1,8 @@
#ifndef CACHE_TREE_H
#define CACHE_TREE_H
+#include "tree.h"
+
struct cache_tree;
struct cache_tree_sub {
struct cache_tree *cache_tree;
@@ -33,4 +35,6 @@ int cache_tree_update(struct cache_tree *, struct cache_entry **, int, int, int)
#define WRITE_TREE_PREFIX_ERROR (-3)
int write_cache_as_tree(unsigned char *sha1, int missing_ok, const char *prefix);
+void prime_cache_tree(struct cache_tree **, struct tree *);
+
#endif