rugged 1.3.1 → 1.9.0

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

@@ -8,19 +8,20 @@
 #include "common.h"
 
 #include "git2/describe.h"
-#include "git2/strarray.h"
 #include "git2/diff.h"
 #include "git2/status.h"
 
+#include "buf.h"
 #include "commit.h"
 #include "commit_list.h"
-#include "oidmap.h"
 #include "refs.h"
 #include "repository.h"
 #include "revwalk.h"
+#include "strarray.h"
 #include "tag.h"
 #include "vector.h"
 #include "wildmatch.h"
+#include "hashmap_oid.h"
 
 /* Ported from https://github.com/git/git/blob/89dde7882f71f846ccd0359756d27bebc31108de/builtin/describe.c */
 
@@ -31,20 +32,22 @@ struct commit_name {
 	git_oid sha1;
 	char *path;
 
-	/* Khash workaround. They original key has to still be reachable */
+	/* The original key for the hashmap */
 	git_oid peeled;
 };
 
-static void *oidmap_value_bykey(git_oidmap *map, const git_oid *key)
-{
-	return git_oidmap_get(map, key);
-}
+GIT_HASHMAP_OID_SETUP(git_describe_oidmap, struct commit_name *);
 
 static struct commit_name *find_commit_name(
-	git_oidmap *names,
+	git_describe_oidmap *names,
 	const git_oid *peeled)
 {
-	return (struct commit_name *)(oidmap_value_bykey(names, peeled));
+	struct commit_name *result;
+
+	if (git_describe_oidmap_get(&result, names, peeled) == 0)
+		return result;
+
+	return NULL;
 }
 
 static int replace_name(
@@ -91,7 +94,7 @@ static int replace_name(
 
 static int add_to_known_names(
 	git_repository *repo,
-	git_oidmap *names,
+	git_describe_oidmap *names,
 	const char *path,
 	const git_oid *peeled,
 	unsigned int prio,
@@ -120,7 +123,7 @@ static int add_to_known_names(
 		e->path = git__strdup(path);
 		git_oid_cpy(&e->peeled, peeled);
 
-		if (!found && git_oidmap_set(names, &e->peeled, e) < 0)
+		if (!found && git_describe_oidmap_put(names, &e->peeled, e) < 0)
 			return -1;
 	}
 	else
@@ -173,7 +176,7 @@ struct get_name_data
 {
 	git_describe_options *opts;
 	git_repository *repo;
-	git_oidmap *names;
+	git_describe_oidmap names;
 	git_describe_result *result;
 };
 
@@ -239,7 +242,7 @@ static int get_name(const char *refname, void *payload)
 	else
 		prio = 0;
 
-	add_to_known_names(data->repo, data->names,
+	add_to_known_names(data->repo, &data->names,
 		all ? refname + strlen(GIT_REFS_DIR) : refname + strlen(GIT_REFS_TAGS_DIR),
 		&peeled, prio, &sha1);
 	return 0;
@@ -322,7 +325,7 @@ static unsigned long finish_depth_computation(
 	return seen_commits;
 }
 
-static int display_name(git_buf *buf, git_repository *repo, struct commit_name *n)
+static int display_name(git_str *buf, git_repository *repo, struct commit_name *n)
 {
 	if (n->prio == 2 && !n->tag) {
 		if (git_tag_lookup(&n->tag, repo, &n->sha1) < 0) {
@@ -346,9 +349,9 @@ static int display_name(git_buf *buf, git_repository *repo, struct commit_name *
 	}
 
 	if (n->tag)
-		git_buf_printf(buf, "%s", git_tag_name(n->tag));
+		git_str_printf(buf, "%s", git_tag_name(n->tag));
 	else
-		git_buf_printf(buf, "%s", n->path);
+		git_str_printf(buf, "%s", n->path);
 
 	return 0;
 }
@@ -362,12 +365,15 @@ static int find_unique_abbrev_size(
 	size_t size = abbreviated_size;
 	git_odb *odb;
 	git_oid dummy;
+	size_t hexsize;
 	int error;
 
 	if ((error = git_repository_odb__weakptr(&odb, repo)) < 0)
 		return error;
 
-	while (size < GIT_OID_HEXSZ) {
+	hexsize = git_oid_hexsize(repo->oid_type);
+
+	while (size < hexsize) {
 		if ((error = git_odb_exists_prefix(&dummy, odb, oid_in, size)) == 0) {
 			*out = (int) size;
 			return 0;
@@ -382,13 +388,13 @@ static int find_unique_abbrev_size(
 	}
 
 	/* If we didn't find any shorter prefix, we have to do the whole thing */
-	*out = GIT_OID_HEXSZ;
+	*out = (int)hexsize;
 
 	return 0;
 }
 
 static int show_suffix(
-	git_buf *buf,
+	git_str *buf,
 	int depth,
 	git_repository *repo,
 	const git_oid *id,
@@ -396,24 +402,24 @@ static int show_suffix(
 {
 	int error, size = 0;
 
-	char hex_oid[GIT_OID_HEXSZ];
+	char hex_oid[GIT_OID_MAX_HEXSIZE];
 
 	if ((error = find_unique_abbrev_size(&size, repo, id, abbrev_size)) < 0)
 		return error;
 
 	git_oid_fmt(hex_oid, id);
 
-	git_buf_printf(buf, "-%d-g", depth);
+	git_str_printf(buf, "-%d-g", depth);
 
-	git_buf_put(buf, hex_oid, size);
+	git_str_put(buf, hex_oid, size);
 
-	return git_buf_oom(buf) ? -1 : 0;
+	return git_str_oom(buf) ? -1 : 0;
 }
 
 #define MAX_CANDIDATES_TAGS FLAG_BITS - 1
 
 static int describe_not_found(const git_oid *oid, const char *message_format) {
-	char oid_str[GIT_OID_HEXSZ + 1];
+	char oid_str[GIT_OID_MAX_HEXSIZE + 1];
 	git_oid_tostr(oid_str, sizeof(oid_str), oid);
 
 	git_error_set(GIT_ERROR_DESCRIBE, message_format, oid_str);
@@ -447,7 +453,7 @@ static int describe(
 
 	git_oid_cpy(&data->result->commit_id, git_commit_id(commit));
 
-	n = find_commit_name(data->names, git_commit_id(commit));
+	n = find_commit_name(&data->names, git_commit_id(commit));
 	if (n && (tags || all || n->prio == 2)) {
 		/*
 		 * Exact match to an existing ref.
@@ -488,7 +494,7 @@ static int describe(
 		git_commit_list_node *c = (git_commit_list_node *)git_pqueue_pop(&list);
 		seen_commits++;
 
-		n = find_commit_name(data->names, &c->oid);
+		n = find_commit_name(&data->names, &c->oid);
 
 		if (n) {
 			if (!tags && !all && n->prio < 2) {
@@ -524,7 +530,7 @@ static int describe(
 		if (annotated_cnt && (git_pqueue_size(&list) == 0)) {
 			/*
 			if (debug) {
-				char oid_str[GIT_OID_HEXSZ + 1];
+				char oid_str[GIT_OID_MAX_HEXSIZE + 1];
 				git_oid_tostr(oid_str, sizeof(oid_str), &c->oid);
 
 				fprintf(stderr, "finished search at %s\n", oid_str);
@@ -591,7 +597,7 @@ static int describe(
 			"head", "lightweight", "annotated",
 		};
 
-		char oid_str[GIT_OID_HEXSZ + 1];
+		char oid_str[GIT_OID_MAX_HEXSIZE + 1];
 
 		if (debug) {
 			for (cur_match = 0; cur_match < match_cnt; cur_match++) {
@@ -623,7 +629,7 @@ cleanup:
 			git__free(match);
 		}
 	}
-	git_vector_free(&all_matches);
+	git_vector_dispose(&all_matches);
 	git_pqueue_free(&list);
 	git_revwalk_free(walk);
 	return error;
@@ -649,11 +655,12 @@ int git_describe_commit(
 	git_object *committish,
 	git_describe_options *opts)
 {
-	struct get_name_data data;
+	struct get_name_data data = {0};
 	struct commit_name *name;
 	git_commit *commit;
-	int error = -1;
 	git_describe_options normalized;
+	git_hashmap_iter_t iter = GIT_HASHMAP_INIT;
+	int error = -1;
 
 	GIT_ASSERT_ARG(result);
 	GIT_ASSERT_ARG(committish);
@@ -673,9 +680,6 @@ int git_describe_commit(
 		"git_describe_options");
 	data.opts = &normalized;
 
-	if ((error = git_oidmap_new(&data.names)) < 0)
-		return error;
-
 	/** TODO: contains to be implemented */
 
 	if ((error = git_object_peel((git_object **)(&commit), committish, GIT_OBJECT_COMMIT)) < 0)
@@ -686,7 +690,7 @@ int git_describe_commit(
 			get_name, &data)) < 0)
 				goto cleanup;
 
-	if (git_oidmap_size(data.names) == 0 && !normalized.show_commit_oid_as_fallback) {
+	if (git_describe_oidmap_size(&data.names) == 0 && !normalized.show_commit_oid_as_fallback) {
 		git_error_set(GIT_ERROR_DESCRIBE, "cannot describe - "
 			"no reference found, cannot describe anything.");
 		error = -1;
@@ -699,13 +703,13 @@ int git_describe_commit(
 cleanup:
 	git_commit_free(commit);
 
-	git_oidmap_foreach_value(data.names, name, {
+	while (git_describe_oidmap_iterate(&iter, NULL, &name, &data.names) == 0) {
 		git_tag_free(name->tag);
 		git__free(name->path);
 		git__free(name);
-	});
+	}
 
-	git_oidmap_free(data.names);
+	git_describe_oidmap_dispose(&data.names);
 
 	if (error < 0)
 		git_describe_result_free(data.result);
@@ -769,7 +773,10 @@ static int normalize_format_options(
 	return 0;
 }
 
-int git_describe_format(git_buf *out, const git_describe_result *result, const git_describe_format_options *given)
+static int git_describe__format(
+	git_str *out,
+	const git_describe_result *result,
+	const git_describe_format_options *given)
 {
 	int error;
 	git_repository *repo;
@@ -782,10 +789,6 @@ int git_describe_format(git_buf *out, const git_describe_result *result, const g
 	GIT_ERROR_CHECK_VERSION(given, GIT_DESCRIBE_FORMAT_OPTIONS_VERSION, "git_describe_format_options");
 	normalize_format_options(&opts, given);
 
-	if ((error = git_buf_sanitize(out)) < 0)
-		return error;
-
-
 	if (opts.always_use_long_format && opts.abbreviated_size == 0) {
 		git_error_set(GIT_ERROR_DESCRIBE, "cannot describe - "
 			"'always_use_long_format' is incompatible with a zero"
@@ -809,14 +812,14 @@ int git_describe_format(git_buf *out, const git_describe_result *result, const g
 		}
 
 		if (result->dirty && opts.dirty_suffix)
-			git_buf_puts(out, opts.dirty_suffix);
+			git_str_puts(out, opts.dirty_suffix);
 
-		return git_buf_oom(out) ? -1 : 0;
+		return git_str_oom(out) ? -1 : 0;
 	}
 
 	/* If we didn't find *any* tags, we fall back to the commit's id */
 	if (result->fallback_to_id) {
-		char hex_oid[GIT_OID_HEXSZ + 1] = {0};
+		char hex_oid[GIT_OID_MAX_HEXSIZE + 1] = {0};
 		int size = 0;
 
 		if ((error = find_unique_abbrev_size(
@@ -824,12 +827,12 @@ int git_describe_format(git_buf *out, const git_describe_result *result, const g
 			return -1;
 
 		git_oid_fmt(hex_oid, &result->commit_id);
-		git_buf_put(out, hex_oid, size);
+		git_str_put(out, hex_oid, size);
 
 		if (result->dirty && opts.dirty_suffix)
-			git_buf_puts(out, opts.dirty_suffix);
+			git_str_puts(out, opts.dirty_suffix);
 
-		return git_buf_oom(out) ? -1 : 0;
+		return git_str_oom(out) ? -1 : 0;
 	}
 
 	/* Lastly, if we found a matching tag, we show that */
@@ -845,10 +848,18 @@ int git_describe_format(git_buf *out, const git_describe_result *result, const g
 	}
 
 	if (result->dirty && opts.dirty_suffix) {
-		git_buf_puts(out, opts.dirty_suffix);
+		git_str_puts(out, opts.dirty_suffix);
 	}
 
-	return git_buf_oom(out) ? -1 : 0;
+	return git_str_oom(out) ? -1 : 0;
+}
+
+int git_describe_format(
+	git_buf *out,
+	const git_describe_result *result,
+	const git_describe_format_options *given)
+{
+	GIT_BUF_WRAP_PRIVATE(out, git_describe__format, result, given);
 }
 
 void git_describe_result_free(git_describe_result *result)

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

@@ -8,6 +8,7 @@
 #include "diff.h"
 
 #include "common.h"
+#include "buf.h"
 #include "patch.h"
 #include "email.h"
 #include "commit.h"
@@ -15,11 +16,13 @@
 #include "diff_generate.h"
 
 #include "git2/version.h"
-#include "git2/email.h"
+#include "git2/sys/email.h"
 
 struct patch_id_args {
+	git_diff *diff;
 	git_hash_ctx ctx;
 	git_oid result;
+	git_oid_t oid_type;
 	int first_file;
 };
 
@@ -162,6 +165,7 @@ int git_diff_format_email(
 	const git_diff_format_email_options *opts)
 {
 	git_email_create_options email_create_opts = GIT_EMAIL_CREATE_OPTIONS_INIT;
+	git_str email = GIT_STR_INIT;
 	int error;
 
 	GIT_ASSERT_ARG(out);
@@ -172,14 +176,29 @@ int git_diff_format_email(
 		GIT_DIFF_FORMAT_EMAIL_OPTIONS_VERSION,
 		"git_format_email_options");
 
+	/* This is a `git_buf` special case; subsequent calls append. */
+	email.ptr = out->ptr;
+	email.asize = out->reserved;
+	email.size = out->size;
+
+	out->ptr = git_str__initstr;
+	out->reserved = 0;
+	out->size = 0;
+
 	if ((opts->flags & GIT_DIFF_FORMAT_EMAIL_EXCLUDE_SUBJECT_PATCH_MARKER) != 0)
 		email_create_opts.subject_prefix = "";
 
-
-	error = git_email__append_from_diff(out, diff, opts->patch_no,
+	error = git_email__append_from_diff(&email, diff, opts->patch_no,
 		opts->total_patches, opts->id, opts->summary, opts->body,
 		opts->author, &email_create_opts);
 
+	if (error < 0)
+		goto done;
+
+	error = git_buf_fromstr(out, &email);
+
+done:
+	git_str_dispose(&email);
 	return error;
 }
 
@@ -263,17 +282,19 @@ int git_diff_find_options_init(
 	return 0;
 }
 
-static int flush_hunk(git_oid *result, git_hash_ctx *ctx)
+static int flush_hunk(git_oid *result, struct patch_id_args *args)
 {
+	git_hash_ctx *ctx = &args->ctx;
 	git_oid hash;
 	unsigned short carry = 0;
-	int error, i;
+	size_t i;
+	int error;
 
-	if ((error = git_hash_final(&hash, ctx)) < 0 ||
+	if ((error = git_hash_final(hash.id, ctx)) < 0 ||
 	    (error = git_hash_init(ctx)) < 0)
 		return error;
 
-	for (i = 0; i < GIT_OID_RAWSZ; i++) {
+	for (i = 0; i < git_oid_size(args->oid_type); i++) {
 		carry += result->id[i] + hash.id[i];
 		result->id[i] = (unsigned char)carry;
 		carry >>= 8;
@@ -282,7 +303,7 @@ static int flush_hunk(git_oid *result, git_hash_ctx *ctx)
 	return 0;
 }
 
-static void strip_spaces(git_buf *buf)
+static void strip_spaces(git_str *buf)
 {
 	char *src = buf->ptr, *dst = buf->ptr;
 	char c;
@@ -295,7 +316,7 @@ static void strip_spaces(git_buf *buf)
 		}
 	}
 
-	git_buf_truncate(buf, len);
+	git_str_truncate(buf, len);
 }
 
 static int diff_patchid_print_callback_to_buf(
@@ -305,7 +326,7 @@ static int diff_patchid_print_callback_to_buf(
 	void *payload)
 {
 	struct patch_id_args *args = (struct patch_id_args *) payload;
-	git_buf buf = GIT_BUF_INIT;
+	git_str buf = GIT_STR_INIT;
 	int error = 0;
 
 	if (line->origin == GIT_DIFF_LINE_CONTEXT_EOFNL ||
@@ -321,7 +342,7 @@ static int diff_patchid_print_callback_to_buf(
 
 	if (line->origin == GIT_DIFF_LINE_FILE_HDR &&
 	    !args->first_file &&
-	    (error = flush_hunk(&args->result, &args->ctx) < 0))
+	    (error = flush_hunk(&args->result, args) < 0))
 			goto out;
 
 	if ((error = git_hash_update(&args->ctx, buf.ptr, buf.size)) < 0)
@@ -331,7 +352,7 @@ static int diff_patchid_print_callback_to_buf(
 		args->first_file = 0;
 
 out:
-	git_buf_dispose(&buf);
+	git_str_dispose(&buf);
 	return error;
 }
 
@@ -345,14 +366,19 @@ int git_diff_patchid_options_init(git_diff_patchid_options *opts, unsigned int v
 int git_diff_patchid(git_oid *out, git_diff *diff, git_diff_patchid_options *opts)
 {
 	struct patch_id_args args;
+	git_hash_algorithm_t algorithm;
 	int error;
 
 	GIT_ERROR_CHECK_VERSION(
 		opts, GIT_DIFF_PATCHID_OPTIONS_VERSION, "git_diff_patchid_options");
 
+	algorithm = git_oid_algorithm(diff->opts.oid_type);
+
 	memset(&args, 0, sizeof(args));
+	args.diff = diff;
 	args.first_file = 1;
-	if ((error = git_hash_ctx_init(&args.ctx)) < 0)
+	args.oid_type = diff->opts.oid_type;
+	if ((error = git_hash_ctx_init(&args.ctx, algorithm)) < 0)
 		goto out;
 
 	if ((error = git_diff_print(diff,
@@ -361,9 +387,13 @@ int git_diff_patchid(git_oid *out, git_diff *diff, git_diff_patchid_options *opt
 				    &args)) < 0)
 		goto out;
 
-	if ((error = (flush_hunk(&args.result, &args.ctx))) < 0)
+	if ((error = (flush_hunk(&args.result, &args))) < 0)
 		goto out;
 
+#ifdef GIT_EXPERIMENTAL_SHA256
+	args.result.type = diff->opts.oid_type;
+#endif
+
 	git_oid_cpy(out, &args.result);
 
 out:

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

@@ -14,9 +14,7 @@
 #include "git2/sys/diff.h"
 #include "git2/oid.h"
 
-#include <stdio.h>
 #include "vector.h"
-#include "buffer.h"
 #include "iterator.h"
 #include "repository.h"
 #include "pool.h"
@@ -28,19 +26,19 @@
 typedef enum {
 	GIT_DIFF_TYPE_UNKNOWN = 0,
 	GIT_DIFF_TYPE_GENERATED = 1,
-	GIT_DIFF_TYPE_PARSED = 2,
+	GIT_DIFF_TYPE_PARSED = 2
 } git_diff_origin_t;
 
 struct git_diff {
-	git_refcount     rc;
+	git_refcount      rc;
 	git_repository   *repo;
-	git_attr_session attrsession;
+	git_attr_session  attrsession;
 	git_diff_origin_t type;
-	git_diff_options opts;
-	git_vector       deltas;    /* vector of git_diff_delta */
+	git_diff_options  opts;
+	git_vector        deltas;    /* vector of git_diff_delta */
 	git_pool pool;
-	git_iterator_t old_src;
-	git_iterator_t new_src;
+	git_iterator_t    old_src;
+	git_iterator_t    new_src;
 	git_diff_perfdata perf;
 
 	int (*strcomp)(const char *, const char *);
@@ -53,7 +51,7 @@ struct git_diff {
 };
 
 extern int git_diff_delta__format_file_header(
-	git_buf *out,
+	git_str *out,
 	const git_diff_delta *delta,
 	const char *oldpfx,
 	const char *newpfx,