rugged 1.3.1 → 1.9.0

data/vendor/libgit2/src/{revwalk.c → libgit2/revwalk.c}

@@ -14,6 +14,9 @@
 #include "git2/revparse.h"
 #include "merge.h"
 #include "vector.h"
+#include "hashmap_oid.h"
+
+GIT_HASHMAP_OID_FUNCTIONS(git_revwalk_oidmap, GIT_HASHMAP_INLINE, git_commit_list_node *);
 
 static int get_revision(git_commit_list_node **out, git_revwalk *walk, git_commit_list **list);
 
@@ -23,7 +26,7 @@ git_commit_list_node *git_revwalk__commit_lookup(
 	git_commit_list_node *commit;
 
 	/* lookup and reserve space if not already present */
-	if ((commit = git_oidmap_get(walk->commits, oid)) != NULL)
+	if (git_revwalk_oidmap_get(&commit, &walk->commits, oid) == 0)
 		return commit;
 
 	commit = git_commit_list_alloc_node(walk);
@@ -32,7 +35,7 @@ git_commit_list_node *git_revwalk__commit_lookup(
 
 	git_oid_cpy(&commit->oid, oid);
 
-	if ((git_oidmap_set(walk->commits, &commit->oid, commit)) < 0)
+	if (git_revwalk_oidmap_put(&walk->commits, &commit->oid, commit) < 0)
 		return NULL;
 
 	return commit;
@@ -83,8 +86,13 @@ int git_revwalk__push_commit(git_revwalk *walk, const git_oid *oid, const git_re
 
 	commit->uninteresting = opts->uninteresting;
 	list = walk->user_input;
-	if ((opts->insert_by_date &&
-	    git_commit_list_insert_by_date(commit, &list) == NULL) ||
+
+	/* To insert by date, we need to parse so we know the date. */
+	if (opts->insert_by_date && ((error = git_commit_list_parse(walk, commit)) < 0))
+		return error;
+
+	if ((opts->insert_by_date == 0 ||
+	    git_commit_list_insert_by_date(commit, &list) == NULL) &&
 	    git_commit_list_insert(commit, &list) == NULL) {
 		git_error_set_oom();
 		return -1;
@@ -121,8 +129,12 @@ int git_revwalk__push_ref(git_revwalk *walk, const char *refname, const git_revw
 {
 	git_oid oid;
 
-	if (git_reference_name_to_id(&oid, walk->repo, refname) < 0)
+	int error = git_reference_name_to_id(&oid, walk->repo, refname);
+	if (opts->from_glob && (error == GIT_ENOTFOUND || error == GIT_EINVALIDSPEC || error == GIT_EPEEL)) {
+		return 0;
+	} else if (error < 0) {
 		return -1;
+	}
 
 	return git_revwalk__push_commit(walk, &oid, opts);
 }
@@ -131,7 +143,7 @@ int git_revwalk__push_glob(git_revwalk *walk, const char *glob, const git_revwal
 {
 	git_revwalk__push_options opts = GIT_REVWALK__PUSH_OPTIONS_INIT;
 	int error = 0;
-	git_buf buf = GIT_BUF_INIT;
+	git_str buf = GIT_STR_INIT;
 	git_reference *ref;
 	git_reference_iterator *iter;
 	size_t wildcard;
@@ -144,15 +156,15 @@ int git_revwalk__push_glob(git_revwalk *walk, const char *glob, const git_revwal
 
 	/* refs/ is implied if not given in the glob */
 	if (git__prefixcmp(glob, GIT_REFS_DIR) != 0)
-		git_buf_joinpath(&buf, GIT_REFS_DIR, glob);
+		git_str_joinpath(&buf, GIT_REFS_DIR, glob);
 	else
-		git_buf_puts(&buf, glob);
-	GIT_ERROR_CHECK_ALLOC_BUF(&buf);
+		git_str_puts(&buf, glob);
+	GIT_ERROR_CHECK_ALLOC_STR(&buf);
 
 	/* If no '?', '*' or '[' exist, we append '/ *' to the glob */
 	wildcard = strcspn(glob, "?*[");
 	if (!glob[wildcard])
-		git_buf_put(&buf, "/*", 2);
+		git_str_put(&buf, "/*", 2);
 
 	if ((error = git_reference_iterator_glob_new(&iter, walk->repo, buf.ptr)) < 0)
 		goto out;
@@ -169,7 +181,7 @@ int git_revwalk__push_glob(git_revwalk *walk, const char *glob, const git_revwal
 	if (error == GIT_ITEROVER)
 		error = 0;
 out:
-	git_buf_dispose(&buf);
+	git_str_dispose(&buf);
 	return error;
 }
 
@@ -427,7 +439,7 @@ static int add_parents_to_list(git_revwalk *walk, git_commit_list_node *commit,
 	return 0;
 }
 
-/* How many unintersting commits we want to look at after we run out of interesting ones */
+/* How many uninteresting commits we want to look at after we run out of interesting ones */
 #define SLOP 5
 
 static int still_interesting(git_commit_list *list, int64_t time, int slop)
@@ -605,7 +617,7 @@ cleanup:
 static int prepare_walk(git_revwalk *walk)
 {
 	int error = 0;
-	git_commit_list *list, *commits = NULL;
+	git_commit_list *list, *commits = NULL, *commits_last = NULL;
 	git_commit_list_node *next;
 
 	/* If there were no pushes, we know that the walk is already over */
@@ -614,6 +626,12 @@ static int prepare_walk(git_revwalk *walk)
 		return GIT_ITEROVER;
 	}
 
+	/*
+	 * This is a bit convoluted, but necessary to maintain the order of
+	 * the commits. This is especially important in situations where
+	 * git_revwalk__push_glob is called with a git_revwalk__push_options
+	 * setting insert_by_date = 1, which is critical for fetch negotiation.
+	 */
 	for (list = walk->user_input; list; list = list->next) {
 		git_commit_list_node *commit = list->item;
 		if ((error = git_commit_list_parse(walk, commit)) < 0)
@@ -623,8 +641,19 @@ static int prepare_walk(git_revwalk *walk)
 			mark_parents_uninteresting(commit);
 
 		if (!commit->seen) {
+			git_commit_list *new_list = NULL;
+			if ((new_list = git_commit_list_create(commit, NULL)) == NULL) {
+				git_error_set_oom();
+				return -1;
+			}
+
 			commit->seen = 1;
-			git_commit_list_insert(commit, &commits);
+			if (commits_last == NULL)
+				commits = new_list;
+			else
+				commits_last->next = new_list;
+
+			commits_last = new_list;
 		}
 	}
 
@@ -674,8 +703,7 @@ int git_revwalk_new(git_revwalk **revwalk_out, git_repository *repo)
 	git_revwalk *walk = git__calloc(1, sizeof(git_revwalk));
 	GIT_ERROR_CHECK_ALLOC(walk);
 
-	if (git_oidmap_new(&walk->commits) < 0 ||
-	    git_pqueue_init(&walk->iterator_time, 0, 8, git_commit_list_time_cmp) < 0 ||
+	if (git_pqueue_init(&walk->iterator_time, 0, 8, git_commit_list_time_cmp) < 0 ||
 	    git_pool_init(&walk->commit_pool, COMMIT_ALLOC) < 0)
 		return -1;
 
@@ -701,7 +729,7 @@ void git_revwalk_free(git_revwalk *walk)
 	git_revwalk_reset(walk);
 	git_odb_free(walk->odb);
 
-	git_oidmap_free(walk->commits);
+	git_revwalk_oidmap_dispose(&walk->commits);
 	git_pool_clear(&walk->commit_pool);
 	git_pqueue_free(&walk->iterator_time);
 	git__free(walk);
@@ -773,17 +801,18 @@ int git_revwalk_next(git_oid *oid, git_revwalk *walk)
 int git_revwalk_reset(git_revwalk *walk)
 {
 	git_commit_list_node *commit;
+	git_hashmap_iter_t iter = GIT_HASHMAP_ITER_INIT;
 
 	GIT_ASSERT_ARG(walk);
 
-	git_oidmap_foreach_value(walk->commits, commit, {
+	while (git_revwalk_oidmap_iterate(&iter, NULL, &commit, &walk->commits) == 0) {
 		commit->seen = 0;
 		commit->in_degree = 0;
 		commit->topo_delay = 0;
 		commit->uninteresting = 0;
 		commit->added = 0;
 		commit->flags = 0;
-		});
+	}
 
 	git_pqueue_clear(&walk->iterator_time);
 	git_commit_list_free(&walk->iterator_topo);

data/vendor/libgit2/src/{revwalk.h → libgit2/revwalk.h}

@@ -10,19 +10,19 @@
 #include "common.h"
 
 #include "git2/revwalk.h"
-#include "oidmap.h"
 #include "commit_list.h"
 #include "pqueue.h"
 #include "pool.h"
 #include "vector.h"
+#include "hashmap_oid.h"
 
-#include "oidmap.h"
+GIT_HASHMAP_OID_STRUCT(git_revwalk_oidmap, git_commit_list_node *);
 
 struct git_revwalk {
 	git_repository *repo;
 	git_odb *odb;
 
-	git_oidmap *commits;
+	git_revwalk_oidmap commits;
 	git_pool commit_pool;
 
 	git_commit_list *iterator_topo;

data/vendor/libgit2/src/{libgit2.c → libgit2/settings.c}

@@ -5,13 +5,15 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 
-#include "libgit2.h"
+#include "settings.h"
 
 #include <git2.h>
 #include "alloc.h"
+#include "buf.h"
 #include "cache.h"
 #include "common.h"
 #include "filter.h"
+#include "grafts.h"
 #include "hash.h"
 #include "index.h"
 #include "merge_driver.h"
@@ -19,18 +21,19 @@
 #include "mwindow.h"
 #include "object.h"
 #include "odb.h"
+#include "rand.h"
 #include "refs.h"
 #include "runtime.h"
 #include "sysdir.h"
 #include "thread.h"
-#include "threadstate.h"
 #include "git2/global.h"
 #include "streams/registry.h"
 #include "streams/mbedtls.h"
 #include "streams/openssl.h"
+#include "streams/socket.h"
 #include "transports/smart.h"
 #include "transports/http.h"
-#include "transports/ssh.h"
+#include "transports/ssh_libssh2.h"
 
 #ifdef GIT_WIN32
 # include "win32/w32_leakcheck.h"
@@ -44,82 +47,25 @@ extern size_t git_indexer__max_objects;
 extern bool git_disable_pack_keep_file_checks;
 extern int git_odb__packed_priority;
 extern int git_odb__loose_priority;
+extern int git_socket_stream__connect_timeout;
+extern int git_socket_stream__timeout;
 
 char *git__user_agent;
+char *git__user_agent_product;
 char *git__ssl_ciphers;
 
-static void libgit2_settings_global_shutdown(void)
+static void settings_global_shutdown(void)
 {
 	git__free(git__user_agent);
+	git__free(git__user_agent_product);
+
 	git__free(git__ssl_ciphers);
 	git_repository__free_extensions();
 }
 
-static int git_libgit2_settings_global_init(void)
+int git_settings_global_init(void)
 {
-	return git_runtime_shutdown_register(libgit2_settings_global_shutdown);
-}
-
-int git_libgit2_init(void)
-{
-	static git_runtime_init_fn init_fns[] = {
-#ifdef GIT_WIN32
-		git_win32_leakcheck_global_init,
-#endif
-		git_allocator_global_init,
-		git_threadstate_global_init,
-		git_threads_global_init,
-		git_hash_global_init,
-		git_sysdir_global_init,
-		git_filter_global_init,
-		git_merge_driver_global_init,
-		git_transport_ssh_global_init,
-		git_stream_registry_global_init,
-		git_openssl_stream_global_init,
-		git_mbedtls_stream_global_init,
-		git_mwindow_global_init,
-		git_pool_global_init,
-		git_libgit2_settings_global_init
-	};
-
-	return git_runtime_init(init_fns, ARRAY_SIZE(init_fns));
-}
-
-int git_libgit2_init_count(void)
-{
-	return git_runtime_init_count();
-}
-
-int git_libgit2_shutdown(void)
-{
-	return git_runtime_shutdown();
-}
-
-int git_libgit2_version(int *major, int *minor, int *rev)
-{
-	*major = LIBGIT2_VER_MAJOR;
-	*minor = LIBGIT2_VER_MINOR;
-	*rev = LIBGIT2_VER_REVISION;
-
-	return 0;
-}
-
-int git_libgit2_features(void)
-{
-	return 0
-#ifdef GIT_THREADS
-		| GIT_FEATURE_THREADS
-#endif
-#ifdef GIT_HTTPS
-		| GIT_FEATURE_HTTPS
-#endif
-#if defined(GIT_SSH)
-		| GIT_FEATURE_SSH
-#endif
-#if defined(GIT_USE_NSEC)
-		| GIT_FEATURE_NSEC
-#endif
-	;
+	return git_runtime_shutdown_register(settings_global_shutdown);
 }
 
 static int config_level_to_sysdir(int *out, int config_level)
@@ -146,14 +92,16 @@ static int config_level_to_sysdir(int *out, int config_level)
 	return -1;
 }
 
-const char *git_libgit2__user_agent(void)
+const char *git_settings__user_agent_product(void)
 {
-	return git__user_agent;
+	return git__user_agent_product ? git__user_agent_product :
+		"git/2.0";
 }
 
-const char *git_libgit2__ssl_ciphers(void)
+const char *git_settings__user_agent(void)
 {
-	return git__ssl_ciphers;
+	return git__user_agent ? git__user_agent :
+		"libgit2 " LIBGIT2_VERSION;
 }
 
 int git_libgit2_opts(int key, ...)
@@ -192,15 +140,17 @@ int git_libgit2_opts(int key, ...)
 		{
 			int sysdir = va_arg(ap, int);
 			git_buf *out = va_arg(ap, git_buf *);
-			const git_buf *tmp;
+			git_str str = GIT_STR_INIT;
+			const git_str *tmp;
 			int level;
 
-			if ((error = config_level_to_sysdir(&level, sysdir)) < 0 ||
-			    (error = git_buf_sanitize(out)) < 0 ||
-			    (error = git_sysdir_get(&tmp, level)) < 0)
+			if ((error = git_buf_tostr(&str, out)) < 0 ||
+			    (error = config_level_to_sysdir(&level, sysdir)) < 0 ||
+			    (error = git_sysdir_get(&tmp, level)) < 0 ||
+			    (error = git_str_put(&str, tmp->ptr, tmp->size)) < 0)
 				break;
 
-			error = git_buf_sets(out, tmp->ptr);
+			error = git_buf_fromstr(out, &str);
 		}
 		break;
 
@@ -237,13 +187,15 @@ int git_libgit2_opts(int key, ...)
 	case GIT_OPT_GET_TEMPLATE_PATH:
 		{
 			git_buf *out = va_arg(ap, git_buf *);
-			const git_buf *tmp;
+			git_str str = GIT_STR_INIT;
+			const git_str *tmp;
 
-			if ((error = git_buf_sanitize(out)) < 0 ||
-			    (error = git_sysdir_get(&tmp, GIT_SYSDIR_TEMPLATE)) < 0)
+			if ((error = git_buf_tostr(&str, out)) < 0 ||
+			    (error = git_sysdir_get(&tmp, GIT_SYSDIR_TEMPLATE)) < 0 ||
+			    (error = git_str_put(&str, tmp->ptr, tmp->size)) < 0)
 				break;
 
-			error = git_buf_sets(out, tmp->ptr);
+			error = git_buf_fromstr(out, &str);
 		}
 		break;
 
@@ -269,14 +221,77 @@ int git_libgit2_opts(int key, ...)
 		error = -1;
 #endif
 		break;
+
+	case GIT_OPT_ADD_SSL_X509_CERT:
+#ifdef GIT_OPENSSL
+		{
+			X509 *cert = va_arg(ap, X509 *);
+			error = git_openssl__add_x509_cert(cert);
+		}
+#else
+		git_error_set(GIT_ERROR_SSL, "TLS backend doesn't support adding of the raw certs");
+		error = -1;
+#endif
+		break;
+
 	case GIT_OPT_SET_USER_AGENT:
-		git__free(git__user_agent);
-		git__user_agent = git__strdup(va_arg(ap, const char *));
-		if (!git__user_agent) {
-			git_error_set_oom();
-			error = -1;
+		{
+			const char *new_agent = va_arg(ap, const char *);
+
+			git__free(git__user_agent);
+
+			if (new_agent) {
+				git__user_agent= git__strdup(new_agent);
+
+				if (!git__user_agent)
+					error = -1;
+			} else {
+				git__user_agent = NULL;
+			}
+		}
+		break;
+
+	case GIT_OPT_GET_USER_AGENT:
+		{
+			git_buf *out = va_arg(ap, git_buf *);
+			git_str str = GIT_STR_INIT;
+
+			if ((error = git_buf_tostr(&str, out)) < 0 ||
+			    (error = git_str_puts(&str, git_settings__user_agent())) < 0)
+				break;
+
+			error = git_buf_fromstr(out, &str);
+		}
+		break;
+
+	case GIT_OPT_SET_USER_AGENT_PRODUCT:
+		{
+			const char *new_agent = va_arg(ap, const char *);
+
+			git__free(git__user_agent_product);
+
+			if (new_agent) {
+				git__user_agent_product = git__strdup(new_agent);
+
+				if (!git__user_agent_product)
+					error = -1;
+			} else {
+				git__user_agent_product = NULL;
+			}
 		}
+		break;
 
+	case GIT_OPT_GET_USER_AGENT_PRODUCT:
+		{
+			git_buf *out = va_arg(ap, git_buf *);
+			git_str str = GIT_STR_INIT;
+
+			if ((error = git_buf_tostr(&str, out)) < 0 ||
+			    (error = git_str_puts(&str, git_settings__user_agent_product())) < 0)
+				break;
+
+			error = git_buf_fromstr(out, &str);
+		}
 		break;
 
 	case GIT_OPT_ENABLE_STRICT_OBJECT_CREATION:
@@ -303,15 +318,6 @@ int git_libgit2_opts(int key, ...)
 #endif
 		break;
 
-	case GIT_OPT_GET_USER_AGENT:
-		{
-			git_buf *out = va_arg(ap, git_buf *);
-			if ((error = git_buf_sanitize(out)) < 0)
-				break;
-			error = git_buf_sets(out, git__user_agent);
-		}
-		break;
-
 	case GIT_OPT_ENABLE_OFS_DELTA:
 		git_smart__ofs_delta_enabled = (va_arg(ap, int) != 0);
 		break;
@@ -390,6 +396,67 @@ int git_libgit2_opts(int key, ...)
 		}
 		break;
 
+	case GIT_OPT_GET_OWNER_VALIDATION:
+		*(va_arg(ap, int *)) = git_repository__validate_ownership;
+		break;
+
+	case GIT_OPT_SET_OWNER_VALIDATION:
+		git_repository__validate_ownership = (va_arg(ap, int) != 0);
+		break;
+
+	case GIT_OPT_GET_HOMEDIR:
+		{
+			git_buf *out = va_arg(ap, git_buf *);
+			git_str str = GIT_STR_INIT;
+			const git_str *tmp;
+
+			if ((error = git_buf_tostr(&str, out)) < 0 ||
+			    (error = git_sysdir_get(&tmp, GIT_SYSDIR_HOME)) < 0 ||
+			    (error = git_str_put(&str, tmp->ptr, tmp->size)) < 0)
+				break;
+
+			error = git_buf_fromstr(out, &str);
+		}
+		break;
+
+	case GIT_OPT_SET_HOMEDIR:
+		error = git_sysdir_set(GIT_SYSDIR_HOME, va_arg(ap, const char *));
+		break;
+
+	case GIT_OPT_GET_SERVER_CONNECT_TIMEOUT:
+		*(va_arg(ap, int *)) = git_socket_stream__connect_timeout;
+		break;
+
+	case GIT_OPT_SET_SERVER_CONNECT_TIMEOUT:
+		{
+			int timeout = va_arg(ap, int);
+
+			if (timeout < 0) {
+				git_error_set(GIT_ERROR_INVALID, "invalid connect timeout");
+				error = -1;
+			} else {
+				git_socket_stream__connect_timeout = timeout;
+			}
+		}
+		break;
+
+	case GIT_OPT_GET_SERVER_TIMEOUT:
+		*(va_arg(ap, int *)) = git_socket_stream__timeout;
+		break;
+
+	case GIT_OPT_SET_SERVER_TIMEOUT:
+		{
+			int timeout = va_arg(ap, int);
+
+			if (timeout < 0) {
+				git_error_set(GIT_ERROR_INVALID, "invalid timeout");
+				error = -1;
+			} else {
+				git_socket_stream__timeout = timeout;
+			}
+		}
+		break;
+
 	default:
 		git_error_set(GIT_ERROR_INVALID, "invalid option key");
 		error = -1;

data/vendor/libgit2/src/{settings.h → libgit2/settings.h}

@@ -4,8 +4,12 @@
  * This file is part of libgit2, distributed under the GNU GPL v2 with
  * a Linking Exception. For full terms see the included COPYING file.
  */
+#ifndef INCLUDE_settings_h__
+#define INCLUDE_settings_h__
 
 extern int git_settings_global_init(void);
 
-extern const char *git_libgit2__user_agent(void);
-extern const char *git_libgit2__ssl_ciphers(void);
+extern const char *git_settings__user_agent(void);
+extern const char *git_settings__user_agent_product(void);
+
+#endif