push: remove own copy of callbacks

[libgit2.git] / src / index.h

diff --git a/src/index.h b/src/index.h
index 9498907b683a8c4f919a54843c9fa6b52ee4f04b..0f6f4e86e2097d2f0bb1341054b31dd01edb81d3 100644 (file)
--- a/src/index.h
+++ b/src/index.h
@@ -21,18 +21,23 @@ struct git_index {
        git_refcount rc;
 
        char *index_file_path;
-
        git_futils_filestamp stamp;
+
        git_vector entries;
 
-       unsigned int on_disk:1;
+       git_mutex  lock;    /* lock held while entries is being changed */
+       git_vector deleted; /* deleted entries if readers > 0 */
+       git_atomic readers; /* number of active iterators */
 
+       unsigned int on_disk:1;
        unsigned int ignore_case:1;
        unsigned int distrust_filemode:1;
        unsigned int no_symlinks:1;
 
        git_tree_cache *tree;
+       git_pool tree_pool;
 
+       git_vector names;
        git_vector reuc;
 
        git_vector_cmp entries_cmp_path;
@@ -41,13 +46,83 @@ struct git_index {
        git_vector_cmp reuc_search;
 };
 
-extern void git_index_entry__init_from_stat(git_index_entry *entry, struct stat *st);
+struct git_index_conflict_iterator {
+       git_index *index;
+       size_t cur;
+};
+
+extern void git_index_entry__init_from_stat(
+       git_index_entry *entry, struct stat *st, bool trust_mode);
 
-extern size_t git_index__prefix_position(git_index *index, const char *path);
+/* Index entry comparison functions for array sorting */
+extern int git_index_entry_cmp(const void *a, const void *b);
+extern int git_index_entry_icmp(const void *a, const void *b);
 
-extern int git_index_entry__cmp(const void *a, const void *b);
-extern int git_index_entry__cmp_icase(const void *a, const void *b);
+/* Index entry search functions for search using a search spec */
+extern int git_index_entry_srch(const void *a, const void *b);
+extern int git_index_entry_isrch(const void *a, const void *b);
+
+/* Search index for `path`, returning GIT_ENOTFOUND if it does not exist
+ * (but not setting an error message).
+ *
+ * `at_pos` is set to the position where it is or would be inserted.
+ * Pass `path_len` as strlen of path or 0 to call strlen internally.
+ */
+extern int git_index__find_pos(
+       size_t *at_pos, git_index *index, const char *path, size_t path_len, int stage);
 
 extern void git_index__set_ignore_case(git_index *index, bool ignore_case);
 
+extern unsigned int git_index__create_mode(unsigned int mode);
+
+GIT_INLINE(const git_futils_filestamp *) git_index__filestamp(git_index *index)
+{
+   return &index->stamp;
+}
+
+extern int git_index__changed_relative_to(git_index *index, const git_futils_filestamp *fs);
+
+/* Copy the current entries vector *and* increment the index refcount.
+ * Call `git_index__release_snapshot` when done.
+ */
+extern int git_index_snapshot_new(git_vector *snap, git_index *index);
+extern void git_index_snapshot_release(git_vector *snap, git_index *index);
+
+/* Allow searching in a snapshot; entries must already be sorted! */
+extern int git_index_snapshot_find(
+       size_t *at_pos, git_vector *snap, git_vector_cmp entry_srch,
+       const char *path, size_t path_len, int stage);
+
+/* Replace an index with a new index */
+int git_index_read_index(git_index *index, const git_index *new_index);
+
+typedef struct {
+       git_index *index;
+       git_filebuf file;
+       unsigned int should_write:1;
+} git_indexwriter;
+
+#define GIT_INDEXWRITER_INIT { NULL, GIT_FILEBUF_INIT }
+
+/* Lock the index for eventual writing. */
+extern int git_indexwriter_init(git_indexwriter *writer, git_index *index);
+
+/* Lock the index for eventual writing by a repository operation: a merge,
+ * revert, cherry-pick or a rebase.  Note that the given checkout strategy
+ * will be updated for the operation's use so that checkout will not write
+ * the index.
+ */
+extern int git_indexwriter_init_for_operation(
+       git_indexwriter *writer,
+       git_repository *repo,
+       unsigned int *checkout_strategy);
+
+/* Write the index and unlock it. */
+extern int git_indexwriter_commit(git_indexwriter *writer);
+
+/* Cleanup an index writing session, unlocking the file (if it is still
+ * locked and freeing any data structures.
+ */
+extern void git_indexwriter_cleanup(git_indexwriter *writer);
+
 #endif