rugged 1.3.1 → 1.9.0

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

@@ -8,7 +8,6 @@
 #include "transaction.h"
 
 #include "repository.h"
-#include "strmap.h"
 #include "refdb.h"
 #include "pool.h"
 #include "reflog.h"
@@ -23,7 +22,7 @@
 typedef enum {
 	TRANSACTION_NONE,
 	TRANSACTION_REFS,
-	TRANSACTION_CONFIG,
+	TRANSACTION_CONFIG
 } transaction_t;
 
 typedef struct {
@@ -44,17 +43,23 @@ typedef struct {
 		remove :1;
 } transaction_node;
 
+GIT_HASHMAP_STR_SETUP(git_transaction_nodemap, transaction_node *);
+
 struct git_transaction {
 	transaction_t type;
 	git_repository *repo;
 	git_refdb *db;
 	git_config *cfg;
+	void *cfg_data;
 
-	git_strmap *locks;
+	git_transaction_nodemap locks;
 	git_pool pool;
 };
 
-int git_transaction_config_new(git_transaction **out, git_config *cfg)
+int git_transaction_config_new(
+	git_transaction **out,
+	git_config *cfg,
+	void *data)
 {
 	git_transaction *tx;
 
@@ -66,6 +71,8 @@ int git_transaction_config_new(git_transaction **out, git_config *cfg)
 
 	tx->type = TRANSACTION_CONFIG;
 	tx->cfg = cfg;
+	tx->cfg_data = data;
+
 	*out = tx;
 	return 0;
 }
@@ -88,11 +95,6 @@ int git_transaction_new(git_transaction **out, git_repository *repo)
 		goto on_error;
 	}
 
-	if ((error = git_strmap_new(&tx->locks)) < 0) {
-		error = -1;
-		goto on_error;
-	}
-
 	if ((error = git_repository_refdb(&tx->db, repo)) < 0)
 		goto on_error;
 
@@ -124,7 +126,7 @@ int git_transaction_lock_ref(git_transaction *tx, const char *refname)
 	if ((error = git_refdb_lock(&node->payload, tx->db, refname)) < 0)
 		return error;
 
-	if ((error = git_strmap_set(tx->locks, node->name, node)) < 0)
+	if ((error = git_transaction_nodemap_put(&tx->locks, node->name, node)) < 0)
 		goto cleanup;
 
 	return 0;
