rugged 1.7.2 → 1.9.6

data/vendor/libgit2/src/libgit2/diff_stats.c

@@ -28,7 +28,6 @@ struct git_diff_stats {
 	size_t files_changed;
 	size_t insertions;
 	size_t deletions;
-	size_t renames;
 
 	size_t max_name;
 	size_t max_filestat;
@@ -68,17 +67,19 @@ static int diff_file_stats_full_to_buf(
 		size_t common_dirlen;
 		int error;
 
-		padding = stats->max_name - strlen(old_path) - strlen(new_path);
-
 		if ((common_dirlen = git_fs_path_common_dirlen(old_path, new_path)) &&
 		    common_dirlen <= INT_MAX) {
 			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);
+			padding = stats->max_name + common_dirlen - strlen(old_path)
+			          - strlen(new_path) - 2 - strlen(DIFF_RENAME_FILE_SEPARATOR);
 		} else {
 			error = git_str_printf(out, " %s" DIFF_RENAME_FILE_SEPARATOR "%s",
 					       old_path, new_path);
+			padding = stats->max_name - strlen(old_path)
+			          - strlen(new_path) - strlen(DIFF_RENAME_FILE_SEPARATOR);
 		}
 
 		if (error < 0)
@@ -89,9 +90,6 @@ static int diff_file_stats_full_to_buf(
 			goto on_error;
 
 		padding = stats->max_name - strlen(adddel_path);
-
-		if (stats->renames > 0)
-			padding += strlen(DIFF_RENAME_FILE_SEPARATOR);
 	}
 
 	if (git_str_putcn(out, ' ', padding) < 0 ||
@@ -210,14 +208,23 @@ int git_diff_get_stats(
 		if ((error = git_patch_from_diff(&patch, diff, i)) < 0)
 			break;
 
-		/* keep a count of renames because it will affect formatting */
+		/* Length calculation for renames mirrors the actual presentation format
+		 * generated in diff_file_stats_full_to_buf; namelen is the full length of
+		 * what will be printed, taking into account renames and common prefixes.
+		 */
 		delta = patch->delta;
-
-		/* TODO ugh */
 		namelen = strlen(delta->new_file.path);
-		if (delta->old_file.path && strcmp(delta->old_file.path, delta->new_file.path) != 0) {
-			namelen += strlen(delta->old_file.path);
-			stats->renames++;
+		if (delta->old_file.path &&
+		    strcmp(delta->old_file.path, delta->new_file.path) != 0) {
+			size_t common_dirlen;
+			if ((common_dirlen = git_fs_path_common_dirlen(delta->old_file.path, delta->new_file.path)) &&
+			    common_dirlen <= INT_MAX) {
+				namelen += strlen(delta->old_file.path) + 2 +
+				           strlen(DIFF_RENAME_FILE_SEPARATOR) - common_dirlen;
+			} else {
+				namelen += strlen(delta->old_file.path) +
+				           strlen(DIFF_RENAME_FILE_SEPARATOR);
+			}
 		}
 
 		/* and, of course, count the line stats */

data/vendor/libgit2/src/libgit2/diff_tform.c

@@ -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;
@@ -424,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;
 }
@@ -653,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,
@@ -810,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;
@@ -844,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;
 
@@ -852,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);
@@ -1093,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/libgit2/email.c

@@ -16,6 +16,7 @@
 
 #include "git2/email.h"
 #include "git2/patch.h"
+#include "git2/sys/email.h"
 #include "git2/version.h"
 
 /*

data/vendor/libgit2/src/libgit2/fetch.c

@@ -60,9 +60,11 @@ static int mark_local(git_remote *remote)
 
 	git_vector_foreach(&remote->refs, i, head) {
 		/* If we have the object, mark it so we don't ask for it.
-		   However if we are unshallowing, we need to ask for it
-		   even though the head exists locally. */
-		if (remote->nego.depth != INT_MAX && git_odb_exists(odb, &head->oid))
+		   However if we are unshallowing or changing history
+		   depth, we need to ask for it even though the head
+		   exists locally. */
+		if (remote->nego.depth == GIT_FETCH_DEPTH_FULL &&
+		    git_odb_exists(odb, &head->oid))
 			head->local = 1;
 		else
 			remote->need_pack = 1;

data/vendor/libgit2/src/libgit2/fetchhead.c

@@ -106,7 +106,7 @@ static int fetchhead_ref_write(
 	git_fetchhead_ref *fetchhead_ref)
 {
 	char oid[GIT_OID_MAX_HEXSIZE + 1];
-	const char *type, *name;
+	const char *type = NULL, *name = NULL;
 	int head = 0;
 
 	GIT_ASSERT_ARG(file);

data/vendor/libgit2/src/libgit2/filter.c

@@ -239,7 +239,7 @@ static void git_filter_global_shutdown(void)
 		git__free(fdef);
 	}
 
-	git_vector_free(&filter_registry.filters);
+	git_vector_dispose(&filter_registry.filters);
 
 	git_rwlock_wrunlock(&filter_registry.lock);
 	git_rwlock_free(&filter_registry.lock);
@@ -908,7 +908,7 @@ static int buffered_stream_close(git_writestream *s)
 {
 	struct buffered_stream *buffered_stream = (struct buffered_stream *)s;
 	git_str *writebuf;
-	git_error_state error_state = {0};
+	git_error *last_error;
 	int error;
 
 	GIT_ASSERT_ARG(buffered_stream);
@@ -946,9 +946,9 @@ static int buffered_stream_close(git_writestream *s)
 	} else {
 		/* close stream before erroring out taking care
 		 * to preserve the original error */
-		git_error_state_capture(&error_state, error);
+		git_error_save(&last_error);
 		buffered_stream->target->close(buffered_stream->target);
-		git_error_state_restore(&error_state);
+		git_error_restore(last_error);
 		return error;
 	}
 
@@ -1106,7 +1106,7 @@ static void filter_streams_free(git_vector *streams)
 
 	git_vector_foreach(streams, i, stream)
 		stream->free(stream);
-	git_vector_free(streams);
+	git_vector_dispose(streams);
 }
 
 int git_filter_list_stream_file(

data/vendor/libgit2/src/libgit2/git2.rc

@@ -10,7 +10,7 @@
 #endif
 
 #ifndef LIBGIT2_COMMENTS
-# define LIBGIT2_COMMENTS "For more information visit http://libgit2.github.com/"
+# define LIBGIT2_COMMENTS "For more information visit https://libgit2.org/"
 #endif
 
 #ifdef __GNUC__
@@ -25,8 +25,8 @@ VS_VERSION_INFO		VERSIONINFO
 #else
 VS_VERSION_INFO		VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
 #endif
-  FILEVERSION		LIBGIT2_VER_MAJOR,LIBGIT2_VER_MINOR,LIBGIT2_VER_REVISION,LIBGIT2_VER_PATCH
-  PRODUCTVERSION	LIBGIT2_VER_MAJOR,LIBGIT2_VER_MINOR,LIBGIT2_VER_REVISION,LIBGIT2_VER_PATCH
+  FILEVERSION		LIBGIT2_VERSION_MAJOR,LIBGIT2_VERSION_MINOR,LIBGIT2_VERSION_REVISION,LIBGIT2_VERSION_PATCH
+  PRODUCTVERSION	LIBGIT2_VERSION_MAJOR,LIBGIT2_VERSION_MINOR,LIBGIT2_VERSION_REVISION,LIBGIT2_VERSION_PATCH
   FILEFLAGSMASK		VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
   FILEFLAGS		VS_FF_DEBUG

data/vendor/libgit2/src/libgit2/grafts.c

@@ -11,10 +11,13 @@
 #include "oid.h"
 #include "oidarray.h"
 #include "parse.h"
+#include "hashmap_oid.h"
+
+GIT_HASHMAP_OID_SETUP(git_grafts_oidmap, git_commit_graft *);
 
 struct git_grafts {
 	/* Map of `git_commit_graft`s */
-	git_oidmap *commits;
+	git_grafts_oidmap commits;
 
 	/* Type of object IDs */
 	git_oid_t oid_type;
@@ -33,11 +36,6 @@ int git_grafts_new(git_grafts **out, git_oid_t oid_type)
 	grafts = git__calloc(1, sizeof(*grafts));
 	GIT_ERROR_CHECK_ALLOC(grafts);
 
-	if ((git_oidmap_new(&grafts->commits)) < 0) {
-		git__free(grafts);
-		return -1;
-	}
-
 	grafts->oid_type = oid_type;
 
 	*out = grafts;
@@ -88,23 +86,24 @@ void git_grafts_free(git_grafts *grafts)
 		return;
 	git__free(grafts->path);
 	git_grafts_clear(grafts);
-	git_oidmap_free(grafts->commits);
+	git_grafts_oidmap_dispose(&grafts->commits);
 	git__free(grafts);
 }
 
 void git_grafts_clear(git_grafts *grafts)
 {
+	git_hashmap_iter_t iter = GIT_HASHMAP_ITER_INIT;
 	git_commit_graft *graft;
 
 	if (!grafts)
 		return;
 
-	git_oidmap_foreach_value(grafts->commits, graft, {
+	while (git_grafts_oidmap_iterate(&iter, NULL, &graft, &grafts->commits) == 0) {
 		git__free(graft->parents.ptr);
 		git__free(graft);
-	});
+	}
 
-	git_oidmap_clear(grafts->commits);
+	git_grafts_oidmap_clear(&grafts->commits);
 }
 
 int git_grafts_refresh(git_grafts *grafts)
@@ -205,7 +204,7 @@ int git_grafts_add(git_grafts *grafts, const git_oid *oid, git_array_oid_t paren
 	if ((error = git_grafts_remove(grafts, &graft->oid)) < 0 && error != GIT_ENOTFOUND)
 		goto cleanup;
 
-	if ((error = git_oidmap_set(grafts->commits, &graft->oid, graft)) < 0)
+	if ((error = git_grafts_oidmap_put(&grafts->commits, &graft->oid, graft)) < 0)
 		goto cleanup;
 
 	return 0;
@@ -223,10 +222,10 @@ int git_grafts_remove(git_grafts *grafts, const git_oid *oid)
 
 	GIT_ASSERT_ARG(grafts && oid);
 
-	if ((graft = git_oidmap_get(grafts->commits, oid)) == NULL)
+	if (git_grafts_oidmap_get(&graft, &grafts->commits, oid) != 0)
 		return GIT_ENOTFOUND;
 
-	if ((error = git_oidmap_delete(grafts->commits, oid)) < 0)
+	if ((error = git_grafts_oidmap_remove(&grafts->commits, oid)) < 0)
 		return error;
 
 	git__free(graft->parents.ptr);
@@ -238,23 +237,22 @@ int git_grafts_remove(git_grafts *grafts, const git_oid *oid)
 int git_grafts_get(git_commit_graft **out, git_grafts *grafts, const git_oid *oid)
 {
 	GIT_ASSERT_ARG(out && grafts && oid);
-	if ((*out = git_oidmap_get(grafts->commits, oid)) == NULL)
-		return GIT_ENOTFOUND;
-	return 0;
+	return git_grafts_oidmap_get(out, &grafts->commits, oid);
 }
 
 int git_grafts_oids(git_oid **out, size_t *out_len, git_grafts *grafts)
 {
+	git_hashmap_iter_t iter = GIT_HASHMAP_ITER_INIT;
 	git_array_oid_t array = GIT_ARRAY_INIT;
 	const git_oid *oid;
-	size_t existing, i = 0;
+	size_t existing;
 
 	GIT_ASSERT_ARG(out && grafts);
 
-	if ((existing = git_oidmap_size(grafts->commits)) > 0)
+	if ((existing = git_grafts_oidmap_size(&grafts->commits)) > 0)
 		git_array_init_to_size(array, existing);
 
-	while (git_oidmap_iterate(NULL, grafts->commits, &i, &oid) == 0) {
+	while (git_grafts_oidmap_iterate(&iter, &oid, NULL, &grafts->commits) == 0) {
 		git_oid *cpy = git_array_alloc(array);
 		GIT_ERROR_CHECK_ALLOC(cpy);
 		git_oid_cpy(cpy, oid);
@@ -268,5 +266,5 @@ int git_grafts_oids(git_oid **out, size_t *out_len, git_grafts *grafts)
 
 size_t git_grafts_size(git_grafts *grafts)
 {
-	return git_oidmap_size(grafts->commits);
+	return git_grafts_oidmap_size(&grafts->commits);
 }

data/vendor/libgit2/src/libgit2/grafts.h

@@ -9,7 +9,6 @@
 
 #include "common.h"
 #include "oidarray.h"
-#include "oidmap.h"
 
 /** graft commit */
 typedef struct {

data/vendor/libgit2/src/libgit2/graph.c

@@ -243,7 +243,7 @@ int git_graph_reachable_from_any(
 
 done:
 	git_commit_list_free(&result);
-	git_vector_free(&list);
+	git_vector_dispose(&list);
 	git_revwalk_free(walk);
 	return error;
 }

data/vendor/libgit2/src/libgit2/hashmap_oid.h

@@ -0,0 +1,30 @@
+/*
+ * 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_hashmap_oid_h__
+#define INCLUDE_hashmap_oid_h__
+
+#include "hashmap.h"
+
+GIT_INLINE(uint32_t) git_hashmap_oid_hashcode(const git_oid *oid)
+{
+	uint32_t hash;
+	memcpy(&hash, oid->id, sizeof(uint32_t));
+	return hash;
+}
+
+#define GIT_HASHMAP_OID_STRUCT(name, val_t) \
+	GIT_HASHMAP_STRUCT(name, const git_oid *, val_t)
+#define GIT_HASHMAP_OID_PROTOTYPES(name, val_t) \
+	GIT_HASHMAP_PROTOTYPES(name, const git_oid *, val_t)
+#define GIT_HASHMAP_OID_FUNCTIONS(name, scope, val_t) \
+	GIT_HASHMAP_FUNCTIONS(name, scope, const git_oid *, val_t, git_hashmap_oid_hashcode, git_oid_equal)
+
+#define GIT_HASHMAP_OID_SETUP(name, val_t) \
+	GIT_HASHMAP_OID_STRUCT(name, val_t) \
+	GIT_HASHMAP_OID_FUNCTIONS(name, GIT_HASHMAP_INLINE, val_t)
+
+#endif

data/vendor/libgit2/src/libgit2/ignore.c

@@ -296,6 +296,8 @@ int git_ignore__for_path(
 {
 	int error = 0;
 	const char *workdir = git_repository_workdir(repo);
+	git_attr_cache *attrcache;
+	const char *excludes_file = NULL;
 	git_str infopath = GIT_STR_INIT;
 
 	GIT_ASSERT_ARG(repo);
@@ -358,10 +360,12 @@ int git_ignore__for_path(
 	}
 
 	/* load core.excludesfile */
-	if (git_repository_attr_cache(repo)->cfg_excl_file != NULL)
+	attrcache = git_repository_attr_cache(repo);
+	excludes_file = git_attr_cache_excludesfile(attrcache);
+
+	if (excludes_file != NULL)
 		error = push_ignore_file(
-			ignores, &ignores->ign_global, NULL,
-			git_repository_attr_cache(repo)->cfg_excl_file);
+			ignores, &ignores->ign_global, NULL, excludes_file);
 
 cleanup:
 	git_str_dispose(&infopath);
@@ -428,13 +432,13 @@ void git_ignore__free(git_ignores *ignores)
 		git_attr_file__free(file);
 		ignores->ign_path.contents[i] = NULL;
 	}
-	git_vector_free(&ignores->ign_path);
+	git_vector_dispose(&ignores->ign_path);
 
 	git_vector_foreach(&ignores->ign_global, i, file) {
 		git_attr_file__free(file);
 		ignores->ign_global.contents[i] = NULL;
 	}
-	git_vector_free(&ignores->ign_global);
+	git_vector_dispose(&ignores->ign_global);
 
 	git_str_dispose(&ignores->dir);
 }