rugged 0.28.4 → 0.28.4.1

data/vendor/libgit2/src/config_mem.c

@@ -78,24 +78,20 @@ static int read_variable_cb(
 static int config_memory_open(git_config_backend *backend, git_config_level_t level, const git_repository *repo)
 {
 	config_memory_backend *memory_backend = (config_memory_backend *) backend;
-	git_config_parser parser = GIT_PARSE_CTX_INIT;
 	config_memory_parse_data parse_data;
-	int error;
+	git_config_parser reader;
 
 	GIT_UNUSED(repo);
 
-	if ((error = git_config_parser_init(&parser, "in-memory", memory_backend->cfg.ptr,
-					    memory_backend->cfg.size)) < 0)
-		goto out;
+	if (memory_backend->cfg.size == 0)
+		return 0;
+
+	git_parse_ctx_init(&reader.ctx, memory_backend->cfg.ptr, memory_backend->cfg.size);
+	reader.file = NULL;
 	parse_data.entries = memory_backend->entries;
 	parse_data.level = level;
 
-	if ((error = git_config_parse(&parser, NULL, read_variable_cb, NULL, NULL, &parse_data)) < 0)
-		goto out;
-
-out:
-	git_config_parser_dispose(&parser);
-	return error;
+	return git_config_parse(&reader, NULL, read_variable_cb, NULL, NULL, &parse_data);
 }
 
 static int config_memory_get(git_config_backend *backend, const char *key, git_config_entry **out)
@@ -170,6 +166,14 @@ static int config_memory_unlock(git_config_backend *backend, int success)
 	return config_error_readonly();
 }
 
