rugged 1.3.1 → 1.9.0

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

@@ -5,8 +5,10 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 
-#include "common.h"
+#include "diff_stats.h"
 
+#include "buf.h"
+#include "common.h"
 #include "vector.h"
 #include "diff.h"
 #include "patch_generate.h"
@@ -47,7 +49,7 @@ static int digits_for_value(size_t val)
 }
 
 static int diff_file_stats_full_to_buf(
-	git_buf *out,
+	git_str *out,
 	const git_diff_delta *delta,
 	const diff_file_stats *filestat,
 	const git_diff_stats *stats,
@@ -68,14 +70,14 @@ static int diff_file_stats_full_to_buf(
 
 		padding = stats->max_name - strlen(old_path) - strlen(new_path);
 
-		if ((common_dirlen = git_path_common_dirlen(old_path, new_path)) &&
+		if ((common_dirlen = git_fs_path_common_dirlen(old_path, new_path)) &&
 		    common_dirlen <= INT_MAX) {
-			error = git_buf_printf(out, " %.*s{%s"DIFF_RENAME_FILE_SEPARATOR"%s}",
+			error = git_str_printf(out, " %.*s{%s"DIFF_RENAME_FILE_SEPARATOR"%s}",
 					       (int) common_dirlen, old_path,
 					       old_path + common_dirlen,
 					       new_path + common_dirlen);
 		} else {
-			error = git_buf_printf(out, " %s" DIFF_RENAME_FILE_SEPARATOR "%s",
+			error = git_str_printf(out, " %s" DIFF_RENAME_FILE_SEPARATOR "%s",
 					       old_path, new_path);
 		}
 
@@ -83,7 +85,7 @@ static int diff_file_stats_full_to_buf(
 			goto on_error;
 	} else {
 		adddel_path = new_path ? new_path : old_path;
-		if (git_buf_printf(out, " %s", adddel_path) < 0)
+		if (git_str_printf(out, " %s", adddel_path) < 0)
 			goto on_error;
 
 		padding = stats->max_name - strlen(adddel_path);
@@ -92,28 +94,28 @@ static int diff_file_stats_full_to_buf(
 			padding += strlen(DIFF_RENAME_FILE_SEPARATOR);
 	}
 
-	if (git_buf_putcn(out, ' ', padding) < 0 ||
-		git_buf_puts(out, " | ") < 0)
+	if (git_str_putcn(out, ' ', padding) < 0 ||
+		git_str_puts(out, " | ") < 0)
 		goto on_error;
 
 	if (delta->flags & GIT_DIFF_FLAG_BINARY) {
-		if (git_buf_printf(out,
+		if (git_str_printf(out,
 				"Bin %" PRId64 " -> %" PRId64 " bytes", old_size, new_size) < 0)
 			goto on_error;
 	}
 	else {
-		if (git_buf_printf(out,
+		if (git_str_printf(out,
 				"%*" PRIuZ, stats->max_digits,
 				filestat->insertions + filestat->deletions) < 0)
 			goto on_error;
 
 		if (filestat->insertions || filestat->deletions) {
-			if (git_buf_putc(out, ' ') < 0)
+			if (git_str_putc(out, ' ') < 0)
 				goto on_error;
 
 			if (!width) {
-				if (git_buf_putcn(out, '+', filestat->insertions) < 0 ||
-					git_buf_putcn(out, '-', filestat->deletions) < 0)
+				if (git_str_putcn(out, '+', filestat->insertions) < 0 ||
+					git_str_putcn(out, '-', filestat->deletions) < 0)
 					goto on_error;
 			} else {
 				size_t total = filestat->insertions + filestat->deletions;
@@ -122,21 +124,21 @@ static int diff_file_stats_full_to_buf(
 				size_t plus = full * filestat->insertions / total;
 				size_t minus = full - plus;
 
-				if (git_buf_putcn(out, '+', max(plus,  1)) < 0 ||
-					git_buf_putcn(out, '-', max(minus, 1)) < 0)
+				if (git_str_putcn(out, '+', max(plus,  1)) < 0 ||
+					git_str_putcn(out, '-', max(minus, 1)) < 0)
 					goto on_error;
 			}
 		}
 	}
 
-	git_buf_putc(out, '\n');
+	git_str_putc(out, '\n');
 
 on_error:
-	return (git_buf_oom(out) ? -1 : 0);
+	return (git_str_oom(out) ? -1 : 0);
 }
 
 static int diff_file_stats_number_to_buf(
-	git_buf *out,
+	git_str *out,
 	const git_diff_delta *delta,
 	const diff_file_stats *filestats)
 {
@@ -144,29 +146,29 @@ static int diff_file_stats_number_to_buf(
 	const char *path = delta->new_file.path;
 
 	if (delta->flags & GIT_DIFF_FLAG_BINARY)
-		error = git_buf_printf(out, "%-8c" "%-8c" "%s\n", '-', '-', path);
+		error = git_str_printf(out, "%-8c" "%-8c" "%s\n", '-', '-', path);
 	else
-		error = git_buf_printf(out, "%-8" PRIuZ "%-8" PRIuZ "%s\n",
+		error = git_str_printf(out, "%-8" PRIuZ "%-8" PRIuZ "%s\n",
 			filestats->insertions, filestats->deletions, path);
 
 	return error;
 }
 
 static int diff_file_stats_summary_to_buf(
-	git_buf *out,
+	git_str *out,
 	const git_diff_delta *delta)
 {
 	if (delta->old_file.mode != delta->new_file.mode) {
 		if (delta->old_file.mode == 0) {
-			git_buf_printf(out, " create mode %06o %s\n",
+			git_str_printf(out, " create mode %06o %s\n",
 				delta->new_file.mode, delta->new_file.path);
 		}
 		else if (delta->new_file.mode == 0) {
-			git_buf_printf(out, " delete mode %06o %s\n",
+			git_str_printf(out, " delete mode %06o %s\n",
 				delta->old_file.mode, delta->old_file.path);
 		}
 		else {
-			git_buf_printf(out, " mode change %06o => %06o %s\n",
+			git_str_printf(out, " mode change %06o => %06o %s\n",
 				delta->old_file.mode, delta->new_file.mode, delta->new_file.path);
 		}
 	}
@@ -278,6 +280,15 @@ int git_diff_stats_to_buf(
 	const git_diff_stats *stats,
 	git_diff_stats_format_t format,
 	size_t width)
+{
+	GIT_BUF_WRAP_PRIVATE(out, git_diff__stats_to_buf, stats, format, width);
+}
+
+int git_diff__stats_to_buf(
+	git_str *out,
+	const git_diff_stats *stats,
+	git_diff_stats_format_t format,
+	size_t width)
 {
 	int error = 0;
 	size_t i;
@@ -320,23 +331,23 @@ int git_diff_stats_to_buf(
 	}
 
 	if (format & GIT_DIFF_STATS_FULL || format & GIT_DIFF_STATS_SHORT) {
-		git_buf_printf(
+		git_str_printf(
 			out, " %" PRIuZ " file%s changed",
 			stats->files_changed, stats->files_changed != 1 ? "s" : "");
 
 		if (stats->insertions || stats->deletions == 0)
-			git_buf_printf(
+			git_str_printf(
 				out, ", %" PRIuZ " insertion%s(+)",
 				stats->insertions, stats->insertions != 1 ? "s" : "");
 
 		if (stats->deletions || stats->insertions == 0)
-			git_buf_printf(
+			git_str_printf(
 				out, ", %" PRIuZ " deletion%s(-)",
 				stats->deletions, stats->deletions != 1 ? "s" : "");
 
-		git_buf_putc(out, '\n');
+		git_str_putc(out, '\n');
 
-		if (git_buf_oom(out))
+		if (git_str_oom(out))
 			return -1;
 	}
 

data/vendor/libgit2/src/libgit2/diff_stats.h

@@ -0,0 +1,18 @@
+/*
+ * 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_diff_stats_h__
+#define INCLUDE_diff_stats_h__
+
+#include "common.h"
+
+int git_diff__stats_to_buf(
+	git_str *out,
+	const git_diff_stats *stats,
+	git_diff_stats_format_t format,
+	size_t width);
+
+#endif

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

@@ -13,7 +13,7 @@
 
 #include "diff.h"
 #include "diff_generate.h"
-#include "path.h"
+#include "fs_path.h"
 #include "futils.h"
 #include "config.h"
 
@@ -190,7 +190,7 @@ int git_diff__merge(
 			git_pool_strdup_safe(&onto->pool, onto->opts.new_prefix);
 	}
 
-	git_vector_free_deep(&onto_new);
+	git_vector_dispose_deep(&onto_new);
 	git_pool_clear(&onto_pool);
 
 	return error;
@@ -241,7 +241,7 @@ int git_diff_find_similar__calc_similarity(
 
 #define DEFAULT_THRESHOLD 50
 #define DEFAULT_BREAK_REWRITE_THRESHOLD 60
-#define DEFAULT_RENAME_LIMIT 200
+#define DEFAULT_RENAME_LIMIT 1000
 
 static int normalize_find_opts(
 	git_diff *diff,
@@ -364,6 +364,7 @@ static int insert_delete_side_of_split(
 	memset(&deleted->new_file, 0, sizeof(deleted->new_file));
 	deleted->new_file.path = deleted->old_file.path;
 	deleted->new_file.flags |= GIT_DIFF_FLAG_VALID_ID;
+	git_oid_clear(&deleted->new_file.id, diff->opts.oid_type);
 
 	return git_vector_insert(onto, deleted);
 }
@@ -375,7 +376,7 @@ static int apply_splits_and_deletes(
 	size_t i;
 	git_diff_delta *delta;
 
-	if (git_vector_init(&onto, expected_size, git_diff_delta__cmp) < 0)
+	if (git_vector_init(&onto, expected_size, diff->deltas._cmp) < 0)
 		return -1;
 
 	/* build new delta list without TO_DELETE and splitting TO_SPLIT */
@@ -397,6 +398,7 @@ static int apply_splits_and_deletes(
 			memset(&delta->old_file, 0, sizeof(delta->old_file));
 			delta->old_file.path = delta->new_file.path;
 			delta->old_file.flags |= GIT_DIFF_FLAG_VALID_ID;
+			git_oid_clear(&delta->old_file.id, diff->opts.oid_type);
 		}
 
 		/* clean up delta before inserting into new list */
@@ -422,13 +424,13 @@ static int apply_splits_and_deletes(
 
 	/* swap new delta list into place */
 	git_vector_swap(&diff->deltas, &onto);
-	git_vector_free(&onto);
+	git_vector_dispose(&onto);
 	git_vector_sort(&diff->deltas);
 
 	return 0;
 
 on_error:
-	git_vector_free_deep(&onto);
+	git_vector_dispose_deep(&onto);
 
 	return -1;
 }
@@ -444,7 +446,7 @@ typedef struct {
 	git_iterator_t src;
 	git_repository *repo;
 	git_diff_file *file;
-	git_buf data;
+	git_str data;
 	git_odb_object *odb_obj;
 	git_blob *blob;
 } similarity_info;
@@ -458,9 +460,10 @@ static int similarity_init(
 	info->file = similarity_get_file(diff, file_idx);
 	info->odb_obj = NULL;
 	info->blob = NULL;
-	git_buf_init(&info->data, 0);
+	git_str_init(&info->data, 0);
 
-	if (info->file->size > 0 || info->src == GIT_ITERATOR_WORKDIR)
+	if ((info->file->flags & GIT_DIFF_FLAG_VALID_SIZE) ||
+	    info->src == GIT_ITERATOR_WORKDIR)
 		return 0;
 
 	return git_diff_file__resolve_zero_size(
@@ -481,7 +484,7 @@ static int similarity_sig(
 			return error;
 
 		/* if path is not a regular file, just skip this item */
-		if (!git_path_isfile(info->data.ptr))
+		if (!git_fs_path_isfile(info->data.ptr))
 			return 0;
 
 		/* TODO: apply wd-to-odb filters to file data if necessary */
@@ -529,7 +532,7 @@ static void similarity_unload(similarity_info *info)
 	if (info->blob)
 		git_blob_free(info->blob);
 	else
-		git_buf_dispose(&info->data);
+		git_str_dispose(&info->data);
 }
 
 #define FLAG_SET(opts,flag_name) (((opts)->flags & flag_name) != 0)
@@ -650,6 +653,23 @@ static int calc_self_similarity(
 	return 0;
 }
 
+static void handle_non_blob(
+	git_diff *diff,
+	const git_diff_find_options *opts,
+	size_t delta_idx)
+{
+	git_diff_delta *delta = GIT_VECTOR_GET(&diff->deltas, delta_idx);
+
+	/* skip things that are blobs */
+	if (GIT_MODE_ISBLOB(delta->old_file.mode))
+		return;
+
+	/* honor "remove unmodified" flag for non-blobs (eg submodules) */
+	if (delta->status == GIT_DELTA_UNMODIFIED &&
+	    FLAG_SET(opts, GIT_DIFF_FIND_REMOVE_UNMODIFIED))
+		delta->flags |= GIT_DIFF_FLAG__TO_DELETE;
+}
+
 static bool is_rename_target(
 	git_diff *diff,
 	const git_diff_find_options *opts,
@@ -807,7 +827,8 @@ int git_diff_find_similar(
 	git_diff_find_options opts = GIT_DIFF_FIND_OPTIONS_INIT;
 	size_t num_deltas, num_srcs = 0, num_tgts = 0;
 	size_t tried_srcs = 0, tried_tgts = 0;
-	size_t num_rewrites = 0, num_updates = 0, num_bumped = 0;
+	size_t num_rewrites = 0, num_updates = 0, num_bumped = 0,
+	       num_to_delete = 0;
 	size_t sigcache_size;
 	void **sigcache = NULL; /* cache of similarity metric file signatures */
 	diff_find_match *tgt2src = NULL;
@@ -841,6 +862,8 @@ int git_diff_find_similar(
 	 * mark them for splitting if break-rewrites is enabled
 	 */
 	git_vector_foreach(&diff->deltas, t, tgt) {
+		handle_non_blob(diff, &opts, t);
+
 		if (is_rename_source(diff, &opts, t, sigcache))
 			++num_srcs;
 
@@ -849,11 +872,14 @@ int git_diff_find_similar(
 
 		if ((tgt->flags & GIT_DIFF_FLAG__TO_SPLIT) != 0)
 			num_rewrites++;
+
+		if ((tgt->flags & GIT_DIFF_FLAG__TO_DELETE) != 0)
+			num_to_delete++;
 	}
 
-	/* if there are no candidate srcs or tgts, we're done */
+	/* If there are no candidate srcs or tgts, no need to find matches */
 	if (!num_srcs || !num_tgts)
-		goto cleanup;
+		goto split_and_delete;
 
 	src2tgt = git__calloc(num_deltas, sizeof(diff_find_match));
 	GIT_ERROR_CHECK_ALLOC(src2tgt);
@@ -994,6 +1020,7 @@ find_best_matches:
 				memset(&src->new_file, 0, sizeof(src->new_file));
 				src->new_file.path = src->old_file.path;
 				src->new_file.flags |= GIT_DIFF_FLAG_VALID_ID;
+				git_oid_clear(&src->new_file.id, diff->opts.oid_type);
 
 				num_updates++;
 
@@ -1019,6 +1046,7 @@ find_best_matches:
 				memset(&src->old_file, 0, sizeof(src->old_file));
 				src->old_file.path = src->new_file.path;
 				src->old_file.flags |= GIT_DIFF_FLAG_VALID_ID;
+				git_oid_clear(&src->old_file.id, diff->opts.oid_type);
 
 				src->flags &= ~GIT_DIFF_FLAG__TO_SPLIT;
 				num_rewrites--;
@@ -1088,15 +1116,20 @@ find_best_matches:
 		}
 	}
 
+split_and_delete:
 	/*
 	 * Actually split and delete entries as needed
 	 */
 
-	if (num_rewrites > 0 || num_updates > 0)
+	if (num_rewrites > 0 || num_updates > 0 || num_to_delete > 0) {
+		size_t apply_len = diff->deltas.length -
+		                   num_rewrites - num_to_delete;
+
 		error = apply_splits_and_deletes(
-			diff, diff->deltas.length - num_rewrites,
+			diff, apply_len,
 			FLAG_SET(&opts, GIT_DIFF_BREAK_REWRITES) &&
 			!FLAG_SET(&opts, GIT_DIFF_BREAK_REWRITES_FOR_RENAMES_ONLY));
+	}
 
 cleanup:
 	git__free(tgt2src);

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

@@ -11,6 +11,7 @@
 #include "diff.h"
 #include "diff_driver.h"
 #include "patch_generate.h"
+#include "utf8.h"
 
 static int git_xdiff_scan_int(const char **str, int *value)
 {
@@ -218,14 +219,9 @@ static int git_xdiff(git_patch_generated_output *output, git_patch_generated *pa
 	 * updates are needed to xo->params.flags
 	 */
 
-	git_patch_generated_old_data(&info.xd_old_data.ptr, &info.xd_old_data.size, patch);
-	git_patch_generated_new_data(&info.xd_new_data.ptr, &info.xd_new_data.size, patch);
-
-	if (info.xd_old_data.size > GIT_XDIFF_MAX_SIZE ||
-		info.xd_new_data.size > GIT_XDIFF_MAX_SIZE) {
-		git_error_set(GIT_ERROR_INVALID, "files too large for diff");
+	if (git_patch_generated_old_data(&info.xd_old_data.ptr, &info.xd_old_data.size, patch) < 0 ||
+	    git_patch_generated_new_data(&info.xd_new_data.ptr, &info.xd_new_data.size, patch) < 0)
 		return -1;
-	}
 
 	xdl_diff(&info.xd_old_data, &info.xd_new_data,
 		&xo->params, &xo->config, &xo->callback);
@@ -261,5 +257,5 @@ void git_xdiff_init(git_xdiff_output *xo, const git_diff_options *opts)
 	if (flags & GIT_DIFF_IGNORE_BLANK_LINES)
 		xo->params.flags |= XDF_IGNORE_BLANK_LINES;
 
-	xo->callback.outf = git_xdiff_cb;
+	xo->callback.out_line = git_xdiff_cb;
 }

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

@@ -10,7 +10,7 @@
 #include "common.h"
 
 #include "diff.h"
-#include "xdiff/xdiff.h"
+#include "xdiff.h"
 #include "patch_generate.h"
 
 /* xdiff cannot cope with large files.  these files should not be passed to