rugged 1.7.2 → 1.9.4

data/vendor/libgit2/src/libgit2/indexer.c

@@ -20,14 +20,16 @@
 #include "filebuf.h"
 #include "oid.h"
 #include "oidarray.h"
-#include "oidmap.h"
 #include "zstream.h"
 #include "object.h"
+#include "hashmap_oid.h"
 
 size_t git_indexer__max_objects = UINT32_MAX;
 
 #define UINT31_MAX (0x7FFFFFFF)
 
+GIT_HASHMAP_OID_SETUP(git_indexer_oidmap, git_oid *);
+
 struct entry {
 	git_oid oid;
 	uint32_t crc;
@@ -63,7 +65,7 @@ struct git_indexer {
 	char objbuf[8*1024];
 
 	/* OIDs referenced from pack objects. Used for verification. */
-	git_oidmap *expected_oids;
+	git_indexer_oidmap expected_oids;
 
 	/* Needed to look up objects which we want to inject to fix a thin pack */
 	git_odb *odb;
@@ -169,9 +171,12 @@ static int indexer_new(
 	if (in_opts)
 		memcpy(&opts, in_opts, sizeof(opts));
 
+	if (oid_type)
+		GIT_ASSERT_ARG(git_oid_type_is_valid(oid_type));
+
 	idx = git__calloc(1, sizeof(git_indexer));
 	GIT_ERROR_CHECK_ALLOC(idx);
-	idx->oid_type = oid_type;
+	idx->oid_type = oid_type ? oid_type : GIT_OID_DEFAULT;
 	idx->odb = odb;
 	idx->progress_cb = opts.progress_cb;
 	idx->progress_payload = opts.progress_cb_payload;
@@ -181,8 +186,7 @@ static int indexer_new(
 	checksum_type = indexer_hash_algorithm(idx);
 
 	if ((error = git_hash_ctx_init(&idx->hash_ctx, checksum_type)) < 0 ||
-	    (error = git_hash_ctx_init(&idx->trailer, checksum_type)) < 0 ||
-	    (error = git_oidmap_new(&idx->expected_oids)) < 0)
+	    (error = git_hash_ctx_init(&idx->trailer, checksum_type)) < 0)
 		goto cleanup;
 
 	idx->do_verify = opts.verify;
@@ -232,13 +236,12 @@ cleanup:
 int git_indexer_new(
 	git_indexer **out,
 	const char *prefix,
-	git_oid_t oid_type,
 	git_indexer_options *opts)
 {
 	return indexer_new(
 		out,
 		prefix,
-		oid_type,
+		opts ? opts->oid_type : 0,
 		opts ? opts->mode : 0,
 		opts ? opts->odb : NULL,
 		opts);
@@ -380,12 +383,12 @@ static int add_expected_oid(git_indexer *idx, const git_oid *oid)
 	 * not have to expect it.
 	 */
 	if ((!idx->odb || !git_odb_exists(idx->odb, oid)) &&
-	    !git_oidmap_exists(idx->pack->idx_cache, oid) &&
-	    !git_oidmap_exists(idx->expected_oids, oid)) {
+	    !git_pack_oidmap_contains(&idx->pack->idx_cache, oid) &&
+	    !git_indexer_oidmap_contains(&idx->expected_oids, oid)) {
 		    git_oid *dup = git__malloc(sizeof(*oid));
 		    GIT_ERROR_CHECK_ALLOC(dup);
 		    git_oid_cpy(dup, oid);
-		    return git_oidmap_set(idx->expected_oids, dup, dup);
+		    return git_indexer_oidmap_put(&idx->expected_oids, dup, dup);
 	}
 
 	return 0;
@@ -412,8 +415,8 @@ static int check_object_connectivity(git_indexer *idx, const git_rawobj *obj)
 		goto out;
 	}
 
-	if ((expected = git_oidmap_get(idx->expected_oids, &object->cached.oid)) != NULL) {
-		git_oidmap_delete(idx->expected_oids, &object->cached.oid);
+	if (git_indexer_oidmap_get(&expected, &idx->expected_oids, &object->cached.oid) == 0) {
+		git_indexer_oidmap_remove(&idx->expected_oids, &object->cached.oid);
 		git__free(expected);
 	}
 
@@ -518,7 +521,7 @@ static int store_object(git_indexer *idx)
 	git_oid_cpy(&pentry->id, &oid);
 	pentry->offset = entry_start;
 
-	if (git_oidmap_exists(idx->pack->idx_cache, &pentry->id)) {
+	if (git_pack_oidmap_contains(&idx->pack->idx_cache, &pentry->id)) {
 		const char *idstr = git_oid_tostr_s(&pentry->id);
 
 		if (!idstr)
@@ -530,7 +533,7 @@ static int store_object(git_indexer *idx)
 		goto on_error;
 	}
 
-	if ((error = git_oidmap_set(idx->pack->idx_cache, &pentry->id, pentry)) < 0) {
+	if ((error = git_pack_oidmap_put(&idx->pack->idx_cache, &pentry->id, pentry)) < 0) {
 		git__free(pentry);
 		git_error_set_oom();
 		goto on_error;
@@ -559,7 +562,7 @@ on_error:
 
 GIT_INLINE(bool) has_entry(git_indexer *idx, git_oid *id)
 {
-	return git_oidmap_exists(idx->pack->idx_cache, id);
+	return git_pack_oidmap_contains(&idx->pack->idx_cache, id);
 }
 
 static int save_entry(git_indexer *idx, struct entry *entry, struct git_pack_entry *pentry, off64_t entry_start)
@@ -575,8 +578,8 @@ static int save_entry(git_indexer *idx, struct entry *entry, struct git_pack_ent
 
 	pentry->offset = entry_start;
 
-	if (git_oidmap_exists(idx->pack->idx_cache, &pentry->id) ||
-	    git_oidmap_set(idx->pack->idx_cache, &pentry->id, pentry) < 0) {
+	if (git_pack_oidmap_contains(&idx->pack->idx_cache, &pentry->id) ||
+	    git_pack_oidmap_put(&idx->pack->idx_cache, &pentry->id, pentry) < 0) {
 		git_error_set(GIT_ERROR_INDEXER, "cannot insert object into pack");
 		return -1;
 	}
@@ -911,9 +914,6 @@ int git_indexer_append(git_indexer *idx, const void *data, size_t size, git_inde
 			return -1;
 		}
 
-		if (git_oidmap_new(&idx->pack->idx_cache) < 0)
-			return -1;
-
 		idx->pack->has_cache = 1;
 		if (git_vector_init(&idx->objects, total_objects, objects_cmp) < 0)
 			return -1;
@@ -921,12 +921,12 @@ int git_indexer_append(git_indexer *idx, const void *data, size_t size, git_inde
 		if (git_vector_init(&idx->deltas, total_objects / 2, NULL) < 0)
 			return -1;
 
+		stats->total_objects = total_objects;
+		stats->indexed_objects = 0;
 		stats->received_objects = 0;
 		stats->local_objects = 0;
 		stats->total_deltas = 0;
 		stats->indexed_deltas = 0;
-		stats->indexed_objects = 0;
-		stats->total_objects = total_objects;
 
 		if ((error = do_progress_callback(idx, stats)) != 0)
 			return error;
@@ -1301,9 +1301,9 @@ int git_indexer_commit(git_indexer *idx, git_indexer_progress *stats)
 	 * bail out due to an incomplete and thus corrupt
 	 * packfile.
 	 */
-	if (git_oidmap_size(idx->expected_oids) > 0) {
+	if (git_indexer_oidmap_size(&idx->expected_oids) > 0) {
 		git_error_set(GIT_ERROR_INDEXER, "packfile is missing %"PRIuZ" objects",
-			git_oidmap_size(idx->expected_oids));
+			(size_t)git_indexer_oidmap_size(&idx->expected_oids));
 		return -1;
 	}
 
@@ -1446,9 +1446,9 @@ on_error:
 
 void git_indexer_free(git_indexer *idx)
 {
-	const git_oid *key;
-	git_oid *value;
-	size_t iter;
+	struct git_pack_entry *pentry;
+	git_oid *id;
+	git_hashmap_iter_t iter = GIT_HASHMAP_ITER_INIT;
 
 	if (idx == NULL)
 		return;
@@ -1456,28 +1456,24 @@ void git_indexer_free(git_indexer *idx)
 	if (idx->have_stream)
 		git_packfile_stream_dispose(&idx->stream);
 
-	git_vector_free_deep(&idx->objects);
+	git_vector_dispose_deep(&idx->objects);
 
-	if (idx->pack->idx_cache) {
-		struct git_pack_entry *pentry;
-		git_oidmap_foreach_value(idx->pack->idx_cache, pentry, {
-			git__free(pentry);
-		});
+	while (git_pack_oidmap_iterate(&iter, NULL, &pentry, &idx->pack->idx_cache) == 0)
+		git__free(pentry);
 
-		git_oidmap_free(idx->pack->idx_cache);
-	}
+	git_pack_oidmap_dispose(&idx->pack->idx_cache);
 
-	git_vector_free_deep(&idx->deltas);
+	git_vector_dispose_deep(&idx->deltas);
 
 	git_packfile_free(idx->pack, !idx->pack_committed);
 
-	iter = 0;
-	while (git_oidmap_iterate((void **) &value, idx->expected_oids, &iter, &key) == 0)
-		git__free(value);
+	iter = GIT_HASHMAP_ITER_INIT;
+	while (git_indexer_oidmap_iterate(&iter, NULL, &id, &idx->expected_oids) == 0)
+		git__free(id);
 
 	git_hash_ctx_cleanup(&idx->trailer);
 	git_hash_ctx_cleanup(&idx->hash_ctx);
 	git_str_dispose(&idx->entry_data);
-	git_oidmap_free(idx->expected_oids);
+	git_indexer_oidmap_dispose(&idx->expected_oids);
 	git__free(idx);
 }

data/vendor/libgit2/src/libgit2/iterator.c

@@ -26,9 +26,10 @@
 #define iterator__ignore_dot_git(I)    iterator__flag(I,IGNORE_DOT_GIT)
 #define iterator__descend_symlinks(I)  iterator__flag(I,DESCEND_SYMLINKS)
 
-
 static void iterator_set_ignore_case(git_iterator *iter, bool ignore_case)
 {
+	int (*vector_cmp)(const void *a, const void *b);
+
 	if (ignore_case)
 		iter->flags |= GIT_ITERATOR_IGNORE_CASE;
 	else
@@ -39,7 +40,9 @@ static void iterator_set_ignore_case(git_iterator *iter, bool ignore_case)
 	iter->prefixcomp = ignore_case ? git__prefixcmp_icase : git__prefixcmp;
 	iter->entry_srch = ignore_case ? git_index_entry_isrch : git_index_entry_srch;
 
-	git_vector_set_cmp(&iter->pathlist, (git_vector_cmp)iter->strcomp);
+	vector_cmp = ignore_case ? git__strcasecmp_cb : git__strcmp_cb;
+
+	git_vector_set_cmp(&iter->pathlist, vector_cmp);
 }
 
 static int iterator_range_init(
@@ -299,6 +302,7 @@ typedef enum {
 static iterator_pathlist_search_t iterator_pathlist_search(
 	git_iterator *iter, const char *path, size_t path_len)
 {
+	int (*vector_cmp)(const void *a, const void *b);
 	const char *p;
 	size_t idx;
 	int error;
@@ -308,8 +312,10 @@ static iterator_pathlist_search_t iterator_pathlist_search(
 
 	git_vector_sort(&iter->pathlist);
 
-	error = git_vector_bsearch2(&idx, &iter->pathlist,
-		(git_vector_cmp)iter->strcomp, path);
+	vector_cmp = (iter->flags & GIT_ITERATOR_IGNORE_CASE) != 0 ?
+		git__strcasecmp_cb : git__strcmp_cb;
+
+	error = git_vector_bsearch2(&idx, &iter->pathlist, vector_cmp, path);
 
 	/* the given path was found in the pathlist.  since the pathlist only
 	 * matches directories when they're suffixed with a '/', analyze the
@@ -690,7 +696,7 @@ static int tree_iterator_frame_pop(tree_iterator *iter)
 
 	frame = git_array_pop(iter->frames);
 
-	git_vector_free(&frame->entries);
+	git_vector_dispose(&frame->entries);
 	git_tree_free(frame->tree);
 
 	do {
@@ -703,7 +709,7 @@ static int tree_iterator_frame_pop(tree_iterator *iter)
 	git_vector_foreach(&frame->similar_trees, i, tree)
 		git_tree_free(tree);
 
-	git_vector_free(&frame->similar_trees);
+	git_vector_dispose(&frame->similar_trees);
 
 	git_str_dispose(&frame->path);
 
@@ -1495,7 +1501,7 @@ GIT_INLINE(int) filesystem_iterator_frame_pop(filesystem_iterator *iter)
 	filesystem_iterator_frame_pop_ignores(iter);
 
 	git_pool_clear(&frame->entry_pool);
-	git_vector_free(&frame->entries);
+	git_vector_dispose(&frame->entries);
 
 	return 0;
 }
@@ -2330,7 +2336,7 @@ void git_iterator_free(git_iterator *iter)
 
 	iter->cb->free(iter);
 
-	git_vector_free(&iter->pathlist);
+	git_vector_dispose(&iter->pathlist);
 	git__free(iter->start);
 	git__free(iter->end);