rugged 0.28.4 → 0.28.4.1

data/vendor/libgit2/src/notes.c

@@ -288,7 +288,7 @@ static int note_write(
 
 	/* TODO: should we apply filters? */
 	/* create note object */
-	if ((error = git_blob_create_from_buffer(&oid, repo, note, strlen(note))) < 0)
+	if ((error = git_blob_create_frombuffer(&oid, repo, note, strlen(note))) < 0)
 		goto cleanup;
 
 	if ((error = manipulate_note_in_tree_r(
@@ -320,7 +320,7 @@ static int note_new(
 	git_blob *blob)
 {
 	git_note *note = NULL;
-	git_object_size_t blobsize;
+	git_off_t blobsize;
 
 	note = git__malloc(sizeof(git_note));
 	GIT_ERROR_CHECK_ALLOC(note);

data/vendor/libgit2/src/object.c

@@ -21,7 +21,6 @@
 bool git_object__strict_input_validation = true;
 
 extern int git_odb_hash(git_oid *out, const void *data, size_t len, git_object_t type);
-size_t git_object__size(git_object_t type);
 
 typedef struct {
 	const char	*str;	/* type name string */
@@ -497,7 +496,7 @@ int git_object_short_id(git_buf *out, const git_object *obj)
 	git_buf_sanitize(out);
 	repo = git_object_owner(obj);
 
-	if ((error = git_repository__configmap_lookup(&len, repo, GIT_CONFIGMAP_ABBREV)) < 0)
+	if ((error = git_repository__cvar(&len, repo, GIT_CVAR_ABBREV)) < 0)
 		return error;
 
 	if ((error = git_repository_odb(&odb, repo)) < 0)
@@ -550,3 +549,4 @@ bool git_object__is_valid(
 
 	return true;
 }
+

data/vendor/libgit2/src/object.h

@@ -11,8 +11,6 @@
 
 #include "repository.h"
 
-#define GIT_OBJECT_SIZE_MAX UINT64_MAX
-
 extern bool git_object__strict_input_validation;
 
 /** Base git object for inheritance */

data/vendor/libgit2/src/odb.c

@@ -10,7 +10,7 @@
 #include <zlib.h>
 #include "git2/object.h"
 #include "git2/sys/odb_backend.h"
-#include "futils.h"
+#include "fileops.h"
 #include "hash.h"
 #include "delta.h"
 #include "filter.h"
@@ -89,7 +89,7 @@ int git_odb__format_object_header(
 	size_t *written,
 	char *hdr,
 	size_t hdr_size,
-	git_object_size_t obj_len,
+	git_off_t obj_len,
 	git_object_t obj_type)
 {
 	const char *type_str = git_object_type2string(obj_type);
@@ -320,26 +320,20 @@ int git_odb__hashlink(git_oid *out, const char *path)
 
 int git_odb_hashfile(git_oid *out, const char *path, git_object_t type)
 {
-	uint64_t size;
-	int fd, error = 0;
-
-	if ((fd = git_futils_open_ro(path)) < 0)
+	git_off_t size;
+	int result, fd = git_futils_open_ro(path);
+	if (fd < 0)
 		return fd;
 
-	if ((error = git_futils_filesize(&size, fd)) < 0)
-		goto done;
-
-	if (!git__is_sizet(size)) {
+	if ((size = git_futils_filesize(fd)) < 0 || !git__is_sizet(size)) {
 		git_error_set(GIT_ERROR_OS, "file size overflow for 32-bit systems");
-		error = -1;
-		goto done;
+		p_close(fd);
+		return -1;
 	}
 
-	error = git_odb__hashfd(out, fd, (size_t)size, type);
-
-done:
+	result = git_odb__hashfd(out, fd, (size_t)size, type);
 	p_close(fd);
-	return error;
+	return result;
 }
 
 int git_odb_hash(git_oid *id, const void *data, size_t len, git_object_t type)
@@ -391,7 +385,7 @@ static void fake_wstream__free(git_odb_stream *_stream)
 	git__free(stream);
 }
 
-static int init_fake_wstream(git_odb_stream **stream_p, git_odb_backend *backend, git_object_size_t size, git_object_t type)
+static int init_fake_wstream(git_odb_stream **stream_p, git_odb_backend *backend, git_off_t size, git_object_t type)
 {
 	fake_wstream *stream;
 	size_t blobsize;
@@ -454,7 +448,7 @@ int git_odb_new(git_odb **out)
 		return -1;
 	}
 	if (git_vector_init(&db->backends, 4, backend_sort_cmp) < 0) {
-		git_cache_dispose(&db->own_cache);
+		git_cache_free(&db->own_cache);
 		git__free(db);
 		return -1;
 	}
@@ -554,7 +548,6 @@ int git_odb__add_default_backends(
 #else
 	if (p_stat(objects_dir, &st) < 0) {
 		if (as_alternates)
-			/* this should warn */
 			return 0;
 
 		git_error_set(GIT_ERROR_ODB, "failed to load object database in '%s'", objects_dir);
@@ -672,7 +665,7 @@ int git_odb__set_caps(git_odb *odb, int caps)
 			return -1;
 		}
 
-		if (!git_repository__configmap_lookup(&val, repo, GIT_CONFIGMAP_FSYNCOBJECTFILES))
+		if (!git_repository__cvar(&val, repo, GIT_CVAR_FSYNCOBJECTFILES))
 			odb->do_fsync = !!val;
 	}
 
@@ -693,7 +686,7 @@ static void odb_free(git_odb *db)
 	}
 
 	git_vector_free(&db->backends);
-	git_cache_dispose(&db->own_cache);
+	git_cache_free(&db->own_cache);
 
 	git__memzero(db, sizeof(*db));
 	git__free(db);
@@ -773,7 +766,7 @@ int git_odb_exists(git_odb *db, const git_oid *id)
 
 	assert(db && id);
 
-	if (git_oid_is_zero(id))
+	if (git_oid_iszero(id))
 		return 0;
 
 	if ((object = git_cache_get_raw(odb_cache(db), id)) != NULL) {
@@ -1001,7 +994,7 @@ int git_odb__read_header_or_object(
 
 	*out = NULL;
 
-	if (git_oid_is_zero(id))
+	if (git_oid_iszero(id))
 		return error_null_oid(GIT_ENOTFOUND, "cannot read object");
 
 	if ((object = git_cache_get_raw(odb_cache(db), id)) != NULL) {
@@ -1106,7 +1099,7 @@ int git_odb_read(git_odb_object **out, git_odb *db, const git_oid *id)
 
 	assert(out && db && id);
 
-	if (git_oid_is_zero(id))
+	if (git_oid_iszero(id))
 		return error_null_oid(GIT_ENOTFOUND, "cannot read object");
 
 	*out = git_cache_get_raw(odb_cache(db), id);
@@ -1130,7 +1123,7 @@ static int odb_otype_fast(git_object_t *type_p, git_odb *db, const git_oid *id)
 	size_t _unused;
 	int error;
 
-	if (git_oid_is_zero(id))
+	if (git_oid_iszero(id))
 		return error_null_oid(GIT_ENOTFOUND, "cannot get object type");
 
 	if ((object = git_cache_get_raw(odb_cache(db), id)) != NULL) {
@@ -1290,7 +1283,7 @@ int git_odb_write(
 
 	git_odb_hash(oid, data, len, type);
 
-	if (git_oid_is_zero(oid))
+	if (git_oid_iszero(oid))
 		return error_null_oid(GIT_EINVALID, "cannot write object");
 
 	if (git_odb__freshen(db, oid))
@@ -1325,7 +1318,7 @@ int git_odb_write(
 	return error;
 }
 
-static int hash_header(git_hash_ctx *ctx, git_object_size_t size, git_object_t type)
+static int hash_header(git_hash_ctx *ctx, git_off_t size, git_object_t type)
 {
 	char header[64];
 	size_t hdrlen;
@@ -1339,7 +1332,7 @@ static int hash_header(git_hash_ctx *ctx, git_object_size_t size, git_object_t t
 }
 
 int git_odb_open_wstream(
-	git_odb_stream **stream, git_odb *db, git_object_size_t size, git_object_t type)
+	git_odb_stream **stream, git_odb *db, git_off_t size, git_object_t type)
 {
 	size_t i, writes = 0;
 	int error = GIT_ERROR;
@@ -1475,7 +1468,7 @@ int git_odb_open_rstream(
 	return error;
 }
 
-int git_odb_write_pack(struct git_odb_writepack **out, git_odb *db, git_indexer_progress_cb progress_cb, void *progress_payload)
+int git_odb_write_pack(struct git_odb_writepack **out, git_odb *db, git_transfer_progress_cb progress_cb, void *progress_payload)
 {
 	size_t i, writes = 0;
 	int error = GIT_ERROR;
@@ -1504,21 +1497,10 @@ int git_odb_write_pack(struct git_odb_writepack **out, git_odb *db, git_indexer_
 	return error;
 }
 
-void *git_odb_backend_data_alloc(git_odb_backend *backend, size_t len)
-{
-	GIT_UNUSED(backend);
-	return git__malloc(len);
-}
-
 void *git_odb_backend_malloc(git_odb_backend *backend, size_t len)
-{
-	return git_odb_backend_data_alloc(backend, len);
-}
-
-void git_odb_backend_data_free(git_odb_backend *backend, void *data)
 {
 	GIT_UNUSED(backend);
-	git__free(data);
+	return git__malloc(len);
 }
 
 int git_odb_refresh(struct git_odb *db)

data/vendor/libgit2/src/odb.h

@@ -70,8 +70,7 @@ int git_odb__hashobj(git_oid *id, git_rawobj *obj);
 /*
  * Format the object header such as it would appear in the on-disk object
  */
-int git_odb__format_object_header(size_t *out_len, char *hdr, size_t hdr_size, git_object_size_t obj_len, git_object_t obj_type);
-
+int git_odb__format_object_header(size_t *out_len, char *hdr, size_t hdr_size, git_off_t obj_len, git_object_t obj_type);
 /*
  * Hash an open file descriptor.
  * This is a performance call when the contents of a fd need to be hashed,
@@ -96,7 +95,7 @@ int git_odb__hashfd_filtered(
  * symlink, then the raw contents of the symlink will be hashed. Otherwise,
  * this will fallback to `git_odb__hashfd`.
  *
- * The hash type for this call is always `GIT_OBJECT_BLOB` because
+ * The hash type for this call is always `GIT_OBJIECT_BLOB` because
  * symlinks may only point to blobs.
  */
 int git_odb__hashlink(git_oid *out, const char *path);

data/vendor/libgit2/src/odb_loose.c

@@ -10,7 +10,7 @@
 #include <zlib.h>
 #include "git2/object.h"
 #include "git2/sys/odb_backend.h"
-#include "futils.h"
+#include "fileops.h"
 #include "hash.h"
 #include "odb.h"
 #include "delta.h"
@@ -408,8 +408,7 @@ done:
 static int read_header_loose(git_rawobj *out, git_buf *loc)
 {
 	unsigned char obj[1024];
-	ssize_t obj_len;
-	int fd, error;
+	int fd, obj_len, error;
 
 	assert(out && loc);
 
@@ -418,14 +417,10 @@ static int read_header_loose(git_rawobj *out, git_buf *loc)
 
 	out->data = NULL;
 
-	if ((error = fd = git_futils_open_ro(loc->ptr)) < 0)
+	if ((error = fd = git_futils_open_ro(loc->ptr)) < 0 ||
+		(error = obj_len = p_read(fd, obj, sizeof(obj))) < 0)
 		goto done;
 
-	if ((obj_len = p_read(fd, obj, sizeof(obj))) < 0) {
-		error = (int)obj_len;
-		goto done;
-	}
-
 	if (!is_zlib_compressed_data(obj, (size_t)obj_len))
 		error = read_header_loose_packlike(out, obj, (size_t)obj_len);
 	else
@@ -824,7 +819,7 @@ static int filebuf_flags(loose_backend *backend)
 	return flags;
 }
 
-static int loose_backend__writestream(git_odb_stream **stream_out, git_odb_backend *_backend, git_object_size_t length, git_object_t type)
+static int loose_backend__writestream(git_odb_stream **stream_out, git_odb_backend *_backend, git_off_t length, git_object_t type)
 {
 	loose_backend *backend;
 	loose_writestream *stream = NULL;
@@ -833,7 +828,7 @@ static int loose_backend__writestream(git_odb_stream **stream_out, git_odb_backe
 	size_t hdrlen;
 	int error;
 
-	assert(_backend);
+	assert(_backend && length >= 0);
 
 	backend = (loose_backend *)_backend;
 	*stream_out = NULL;
@@ -876,8 +871,6 @@ static int loose_backend__readstream_read(
 	size_t start_remain = stream->start_len - stream->start_read;
 	int total = 0, error;
 
-	buffer_len = min(buffer_len, INT_MAX);
-
 	/*
 	 * if we read more than just the header in the initial read, play
 	 * that back for the caller.
@@ -889,20 +882,20 @@ static int loose_backend__readstream_read(
 		buffer += chunk;
 		stream->start_read += chunk;
 
-		total += (int)chunk;
+		total += chunk;
 		buffer_len -= chunk;
 	}
 
 	if (buffer_len) {
-		size_t chunk = buffer_len;
+		size_t chunk = min(buffer_len, INT_MAX);
 
 		if ((error = git_zstream_get_output(buffer, &chunk, &stream->zstream)) < 0)
 			return error;
 
-		total += (int)chunk;
+		total += chunk;
 	}
 
-	return (int)total;
+	return total;
 }
 
 static void loose_backend__readstream_free(git_odb_stream *_stream)

data/vendor/libgit2/src/odb_mempack.c

@@ -10,7 +10,7 @@
 #include "git2/object.h"
 #include "git2/sys/odb_backend.h"
 #include "git2/sys/mempack.h"
-#include "futils.h"
+#include "fileops.h"
 #include "hash.h"
 #include "odb.h"
 #include "array.h"
@@ -37,9 +37,15 @@ static int impl__write(git_odb_backend *_backend, const git_oid *oid, const void
 {
 	struct memory_packer_db *db = (struct memory_packer_db *)_backend;
 	struct memobject *obj = NULL;
+	size_t pos;
 	size_t alloc_len;
+	int rval;
 
-	if (git_oidmap_exists(db->objects, oid))
+	pos = git_oidmap_put(db->objects, oid, &rval);
+	if (rval < 0)
+		return -1;
+
+	if (rval == 0)
 		return 0;
 
 	GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, sizeof(struct memobject), len);
@@ -51,8 +57,8 @@ static int impl__write(git_odb_backend *_backend, const git_oid *oid, const void
 	obj->len = len;
 	obj->type = type;
 
-	if (git_oidmap_set(db->objects, &obj->oid, obj) < 0)
-		return -1;
+	git_oidmap_set_key_at(db->objects, pos, &obj->oid);
+	git_oidmap_set_value_at(db->objects, pos, obj);
 
 	if (type == GIT_OBJECT_COMMIT) {
 		struct memobject **store = git_array_alloc(db->commits);
@@ -73,11 +79,15 @@ static int impl__exists(git_odb_backend *backend, const git_oid *oid)
 static int impl__read(void **buffer_p, size_t *len_p, git_object_t *type_p, git_odb_backend *backend, const git_oid *oid)
 {
 	struct memory_packer_db *db = (struct memory_packer_db *)backend;
-	struct memobject *obj;
+	struct memobject *obj = NULL;
+	size_t pos;
 
-	if ((obj = git_oidmap_get(db->objects, oid)) == NULL)
+	pos = git_oidmap_lookup_index(db->objects, oid);
+	if (!git_oidmap_valid_index(db->objects, pos))
 		return GIT_ENOTFOUND;
 
+	obj = git_oidmap_value_at(db->objects, pos);
+
 	*len_p = obj->len;
 	*type_p = obj->type;
 	*buffer_p = git__malloc(obj->len);
@@ -90,11 +100,15 @@ static int impl__read(void **buffer_p, size_t *len_p, git_object_t *type_p, git_
 static int impl__read_header(size_t *len_p, git_object_t *type_p, git_odb_backend *backend, const git_oid *oid)
 {
 	struct memory_packer_db *db = (struct memory_packer_db *)backend;
-	struct memobject *obj;
+	struct memobject *obj = NULL;
+	size_t pos;
 
-	if ((obj = git_oidmap_get(db->objects, oid)) == NULL)
+	pos = git_oidmap_lookup_index(db->objects, oid);
+	if (!git_oidmap_valid_index(db->objects, pos))
 		return GIT_ENOTFOUND;
 
+	obj = git_oidmap_value_at(db->objects, pos);
+
 	*len_p = obj->len;
 	*type_p = obj->type;
 	return 0;
@@ -157,8 +171,7 @@ int git_mempack_new(git_odb_backend **out)
 	db = git__calloc(1, sizeof(struct memory_packer_db));
 	GIT_ERROR_CHECK_ALLOC(db);
 
-	if (git_oidmap_new(&db->objects) < 0)
-		return -1;
+	db->objects = git_oidmap_alloc();
 
 	db->parent.version = GIT_ODB_BACKEND_VERSION;
 	db->parent.read = &impl__read;

data/vendor/libgit2/src/odb_pack.c

@@ -11,7 +11,7 @@
 #include "git2/repository.h"
 #include "git2/indexer.h"
 #include "git2/sys/odb_backend.h"
-#include "futils.h"
+#include "fileops.h"
 #include "hash.h"
 #include "odb.h"
 #include "delta.h"
@@ -485,7 +485,7 @@ static int pack_backend__foreach(git_odb_backend *_backend, git_odb_foreach_cb c
 	return 0;
 }
 
-static int pack_backend__writepack_append(struct git_odb_writepack *_writepack, const void *data, size_t size, git_indexer_progress *stats)
+static int pack_backend__writepack_append(struct git_odb_writepack *_writepack, const void *data, size_t size, git_transfer_progress *stats)
 {
 	struct pack_writepack *writepack = (struct pack_writepack *)_writepack;
 
@@ -494,7 +494,7 @@ static int pack_backend__writepack_append(struct git_odb_writepack *_writepack,
 	return git_indexer_append(writepack->indexer, data, size, stats);
 }
 
-static int pack_backend__writepack_commit(struct git_odb_writepack *_writepack, git_indexer_progress *stats)
+static int pack_backend__writepack_commit(struct git_odb_writepack *_writepack, git_transfer_progress *stats)
 {
 	struct pack_writepack *writepack = (struct pack_writepack *)_writepack;
 
@@ -516,7 +516,7 @@ static void pack_backend__writepack_free(struct git_odb_writepack *_writepack)
 static int pack_backend__writepack(struct git_odb_writepack **out,
 	git_odb_backend *_backend,
         git_odb *odb,
-	git_indexer_progress_cb progress_cb,
+	git_transfer_progress_cb progress_cb,
 	void *progress_payload)
 {
 	git_indexer_options opts = GIT_INDEXER_OPTIONS_INIT;