rugged 0.28.4 → 0.28.4.1

data/vendor/libgit2/src/diff.c

@@ -323,7 +323,7 @@ int git_diff_commit_as_email(
 	git_commit *commit,
 	size_t patch_no,
 	size_t total_patches,
-	uint32_t flags,
+	git_diff_format_email_flags_t flags,
 	const git_diff_options *diff_opts)
 {
 	git_diff *diff = NULL;
@@ -350,19 +350,14 @@ int git_diff_commit_as_email(
 	return error;
 }
 
-int git_diff_options_init(git_diff_options *opts, unsigned int version)
+int git_diff_init_options(git_diff_options *opts, unsigned int version)
 {
 	GIT_INIT_STRUCTURE_FROM_TEMPLATE(
 		opts, version, git_diff_options, GIT_DIFF_OPTIONS_INIT);
 	return 0;
 }
 
-int git_diff_init_options(git_diff_options *opts, unsigned int version)
-{
-	return git_diff_options_init(opts, version);
-}
-
-int git_diff_find_options_init(
+int git_diff_find_init_options(
 	git_diff_find_options *opts, unsigned int version)
 {
 	GIT_INIT_STRUCTURE_FROM_TEMPLATE(
@@ -370,13 +365,7 @@ int git_diff_find_options_init(
 	return 0;
 }
 
-int git_diff_find_init_options(
-	git_diff_find_options *opts, unsigned int version)
-{
-	return git_diff_find_options_init(opts, version);
-}
-
-int git_diff_format_email_options_init(
+int git_diff_format_email_init_options(
 	git_diff_format_email_options *opts, unsigned int version)
 {
 	GIT_INIT_STRUCTURE_FROM_TEMPLATE(
@@ -385,12 +374,6 @@ int git_diff_format_email_options_init(
 	return 0;
 }
 
-int git_diff_format_email_init_options(
-	git_diff_format_email_options *opts, unsigned int version)
-{
-	return git_diff_format_email_options_init(opts, version);
-}
-
 static int flush_hunk(git_oid *result, git_hash_ctx *ctx)
 {
 	git_oid hash;
@@ -426,44 +409,79 @@ static void strip_spaces(git_buf *buf)
 	git_buf_truncate(buf, len);
 }
 
-int git_diff_patchid_print_callback__to_buf(
+static int file_cb(
 	const git_diff_delta *delta,
-	const git_diff_hunk *hunk,
-	const git_diff_line *line,
+	float progress,
 	void *payload)
 {
 	struct patch_id_args *args = (struct patch_id_args *) payload;
 	git_buf buf = GIT_BUF_INIT;
-	int error = 0;
+	int error;
 
-	if (line->origin == GIT_DIFF_LINE_CONTEXT_EOFNL ||
-	    line->origin == GIT_DIFF_LINE_ADD_EOFNL ||
-	    line->origin == GIT_DIFF_LINE_DEL_EOFNL)
-		goto out;
+	GIT_UNUSED(progress);
 
-	if ((error = git_diff_print_callback__to_buf(delta, hunk,
-						     line, &buf)) < 0)
+	if (!args->first_file &&
+	    (error = flush_hunk(&args->result, &args->ctx)) < 0)
+		goto out;
+	args->first_file = 0;
+
+	if ((error = git_buf_printf(&buf,
+				    "diff--gita/%sb/%s---a/%s+++b/%s",
+				    delta->old_file.path,
+				    delta->new_file.path,
+				    delta->old_file.path,
+				    delta->new_file.path)) < 0)
 		goto out;
 
 	strip_spaces(&buf);
 
-	if (line->origin == GIT_DIFF_LINE_FILE_HDR &&
-	    !args->first_file &&
-	    (error = flush_hunk(&args->result, &args->ctx) < 0))
-			goto out;
-
 	if ((error = git_hash_update(&args->ctx, buf.ptr, buf.size)) < 0)
 		goto out;
 
-	if (line->origin == GIT_DIFF_LINE_FILE_HDR && args->first_file)
-		args->first_file = 0;
+out:
+	git_buf_dispose(&buf);
+	return error;
+}
+
+static int line_cb(
+	const git_diff_delta *delta,
+	const git_diff_hunk *hunk,
+	const git_diff_line *line,
+	void *payload)
+{
+	struct patch_id_args *args = (struct patch_id_args *) payload;
+	git_buf buf = GIT_BUF_INIT;
+	int error;
+
+	GIT_UNUSED(delta);
+	GIT_UNUSED(hunk);
+
+	switch (line->origin) {
+	    case GIT_DIFF_LINE_ADDITION:
+		git_buf_putc(&buf, '+');
+		break;
+	    case GIT_DIFF_LINE_DELETION:
+		git_buf_putc(&buf, '-');
+		break;
+	    case GIT_DIFF_LINE_CONTEXT:
+		break;
+	    default:
+		git_error_set(GIT_ERROR_PATCH, "invalid line origin for patch");
+		return -1;
+	}
+
+	git_buf_put(&buf, line->content, line->content_len);
+	strip_spaces(&buf);
+
+	if ((error = git_hash_update(&args->ctx, buf.ptr, buf.size)) < 0)
+		goto out;
 
 out:
 	git_buf_dispose(&buf);
 	return error;
 }
 
-int git_diff_patchid_options_init(git_diff_patchid_options *opts, unsigned int version)
+int git_diff_patchid_init_options(git_diff_patchid_options *opts, unsigned int version)
 {
 	GIT_INIT_STRUCTURE_FROM_TEMPLATE(
 		opts, version, git_diff_patchid_options, GIT_DIFF_PATCHID_OPTIONS_INIT);
@@ -483,10 +501,7 @@ int git_diff_patchid(git_oid *out, git_diff *diff, git_diff_patchid_options *opt
 	if ((error = git_hash_ctx_init(&args.ctx)) < 0)
 		goto out;
 
-	if ((error = git_diff_print(diff,
-				    GIT_DIFF_FORMAT_PATCH_ID,
-				    git_diff_patchid_print_callback__to_buf,
-				    &args)) < 0)
+	if ((error = git_diff_foreach(diff, file_cb, NULL, NULL, line_cb, &args)) < 0)
 		goto out;
 
 	if ((error = (flush_hunk(&args.result, &args.ctx))) < 0)

data/vendor/libgit2/src/diff.h

@@ -57,8 +57,7 @@ extern int git_diff_delta__format_file_header(
 	const git_diff_delta *delta,
 	const char *oldpfx,
 	const char *newpfx,
-	int oid_strlen,
-	bool print_index);
+	int oid_strlen);
 
 extern int git_diff_delta__cmp(const void *a, const void *b);
 extern int git_diff_delta__casecmp(const void *a, const void *b);

data/vendor/libgit2/src/diff_driver.c

@@ -9,13 +9,11 @@
 
 #include "git2/attr.h"
 
-#include "common.h"
 #include "diff.h"
 #include "strmap.h"
 #include "map.h"
 #include "buf_text.h"
 #include "config.h"
-#include "regexp.h"
 #include "repository.h"
 
 typedef enum {
@@ -26,7 +24,7 @@ typedef enum {
 } git_diff_driver_t;
 
 typedef struct {
-	git_regexp re;
+	regex_t re;
 	int flags;
 } git_diff_driver_pattern;
 
@@ -40,7 +38,7 @@ struct git_diff_driver {
 	uint32_t binary_flags;
 	uint32_t other_flags;
 	git_array_t(git_diff_driver_pattern) fn_patterns;
-	git_regexp  word_pattern;
+	regex_t  word_pattern;
 	char name[GIT_FLEX_ARRAY];
 };
 
@@ -65,7 +63,7 @@ git_diff_driver_registry *git_diff_driver_registry_new(void)
 	if (!reg)
 		return NULL;
 
-	if (git_strmap_new(&reg->drivers) < 0) {
+	if (git_strmap_alloc(&reg->drivers) < 0) {
 		git_diff_driver_registry_free(reg);
 		return NULL;
 	}
@@ -114,7 +112,7 @@ static int diff_driver_add_patterns(
 		if (error < 0)
 			break;
 
-		if ((error = git_regexp_compile(&pat->re, buf.ptr, regex_flags)) != 0) {
+		if ((error = p_regcomp(&pat->re, buf.ptr, regex_flags)) != 0) {
 			/*
 			 * TODO: issue a warning
 			 */
@@ -131,7 +129,7 @@ static int diff_driver_add_patterns(
 
 static int diff_driver_xfuncname(const git_config_entry *entry, void *payload)
 {
-	return diff_driver_add_patterns(payload, entry->value, 0);
+	return diff_driver_add_patterns(payload, entry->value, REG_EXTENDED);
 }
 
 static int diff_driver_funcname(const git_config_entry *entry, void *payload)
@@ -185,9 +183,9 @@ static int git_diff_driver_builtin(
 	git_diff_driver_registry *reg,
 	const char *driver_name)
 {
+	int error = 0;
 	git_diff_driver_definition *ddef = NULL;
 	git_diff_driver *drv = NULL;
-	int error = 0;
 	size_t idx;
 
 	for (idx = 0; idx < ARRAY_SIZE(builtin_defs); ++idx) {
@@ -206,15 +204,20 @@ static int git_diff_driver_builtin(
 
 	if (ddef->fns &&
 		(error = diff_driver_add_patterns(
-			drv, ddef->fns, ddef->flags)) < 0)
+			drv, ddef->fns, ddef->flags | REG_EXTENDED)) < 0)
 		goto done;
 
 	if (ddef->words &&
-	    (error = git_regexp_compile(&drv->word_pattern, ddef->words, ddef->flags)) < 0)
+		(error = p_regcomp(
+			&drv->word_pattern, ddef->words, ddef->flags | REG_EXTENDED)))
+	{
+		error = git_error_set_regex(&drv->word_pattern, error);
 		goto done;
+	}
 
-	if ((error = git_strmap_set(reg->drivers, drv->name, drv)) < 0)
-		goto done;
+	git_strmap_insert(reg->drivers, drv->name, drv, &error);
+	if (error > 0)
+		error = 0;
 
 done:
 	if (error && drv)
@@ -230,8 +233,8 @@ static int git_diff_driver_load(
 {
 	int error = 0;
 	git_diff_driver_registry *reg;
-	git_diff_driver *drv;
-	size_t namelen;
+	git_diff_driver *drv = NULL;
+	size_t namelen, pos;
 	git_config *cfg = NULL;
 	git_buf name = GIT_BUF_INIT;
 	git_config_entry *ce = NULL;
@@ -240,8 +243,9 @@ static int git_diff_driver_load(
 	if ((reg = git_repository_driver_registry(repo)) == NULL)
 		return -1;
 
-	if ((drv = git_strmap_get(reg->drivers, driver_name)) != NULL) {
-		*out = drv;
+	pos = git_strmap_lookup_index(reg->drivers, driver_name);
+	if (git_strmap_valid_index(reg->drivers, pos)) {
+		*out = git_strmap_value_at(reg->drivers, pos);
 		return 0;
 	}
 
@@ -278,9 +282,7 @@ static int git_diff_driver_load(
 	/* TODO: warn if diff.<name>.command or diff.<name>.textconv are set */
 
 	git_buf_truncate(&name, namelen + strlen("diff.."));
-	if ((error = git_buf_PUTS(&name, "xfuncname")) < 0)
-		goto done;
-
+	git_buf_put(&name, "xfuncname", strlen("xfuncname"));
 	if ((error = git_config_get_multivar_foreach(
 			cfg, name.ptr, NULL, diff_driver_xfuncname, drv)) < 0) {
 		if (error != GIT_ENOTFOUND)
@@ -289,9 +291,7 @@ static int git_diff_driver_load(
 	}
 
 	git_buf_truncate(&name, namelen + strlen("diff.."));
-	if ((error = git_buf_PUTS(&name, "funcname")) < 0)
-		goto done;
-
+	git_buf_put(&name, "funcname", strlen("funcname"));
 	if ((error = git_config_get_multivar_foreach(
 			cfg, name.ptr, NULL, diff_driver_funcname, drv)) < 0) {
 		if (error != GIT_ENOTFOUND)
@@ -306,17 +306,16 @@ static int git_diff_driver_load(
 	}
 
 	git_buf_truncate(&name, namelen + strlen("diff.."));
-	if ((error = git_buf_PUTS(&name, "wordregex")) < 0)
-		goto done;
-
+	git_buf_put(&name, "wordregex", strlen("wordregex"));
 	if ((error = git_config__lookup_entry(&ce, cfg, name.ptr, false)) < 0)
 		goto done;
 	if (!ce || !ce->value)
 		/* no diff.<driver>.wordregex, so just continue */;
-	else if (!(error = git_regexp_compile(&drv->word_pattern, ce->value, 0)))
+	else if (!(error = p_regcomp(&drv->word_pattern, ce->value, REG_EXTENDED)))
 		found_driver = true;
 	else {
 		/* TODO: warn about bad regex instead of failure */
+		error = git_error_set_regex(&drv->word_pattern, error);
 		goto done;
 	}
 
@@ -329,8 +328,10 @@ static int git_diff_driver_load(
 		goto done;
 
 	/* store driver in registry */
-	if ((error = git_strmap_set(reg->drivers, drv->name, drv)) < 0)
+	git_strmap_insert(reg->drivers, drv->name, drv, &error);
+	if (error < 0)
 		goto done;
+	error = 0;
 
 	*out = drv;
 
@@ -367,11 +368,11 @@ int git_diff_driver_lookup(
 			attrsession, 0, path, 1, attrs)) < 0)
 		/* return error below */;
 
-	else if (GIT_ATTR_IS_UNSPECIFIED(values[0]))
+	else if (GIT_ATTR_UNSPECIFIED(values[0]))
 		/* just use the auto value */;
-	else if (GIT_ATTR_IS_FALSE(values[0]))
+	else if (GIT_ATTR_FALSE(values[0]))
 		*out = &global_drivers[DIFF_DRIVER_BINARY];
-	else if (GIT_ATTR_IS_TRUE(values[0]))
+	else if (GIT_ATTR_TRUE(values[0]))
 		*out = &global_drivers[DIFF_DRIVER_TEXT];
 
 	/* otherwise look for driver information in config and build driver */
@@ -396,10 +397,10 @@ void git_diff_driver_free(git_diff_driver *driver)
 		return;
 
 	for (i = 0; i < git_array_size(driver->fn_patterns); ++i)
-		git_regexp_dispose(& git_array_get(driver->fn_patterns, i)->re);
+		regfree(& git_array_get(driver->fn_patterns, i)->re);
 	git_array_clear(driver->fn_patterns);
 
-	git_regexp_dispose(&driver->word_pattern);
+	regfree(&driver->word_pattern);
 
 	git__free(driver);
 }
@@ -447,19 +448,19 @@ static int diff_context_line__pattern_match(
 	git_diff_driver *driver, git_buf *line)
 {
 	size_t i, maxi = git_array_size(driver->fn_patterns);
-	git_regmatch pmatch[2];
+	regmatch_t pmatch[2];
 
 	for (i = 0; i < maxi; ++i) {
 		git_diff_driver_pattern *pat = git_array_get(driver->fn_patterns, i);
 
-		if (!git_regexp_search(&pat->re, line->ptr, 2, pmatch)) {
+		if (!regexec(&pat->re, line->ptr, 2, pmatch, 0)) {
 			if (pat->flags & REG_NEGATE)
 				return false;
 
 			/* use pmatch data to trim line data */
-			i = (pmatch[1].start >= 0) ? 1 : 0;
-			git_buf_consume(line, git_buf_cstr(line) + pmatch[i].start);
-			git_buf_truncate(line, pmatch[i].end - pmatch[i].start);
+			i = (pmatch[1].rm_so >= 0) ? 1 : 0;
+			git_buf_consume(line, git_buf_cstr(line) + pmatch[i].rm_so);
+			git_buf_truncate(line, pmatch[i].rm_eo - pmatch[i].rm_so);
 			git_buf_rtrim(line);
 
 			return true;

data/vendor/libgit2/src/diff_file.c

@@ -12,7 +12,7 @@
 #include "diff.h"
 #include "diff_generate.h"
 #include "odb.h"
-#include "futils.h"
+#include "fileops.h"
 #include "filter.h"
 
 #define DIFF_MAX_FILESIZE 0x20000000
@@ -62,7 +62,7 @@ static int diff_file_content_init_common(
 	git_diff_driver_update_options(&fc->opts_flags, fc->driver);
 
 	/* make sure file is conceivable mmap-able */
-	if ((size_t)fc->file->size != fc->file->size)
+	if ((git_off_t)((size_t)fc->file->size) != fc->file->size)
 		fc->file->flags |= GIT_DIFF_FLAG_BINARY;
 	/* check if user is forcing text diff the file */
 	else if (fc->opts_flags & GIT_DIFF_FORCE_TEXT) {
@@ -232,7 +232,7 @@ static int diff_file_content_load_blob(
 	int error = 0;
 	git_odb_object *odb_obj = NULL;
 
-	if (git_oid_is_zero(&fc->file->id))
+	if (git_oid_iszero(&fc->file->id))
 		return 0;
 
 	if (fc->file->mode == GIT_FILEMODE_COMMIT)
@@ -290,8 +290,8 @@ static int diff_file_content_load_workdir_symlink(
 	ssize_t alloc_len, read_len;
 	int symlink_supported, error;
 
-	if ((error = git_repository__configmap_lookup(
-		&symlink_supported, fc->repo, GIT_CONFIGMAP_SYMLINKS)) < 0)
+	if ((error = git_repository__cvar(
+		&symlink_supported, fc->repo, GIT_CVAR_SYMLINKS)) < 0)
 		return -1;
 
 	if (!symlink_supported)
@@ -330,10 +330,8 @@ static int diff_file_content_load_workdir_file(
 	if (fd < 0)
 		return fd;
 
-	if (!fc->file->size)
-	    error = git_futils_filesize(&fc->file->size, fd);
-
-	if (error < 0 || !fc->file->size)
+	if (!fc->file->size &&
+		!(fc->file->size = git_futils_filesize(fd)))
 		goto cleanup;
 
 	if ((diff_opts->flags & GIT_DIFF_SHOW_BINARY) == 0 &&

data/vendor/libgit2/src/diff_file.h

@@ -20,7 +20,7 @@ typedef struct {
 	git_diff_driver *driver;
 	uint32_t flags;
 	uint32_t opts_flags;
-	git_object_size_t opts_max_size;
+	git_off_t opts_max_size;
 	git_iterator_type_t src;
 	const git_blob *blob;
 	git_map map;