rugged 0.28.4 → 0.28.4.1

data/vendor/libgit2/src/diff_generate.c

@@ -9,7 +9,7 @@
 
 #include "diff.h"
 #include "patch_generate.h"
-#include "futils.h"
+#include "fileops.h"
 #include "config.h"
 #include "attr_file.h"
 #include "filter.h"
@@ -179,7 +179,7 @@ static int diff_delta__from_one(
 
 	delta->old_file.flags |= GIT_DIFF_FLAG_VALID_ID;
 
-	if (has_old || !git_oid_is_zero(&delta->new_file.id))
+	if (has_old || !git_oid_iszero(&delta->new_file.id))
 		delta->new_file.flags |= GIT_DIFF_FLAG_VALID_ID;
 
 	return diff_insert_delta(diff, delta, matched_pathspec);
@@ -240,7 +240,7 @@ static int diff_delta__from_two(
 		delta->old_file.flags |= GIT_DIFF_FLAG_EXISTS;
 		delta->new_file.flags |= GIT_DIFF_FLAG_EXISTS;
 
-		if (!git_oid_is_zero(&new_entry->id))
+		if (!git_oid_iszero(&new_entry->id))
 			delta->new_file.flags |= GIT_DIFF_FLAG_VALID_ID;
 	}
 
@@ -472,17 +472,17 @@ static int diff_generated_apply_options(
 	if ((val = git_repository_config_snapshot(&cfg, repo)) < 0)
 		return val;
 
-	if (!git_config__configmap_lookup(&val, cfg, GIT_CONFIGMAP_SYMLINKS) && val)
+	if (!git_config__cvar(&val, cfg, GIT_CVAR_SYMLINKS) && val)
 		diff->diffcaps |= GIT_DIFFCAPS_HAS_SYMLINKS;
 
-	if (!git_config__configmap_lookup(&val, cfg, GIT_CONFIGMAP_IGNORESTAT) && val)
+	if (!git_config__cvar(&val, cfg, GIT_CVAR_IGNORESTAT) && val)
 		diff->diffcaps |= GIT_DIFFCAPS_IGNORE_STAT;
 
 	if ((diff->base.opts.flags & GIT_DIFF_IGNORE_FILEMODE) == 0 &&
-		!git_config__configmap_lookup(&val, cfg, GIT_CONFIGMAP_FILEMODE) && val)
+		!git_config__cvar(&val, cfg, GIT_CVAR_FILEMODE) && val)
 		diff->diffcaps |= GIT_DIFFCAPS_TRUST_MODE_BITS;
 
-	if (!git_config__configmap_lookup(&val, cfg, GIT_CONFIGMAP_TRUSTCTIME) && val)
+	if (!git_config__cvar(&val, cfg, GIT_CVAR_TRUSTCTIME) && val)
 		diff->diffcaps |= GIT_DIFFCAPS_TRUST_CTIME;
 
 	/* Don't set GIT_DIFFCAPS_USE_DEV - compile time option in core git */
@@ -560,11 +560,11 @@ int git_diff__oid_for_file(
 	git_diff *diff,
 	const char *path,
 	uint16_t mode,
-	git_object_size_t size)
+	git_off_t size)
 {
 	git_index_entry entry;
 
-	if (size > UINT32_MAX) {
+	if (size < 0 || size > UINT32_MAX) {
 		git_error_set(GIT_ERROR_NOMEMORY, "file size overflow (for 32-bits) on '%s'", path);
 		return -1;
 	}
@@ -797,13 +797,13 @@ static int maybe_modified(
 	/* if oids and modes match (and are valid), then file is unmodified */
 	} else if (git_oid_equal(&oitem->id, &nitem->id) &&
 			 omode == nmode &&
-			 !git_oid_is_zero(&oitem->id)) {
+			 !git_oid_iszero(&oitem->id)) {
 		status = GIT_DELTA_UNMODIFIED;
 
 	/* if we have an unknown OID and a workdir iterator, then check some
 	 * circumstances that can accelerate things or need special handling
 	 */
-	} else if (git_oid_is_zero(&nitem->id) && new_is_workdir) {
+	} else if (git_oid_iszero(&nitem->id) && new_is_workdir) {
 		bool use_ctime =
 			((diff->diffcaps & GIT_DIFFCAPS_TRUST_CTIME) != 0);
 		git_index *index = git_iterator_index(info->new_iter);
@@ -843,7 +843,7 @@ static int maybe_modified(
 	/* if we got here and decided that the files are modified, but we
 	 * haven't calculated the OID of the new item, then calculate it now
 	 */
-	if (modified_uncertain && git_oid_is_zero(&nitem->id)) {
+	if (modified_uncertain && git_oid_iszero(&nitem->id)) {
 		const git_oid *update_check =
 			DIFF_FLAG_IS_SET(diff, GIT_DIFF_UPDATE_INDEX) && omode == nmode ?
 			&oitem->id : NULL;
@@ -877,7 +877,7 @@ static int maybe_modified(
 
 	return diff_delta__from_two(
 		diff, status, oitem, omode, nitem, nmode,
-		git_oid_is_zero(&noid) ? NULL : &noid, matched_pathspec);
+		git_oid_iszero(&noid) ? NULL : &noid, matched_pathspec);
 }
 
 static bool entry_is_prefixed(
@@ -1262,31 +1262,29 @@ cleanup:
 	return error;
 }
 
-static int diff_prepare_iterator_opts(char **prefix, git_iterator_options *a, int aflags,
-		git_iterator_options *b, int bflags,
-		const git_diff_options *opts)
-{
-	GIT_ERROR_CHECK_VERSION(opts, GIT_DIFF_OPTIONS_VERSION, "git_diff_options");
-
-	*prefix = NULL;
-
-	if (opts && (opts->flags & GIT_DIFF_DISABLE_PATHSPEC_MATCH)) {
-		a->pathlist.strings = opts->pathspec.strings;
-		a->pathlist.count = opts->pathspec.count;
-		b->pathlist.strings = opts->pathspec.strings;
-		b->pathlist.count = opts->pathspec.count;
-	} else if (opts) {
-		*prefix = git_pathspec_prefix(&opts->pathspec);
-		GIT_ERROR_CHECK_ALLOC(prefix);
-	}
-
-	a->flags = aflags;
-	b->flags = bflags;
-	a->start = b->start = *prefix;
-	a->end = b->end = *prefix;
-
-	return 0;
-}
+#define DIFF_FROM_ITERATORS(MAKE_FIRST, FLAGS_FIRST, MAKE_SECOND, FLAGS_SECOND) do { \
+	git_iterator *a = NULL, *b = NULL; \
+	char *pfx = (opts && !(opts->flags & GIT_DIFF_DISABLE_PATHSPEC_MATCH)) ? \
+		git_pathspec_prefix(&opts->pathspec) : NULL; \
+	git_iterator_options a_opts = GIT_ITERATOR_OPTIONS_INIT, \
+		b_opts = GIT_ITERATOR_OPTIONS_INIT; \
+	a_opts.flags = FLAGS_FIRST; \
+	a_opts.start = pfx; \
+	a_opts.end = pfx; \
+	b_opts.flags = FLAGS_SECOND; \
+	b_opts.start = pfx; \
+	b_opts.end = pfx; \
+	GIT_ERROR_CHECK_VERSION(opts, GIT_DIFF_OPTIONS_VERSION, "git_diff_options"); \
+	if (opts && (opts->flags & GIT_DIFF_DISABLE_PATHSPEC_MATCH)) { \
+		a_opts.pathlist.strings = opts->pathspec.strings; \
+		a_opts.pathlist.count = opts->pathspec.count; \
+		b_opts.pathlist.strings = opts->pathspec.strings; \
+		b_opts.pathlist.count = opts->pathspec.count; \
+	} \
+	if (!error && !(error = MAKE_FIRST) && !(error = MAKE_SECOND)) \
+		error = git_diff__from_iterators(&diff, repo, a, b, opts); \
+	git__free(pfx); git_iterator_free(a); git_iterator_free(b); \
+} while (0)
 
 int git_diff_tree_to_tree(
 	git_diff **out,
@@ -1295,12 +1293,8 @@ int git_diff_tree_to_tree(
 	git_tree *new_tree,
 	const git_diff_options *opts)
 {
-	git_iterator_flag_t iflag = GIT_ITERATOR_DONT_IGNORE_CASE;
-	git_iterator_options a_opts = GIT_ITERATOR_OPTIONS_INIT,
-		b_opts = GIT_ITERATOR_OPTIONS_INIT;
-	git_iterator *a = NULL, *b = NULL;
 	git_diff *diff = NULL;
-	char *prefix = NULL;
+	git_iterator_flag_t iflag = GIT_ITERATOR_DONT_IGNORE_CASE;
 	int error = 0;
 
 	assert(out && repo);
@@ -1314,19 +1308,13 @@ int git_diff_tree_to_tree(
 	if (opts && (opts->flags & GIT_DIFF_IGNORE_CASE) != 0)
 		iflag = GIT_ITERATOR_IGNORE_CASE;
 
-	if ((error = diff_prepare_iterator_opts(&prefix, &a_opts, iflag, &b_opts, iflag, opts)) < 0 ||
-	    (error = git_iterator_for_tree(&a, old_tree, &a_opts)) < 0 ||
-	    (error = git_iterator_for_tree(&b, new_tree, &b_opts)) < 0 ||
-	    (error = git_diff__from_iterators(&diff, repo, a, b, opts)) < 0)
-		goto out;
+	DIFF_FROM_ITERATORS(
+		git_iterator_for_tree(&a, old_tree, &a_opts), iflag,
+		git_iterator_for_tree(&b, new_tree, &b_opts), iflag
+	);
 
-	*out = diff;
-	diff = NULL;
-out:
-	git_iterator_free(a);
-	git_iterator_free(b);
-	git_diff_free(diff);
-	git__free(prefix);
+	if (!error)
+		*out = diff;
 
 	return error;
 }
@@ -1349,13 +1337,9 @@ int git_diff_tree_to_index(
 	git_index *index,
 	const git_diff_options *opts)
 {
+	git_diff *diff = NULL;
 	git_iterator_flag_t iflag = GIT_ITERATOR_DONT_IGNORE_CASE |
 		GIT_ITERATOR_INCLUDE_CONFLICTS;
-	git_iterator_options a_opts = GIT_ITERATOR_OPTIONS_INIT,
-		b_opts = GIT_ITERATOR_OPTIONS_INIT;
-	git_iterator *a = NULL, *b = NULL;
-	git_diff *diff = NULL;
-	char *prefix = NULL;
 	bool index_ignore_case = false;
 	int error = 0;
 
@@ -1368,23 +1352,17 @@ int git_diff_tree_to_index(
 
 	index_ignore_case = index->ignore_case;
 
-	if ((error = diff_prepare_iterator_opts(&prefix, &a_opts, iflag, &b_opts, iflag, opts)) < 0 ||
-	    (error = git_iterator_for_tree(&a, old_tree, &a_opts)) < 0 ||
-	    (error = git_iterator_for_index(&b, repo, index, &b_opts)) < 0 ||
-	    (error = git_diff__from_iterators(&diff, repo, a, b, opts)) < 0)
-		goto out;
+	DIFF_FROM_ITERATORS(
+		git_iterator_for_tree(&a, old_tree, &a_opts), iflag,
+		git_iterator_for_index(&b, repo, index, &b_opts), iflag
+	);
 
 	/* if index is in case-insensitive order, re-sort deltas to match */
-	if (index_ignore_case)
+	if (!error && index_ignore_case)
 		git_diff__set_ignore_case(diff, true);
 
-	*out = diff;
-	diff = NULL;
-out:
-	git_iterator_free(a);
-	git_iterator_free(b);
-	git_diff_free(diff);
-	git__free(prefix);
+	if (!error)
+		*out = diff;
 
 	return error;
 }
@@ -1395,11 +1373,7 @@ int git_diff_index_to_workdir(
 	git_index *index,
 	const git_diff_options *opts)
 {
-	git_iterator_options a_opts = GIT_ITERATOR_OPTIONS_INIT,
-		b_opts = GIT_ITERATOR_OPTIONS_INIT;
-	git_iterator *a = NULL, *b = NULL;
 	git_diff *diff = NULL;
-	char *prefix = NULL;
 	int error = 0;
 
 	assert(out && repo);
@@ -1409,24 +1383,20 @@ int git_diff_index_to_workdir(
 	if (!index && (error = diff_load_index(&index, repo)) < 0)
 		return error;
 
-	if ((error = diff_prepare_iterator_opts(&prefix, &a_opts, GIT_ITERATOR_INCLUDE_CONFLICTS,
-						&b_opts, GIT_ITERATOR_DONT_AUTOEXPAND, opts)) < 0 ||
-	    (error = git_iterator_for_index(&a, repo, index, &a_opts)) < 0 ||
-	    (error = git_iterator_for_workdir(&b, repo, index, NULL, &b_opts)) < 0 ||
-	    (error = git_diff__from_iterators(&diff, repo, a, b, opts)) < 0)
-		goto out;
-
-	if ((diff->opts.flags & GIT_DIFF_UPDATE_INDEX) && ((git_diff_generated *)diff)->index_updated)
-		if ((error = git_index_write(index)) < 0)
-			goto out;
-
-	*out = diff;
-	diff = NULL;
-out:
-	git_iterator_free(a);
-	git_iterator_free(b);
-	git_diff_free(diff);
-	git__free(prefix);
+	DIFF_FROM_ITERATORS(
+		git_iterator_for_index(&a, repo, index, &a_opts),
+		GIT_ITERATOR_INCLUDE_CONFLICTS,
+
+		git_iterator_for_workdir(&b, repo, index, NULL, &b_opts),
+		GIT_ITERATOR_DONT_AUTOEXPAND
+	);
+
+	if (!error && (diff->opts.flags & GIT_DIFF_UPDATE_INDEX) != 0 &&
+		((git_diff_generated *)diff)->index_updated)
+		error = git_index_write(index);
+
+	if (!error)
+		*out = diff;
 
 	return error;
 }
@@ -1437,33 +1407,24 @@ int git_diff_tree_to_workdir(
 	git_tree *old_tree,
 	const git_diff_options *opts)
 {
-	git_iterator_options a_opts = GIT_ITERATOR_OPTIONS_INIT,
-		b_opts = GIT_ITERATOR_OPTIONS_INIT;
-	git_iterator *a = NULL, *b = NULL;
 	git_diff *diff = NULL;
-	char *prefix = NULL;
 	git_index *index;
-	int error;
+	int error = 0;
 
 	assert(out && repo);
 
 	*out = NULL;
 
-	if ((error = diff_prepare_iterator_opts(&prefix, &a_opts, 0,
-						&b_opts, GIT_ITERATOR_DONT_AUTOEXPAND, opts) < 0) ||
-	    (error = git_repository_index__weakptr(&index, repo)) < 0 ||
-	    (error = git_iterator_for_tree(&a, old_tree, &a_opts)) < 0 ||
-	    (error = git_iterator_for_workdir(&b, repo, index, old_tree, &b_opts)) < 0 ||
-	    (error = git_diff__from_iterators(&diff, repo, a, b, opts)) < 0)
-		goto out;
-
-	*out = diff;
-	diff = NULL;
-out:
-	git_iterator_free(a);
-	git_iterator_free(b);
-	git_diff_free(diff);
-	git__free(prefix);
+	if ((error = git_repository_index__weakptr(&index, repo)))
+		return error;
+
+	DIFF_FROM_ITERATORS(
+		git_iterator_for_tree(&a, old_tree, &a_opts), 0,
+		git_iterator_for_workdir(&b, repo, index, old_tree, &b_opts), GIT_ITERATOR_DONT_AUTOEXPAND
+	);
+
+	if (!error)
+		*out = diff;
 
 	return error;
 }
@@ -1507,35 +1468,24 @@ int git_diff_index_to_index(
 	git_index *new_index,
 	const git_diff_options *opts)
 {
-	git_iterator_options a_opts = GIT_ITERATOR_OPTIONS_INIT,
-		b_opts = GIT_ITERATOR_OPTIONS_INIT;
-	git_iterator *a = NULL, *b = NULL;
-	git_diff *diff = NULL;
-	char *prefix = NULL;
-	int error;
+	git_diff *diff;
+	int error = 0;
 
 	assert(out && old_index && new_index);
 
 	*out = NULL;
 
-	if ((error = diff_prepare_iterator_opts(&prefix, &a_opts, GIT_ITERATOR_DONT_IGNORE_CASE,
-						&b_opts, GIT_ITERATOR_DONT_IGNORE_CASE, opts) < 0) ||
-	    (error = git_iterator_for_index(&a, repo, old_index, &a_opts)) < 0 ||
-	    (error = git_iterator_for_index(&b, repo, new_index, &b_opts)) < 0 ||
-	    (error = git_diff__from_iterators(&diff, repo, a, b, opts)) < 0)
-		goto out;
+	DIFF_FROM_ITERATORS(
+		git_iterator_for_index(&a, repo, old_index, &a_opts), GIT_ITERATOR_DONT_IGNORE_CASE,
+		git_iterator_for_index(&b, repo, new_index, &b_opts), GIT_ITERATOR_DONT_IGNORE_CASE
+	);
 
 	/* if index is in case-insensitive order, re-sort deltas to match */
-	if (old_index->ignore_case || new_index->ignore_case)
+	if (!error && (old_index->ignore_case || new_index->ignore_case))
 		git_diff__set_ignore_case(diff, true);
 
-	*out = diff;
-	diff = NULL;
-out:
-	git_iterator_free(a);
-	git_iterator_free(b);
-	git_diff_free(diff);
-	git__free(prefix);
+	if (!error)
+		*out = diff;
 
 	return error;
 }

data/vendor/libgit2/src/diff_generate.h

@@ -88,7 +88,7 @@ extern int git_diff__oid_for_file(
 	git_diff *diff,
 	const char *path,
 	uint16_t mode,
-	git_object_size_t size);
+	git_off_t size);
 
 extern int git_diff__oid_for_entry(
 	git_oid *out,
@@ -120,7 +120,7 @@ GIT_INLINE(int) git_diff_file__resolve_zero_size(
 	git_odb_free(odb);
 
 	if (!error)
-		file->size = (git_object_size_t)len;
+		file->size = (git_off_t)len;
 
 	return error;
 }

data/vendor/libgit2/src/diff_parse.c

@@ -45,7 +45,7 @@ static git_diff_parsed *diff_parsed_alloc(void)
 	diff->base.patch_fn = git_patch_parsed_from_diff;
 	diff->base.free_fn = diff_parsed_free;
 
-	if (git_diff_options_init(&diff->base.opts, GIT_DIFF_OPTIONS_VERSION) < 0) {
+	if (git_diff_init_options(&diff->base.opts, GIT_DIFF_OPTIONS_VERSION) < 0) {
 		git__free(diff);
 		return NULL;
 	}

data/vendor/libgit2/src/diff_print.c

@@ -10,7 +10,7 @@
 #include "diff.h"
 #include "diff_file.h"
 #include "patch_generate.h"
-#include "futils.h"
+#include "fileops.h"
 #include "zstream.h"
 #include "blob.h"
 #include "delta.h"
@@ -48,7 +48,7 @@ static int diff_print_info_init__common(
 	if (!pi->id_strlen) {
 		if (!repo)
 			pi->id_strlen = GIT_ABBREV_DEFAULT;
-		else if (git_repository__configmap_lookup(&pi->id_strlen, repo, GIT_CONFIGMAP_ABBREV) < 0)
+		else if (git_repository__cvar(&pi->id_strlen, repo, GIT_CVAR_ABBREV) < 0)
 			return -1;
 	}
 
@@ -269,8 +269,7 @@ static int diff_print_modes(
 }
 
 static int diff_print_oid_range(
-	git_buf *out, const git_diff_delta *delta, int id_strlen,
-	bool print_index)
+	git_buf *out, const git_diff_delta *delta, int id_strlen)
 {
 	char start_oid[GIT_OID_HEXSZ+1], end_oid[GIT_OID_HEXSZ+1];
 
@@ -294,9 +293,8 @@ static int diff_print_oid_range(
 	git_oid_tostr(end_oid, id_strlen + 1, &delta->new_file.id);
 
 	if (delta->old_file.mode == delta->new_file.mode) {
-		if (print_index)
-			git_buf_printf(out, "index %s..%s %o\n",
-				start_oid, end_oid, delta->old_file.mode);
+		git_buf_printf(out, "index %s..%s %o\n",
+			start_oid, end_oid, delta->old_file.mode);
 	} else {
 		if (delta->old_file.mode == 0)
 			git_buf_printf(out, "new file mode %o\n", delta->new_file.mode);
@@ -305,8 +303,7 @@ static int diff_print_oid_range(
 		else
 			diff_print_modes(out, delta);
 
-		if (print_index)
-			git_buf_printf(out, "index %s..%s\n", start_oid, end_oid);
+		git_buf_printf(out, "index %s..%s\n", start_oid, end_oid);
 	}
 
 	return git_buf_oom(out) ? -1 : 0;
@@ -328,10 +325,10 @@ static int diff_delta_format_with_paths(
 	const char *oldpath,
 	const char *newpath)
 {
-	if (git_oid_is_zero(&delta->old_file.id))
+	if (git_oid_iszero(&delta->old_file.id))
 		oldpath = "/dev/null";
 
-	if (git_oid_is_zero(&delta->new_file.id))
+	if (git_oid_iszero(&delta->new_file.id))
 		newpath = "/dev/null";
 
 	return git_buf_printf(out, template, oldpath, newpath);
@@ -384,8 +381,8 @@ done:
 
 static bool delta_is_unchanged(const git_diff_delta *delta)
 {
-	if (git_oid_is_zero(&delta->old_file.id) &&
-		git_oid_is_zero(&delta->new_file.id))
+	if (git_oid_iszero(&delta->old_file.id) &&
+		git_oid_iszero(&delta->new_file.id))
 		return true;
 
 	if (delta->old_file.mode == GIT_FILEMODE_COMMIT ||
@@ -403,8 +400,7 @@ int git_diff_delta__format_file_header(
 	const git_diff_delta *delta,
 	const char *oldpfx,
 	const char *newpfx,
-	int id_strlen,
-	bool print_index)
+	int id_strlen)
 {
 	git_buf old_path = GIT_BUF_INIT, new_path = GIT_BUF_INIT;
 	bool unchanged = delta_is_unchanged(delta);
@@ -435,8 +431,7 @@ int git_diff_delta__format_file_header(
 	}
 
 	if (!unchanged) {
-		if ((error = diff_print_oid_range(out, delta,
-						  id_strlen, print_index)) < 0)
+		if ((error = diff_print_oid_range(out, delta, id_strlen)) < 0)
 			goto done;
 
 		if ((delta->flags & GIT_DIFF_FLAG_BINARY) == 0)
@@ -571,7 +566,6 @@ static int diff_print_patch_file(
 		(pi->flags & GIT_DIFF_FORCE_BINARY);
 	bool show_binary = !!(pi->flags & GIT_DIFF_SHOW_BINARY);
 	int id_strlen = pi->id_strlen;
-	bool print_index = (pi->format != GIT_DIFF_FORMAT_PATCH_ID);
 
 	if (binary && show_binary)
 		id_strlen = delta->old_file.id_abbrev ? delta->old_file.id_abbrev :
@@ -588,8 +582,7 @@ static int diff_print_patch_file(
 		return 0;
 
 	if ((error = git_diff_delta__format_file_header(
-			pi->buf, delta, oldpfx, newpfx,
-			id_strlen, print_index)) < 0)
+			pi->buf, delta, oldpfx, newpfx, id_strlen)) < 0)
 		return error;
 
 	pi->line.origin      = GIT_DIFF_LINE_FILE_HDR;
@@ -677,11 +670,6 @@ int git_diff_print(
 		print_hunk = diff_print_patch_hunk;
 		print_line = diff_print_patch_line;
 		break;
-	case GIT_DIFF_FORMAT_PATCH_ID:
-		print_file = diff_print_patch_file;
-		print_binary = diff_print_patch_binary;
-		print_line = diff_print_patch_line;
-		break;
 	case GIT_DIFF_FORMAT_PATCH_HEADER:
 		print_file = diff_print_patch_file;
 		break;