packfile: add repository argument to cache_or_unpack_entry

diff --git a/repository.h b/repository.h
index 8ae5e8653a1ae31fc5bd124a533f966718184479..e6e00f541bdc7f61b08ad881b8d66047cc0f1d02 100644 (file)
--- a/repository.h
+++ b/repository.h
@@ -2,6 +2,10 @@
 #define REPOSITORY_H
 
 struct config_set;
+struct git_hash_algo;
+struct index_state;
+struct raw_object_store;
+struct submodule_cache;
 
 struct repository {
        /* Environment */
@@ -18,10 +22,12 @@ struct repository {
        char *commondir;
 
        /*
-        * Path to the repository's object store.
-        * Cannot be NULL after initialization.
+        * Holds any information related to accessing the raw object content.
         */
-       char *objectdir;
+       struct raw_object_store *objects;
+
+       /* The store in which the refs are held. */
+       struct ref_store *refs;
 
        /*
         * Path to the repository's graft file.
@@ -41,6 +47,13 @@ struct repository {
         */
        char *worktree;
 
+       /*
+        * Path from the root of the top-level superproject down to this
+        * repository.  This is only non-NULL if the repository is initialized
+        * as a submodule of another repository.
+        */
+       char *submodule_prefix;
+
        /* Subsystems */
        /*
         * Repository's config which contains key-value pairs from the usual
@@ -49,16 +62,19 @@ struct repository {
         */
        struct config_set *config;
 
-       /* Configurations */
+       /* Repository's submodule config as defined by '.gitmodules' */
+       struct submodule_cache *submodule_cache;
+
        /*
-        * Bit used during initialization to indicate if repository state (like
-        * the location of the 'objectdir') should be read from the
-        * environment.  By default this bit will be set at the begining of
-        * 'repo_init()' so that all repositories will ignore the environment.
-        * The exception to this is 'the_repository', which doesn't go through
-        * the normal 'repo_init()' process.
+        * Repository's in-memory index.
+        * 'repo_read_index()' can be used to populate 'index'.
         */
-       unsigned ignore_env:1;
+       struct index_state *index;
+
+       /* Repository's current hash algorithm, as serialized on disk. */
+       const struct git_hash_algo *hash_algo;
+
+       /* Configurations */
 
        /* Indicate if a repository has a different 'commondir' from 'gitdir' */
        unsigned different_commondir:1;
@@ -66,9 +82,37 @@ struct repository {
 
 extern struct repository *the_repository;
 
-extern void repo_set_gitdir(struct repository *repo, const char *path);
+/*
+ * Define a custom repository layout. Any field can be NULL, which
+ * will default back to the path according to the default layout.
+ */
+struct set_gitdir_args {
+       const char *commondir;
+       const char *object_dir;
+       const char *graft_file;
+       const char *index_file;
+       const char *alternate_db;
+};
+
+extern void repo_set_gitdir(struct repository *repo,
+                           const char *root,
+                           const struct set_gitdir_args *extra_args);
 extern void repo_set_worktree(struct repository *repo, const char *path);
-extern int repo_init(struct repository *repo, const char *gitdir, const char *worktree);
+extern void repo_set_hash_algo(struct repository *repo, int algo);
+extern void initialize_the_repository(void);
+extern int repo_submodule_init(struct repository *submodule,
+                              struct repository *superproject,
+                              const char *path);
 extern void repo_clear(struct repository *repo);
 
+/*
+ * Populates the repository's index from its index_file, an index struct will
+ * be allocated if needed.
+ *
+ * Return the number of index entries in the populated index or a value less
+ * than zero if an error occured.  If the repository's index has already been
+ * populated then the number of entries will simply be returned.
+ */
+extern int repo_read_index(struct repository *repo);
+
 #endif /* REPOSITORY_H */