rugged 1.3.1 → 1.6.2

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

@@ -14,10 +14,10 @@
 #include "git2/mailmap.h"
 #include "git2/sys/commit.h"
 
+#include "buf.h"
 #include "odb.h"
 #include "commit.h"
 #include "signature.h"
-#include "message.h"
 #include "refs.h"
 #include "object.h"
 #include "array.h"
@@ -42,7 +42,7 @@ void git_commit__free(void *_commit)
 }
 
 static int git_commit__create_buffer_internal(
-	git_buf *out,
+	git_str *out,
 	const git_signature *author,
 	const git_signature *committer,
 	const char *message_encoding,
@@ -56,28 +56,30 @@ static int git_commit__create_buffer_internal(
 	GIT_ASSERT_ARG(out);
 	GIT_ASSERT_ARG(tree);
 
-	git_oid__writebuf(out, "tree ", tree);
+	if (git_object__write_oid_header(out, "tree ", tree) < 0)
+		goto on_error;
 
 	for (i = 0; i < git_array_size(*parents); i++) {
 		parent = git_array_get(*parents, i);
-		git_oid__writebuf(out, "parent ", parent);
+		if (git_object__write_oid_header(out, "parent ", parent) < 0)
+			goto on_error;
 	}
 
 	git_signature__writebuf(out, "author ", author);
 	git_signature__writebuf(out, "committer ", committer);
 
 	if (message_encoding != NULL)
-		git_buf_printf(out, "encoding %s\n", message_encoding);
+		git_str_printf(out, "encoding %s\n", message_encoding);
 
-	git_buf_putc(out, '\n');
+	git_str_putc(out, '\n');
 
-	if (git_buf_puts(out, message) < 0)
+	if (git_str_puts(out, message) < 0)
 		goto on_error;
 
 	return 0;
 
 on_error:
-	git_buf_dispose(out);
+	git_str_dispose(out);
 	return -1;
 }
 
@@ -136,7 +138,7 @@ static int git_commit__create_internal(
 	int error;
 	git_odb *odb;
 	git_reference *ref = NULL;
-	git_buf buf = GIT_BUF_INIT;
+	git_str buf = GIT_STR_INIT;
 	const git_oid *current_id = NULL;
 	git_array_oid_t parents = GIT_ARRAY_INIT;
 
@@ -179,7 +181,7 @@ static int git_commit__create_internal(
 cleanup:
 	git_array_clear(parents);
 	git_reference_free(ref);
-	git_buf_dispose(&buf);
+	git_str_dispose(&buf);
 	return error;
 }
 
@@ -388,16 +390,22 @@ int git_commit_amend(
 	return error;
 }
 
-static int commit_parse(git_commit *commit, const char *data, size_t size, unsigned int flags)
+static int commit_parse(
+	git_commit *commit,
+	const char *data,
+	size_t size,
+	git_commit__parse_options *opts)
 {
 	const char *buffer_start = data, *buffer;
 	const char *buffer_end = buffer_start + size;
 	git_oid parent_id;
 	size_t header_len;
 	git_signature dummy_sig;
+	int error;
 
 	GIT_ASSERT_ARG(commit);
 	GIT_ASSERT_ARG(data);
+	GIT_ASSERT_ARG(opts);
 
 	buffer = buffer_start;
 
@@ -406,11 +414,14 @@ static int commit_parse(git_commit *commit, const char *data, size_t size, unsig
 	GIT_ERROR_CHECK_ARRAY(commit->parent_ids);
 
 	/* The tree is always the first field */
-	if (!(flags & GIT_COMMIT_PARSE_QUICK)) {
-	    if (git_oid__parse(&commit->tree_id, &buffer, buffer_end, "tree ") < 0)
+	if (!(opts->flags & GIT_COMMIT_PARSE_QUICK)) {
+		if (git_object__parse_oid_header(&commit->tree_id,
+				&buffer, buffer_end, "tree ",
+				opts->oid_type) < 0)
 			goto bad_buffer;
 	} else {
-		size_t tree_len = strlen("tree ") + GIT_OID_HEXSZ + 1;
+		size_t tree_len = strlen("tree ") + git_oid_hexsize(opts->oid_type) + 1;
+
 		if (buffer + tree_len > buffer_end)
 			goto bad_buffer;
 		buffer += tree_len;
@@ -420,25 +431,27 @@ static int commit_parse(git_commit *commit, const char *data, size_t size, unsig
 	 * TODO: commit grafts!
 	 */
 
-	while (git_oid__parse(&parent_id, &buffer, buffer_end, "parent ") == 0) {
+	while (git_object__parse_oid_header(&parent_id,
+			&buffer, buffer_end, "parent ",
+			opts->oid_type) == 0) {
 		git_oid *new_id = git_array_alloc(commit->parent_ids);
 		GIT_ERROR_CHECK_ALLOC(new_id);
 
 		git_oid_cpy(new_id, &parent_id);
 	}
 
-	if (!(flags & GIT_COMMIT_PARSE_QUICK)) {
+	if (!opts || !(opts->flags & GIT_COMMIT_PARSE_QUICK)) {
 		commit->author = git__malloc(sizeof(git_signature));
 		GIT_ERROR_CHECK_ALLOC(commit->author);
 
-		if (git_signature__parse(commit->author, &buffer, buffer_end, "author ", '\n') < 0)
-			return -1;
+		if ((error = git_signature__parse(commit->author, &buffer, buffer_end, "author ", '\n')) < 0)
+			return error;
 	}
 
 	/* Some tools create multiple author fields, ignore the extra ones */
 	while (!git__prefixncmp(buffer, buffer_end - buffer, "author ")) {
-		if (git_signature__parse(&dummy_sig, &buffer, buffer_end, "author ", '\n') < 0)
-			return -1;
+		if ((error = git_signature__parse(&dummy_sig, &buffer, buffer_end, "author ", '\n')) < 0)
+			return error;
 
 		git__free(dummy_sig.name);
 		git__free(dummy_sig.email);
@@ -448,10 +461,10 @@ static int commit_parse(git_commit *commit, const char *data, size_t size, unsig
 	commit->committer = git__malloc(sizeof(git_signature));
 	GIT_ERROR_CHECK_ALLOC(commit->committer);
 
-	if (git_signature__parse(commit->committer, &buffer, buffer_end, "committer ", '\n') < 0)
-		return -1;
+	if ((error = git_signature__parse(commit->committer, &buffer, buffer_end, "committer ", '\n')) < 0)
+		return error;
 
-	if (flags & GIT_COMMIT_PARSE_QUICK)
+	if (opts && opts->flags & GIT_COMMIT_PARSE_QUICK)
 		return 0;
 
 	/* Parse add'l header entries */
@@ -493,22 +506,42 @@ static int commit_parse(git_commit *commit, const char *data, size_t size, unsig
 
 bad_buffer:
 	git_error_set(GIT_ERROR_OBJECT, "failed to parse bad commit object");
-	return -1;
+	return GIT_EINVALID;
 }
 
-int git_commit__parse_raw(void *commit, const char *data, size_t size)
+int git_commit__parse(
+	void *commit,
+	git_odb_object *odb_obj,
+	git_oid_t oid_type)
 {
-	return commit_parse(commit, data, size, 0);
+	git_commit__parse_options parse_options = {0};
+	parse_options.oid_type = oid_type;
+
+	return git_commit__parse_ext(commit, odb_obj, &parse_options);
 }
 
-int git_commit__parse_ext(git_commit *commit, git_odb_object *odb_obj, unsigned int flags)
+int git_commit__parse_raw(
+	void *commit,
+	const char *data,
+	size_t size,
+	git_oid_t oid_type)
 {
-	return commit_parse(commit, git_odb_object_data(odb_obj), git_odb_object_size(odb_obj), flags);
+	git_commit__parse_options parse_options = {0};
+	parse_options.oid_type = oid_type;
+
+	return commit_parse(commit, data, size, &parse_options);
 }
 
-int git_commit__parse(void *_commit, git_odb_object *odb_obj)
+int git_commit__parse_ext(
+	git_commit *commit,
+	git_odb_object *odb_obj,
+	git_commit__parse_options *parse_opts)
 {
-	return git_commit__parse_ext(_commit, odb_obj, 0);
+	return commit_parse(
+		commit,
+		git_odb_object_data(odb_obj),
+		git_odb_object_size(odb_obj),
+		parse_opts);
 }
 
 #define GIT_COMMIT_GETTER(_rvalue, _name, _return, _invalid) \
@@ -545,8 +578,8 @@ const char *git_commit_message(const git_commit *commit)
 
 const char *git_commit_summary(git_commit *commit)
 {
-	git_buf summary = GIT_BUF_INIT;
-	const char *msg, *space;
+	git_str summary = GIT_STR_INIT;
+	const char *msg, *space, *next;
 	bool space_contains_newline = false;
 
 	GIT_ASSERT_ARG_WITH_RETVAL(commit, NULL);
@@ -555,10 +588,21 @@ const char *git_commit_summary(git_commit *commit)
 		for (msg = git_commit_message(commit), space = NULL; *msg; ++msg) {
 			char next_character = msg[0];
 			/* stop processing at the end of the first paragraph */
-			if (next_character == '\n' && (!msg[1] || msg[1] == '\n'))
-				break;
+			if (next_character == '\n') {
+				if (!msg[1])
+					break;
+				if (msg[1] == '\n')
+					break;
+				/* stop processing if next line contains only whitespace */
+				next = msg + 1;
+				while (*next && git__isspace_nonlf(*next)) {
+					++next;
+				}
+				if (!*next || *next == '\n')
+					break;
+			}
 			/* record the beginning of contiguous whitespace runs */
-			else if (git__isspace(next_character)) {
+			if (git__isspace(next_character)) {
 				if(space == NULL) {
 					space = msg;
 					space_contains_newline = false;
@@ -570,17 +614,17 @@ const char *git_commit_summary(git_commit *commit)
 				/* process any recorded whitespace */
 				if (space) {
 					if(space_contains_newline)
-						git_buf_putc(&summary, ' '); /* if the space contains a newline, collapse to ' ' */
+						git_str_putc(&summary, ' '); /* if the space contains a newline, collapse to ' ' */
 					else
-						git_buf_put(&summary, space, (msg - space)); /* otherwise copy it */
+						git_str_put(&summary, space, (msg - space)); /* otherwise copy it */
 					space = NULL;
 				}
 				/* copy the next character */
-				git_buf_putc(&summary, next_character);
+				git_str_putc(&summary, next_character);
 			}
 		}
 
-		commit->summary = git_buf_detach(&summary);
+		commit->summary = git_str_detach(&summary);
 		if (!commit->summary)
 			commit->summary = git__strdup("");
 	}
@@ -678,11 +722,22 @@ int git_commit_nth_gen_ancestor(
 	return 0;
 }
 
-int git_commit_header_field(git_buf *out, const git_commit *commit, const char *field)
+int git_commit_header_field(
+	git_buf *out,
+	const git_commit *commit,
+	const char *field)
+{
+	GIT_BUF_WRAP_PRIVATE(out, git_commit__header_field, commit, field);
+}
+
+int git_commit__header_field(
+	git_str *out,
+	const git_commit *commit,
+	const char *field)
 {
 	const char *eol, *buf = commit->raw_header;
 
-	git_buf_clear(out);
+	git_str_clear(out);
 
 	while ((eol = strchr(buf, '\n'))) {
 		/* We can skip continuations here */
@@ -706,22 +761,22 @@ int git_commit_header_field(git_buf *out, const git_commit *commit, const char *
 
 		buf++; /* skip the SP */
 
-		git_buf_put(out, buf, eol - buf);
-		if (git_buf_oom(out))
+		git_str_put(out, buf, eol - buf);
+		if (git_str_oom(out))
 			goto oom;
 
 		/* If the next line starts with SP, it's multi-line, we must continue */
 		while (eol[1] == ' ') {
-			git_buf_putc(out, '\n');
+			git_str_putc(out, '\n');
 			buf = eol + 2;
 			eol = strchr(buf, '\n');
 			if (!eol)
 				goto malformed;
 
-			git_buf_put(out, buf, eol - buf);
+			git_str_put(out, buf, eol - buf);
 		}
 
-		if (git_buf_oom(out))
+		if (git_str_oom(out))
 			goto oom;
 
 		return 0;
@@ -738,7 +793,35 @@ oom:
 	return -1;
 }
 
-int git_commit_extract_signature(git_buf *signature, git_buf *signed_data, git_repository *repo, git_oid *commit_id, const char *field)
+int git_commit_extract_signature(
+	git_buf *signature_out,
+	git_buf *signed_data_out,
+	git_repository *repo,
+	git_oid *commit_id,
+	const char *field)
+{
+	git_str signature = GIT_STR_INIT, signed_data = GIT_STR_INIT;
+	int error;
+
+	if ((error = git_buf_tostr(&signature, signature_out)) < 0 ||
+	    (error = git_buf_tostr(&signed_data, signed_data_out)) < 0 ||
+	    (error = git_commit__extract_signature(&signature, &signed_data, repo, commit_id, field)) < 0 ||
+	    (error = git_buf_fromstr(signature_out, &signature)) < 0 ||
+	    (error = git_buf_fromstr(signed_data_out, &signed_data)) < 0)
+		goto done;
+
+done:
+	git_str_dispose(&signature);
+	git_str_dispose(&signed_data);
+	return error;
+}
+
+int git_commit__extract_signature(
+	git_str *signature,
+	git_str *signed_data,
+	git_repository *repo,
+	git_oid *commit_id,
+	const char *field)
 {
 	git_odb_object *obj;
 	git_odb *odb;
@@ -746,8 +829,8 @@ int git_commit_extract_signature(git_buf *signature, git_buf *signed_data, git_r
 	const char *h, *eol;
 	int error;
 
-	git_buf_clear(signature);
-	git_buf_clear(signed_data);
+	git_str_clear(signature);
+	git_str_clear(signed_data);
 
 	if (!field)
 		field = "gpgsig";
@@ -769,7 +852,7 @@ int git_commit_extract_signature(git_buf *signature, git_buf *signed_data, git_r
 	while ((h = strchr(buf, '\n')) && h[1] != '\0') {
 		h++;
 		if (git__prefixcmp(buf, field)) {
-			if (git_buf_put(signed_data, buf, h - buf) < 0)
+			if (git_str_put(signed_data, buf, h - buf) < 0)
 				return -1;
 
 			buf = h;
@@ -788,25 +871,25 @@ int git_commit_extract_signature(git_buf *signature, git_buf *signed_data, git_r
 
 		h++; /* skip the SP */
 
-		git_buf_put(signature, h, eol - h);
-		if (git_buf_oom(signature))
+		git_str_put(signature, h, eol - h);
+		if (git_str_oom(signature))
 			goto oom;
 
 		/* If the next line starts with SP, it's multi-line, we must continue */
 		while (eol[1] == ' ') {
-			git_buf_putc(signature, '\n');
+			git_str_putc(signature, '\n');
 			h = eol + 2;
 			eol = strchr(h, '\n');
 			if (!eol)
 				goto malformed;
 
-			git_buf_put(signature, h, eol - h);
+			git_str_put(signature, h, eol - h);
 		}
 
-		if (git_buf_oom(signature))
+		if (git_str_oom(signature))
 			goto oom;
 
-		error = git_buf_puts(signed_data, eol+1);
+		error = git_str_puts(signed_data, eol+1);
 		git_odb_object_free(obj);
 		return error;
 	}
@@ -826,12 +909,29 @@ oom:
 
 cleanup:
 	git_odb_object_free(obj);
-	git_buf_clear(signature);
-	git_buf_clear(signed_data);
+	git_str_clear(signature);
+	git_str_clear(signed_data);
 	return error;
 }
 
-int git_commit_create_buffer(git_buf *out,
+int git_commit_create_buffer(
+	git_buf *out,
+	git_repository *repo,
+	const git_signature *author,
+	const git_signature *committer,
+	const char *message_encoding,
+	const char *message,
+	const git_tree *tree,
+	size_t parent_count,
+	const git_commit *parents[])
+{
+	GIT_BUF_WRAP_PRIVATE(out, git_commit__create_buffer, repo,
+	                     author, committer, message_encoding, message,
+	                     tree, parent_count, parents);
+}
+
+int git_commit__create_buffer(
+	git_str *out,
 	git_repository *repo,
 	const git_signature *author,
 	const git_signature *committer,
@@ -866,7 +966,7 @@ int git_commit_create_buffer(git_buf *out,
 /**
  * Append to 'out' properly marking continuations when there's a newline in 'content'
  */
-static int format_header_field(git_buf *out, const char *field, const char *content)
+static int format_header_field(git_str *out, const char *field, const char *content)
 {
 	const char *lf;
 
@@ -874,19 +974,19 @@ static int format_header_field(git_buf *out, const char *field, const char *cont
 	GIT_ASSERT_ARG(field);
 	GIT_ASSERT_ARG(content);
 
-	git_buf_puts(out, field);
-	git_buf_putc(out, ' ');
+	git_str_puts(out, field);
+	git_str_putc(out, ' ');
 
 	while ((lf = strchr(content, '\n')) != NULL) {
-		git_buf_put(out, content, lf - content);
-		git_buf_puts(out, "\n ");
+		git_str_put(out, content, lf - content);
+		git_str_puts(out, "\n ");
 		content = lf + 1;
 	}
 
-	git_buf_puts(out, content);
-	git_buf_putc(out, '\n');
+	git_str_puts(out, content);
+	git_str_putc(out, '\n');
 
-	return git_buf_oom(out) ? -1 : 0;
+	return git_str_oom(out) ? -1 : 0;
 }
 
 static const git_oid *commit_parent_from_commit(size_t n, void *payload)
@@ -908,15 +1008,20 @@ int git_commit_create_with_signature(
 	int error = 0;
 	const char *field;
 	const char *header_end;
-	git_buf commit = GIT_BUF_INIT;
+	git_str commit = GIT_STR_INIT;
 	git_commit *parsed;
 	git_array_oid_t parents = GIT_ARRAY_INIT;
+	git_commit__parse_options parse_opts = {0};
+
+	parse_opts.oid_type = repo->oid_type;
 
 	/* The first step is to verify that all the tree and parents exist */
 	parsed = git__calloc(1, sizeof(git_commit));
 	GIT_ERROR_CHECK_ALLOC(parsed);
-	if ((error = commit_parse(parsed, commit_content, strlen(commit_content), 0)) < 0)
+	if (commit_parse(parsed, commit_content, strlen(commit_content), &parse_opts) < 0) {
+		error = -1;
 		goto cleanup;
+	}
 
 	if ((error = validate_tree_and_parents(&parents, repo, &parsed->tree_id, commit_parent_from_commit, parsed, NULL, true)) < 0)
 		goto cleanup;
@@ -933,7 +1038,7 @@ int git_commit_create_with_signature(
 
 	/* The header ends after the first LF */
 	header_end++;
-	git_buf_put(&commit, commit_content, header_end - commit_content);
+	git_str_put(&commit, commit_content, header_end - commit_content);
 
 	if (signature != NULL) {
 		field = signature_field ? signature_field : "gpgsig";
@@ -942,9 +1047,9 @@ int git_commit_create_with_signature(
 			goto cleanup;
 	}
 
-	git_buf_puts(&commit, header_end);
+	git_str_puts(&commit, header_end);
 
-	if (git_buf_oom(&commit))
+	if (git_str_oom(&commit))
 		return -1;
 
 	if ((error = git_repository_odb__weakptr(&odb, repo)) < 0)
@@ -955,7 +1060,7 @@ int git_commit_create_with_signature(
 
 cleanup:
 	git_commit__free(parsed);
-	git_buf_dispose(&commit);
+	git_str_dispose(&commit);
 	return error;
 }
 

data/vendor/libgit2/src/libgit2/commit.h

@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * 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_commit_h__
+#define INCLUDE_commit_h__
+
+#include "common.h"
+
+#include "git2/commit.h"
+#include "tree.h"
+#include "repository.h"
+#include "array.h"
+
+#include <time.h>
+
+struct git_commit {
+	git_object object;
+
+	git_array_t(git_oid) parent_ids;
+	git_oid tree_id;
+
+	git_signature *author;
+	git_signature *committer;
+
+	char *message_encoding;
+	char *raw_message;
+	char *raw_header;
+
+	char *summary;
+	char *body;
+};
+
+typedef struct {
+	git_oid_t oid_type;
+	unsigned int flags;
+} git_commit__parse_options;
+
+typedef enum {
+	/** Only parse parents and committer info */
+	GIT_COMMIT_PARSE_QUICK = (1 << 0)
+} git_commit__parse_flags;
+
+int git_commit__header_field(
+	git_str *out,
+	const git_commit *commit,
+	const char *field);
+
+int git_commit__extract_signature(
+	git_str *signature,
+	git_str *signed_data,
+	git_repository *repo,
+	git_oid *commit_id,
+	const char *field);
+
+int git_commit__create_buffer(
+	git_str *out,
+	git_repository *repo,
+	const git_signature *author,
+	const git_signature *committer,
+	const char *message_encoding,
+	const char *message,
+	const git_tree *tree,
+	size_t parent_count,
+	const git_commit *parents[]);
+
+int git_commit__parse(
+	void *commit,
+	git_odb_object *obj,
+	git_oid_t oid_type);
+
+int git_commit__parse_raw(
+	void *commit,
+	const char *data,
+	size_t size,
+	git_oid_t oid_type);
+
+int git_commit__parse_ext(
+	git_commit *commit,
+	git_odb_object *odb_obj,
+	git_commit__parse_options *parse_opts);
+
+void git_commit__free(void *commit);
+
+#endif