index: Add API for unmerged entries New external functions: - git_index_unmerged_entrycount: Counts the unmerged entries in the index - git_index_get_unmerged: Gets an unmerged entry from the index by name New internal functions: - read_unmerged: Wrapper for read_unmerged_internal - read_unmerged_internal: Reads unmerged entries from the index if the index has the INDEX_EXT_UNMERGED_SIG set - unmerged_srch: Search function for unmerged vector - unmerged_cmp: Compare function for unmerged vector New data structures: - git_index now contains a git_vector unmerged that stores unmerged entries - git_index_entry_unmerged: Representation of an unmerged file entry. It represents all three versions of the file at the same time, with one name, three modes and three OIDs
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230
diff --git a/include/git2/index.h b/include/git2/index.h
index 8a84f50..09993a1 100644
--- a/include/git2/index.h
+++ b/include/git2/index.h
@@ -111,6 +111,12 @@ typedef struct git_index_entry {
char *path;
} git_index_entry;
+/** Representation of an unmerged file entry in the index. */
+typedef struct git_index_entry_unmerged {
+ unsigned int mode[3];
+ git_oid oid[3];
+ char *path;
+} git_index_entry_unmerged;
/**
* Create a new Git index object as a memory representation
@@ -233,6 +239,24 @@ GIT_EXTERN(git_index_entry *) git_index_get(git_index *index, int n);
*/
GIT_EXTERN(unsigned int) git_index_entrycount(git_index *index);
+/**
+ * Get the count of unmerged entries currently in the index
+ *
+ * @param index an existing index object
+ * @return integer of count of current unmerged entries
+ */
+GIT_EXTERN(unsigned int) git_index_unmerged_entrycount(git_index *index);
+
+/**
+ * Get an unmerged entry from the index.
+ *
+ * @param entry the pointer to the new unmerged entry
+ * @param index an existing index object
+ * @param path path to search
+ * @return 0 on success, otherwise an error code
+ */
+GIT_EXTERN(int) git_index_get_unmerged(git_index_entry_unmerged **entry, git_index *index, const char *path);
+
/** @} */
GIT_END_DECL
diff --git a/src/index.c b/src/index.c
index 68bb9e2..6a2afda 100644
--- a/src/index.c
+++ b/src/index.c
@@ -46,6 +46,7 @@ static const unsigned int INDEX_VERSION_NUMBER_EXT = 3;
static const unsigned int INDEX_HEADER_SIG = 0x44495243;
static const char INDEX_EXT_TREECACHE_SIG[] = {'T', 'R', 'E', 'E'};
+static const char INDEX_EXT_UNMERGED_SIG[] = {'R', 'E', 'U', 'C'};
struct index_header {
uint32_t signature;
@@ -98,7 +99,9 @@ static size_t read_entry(git_index_entry *dest, const void *buffer, size_t buffe
static int read_header(struct index_header *dest, const void *buffer);
static int read_tree(git_index *index, const char *buffer, size_t buffer_size);
+static int read_unmerged_internal(git_index *, const char **, size_t buffer_size);
static git_index_tree *read_tree_internal(const char **, const char *, git_index_tree *);
+static int read_unmerged_internal(git_index *, const char **, size_t buffer_size);
static int parse_index(git_index *index, const char *buffer, size_t buffer_size);
static void sort_index(git_index *index);
@@ -120,6 +123,21 @@ int index_cmp(const void *a, const void *b)
return strcmp(entry_a->path, entry_b->path);
}
+int unmerged_srch(const void *key, const void *array_member)
+{
+ const char *path = (const char *) key;
+ const git_index_entry_unmerged *entry = *(const git_index_entry_unmerged **) (array_member);
+
+ return strcmp(path, entry->path);
+}
+
+int unmerged_cmp(const void *a, const void *b)
+{
+ const git_index_entry_unmerged *info_a = *(const git_index_entry_unmerged **)(a);
+ const git_index_entry_unmerged *info_b = *(const git_index_entry_unmerged **)(b);
+
+ return strcmp(info_a->path, info_b->path);
+}
static int index_initialize(git_index **index_out, git_repository *owner, const char *index_path)
{
@@ -142,6 +160,7 @@ static int index_initialize(git_index **index_out, git_repository *owner, const
index->repository = owner;
git_vector_init(&index->entries, 32, index_cmp);
+ git_vector_init(&index->unmerged, 32, unmerged_cmp);
/* Check if index file is stored on disk already */
if (gitfo_exists(index->index_file_path) == 0)
@@ -282,6 +301,16 @@ unsigned int git_index_entrycount(git_index *index)
return index->entries.length;
}
+unsigned int git_index_unmerged_entrycount(git_index *index)
+{
+ assert(index);
+
+ if (!&index->unmerged)
+ return 0;
+
+ return index->unmerged.length;
+}
+
git_index_entry *git_index_get(git_index *index, int n)
{
assert(index);
@@ -406,6 +435,22 @@ int git_index_find(git_index *index, const char *path)
return git_vector_bsearch2(&index->entries, index_srch, path);
}
+int git_index_get_unmerged(git_index_entry_unmerged **entry, git_index *index, const char *path)
+{
+ int pos;
+ assert(index);
+
+ if ((pos = git_vector_bsearch2(&index->unmerged, unmerged_srch, path)) < GIT_SUCCESS)
+ return pos;
+
+ if ((*entry = git_vector_get(&index->unmerged, pos)) == NULL) {
+ return GIT_ENOTFOUND;
+ }
+
+ return GIT_SUCCESS;
+}
+
+
static git_index_tree *read_tree_internal(
const char **buffer_in, const char *buffer_end, git_index_tree *parent)
{
@@ -488,6 +533,68 @@ static int read_tree(git_index *index, const char *buffer, size_t buffer_size)
return (index->tree != NULL && buffer == buffer_end) ? GIT_SUCCESS : GIT_EOBJCORRUPTED;
}
+static int read_unmerged_internal(
+ git_index *index, const char **buffer_in, size_t buffer_size)
+{
+ const char *buffer, *endptr;
+ size_t size, len;
+ int i;
+
+ size = buffer_size;
+
+ while (size) {
+ git_index_entry_unmerged *lost;
+
+ buffer = *buffer_in;
+
+ len = strlen(buffer) + 1;
+ if (size <= len)
+ return GIT_ERROR;
+
+ if ((lost = git__malloc(sizeof(git_index_entry_unmerged))) == NULL)
+ return GIT_ERROR;
+
+ if ((lost->path = git__malloc(strlen(buffer))) == NULL)
+ return GIT_ERROR;
+ strcpy(lost->path, buffer);
+
+ if (git_vector_insert(&index->unmerged, lost) < GIT_SUCCESS)
+ return GIT_ERROR;
+
+ size -= len;
+ buffer += len;
+
+ for (i = 0; i < 3; i++) {
+ if (git__strtol32((long int *) &lost->mode[i], buffer, &endptr, 8) < GIT_SUCCESS || !endptr || endptr == buffer || *endptr)
+ return GIT_ERROR;
+ len = (endptr + 1) - (char *) buffer;
+ if (size <= len)
+ return GIT_ERROR;
+ size -= len;
+ buffer += len;
+ }
+
+ for (i = 0; i < 3; i++) {
+ if (!lost->mode[i])
+ continue;
+ if (size < 20)
+ return GIT_ERROR;
+ git_oid_mkraw(&lost->oid[i], (unsigned char *) buffer);
+ size -= 20;
+ buffer += 20;
+ }
+ }
+
+ *buffer_in = buffer;
+ return GIT_SUCCESS;
+}
+
+static int read_unmerged(git_index *index, const char *buffer, size_t buffer_size)
+{
+ read_unmerged_internal(index, &buffer, buffer_size);
+ return (&index->unmerged != NULL) ? GIT_SUCCESS : GIT_EOBJCORRUPTED;
+}
+
static size_t read_entry(git_index_entry *dest, const void *buffer, size_t buffer_size)
{
size_t path_length, entry_size;
@@ -593,6 +700,13 @@ static size_t read_extension(git_index *index, const char *buffer, size_t buffer
if (read_tree(index, buffer + 8, dest.extension_size) < GIT_SUCCESS)
return 0;
+
+ } else if (memcmp(dest.signature, INDEX_EXT_UNMERGED_SIG, 4) == 0) {
+
+ if (read_unmerged(index, buffer + 8, dest.extension_size) < GIT_SUCCESS)
+ return 0;
+ } else {
+ ;
}
} else {
/* we cannot handle non-ignorable extensions;
diff --git a/src/index.h b/src/index.h
index e1e752f..f2402fd 100644
--- a/src/index.h
+++ b/src/index.h
@@ -29,6 +29,8 @@ struct git_index {
unsigned int on_disk:1;
git_index_tree *tree;
+
+ git_vector unmerged;
};
#endif