+static int config_memory_snapshot(git_config_backend **out, git_config_backend *backend)
+{
+	GIT_UNUSED(out);
+	GIT_UNUSED(backend);
+	git_error_set(GIT_ERROR_CONFIG, "this backend does not support snapshots");
+	return -1;
+}
+
 static void config_memory_free(git_config_backend *_backend)
 {
 	config_memory_backend *backend = (config_memory_backend *)_backend;
@@ -211,7 +215,7 @@ int git_config_backend_from_string(git_config_backend **out, const char *cfg, si
 	backend->parent.iterator = config_memory_iterator;
 	backend->parent.lock = config_memory_lock;
 	backend->parent.unlock = config_memory_unlock;
-	backend->parent.snapshot = git_config_backend_snapshot;
+	backend->parent.snapshot = config_memory_snapshot;
 	backend->parent.free = config_memory_free;
 
 	*out = (git_config_backend *)backend;

data/vendor/libgit2/src/config_parse.c

@@ -16,14 +16,9 @@ const char *git_config_escaped = "\n\t\b\"\\";
 
 static void set_parse_error(git_config_parser *reader, int col, const char *error_str)
 {
-	if (col)
-		git_error_set(GIT_ERROR_CONFIG,
-		              "failed to parse config file: %s (in %s:%"PRIuZ", column %d)",
-		              error_str, reader->path, reader->ctx.line_num, col);
-	else
-		git_error_set(GIT_ERROR_CONFIG,
-		              "failed to parse config file: %s (in %s:%"PRIuZ")",
-		              error_str, reader->path, reader->ctx.line_num);
+	const char *file = reader->file ? reader->file->path : "in-memory";
+	git_error_set(GIT_ERROR_CONFIG, "failed to parse config file: %s (in %s:%"PRIuZ", column %d)",
+		error_str, file, reader->ctx.line_num, col);
 }
 
 
@@ -64,35 +59,31 @@ static int strip_comments(char *line, int in_quotes)
 }
 
 
-static int parse_subsection_header(git_config_parser *reader, const char *line, size_t pos, const char *base_name, char **section_name)
+static int parse_section_header_ext(git_config_parser *reader, const char *line, const char *base_name, char **section_name)
 {
 	int c, rpos;
-	const char *first_quote, *last_quote;
+	char *first_quote, *last_quote;
 	const char *line_start = line;
 	git_buf buf = GIT_BUF_INIT;
 	size_t quoted_len, alloc_len, base_name_len = strlen(base_name);
 
-	/* Skip any additional whitespace before our section name */
-	while (git__isspace(line[pos]))
-		pos++;
+	/*
+	 * base_name is what came before the space. We should be at the
+	 * first quotation mark, except for now, line isn't being kept in
+	 * sync so we only really use it to calculate the length.
+	 */
 
-	/* We should be at the first quotation mark. */
-	if (line[pos] != '"') {
-		set_parse_error(reader, 0, "missing quotation marks in section header");
+	first_quote = strchr(line, '"');
+	if (first_quote == NULL) {
+		set_parse_error(reader, 0, "Missing quotation marks in section header");
 		goto end_error;
 	}
 
-	first_quote = &line[pos];
 	last_quote = strrchr(line, '"');
 	quoted_len = last_quote - first_quote;
 
-	if ((last_quote - line) > INT_MAX) {
-		set_parse_error(reader, 0, "invalid section header, line too long");
-		goto end_error;
-	}
-
 	if (quoted_len == 0) {
-		set_parse_error(reader, 0, "missing closing quotation mark in section header");
+		set_parse_error(reader, 0, "Missing closing quotation mark in section header");
 		goto end_error;
 	}
 
@@ -116,7 +107,7 @@ static int parse_subsection_header(git_config_parser *reader, const char *line,
 
 		switch (c) {
 		case 0:
-			set_parse_error(reader, 0, "unexpected end-of-line in section header");
+			set_parse_error(reader, 0, "Unexpected end-of-line in section header");
 			goto end_error;
 
 		case '"':
@@ -126,7 +117,7 @@ static int parse_subsection_header(git_config_parser *reader, const char *line,
 			c = line[++rpos];
 
 			if (c == 0) {
-				set_parse_error(reader, rpos, "unexpected end-of-line in section header");
+				set_parse_error(reader, rpos, "Unexpected end-of-line in section header");
 				goto end_error;
 			}
 
@@ -143,13 +134,13 @@ end_parse:
 		goto end_error;
 
 	if (line[rpos] != '"' || line[rpos + 1] != ']') {
-		set_parse_error(reader, rpos, "unexpected text after closing quotes");
+		set_parse_error(reader, rpos, "Unexpected text after closing quotes");
 		git_buf_dispose(&buf);
 		return -1;
 	}
 
 	*section_name = git_buf_detach(&buf);
-	return (int)(&line[rpos + 2] - line_start); /* rpos is at the closing quote */
+	return &line[rpos + 2] - line_start; /* rpos is at the closing quote */
 
 end_error:
 	git_buf_dispose(&buf);
@@ -174,7 +165,7 @@ static int parse_section_header(git_config_parser *reader, char **section_out)
 	name_end = strrchr(line, ']');
 	if (name_end == NULL) {
 		git__free(line);
-		set_parse_error(reader, 0, "missing ']' in section header");
+		set_parse_error(reader, 0, "Missing ']' in section header");
 		return -1;
 	}
 
@@ -194,14 +185,14 @@ static int parse_section_header(git_config_parser *reader, char **section_out)
 	do {
 		if (git__isspace(c)){
 			name[name_length] = '\0';
-			result = parse_subsection_header(reader, line, pos, name, section_out);
+			result = parse_section_header_ext(reader, line, name, section_out);
 			git__free(line);
 			git__free(name);
 			return result;
 		}
 
 		if (!config_keychar(c) && c != '.') {
-			set_parse_error(reader, pos, "unexpected character in header");
+			set_parse_error(reader, pos, "Unexpected character in header");
 			goto fail_parse;
 		}
 
@@ -210,7 +201,7 @@ static int parse_section_header(git_config_parser *reader, char **section_out)
 	} while ((c = line[pos++]) != ']');
 
 	if (line[pos - 1] != ']') {
-		set_parse_error(reader, pos, "unexpected end of file");
+		set_parse_error(reader, pos, "Unexpected end of file");
 		goto fail_parse;
 	}
 
@@ -395,7 +386,7 @@ static int parse_name(
 		name_end++;
 
 	if (line == name_end) {
-		set_parse_error(reader, 0, "invalid configuration key");
+		set_parse_error(reader, 0, "Invalid configuration key");
 		return -1;
 	}
 
@@ -407,7 +398,7 @@ static int parse_name(
 	if (*value_start == '=') {
 		*value = value_start + 1;
 	} else if (*value_start) {
-		set_parse_error(reader, 0, "invalid configuration key");
+		set_parse_error(reader, 0, "Invalid configuration key");
 		return -1;
 	}
 
@@ -474,24 +465,13 @@ out:
 	return error;
 }
 
-int git_config_parser_init(git_config_parser *out, const char *path, const char *data, size_t datalen)
-{
-	out->path = path;
-	return git_parse_ctx_init(&out->ctx, data, datalen);
-}
-
-void git_config_parser_dispose(git_config_parser *parser)
-{
-	git_parse_ctx_clear(&parser->ctx);
-}
-
 int git_config_parse(
 	git_config_parser *parser,
 	git_config_parser_section_cb on_section,
 	git_config_parser_variable_cb on_variable,
 	git_config_parser_comment_cb on_comment,
 	git_config_parser_eof_cb on_eof,
-	void *payload)
+	void *data)
 {
 	git_parse_ctx *ctx;
 	char *current_section = NULL, *var_name = NULL, *var_value = NULL;
@@ -531,7 +511,7 @@ int git_config_parse(
 			git_parse_advance_chars(ctx, result);
 
 			if (on_section)
-				result = on_section(parser, current_section, line_start, line_len, payload);
+				result = on_section(parser, current_section, line_start, line_len, data);
 			/*
 			 * After we've parsed the section header we may not be
 			 * done with the line. If there's still data in there,
@@ -551,13 +531,13 @@ int git_config_parse(
 		case ';':
 		case '#':
 			if (on_comment) {
-				result = on_comment(parser, line_start, line_len, payload);
+				result = on_comment(parser, line_start, line_len, data);
 			}
 			break;
 
 		default: /* assume variable declaration */
 			if ((result = parse_variable(parser, &var_name, &var_value)) == 0 && on_variable) {
-				result = on_variable(parser, current_section, var_name, var_value, line_start, line_len, payload);
+				result = on_variable(parser, current_section, var_name, var_value, line_start, line_len, data);
 				git__free(var_name);
 				git__free(var_value);
 			}
@@ -570,7 +550,7 @@ int git_config_parse(
 	}
 
 	if (on_eof)
-		result = on_eof(parser, current_section, payload);
+		result = on_eof(parser, current_section, data);
 
 out:
 	git__free(current_section);

data/vendor/libgit2/src/config_parse.h

@@ -8,28 +8,30 @@
 #define INCLUDE_config_parse_h__
 
 #include "common.h"
-
 #include "array.h"
-#include "futils.h"
 #include "oid.h"
 #include "parse.h"
 
 extern const char *git_config_escapes;
 extern const char *git_config_escaped;
 
+typedef struct config_file {
+	git_oid checksum;
+	char *path;
+	git_array_t(struct config_file) includes;
+} git_config_file;
+
 typedef struct {
-	const char *path;
+	struct config_file *file;
 	git_parse_ctx ctx;
 } git_config_parser;
 
-#define GIT_CONFIG_PARSER_INIT { NULL, GIT_PARSE_CTX_INIT }
-
 typedef int (*git_config_parser_section_cb)(
 	git_config_parser *parser,
 	const char *current_section,
 	const char *line,
 	size_t line_len,
-	void *payload);
+	void *data);
 
 typedef int (*git_config_parser_variable_cb)(
 	git_config_parser *parser,
@@ -38,21 +40,18 @@ typedef int (*git_config_parser_variable_cb)(
 	const char *var_value,
 	const char *line,
 	size_t line_len,
-	void *payload);
+	void *data);
 
 typedef int (*git_config_parser_comment_cb)(
 	git_config_parser *parser,
 	const char *line,
 	size_t line_len,
-	void *payload);
+	void *data);
 
 typedef int (*git_config_parser_eof_cb)(
 	git_config_parser *parser,
 	const char *current_section,
-	void *payload);
-
-int git_config_parser_init(git_config_parser *out, const char *path, const char *data, size_t datalen);
-void git_config_parser_dispose(git_config_parser *parser);
+	void *data);
 
 int git_config_parse(
 	git_config_parser *parser,
@@ -60,6 +59,6 @@ int git_config_parse(
 	git_config_parser_variable_cb on_variable,
 	git_config_parser_comment_cb on_comment,
 	git_config_parser_eof_cb on_eof,
-	void *payload);
+	void *data);
 
 #endif

data/vendor/libgit2/src/crlf.c

@@ -12,7 +12,7 @@
 #include "git2/index.h"
 #include "git2/sys/filter.h"
 
-#include "futils.h"
+#include "fileops.h"
 #include "hash.h"
 #include "filter.h"
 #include "buf_text.h"
@@ -44,11 +44,11 @@ struct crlf_filter {
 
 static git_crlf_t check_crlf(const char *value)
 {
-	if (GIT_ATTR_IS_TRUE(value))
+	if (GIT_ATTR_TRUE(value))
 		return GIT_CRLF_TEXT;
-	else if (GIT_ATTR_IS_FALSE(value))
+	else if (GIT_ATTR_FALSE(value))
 		return GIT_CRLF_BINARY;
-	else if (GIT_ATTR_IS_UNSPECIFIED(value))
+	else if (GIT_ATTR_UNSPECIFIED(value))
 		;
 	else if (strcmp(value, "input") == 0)
 		return GIT_CRLF_TEXT_INPUT;
@@ -58,9 +58,9 @@ static git_crlf_t check_crlf(const char *value)
 	return GIT_CRLF_UNDEFINED;
 }
 
-static git_configmap_value check_eol(const char *value)
+static git_cvar_value check_eol(const char *value)
 {
-	if (GIT_ATTR_IS_UNSPECIFIED(value))
+	if (GIT_ATTR_UNSPECIFIED(value))
 		;
 	else if (strcmp(value, "lf") == 0)
 		return GIT_EOL_LF;
@@ -78,7 +78,7 @@ static int has_cr_in_index(const git_filter_source *src)
 	const git_index_entry *entry;
 	git_blob *blob;
 	const void *blobcontent;
-	git_object_size_t blobsize;
+	git_off_t blobsize;
 	bool found_cr;
 
 	if (!path)
@@ -127,7 +127,7 @@ static int text_eol_is_crlf(struct crlf_attrs *ca)
 	return 0;
 }
 
-static git_configmap_value output_eol(struct crlf_attrs *ca)
+static git_cvar_value output_eol(struct crlf_attrs *ca)
 {
 	switch (ca->crlf_action) {
 	case GIT_CRLF_BINARY:
@@ -293,12 +293,12 @@ static int convert_attrs(
 
 	memset(ca, 0, sizeof(struct crlf_attrs));
 
-	if ((error = git_repository__configmap_lookup(&ca->auto_crlf,
-		 git_filter_source_repo(src), GIT_CONFIGMAP_AUTO_CRLF)) < 0 ||
-		(error = git_repository__configmap_lookup(&ca->safe_crlf,
-		 git_filter_source_repo(src), GIT_CONFIGMAP_SAFE_CRLF)) < 0 ||
-		(error = git_repository__configmap_lookup(&ca->core_eol,
-		 git_filter_source_repo(src), GIT_CONFIGMAP_EOL)) < 0)
+	if ((error = git_repository__cvar(&ca->auto_crlf,
+		 git_filter_source_repo(src), GIT_CVAR_AUTO_CRLF)) < 0 ||
+		(error = git_repository__cvar(&ca->safe_crlf,
+		 git_filter_source_repo(src), GIT_CVAR_SAFE_CRLF)) < 0 ||
+		(error = git_repository__cvar(&ca->core_eol,
+		 git_filter_source_repo(src), GIT_CVAR_EOL)) < 0)
 		return error;
 
 	/* downgrade FAIL to WARN if ALLOW_UNSAFE option is used */

data/vendor/libgit2/src/describe.c

@@ -16,11 +16,10 @@
 #include "commit_list.h"
 #include "oidmap.h"
 #include "refs.h"
-#include "repository.h"
 #include "revwalk.h"
 #include "tag.h"
 #include "vector.h"
-#include "wildmatch.h"
+#include "repository.h"
 
 /* Ported from https://github.com/git/git/blob/89dde7882f71f846ccd0359756d27bebc31108de/builtin/describe.c */
 
@@ -37,7 +36,12 @@ struct commit_name {
 
 static void *oidmap_value_bykey(git_oidmap *map, const git_oid *key)
 {
-	return git_oidmap_get(map, key);
+	size_t pos = git_oidmap_lookup_index(map, key);
+
+	if (!git_oidmap_valid_index(map, pos))
+		return NULL;
+
+	return git_oidmap_value_at(map, pos);
 }
 
 static struct commit_name *find_commit_name(
@@ -120,8 +124,13 @@ 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)
-			return -1;
+		if (!found) {
+			int ret;
+
+			git_oidmap_insert(names, &e->peeled, e, &ret);
+			if (ret < 0)
+				return -1;
+		}
 	}
 	else
 		git_tag_free(tag);
@@ -215,7 +224,7 @@ static int get_name(const char *refname, void *payload)
 		return 0;
 
 	/* Accept only tags that match the pattern, if given */
-	if (data->opts->pattern && (!is_tag || wildmatch(data->opts->pattern,
+	if (data->opts->pattern && (!is_tag || p_fnmatch(data->opts->pattern,
 		refname + strlen(GIT_REFS_TAGS_DIR), 0)))
 				return 0;
 
@@ -672,8 +681,8 @@ int git_describe_commit(
 		"git_describe_options");
 	data.opts = &normalized;
 
-	if ((error = git_oidmap_new(&data.names)) < 0)
-		return error;
+	data.names = git_oidmap_alloc();
+	GIT_ERROR_CHECK_ALLOC(data.names);
 
 	/** TODO: contains to be implemented */
 
@@ -760,7 +769,7 @@ static int normalize_format_options(
 	const git_describe_format_options *src)
 {
 	if (!src) {
-		git_describe_format_options_init(dst, GIT_DESCRIBE_FORMAT_OPTIONS_VERSION);
+		git_describe_init_format_options(dst, GIT_DESCRIBE_FORMAT_OPTIONS_VERSION);
 		return 0;
 	}
 
@@ -869,26 +878,16 @@ void git_describe_result_free(git_describe_result *result)
 	git__free(result);
 }
 
-int git_describe_options_init(git_describe_options *opts, unsigned int version)
+int git_describe_init_options(git_describe_options *opts, unsigned int version)
 {
 	GIT_INIT_STRUCTURE_FROM_TEMPLATE(
 		opts, version, git_describe_options, GIT_DESCRIBE_OPTIONS_INIT);
 	return 0;
 }
 
-int git_describe_init_options(git_describe_options *opts, unsigned int version)
-{
-	return git_describe_options_init(opts, version);
-}
-
-int git_describe_format_options_init(git_describe_format_options *opts, unsigned int version)
+int git_describe_init_format_options(git_describe_format_options *opts, unsigned int version)
 {
 	GIT_INIT_STRUCTURE_FROM_TEMPLATE(
 		opts, version, git_describe_format_options, GIT_DESCRIBE_FORMAT_OPTIONS_INIT);
 	return 0;
 }
-
-int git_describe_init_format_options(git_describe_format_options *opts, unsigned int version)
-{
-	return git_describe_format_options_init(opts, version);
-}