@@ -138,8 +140,11 @@ cleanup:
 static int find_locked(transaction_node **out, git_transaction *tx, const char *refname)
 {
 	transaction_node *node;
+	int error;
+
+	error = git_transaction_nodemap_get(&node, &tx->locks, refname);
 
-	if ((node = git_strmap_get(tx->locks, refname)) == NULL) {
+	if (error != 0) {
 		git_error_set(GIT_ERROR_REFERENCE, "the specified reference is not locked");
 		return GIT_ENOTFOUND;
 	}
@@ -328,18 +333,20 @@ static int update_target(git_refdb *db, transaction_node *node)
 int git_transaction_commit(git_transaction *tx)
 {
 	transaction_node *node;
+	git_hashmap_iter_t iter = GIT_HASHMAP_ITER_INIT;
 	int error = 0;
 
 	GIT_ASSERT_ARG(tx);
 
 	if (tx->type == TRANSACTION_CONFIG) {
-		error = git_config_unlock(tx->cfg, true);
+		error = git_config_unlock(tx->cfg, tx->cfg_data, true);
 		tx->cfg = NULL;
+		tx->cfg_data = NULL;
 
 		return error;
 	}
 
-	git_strmap_foreach_value(tx->locks, node, {
+	while (git_transaction_nodemap_iterate(&iter, NULL, &node, &tx->locks) == 0) {
 		if (node->reflog) {
 			if ((error = tx->db->backend->reflog_write(tx->db->backend, node->reflog)) < 0)
 				return error;
@@ -355,7 +362,7 @@ int git_transaction_commit(git_transaction *tx)
 			if ((error = update_target(tx->db, node)) < 0)
 				return error;
 		}
-	});
+	}
 
 	return 0;
 }
@@ -364,30 +371,29 @@ void git_transaction_free(git_transaction *tx)
 {
 	transaction_node *node;
 	git_pool pool;
+	git_hashmap_iter_t iter = GIT_HASHMAP_ITER_INIT;
 
 	if (!tx)
 		return;
 
 	if (tx->type == TRANSACTION_CONFIG) {
-		if (tx->cfg) {
-			git_config_unlock(tx->cfg, false);
-			git_config_free(tx->cfg);
-		}
+		if (tx->cfg)
+			git_config_unlock(tx->cfg, tx->cfg_data, false);
 
 		git__free(tx);
 		return;
 	}
 
 	/* start by unlocking the ones we've left hanging, if any */
-	git_strmap_foreach_value(tx->locks, node, {
+	while (git_transaction_nodemap_iterate(&iter, NULL, &node, &tx->locks) == 0) {
 		if (node->committed)
 			continue;
 
 		git_refdb_unlock(tx->db, node->payload, false, false, NULL, NULL, NULL);
-	});
+	}
 
 	git_refdb_free(tx->db);
-	git_strmap_free(tx->locks);
+	git_transaction_nodemap_dispose(&tx->locks);
 
 	/* tx is inside the pool, so we need to extract the data */
 	memcpy(&pool, &tx->pool, sizeof(git_pool));

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

@@ -9,6 +9,9 @@
 
 #include "common.h"
 
-int git_transaction_config_new(git_transaction **out, git_config *cfg);
+int git_transaction_config_new(
+	git_transaction **out,
+	git_config *cfg,
+	void *data);
 
 #endif

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

@@ -12,7 +12,7 @@
 #include "git2/net.h"
 #include "git2/transport.h"
 #include "git2/sys/transport.h"
-#include "path.h"
+#include "fs_path.h"
 
 typedef struct transport_definition {
 	char *prefix;
@@ -22,6 +22,7 @@ typedef struct transport_definition {
 
 static git_smart_subtransport_definition http_subtransport_definition = { git_smart_subtransport_http, 1, NULL };
 static git_smart_subtransport_definition git_subtransport_definition = { git_smart_subtransport_git, 0, NULL };
+
 #ifdef GIT_SSH
 static git_smart_subtransport_definition ssh_subtransport_definition = { git_smart_subtransport_ssh, 0, NULL };
 #endif
@@ -33,11 +34,13 @@ static transport_definition transports[] = {
 	{ "http://",  git_transport_smart, &http_subtransport_definition },
 	{ "https://", git_transport_smart, &http_subtransport_definition },
 	{ "file://",  git_transport_local, NULL },
+
 #ifdef GIT_SSH
 	{ "ssh://",   git_transport_smart, &ssh_subtransport_definition },
 	{ "ssh+git://",   git_transport_smart, &ssh_subtransport_definition },
 	{ "git+ssh://",   git_transport_smart, &ssh_subtransport_definition },
 #endif
+
 	{ NULL, 0, 0 }
 };
 
@@ -82,7 +85,7 @@ static int transport_find_fn(
 	 * to a directory and if so assume local path, else assume SSH */
 
 	/* Check to see if the path points to a file on the local file system */
-	if (!definition && git_path_exists(url) && git_path_isdir(url))
+	if (!definition && git_fs_path_exists(url) && git_fs_path_isdir(url))
 		definition = &local_transport_definition;
 #endif
 
@@ -98,7 +101,7 @@ static int transport_find_fn(
 
 #ifndef GIT_WIN32
 	/* Check to see if the path points to a file on the local file system */
-	if (!definition && git_path_exists(url) && git_path_isdir(url))
+	if (!definition && git_fs_path_exists(url) && git_fs_path_isdir(url))
 		definition = &local_transport_definition;
 #endif
 
@@ -143,7 +146,7 @@ int git_transport_register(
 	git_transport_cb cb,
 	void *param)
 {
-	git_buf prefix = GIT_BUF_INIT;
+	git_str prefix = GIT_STR_INIT;
 	transport_definition *d, *definition = NULL;
 	size_t i;
 	int error = 0;
@@ -151,7 +154,7 @@ int git_transport_register(
 	GIT_ASSERT_ARG(scheme);
 	GIT_ASSERT_ARG(cb);
 
-	if ((error = git_buf_printf(&prefix, "%s://", scheme)) < 0)
+	if ((error = git_str_printf(&prefix, "%s://", scheme)) < 0)
 		goto on_error;
 
 	git_vector_foreach(&custom_transports, i, d) {
@@ -164,7 +167,7 @@ int git_transport_register(
 	definition = git__calloc(1, sizeof(transport_definition));
 	GIT_ERROR_CHECK_ALLOC(definition);
 
-	definition->prefix = git_buf_detach(&prefix);
+	definition->prefix = git_str_detach(&prefix);
 	definition->fn = cb;
 	definition->param = param;
 
@@ -174,21 +177,21 @@ int git_transport_register(
 	return 0;
 
 on_error:
-	git_buf_dispose(&prefix);
+	git_str_dispose(&prefix);
 	git__free(definition);
 	return error;
 }
 
 int git_transport_unregister(const char *scheme)
 {
-	git_buf prefix = GIT_BUF_INIT;
+	git_str prefix = GIT_STR_INIT;
 	transport_definition *d;
 	size_t i;
 	int error = 0;
 
 	GIT_ASSERT_ARG(scheme);
 
-	if ((error = git_buf_printf(&prefix, "%s://", scheme)) < 0)
+	if ((error = git_str_printf(&prefix, "%s://", scheme)) < 0)
 		goto done;
 
 	git_vector_foreach(&custom_transports, i, d) {
@@ -200,7 +203,7 @@ int git_transport_unregister(const char *scheme)
 			git__free(d);
 
 			if (!custom_transports.length)
-				git_vector_free(&custom_transports);
+				git_vector_dispose(&custom_transports);
 
 			error = 0;
 			goto done;
@@ -210,7 +213,7 @@ int git_transport_unregister(const char *scheme)
 	error = GIT_ENOTFOUND;
 
 done:
-	git_buf_dispose(&prefix);
+	git_str_dispose(&prefix);
 	return error;
 }
 

data/vendor/libgit2/src/{transports → libgit2/transports}/auth.c

@@ -7,17 +7,15 @@
 
 #include "auth.h"
 
-#include "git2.h"
-#include "buffer.h"
 #include "git2/sys/credential.h"
 
 static int basic_next_token(
-	git_buf *out,
+	git_str *out,
 	git_http_auth_context *ctx,
 	git_credential *c)
 {
 	git_credential_userpass_plaintext *cred;
-	git_buf raw = GIT_BUF_INIT;
+	git_str raw = GIT_STR_INIT;
 	int error = GIT_EAUTH;
 
 	GIT_UNUSED(ctx);
@@ -29,11 +27,11 @@ static int basic_next_token(
 
 	cred = (git_credential_userpass_plaintext *)c;
 
-	git_buf_printf(&raw, "%s:%s", cred->username, cred->password);
+	git_str_printf(&raw, "%s:%s", cred->username, cred->password);
 
-	if (git_buf_oom(&raw) ||
-		git_buf_puts(out, "Basic ") < 0 ||
-		git_buf_encode_base64(out, git_buf_cstr(&raw), raw.size) < 0)
+	if (git_str_oom(&raw) ||
+		git_str_puts(out, "Basic ") < 0 ||
+		git_str_encode_base64(out, git_str_cstr(&raw), raw.size) < 0)
 		goto on_error;
 
 	error = 0;
@@ -42,7 +40,7 @@ on_error:
 	if (raw.size)
 		git__memzero(raw.ptr, raw.size);
 
-	git_buf_dispose(&raw);
+	git_str_dispose(&raw);
 	return error;
 }
 

data/vendor/libgit2/src/{transports → libgit2/transports}/auth.h

@@ -9,14 +9,12 @@
 #define INCLUDE_transports_auth_h__
 
 #include "common.h"
-
-#include "git2.h"
-#include "netops.h"
+#include "net.h"
 
 typedef enum {
 	GIT_HTTP_AUTH_BASIC = 1,
 	GIT_HTTP_AUTH_NEGOTIATE = 2,
-	GIT_HTTP_AUTH_NTLM = 4,
+	GIT_HTTP_AUTH_NTLM = 4
 } git_http_auth_t;
 
 typedef struct git_http_auth_context git_http_auth_context;
@@ -35,7 +33,7 @@ struct git_http_auth_context {
 	int (*set_challenge)(git_http_auth_context *ctx, const char *challenge);
 
 	/** Gets the next authentication token from the context */
-	int (*next_token)(git_buf *out, git_http_auth_context *ctx, git_credential *cred);
+	int (*next_token)(git_str *out, git_http_auth_context *ctx, git_credential *cred);
 
 	/** Examines if all tokens have been presented. */
 	int (*is_complete)(git_http_auth_context *ctx);

data/vendor/libgit2/src/{transports/auth_negotiate.c → libgit2/transports/auth_gssapi.c}

@@ -10,7 +10,6 @@
 #if defined(GIT_GSSAPI) || defined(GIT_GSSFRAMEWORK)
 
 #include "git2.h"
-#include "buffer.h"
 #include "auth.h"
 #include "git2/sys/credential.h"
 
@@ -21,25 +20,25 @@
 #include <krb5.h>
 #endif
 
-static gss_OID_desc negotiate_oid_spnego =
+static gss_OID_desc gssapi_oid_spnego =
 	{ 6, (void *) "\x2b\x06\x01\x05\x05\x02" };
-static gss_OID_desc negotiate_oid_krb5 =
+static gss_OID_desc gssapi_oid_krb5 =
 	{ 9, (void *) "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02" };
 
-static gss_OID negotiate_oids[] =
-	{ &negotiate_oid_spnego, &negotiate_oid_krb5, NULL };
+static gss_OID gssapi_oids[] =
+	{ &gssapi_oid_spnego, &gssapi_oid_krb5, NULL };
 
 typedef struct {
 	git_http_auth_context parent;
 	unsigned configured : 1,
 		complete : 1;
-	git_buf target;
+	git_str target;
 	char *challenge;
 	gss_ctx_id_t gss_context;
 	gss_OID oid;
-} http_auth_negotiate_context;
+} http_auth_gssapi_context;
 
-static void negotiate_err_set(
+static void gssapi_err_set(
 	OM_uint32 status_major,
 	OM_uint32 status_minor,
 	const char *message)
@@ -59,11 +58,11 @@ static void negotiate_err_set(
 	}
 }
 
-static int negotiate_set_challenge(
+static int gssapi_set_challenge(
 	git_http_auth_context *c,
 	const char *challenge)
 {
-	http_auth_negotiate_context *ctx = (http_auth_negotiate_context *)c;
+	http_auth_gssapi_context *ctx = (http_auth_gssapi_context *)c;
 
 	GIT_ASSERT_ARG(ctx);
 	GIT_ASSERT_ARG(challenge);
@@ -77,7 +76,7 @@ static int negotiate_set_challenge(
 	return 0;
 }
 
-static void negotiate_context_dispose(http_auth_negotiate_context *ctx)
+static void gssapi_context_dispose(http_auth_gssapi_context *ctx)
 {
 	OM_uint32 status_minor;
 
@@ -87,24 +86,24 @@ static void negotiate_context_dispose(http_auth_negotiate_context *ctx)
 		ctx->gss_context = GSS_C_NO_CONTEXT;
 	}
 
-	git_buf_dispose(&ctx->target);
+	git_str_dispose(&ctx->target);
 
 	git__free(ctx->challenge);
 	ctx->challenge = NULL;
 }
 
-static int negotiate_next_token(
-	git_buf *buf,
+static int gssapi_next_token(
+	git_str *buf,
 	git_http_auth_context *c,
 	git_credential *cred)
 {
-	http_auth_negotiate_context *ctx = (http_auth_negotiate_context *)c;
+	http_auth_gssapi_context *ctx = (http_auth_gssapi_context *)c;
 	OM_uint32 status_major, status_minor;
 	gss_buffer_desc target_buffer = GSS_C_EMPTY_BUFFER,
 		input_token = GSS_C_EMPTY_BUFFER,
 		output_token = GSS_C_EMPTY_BUFFER;
 	gss_buffer_t input_token_ptr = GSS_C_NO_BUFFER;
-	git_buf input_buf = GIT_BUF_INIT;
+	git_str input_buf = GIT_STR_INIT;
 	gss_name_t server = NULL;
 	gss_OID mech;
 	size_t challenge_len;
@@ -127,7 +126,7 @@ static int negotiate_next_token(
 		GSS_C_NT_HOSTBASED_SERVICE, &server);
 
 	if (GSS_ERROR(status_major)) {
-		negotiate_err_set(status_major, status_minor,
+		gssapi_err_set(status_major, status_minor,
 			"could not parse principal");
 		error = -1;
 		goto done;
@@ -142,7 +141,7 @@ static int negotiate_next_token(
 	}
 
 	if (challenge_len > 9) {
-		if (git_buf_decode_base64(&input_buf,
+		if (git_str_decode_base64(&input_buf,
 				ctx->challenge + 10, challenge_len - 10) < 0) {
 			git_error_set(GIT_ERROR_NET, "invalid negotiate challenge from server");
 			error = -1;
@@ -153,10 +152,10 @@ static int negotiate_next_token(
 		input_token.length = input_buf.size;
 		input_token_ptr = &input_token;
 	} else if (ctx->gss_context != GSS_C_NO_CONTEXT) {
-		negotiate_context_dispose(ctx);
+		gssapi_context_dispose(ctx);
 	}
 
-	mech = &negotiate_oid_spnego;
+	mech = &gssapi_oid_spnego;
 
 	status_major = gss_init_sec_context(
 		&status_minor,
@@ -174,14 +173,14 @@ static int negotiate_next_token(
 		NULL);
 
 	if (GSS_ERROR(status_major)) {
-		negotiate_err_set(status_major, status_minor, "negotiate failure");
+		gssapi_err_set(status_major, status_minor, "negotiate failure");
 		error = -1;
 		goto done;
 	}
 
 	/* This message merely told us auth was complete; we do not respond. */
 	if (status_major == GSS_S_COMPLETE) {
-		negotiate_context_dispose(ctx);
+		gssapi_context_dispose(ctx);
 		ctx->complete = 1;
 		goto done;
 	}
@@ -192,33 +191,33 @@ static int negotiate_next_token(
 		goto done;
 	}
 
-	git_buf_puts(buf, "Negotiate ");
-	git_buf_encode_base64(buf, output_token.value, output_token.length);
+	git_str_puts(buf, "Negotiate ");
+	git_str_encode_base64(buf, output_token.value, output_token.length);
 
-	if (git_buf_oom(buf))
+	if (git_str_oom(buf))
 		error = -1;
 
 done:
 	gss_release_name(&status_minor, &server);
 	gss_release_buffer(&status_minor, (gss_buffer_t) &output_token);
-	git_buf_dispose(&input_buf);
+	git_str_dispose(&input_buf);
 	return error;
 }
 
-static int negotiate_is_complete(git_http_auth_context *c)
+static int gssapi_is_complete(git_http_auth_context *c)
 {
-	http_auth_negotiate_context *ctx = (http_auth_negotiate_context *)c;
+	http_auth_gssapi_context *ctx = (http_auth_gssapi_context *)c;
 
 	GIT_ASSERT_ARG(ctx);
 
 	return (ctx->complete == 1);
 }
 
-static void negotiate_context_free(git_http_auth_context *c)
+static void gssapi_context_free(git_http_auth_context *c)
 {
-	http_auth_negotiate_context *ctx = (http_auth_negotiate_context *)c;
+	http_auth_gssapi_context *ctx = (http_auth_gssapi_context *)c;
 
-	negotiate_context_dispose(ctx);
+	gssapi_context_dispose(ctx);
 
 	ctx->configured = 0;
 	ctx->complete = 0;
@@ -227,8 +226,8 @@ static void negotiate_context_free(git_http_auth_context *c)
 	git__free(ctx);
 }
 
-static int negotiate_init_context(
-	http_auth_negotiate_context *ctx,
+static int gssapi_init_context(
+	http_auth_gssapi_context *ctx,
 	const git_net_url *url)
 {
 	OM_uint32 status_major, status_minor;
@@ -240,13 +239,13 @@ static int negotiate_init_context(
 	status_major = gss_indicate_mechs(&status_minor, &mechanism_list);
 
 	if (GSS_ERROR(status_major)) {
-		negotiate_err_set(status_major, status_minor,
+		gssapi_err_set(status_major, status_minor,
 			"could not query mechanisms");
 		return -1;
 	}
 
 	if (mechanism_list) {
-		for (oid = negotiate_oids; *oid; oid++) {
+		for (oid = gssapi_oids; *oid; oid++) {
 			for (i = 0; i < mechanism_list->count; i++) {
 				item = &mechanism_list->elements[i];
 
@@ -270,10 +269,10 @@ static int negotiate_init_context(
 		return GIT_EAUTH;
 	}
 
-	git_buf_puts(&ctx->target, "HTTP@");
-	git_buf_puts(&ctx->target, url->host);
+	git_str_puts(&ctx->target, "HTTP@");
+	git_str_puts(&ctx->target, url->host);
 
-	if (git_buf_oom(&ctx->target))
+	if (git_str_oom(&ctx->target))
 		return -1;
 
 	ctx->gss_context = GSS_C_NO_CONTEXT;
@@ -286,14 +285,14 @@ int git_http_auth_negotiate(
 	git_http_auth_context **out,
 	const git_net_url *url)
 {
-	http_auth_negotiate_context *ctx;
+	http_auth_gssapi_context *ctx;
 
 	*out = NULL;
 
-	ctx = git__calloc(1, sizeof(http_auth_negotiate_context));
+	ctx = git__calloc(1, sizeof(http_auth_gssapi_context));
 	GIT_ERROR_CHECK_ALLOC(ctx);
 
-	if (negotiate_init_context(ctx, url) < 0) {
+	if (gssapi_init_context(ctx, url) < 0) {
 		git__free(ctx);
 		return -1;
 	}
@@ -301,10 +300,10 @@ int git_http_auth_negotiate(
 	ctx->parent.type = GIT_HTTP_AUTH_NEGOTIATE;
 	ctx->parent.credtypes = GIT_CREDENTIAL_DEFAULT;
 	ctx->parent.connection_affinity = 1;
-	ctx->parent.set_challenge = negotiate_set_challenge;
-	ctx->parent.next_token = negotiate_next_token;
-	ctx->parent.is_complete = negotiate_is_complete;
-	ctx->parent.free = negotiate_context_free;
+	ctx->parent.set_challenge = gssapi_set_challenge;
+	ctx->parent.next_token = gssapi_next_token;
+	ctx->parent.is_complete = gssapi_is_complete;
+	ctx->parent.free = gssapi_context_free;
 
 	*out = (git_http_auth_context *)ctx;
 

data/vendor/libgit2/src/{transports → libgit2/transports}/auth_negotiate.h

@@ -12,7 +12,7 @@
 #include "git2.h"
 #include "auth.h"
 
-#if defined(GIT_GSSAPI) || defined(GIT_GSSFRAMEWORK)
+#if defined(GIT_GSSAPI) || defined(GIT_GSSFRAMEWORK) || defined(GIT_WIN32)
 
 extern int git_http_auth_negotiate(
 	git_http_auth_context **out,

data/vendor/libgit2/src/{transports → libgit2/transports}/auth_ntlm.h

@@ -8,13 +8,12 @@
 #ifndef INCLUDE_transports_auth_ntlm_h__
 #define INCLUDE_transports_auth_ntlm_h__
 
-#include "git2.h"
 #include "auth.h"
 
 /* NTLM requires a full request/challenge/response */
 #define GIT_AUTH_STEPS_NTLM 2
 
-#ifdef GIT_NTLM
+#if defined(GIT_NTLM) || defined(GIT_WIN32)
 
 #if defined(GIT_OPENSSL)
 # define CRYPT_OPENSSL