rugged 0.28.4 → 0.28.4.1

data/vendor/libgit2/src/hashsig.c

@@ -8,7 +8,7 @@
 #include "common.h"
 
 #include "git2/sys/hashsig.h"
-#include "futils.h"
+#include "fileops.h"
 #include "util.h"
 
 typedef uint32_t hashsig_t;

data/vendor/libgit2/src/idxmap.c

@@ -32,148 +32,122 @@ static kh_inline khint_t idxentry_hash(const git_index_entry *e)
 __KHASH_IMPL(idx, static kh_inline, const git_index_entry *, git_index_entry *, 1, idxentry_hash, idxentry_equal)
 __KHASH_IMPL(idxicase, static kh_inline, const git_index_entry *, git_index_entry *, 1, idxentry_hash, idxentry_icase_equal)
 
-int git_idxmap_new(git_idxmap **out)
+int git_idxmap_alloc(git_idxmap **map)
 {
-	*out = kh_init(idx);
-	GIT_ERROR_CHECK_ALLOC(*out);
+	if ((*map = kh_init(idx)) == NULL) {
+		git_error_set_oom();
+		return -1;
+	}
 
 	return 0;
 }
 
-int git_idxmap_icase_new(git_idxmap_icase **out)
+int git_idxmap_icase_alloc(git_idxmap_icase **map)
 {
-	*out = kh_init(idxicase);
-	GIT_ERROR_CHECK_ALLOC(*out);
+	if ((*map = kh_init(idxicase)) == NULL) {
+		git_error_set_oom();
+		return -1;
+	}
 
 	return 0;
 }
 
-void git_idxmap_free(git_idxmap *map)
+void git_idxmap_insert(git_idxmap *map, const git_index_entry *key, void *value, int *rval)
 {
-	kh_destroy(idx, map);
+	khiter_t idx = kh_put(idx, map, key, rval);
+
+	if ((*rval) >= 0) {
+		if ((*rval) == 0)
+			kh_key(map, idx) = key;
+		kh_val(map, idx) = value;
+	}
 }
 
-void git_idxmap_icase_free(git_idxmap_icase *map)
+void git_idxmap_icase_insert(git_idxmap_icase *map, const git_index_entry *key, void *value, int *rval)
 {
-	kh_destroy(idxicase, map);
+	khiter_t idx = kh_put(idxicase, map, key, rval);
+
+	if ((*rval) >= 0) {
+		if ((*rval) == 0)
+			kh_key(map, idx) = key;
+		kh_val(map, idx) = value;
+	}
 }
 
-void git_idxmap_clear(git_idxmap *map)
+size_t git_idxmap_lookup_index(git_idxmap *map, const git_index_entry *key)
 {
-	kh_clear(idx, map);
+	return kh_get(idx, map, key);
 }
 
-void git_idxmap_icase_clear(git_idxmap_icase *map)
+size_t git_idxmap_icase_lookup_index(git_idxmap_icase *map, const git_index_entry *key)
 {
-	kh_clear(idxicase, map);
+	return kh_get(idxicase, map, key);
 }
 
-int git_idxmap_resize(git_idxmap *map, size_t size)
+void *git_idxmap_value_at(git_idxmap *map, size_t idx)
 {
-	if (!git__is_uint32(size) ||
-	    kh_resize(idx, map, (khiter_t)size) < 0) {
-		git_error_set_oom();
-		return -1;
-	}
-	return 0;
+	return kh_val(map, idx);
 }
 
-int git_idxmap_icase_resize(git_idxmap_icase *map, size_t size)
+int git_idxmap_valid_index(git_idxmap *map, size_t idx)
 {
-	if (!git__is_uint32(size) ||
-	    kh_resize(idxicase, map, (khiter_t)size) < 0) {
-		git_error_set_oom();
-		return -1;
-	}
-	return 0;
+	return idx != kh_end(map);
 }
 
-void *git_idxmap_get(git_idxmap *map, const git_index_entry *key)
+int git_idxmap_has_data(git_idxmap *map, size_t idx)
 {
-	size_t idx = kh_get(idx, map, key);
-	if (idx == kh_end(map) || !kh_exist(map, idx))
-		return NULL;
-	return kh_val(map, idx);
+	return kh_exist(map, idx);
 }
 
-int git_idxmap_set(git_idxmap *map, const git_index_entry *key, void *value)
+void git_idxmap_resize(git_idxmap *map, size_t size)
 {
-	size_t idx;
-	int rval;
-
-	idx = kh_put(idx, map, key, &rval);
-	if (rval < 0)
-		return -1;
-
-	if (rval == 0)
-		kh_key(map, idx) = key;
-
-	kh_val(map, idx) = value;
-
-	return 0;
+	kh_resize(idx, map, size);
 }
 
-int git_idxmap_icase_set(git_idxmap_icase *map, const git_index_entry *key, void *value)
+void git_idxmap_icase_resize(git_idxmap_icase *map, size_t size)
 {
-	size_t idx;
-	int rval;
-
-	idx = kh_put(idxicase, map, key, &rval);
-	if (rval < 0)
-		return -1;
-
-	if (rval == 0)
-		kh_key(map, idx) = key;
-
-	kh_val(map, idx) = value;
-
-	return 0;
+	kh_resize(idxicase, map, size);
 }
 
-void *git_idxmap_icase_get(git_idxmap_icase *map, const git_index_entry *key)
+void git_idxmap_free(git_idxmap *map)
 {
-	size_t idx = kh_get(idxicase, map, key);
-	if (idx == kh_end(map) || !kh_exist(map, idx))
-		return NULL;
-	return kh_val(map, idx);
+	kh_destroy(idx, map);
 }
 
-void git_idxmap_insert(git_idxmap *map, const git_index_entry *key, void *value, int *rval)
+void git_idxmap_icase_free(git_idxmap_icase *map)
 {
-	khiter_t idx = kh_put(idx, map, key, rval);
-
-	if ((*rval) >= 0) {
-		if ((*rval) == 0)
-			kh_key(map, idx) = key;
-		kh_val(map, idx) = value;
-	}
+	kh_destroy(idxicase, map);
 }
 
-void git_idxmap_icase_insert(git_idxmap_icase *map, const git_index_entry *key, void *value, int *rval)
+void git_idxmap_clear(git_idxmap *map)
 {
-	khiter_t idx = kh_put(idxicase, map, key, rval);
+	kh_clear(idx, map);
+}
 
-	if ((*rval) >= 0) {
-		if ((*rval) == 0)
-			kh_key(map, idx) = key;
-		kh_val(map, idx) = value;
-	}
+void git_idxmap_icase_clear(git_idxmap_icase *map)
+{
+	kh_clear(idxicase, map);
 }
 
-int git_idxmap_delete(git_idxmap *map, const git_index_entry *key)
+void git_idxmap_delete_at(git_idxmap *map, size_t idx)
 {
-	khiter_t idx = kh_get(idx, map, key);
-	if (idx == kh_end(map))
-		return GIT_ENOTFOUND;
 	kh_del(idx, map, idx);
-	return 0;
 }
 
-int git_idxmap_icase_delete(git_idxmap_icase *map, const git_index_entry *key)
+void git_idxmap_icase_delete_at(git_idxmap_icase *map, size_t idx)
 {
-	khiter_t idx = kh_get(idxicase, map, key);
-	if (idx == kh_end(map))
-		return GIT_ENOTFOUND;
 	kh_del(idxicase, map, idx);
-	return 0;
+}
+
+void git_idxmap_delete(git_idxmap *map, const git_index_entry *key)
+{
+	khiter_t idx = git_idxmap_lookup_index(map, key);
+	if (git_idxmap_valid_index(map, idx))
+		git_idxmap_delete_at(map, idx);
+}
+void git_idxmap_icase_delete(git_idxmap_icase *map, const git_index_entry *key)
+{
+	khiter_t idx = git_idxmap_icase_lookup_index(map, key);
+	if (git_idxmap_valid_index((git_idxmap *)map, idx))
+		git_idxmap_icase_delete_at(map, idx);
 }

data/vendor/libgit2/src/idxmap.h

@@ -11,167 +11,31 @@
 
 #include "git2/index.h"
 
-/** A map with `git_index_entry`s as key. */
 typedef struct kh_idx_s git_idxmap;
-/** A map with case-insensitive `git_index_entry`s as key */
 typedef struct kh_idxicase_s git_idxmap_icase;
 
-/**
- * Allocate a new index entry map.
- *
- * @param out Pointer to the map that shall be allocated.
- * @return 0 on success, an error code if allocation has failed.
- */
-int git_idxmap_new(git_idxmap **out);
+int git_idxmap_alloc(git_idxmap **map);
+int git_idxmap_icase_alloc(git_idxmap_icase **map);
+void git_idxmap_insert(git_idxmap *map, const git_index_entry *key, void *value, int *rval);
+void git_idxmap_icase_insert(git_idxmap_icase *map, const git_index_entry *key, void *value, int *rval);
 
-/**
- * Allocate a new case-insensitive index entry map.
- *
- * @param out Pointer to the map that shall be allocated.
- * @return 0 on success, an error code if allocation has failed.
- */
-int git_idxmap_icase_new(git_idxmap_icase **out);
+size_t git_idxmap_lookup_index(git_idxmap *map, const git_index_entry *key);
+size_t git_idxmap_icase_lookup_index(git_idxmap_icase *map, const git_index_entry *key);
+void *git_idxmap_value_at(git_idxmap *map, size_t idx);
+int git_idxmap_valid_index(git_idxmap *map, size_t idx);
+int git_idxmap_has_data(git_idxmap *map, size_t idx);
 
-/**
- * Free memory associated with the map.
- *
- * Note that this function will _not_ free values added to this
- * map.
- *
- * @param map Pointer to the map that is to be free'd. May be
- *            `NULL`.
- */
+void git_idxmap_resize(git_idxmap *map, size_t size);
+void git_idxmap_icase_resize(git_idxmap_icase *map, size_t size);
 void git_idxmap_free(git_idxmap *map);
-
-/**
- * Free memory associated with the map.
- *
- * Note that this function will _not_ free values added to this
- * map.
- *
- * @param map Pointer to the map that is to be free'd. May be
- *            `NULL`.
- */
 void git_idxmap_icase_free(git_idxmap_icase *map);
-
-/**
- * Clear all entries from the map.
- *
- * This function will remove all entries from the associated map.
- * Memory associated with it will not be released, though.
- *
- * @param map Pointer to the map that shall be cleared. May be
- *            `NULL`.
- */
 void git_idxmap_clear(git_idxmap *map);
-
-/**
- * Clear all entries from the map.
- *
- * This function will remove all entries from the associated map.
- * Memory associated with it will not be released, though.
- *
- * @param map Pointer to the map that shall be cleared. May be
- *            `NULL`.
- */
 void git_idxmap_icase_clear(git_idxmap_icase *map);
 
-/**
- * Resize the map by allocating more memory.
- *
- * @param map map that shall be resized
- * @param size count of entries that the map shall hold
- * @return `0` if the map was successfully resized, a negative
- *         error code otherwise
- */
-int git_idxmap_resize(git_idxmap *map, size_t size);
+void git_idxmap_delete_at(git_idxmap *map, size_t idx);
+void git_idxmap_icase_delete_at(git_idxmap_icase *map, size_t idx);
 
-/**
- * Resize the map by allocating more memory.
- *
- * @param map map that shall be resized
- * @param size count of entries that the map shall hold
- * @return `0` if the map was successfully resized, a negative
- *         error code otherwise
- */
-int git_idxmap_icase_resize(git_idxmap_icase *map, size_t size);
-
-/**
- * Return value associated with the given key.
- *
- * @param map map to search key in
- * @param key key to search for; the index entry will be searched
- *            for by its case-sensitive path
- * @return value associated with the given key or NULL if the key was not found
- */
-void *git_idxmap_get(git_idxmap *map, const git_index_entry *key);
-
-/**
- * Return value associated with the given key.
- *
- * @param map map to search key in
- * @param key key to search for; the index entry will be searched
- *            for by its case-insensitive path
- * @return value associated with the given key or NULL if the key was not found
- */
-void *git_idxmap_icase_get(git_idxmap_icase *map, const git_index_entry *key);
-
-/**
- * Set the entry for key to value.
- *
- * If the map has no corresponding entry for the given key, a new
- * entry will be created with the given value. If an entry exists
- * already, its value will be updated to match the given value.
- *
- * @param map map to create new entry in
- * @param key key to set
- * @param value value to associate the key with; may be NULL
- * @return zero if the key was successfully set, a negative error
- *         code otherwise
- */
-int git_idxmap_set(git_idxmap *map, const git_index_entry *key, void *value);
-
-/**
- * Set the entry for key to value.
- *
- * If the map has no corresponding entry for the given key, a new
- * entry will be created with the given value. If an entry exists
- * already, its value will be updated to match the given value.
- *
- * @param map map to create new entry in
- * @param key key to set
- * @param value value to associate the key with; may be NULL
- * @return zero if the key was successfully set, a negative error
- *         code otherwise
- */
-int git_idxmap_icase_set(git_idxmap_icase *map, const git_index_entry *key, void *value);
-
-/**
- * Delete an entry from the map.
- *
- * Delete the given key and its value from the map. If no such
- * key exists, this will do nothing.
- *
- * @param map map to delete key in
- * @param key key to delete
- * @return `0` if the key has been deleted, GIT_ENOTFOUND if no
- *         such key was found, a negative code in case of an
- *         error
- */
-int git_idxmap_delete(git_idxmap *map, const git_index_entry *key);
-
-/**
- * Delete an entry from the map.
- *
- * Delete the given key and its value from the map. If no such
- * key exists, this will do nothing.
- *
- * @param map map to delete key in
- * @param key key to delete
- * @return `0` if the key has been deleted, GIT_ENOTFOUND if no
- *         such key was found, a negative code in case of an
- *         error
- */
-int git_idxmap_icase_delete(git_idxmap_icase *map, const git_index_entry *key);
+void git_idxmap_delete(git_idxmap *map, const git_index_entry *key);
+void git_idxmap_icase_delete(git_idxmap_icase *map, const git_index_entry *key);
 
 #endif

data/vendor/libgit2/src/ignore.c

@@ -12,7 +12,7 @@
 #include "attrcache.h"
 #include "path.h"
 #include "config.h"
-#include "wildmatch.h"
+#include "fnmatch.h"
 
 #define GIT_IGNORE_INTERNAL		"[internal]exclude"
 
@@ -101,7 +101,7 @@ static int does_negate_pattern(git_attr_fnmatch *rule, git_attr_fnmatch *neg)
  */
 static int does_negate_rule(int *out, git_vector *rules, git_attr_fnmatch *match)
 {
-	int error = 0, wildmatch_flags;
+	int error = 0, fnflags;
 	size_t i;
 	git_attr_fnmatch *rule;
 	char *path;
@@ -109,9 +109,9 @@ static int does_negate_rule(int *out, git_vector *rules, git_attr_fnmatch *match
 
 	*out = 0;
 
-	wildmatch_flags = WM_PATHNAME;
+	fnflags = FNM_PATHNAME;
 	if (match->flags & GIT_ATTR_FNMATCH_ICASE)
-		wildmatch_flags |= WM_CASEFOLD;
+		fnflags |= FNM_IGNORECASE;
 
 	/* path of the file relative to the workdir, so we match the rules in subdirs */
 	if (match->containing_dir) {
@@ -141,8 +141,13 @@ static int does_negate_rule(int *out, git_vector *rules, git_attr_fnmatch *match
 		if (git_buf_oom(&buf))
 			goto out;
 
+		if ((error = p_fnmatch(git_buf_cstr(&buf), path, fnflags)) < 0) {
+			git_error_set(GIT_ERROR_INVALID, "error matching pattern");
+			goto out;
+		}
+
 		/* if we found a match, we want to keep this rule */
-		if ((wildmatch(git_buf_cstr(&buf), path, wildmatch_flags)) == WM_MATCH) {
+		if (error != FNM_NOMATCH) {
 			*out = 1;
 			error = 0;
 			goto out;
@@ -158,16 +163,14 @@ out:
 }
 
 static int parse_ignore_file(
-	git_repository *repo, git_attr_file *attrs, const char *data, bool allow_macros)
+	git_repository *repo, git_attr_file *attrs, const char *data)
 {
 	int error = 0;
 	int ignore_case = false;
 	const char *scan = data, *context = NULL;
 	git_attr_fnmatch *match = NULL;
 
-	GIT_UNUSED(allow_macros);
-
-	if (git_repository__configmap_lookup(&ignore_case, repo, GIT_CONFIGMAP_IGNORECASE) < 0)
+	if (git_repository__cvar(&ignore_case, repo, GIT_CVAR_IGNORECASE) < 0)
 		git_error_clear();
 
 	/* if subdir file path, convert context for file paths */
@@ -190,7 +193,9 @@ static int parse_ignore_file(
 		}
 
 		match->flags =
-		    GIT_ATTR_FNMATCH_ALLOWSPACE | GIT_ATTR_FNMATCH_ALLOWNEG;
+		    GIT_ATTR_FNMATCH_ALLOWSPACE |
+		    GIT_ATTR_FNMATCH_ALLOWNEG |
+		    GIT_ATTR_FNMATCH_NOLEADINGDIR;
 
 		if (!(error = git_attr_fnmatch__parse(
 			match, &attrs->pool, context, &scan)))
@@ -241,8 +246,9 @@ static int push_ignore_file(
 	int error = 0;
 	git_attr_file *file = NULL;
 
-	error = git_attr_cache__get(&file, ignores->repo, NULL, GIT_ATTR_FILE__FROM_FILE,
-				    base, filename, parse_ignore_file, false);
+	error = git_attr_cache__get(
+		&file, ignores->repo, NULL, GIT_ATTR_FILE__FROM_FILE,
+		base, filename, parse_ignore_file);
 	if (error < 0)
 		return error;
 
@@ -268,12 +274,12 @@ static int get_internal_ignores(git_attr_file **out, git_repository *repo)
 	if ((error = git_attr_cache__init(repo)) < 0)
 		return error;
 
-	error = git_attr_cache__get(out, repo, NULL, GIT_ATTR_FILE__IN_MEMORY, NULL,
-				    GIT_IGNORE_INTERNAL, NULL, false);
+	error = git_attr_cache__get(
+		out, repo, NULL, GIT_ATTR_FILE__IN_MEMORY, NULL, GIT_IGNORE_INTERNAL, NULL);
 
 	/* if internal rules list is empty, insert default rules */
 	if (!error && !(*out)->rules.length)
-		error = parse_ignore_file(repo, *out, GIT_IGNORE_DEFAULT_RULES, false);
+		error = parse_ignore_file(repo, *out, GIT_IGNORE_DEFAULT_RULES);
 
 	return error;
 }
@@ -293,8 +299,8 @@ int git_ignore__for_path(
 	ignores->repo = repo;
 
 	/* Read the ignore_case flag */
-	if ((error = git_repository__configmap_lookup(
-			&ignores->ignore_case, repo, GIT_CONFIGMAP_IGNORECASE)) < 0)
+	if ((error = git_repository__cvar(
+			&ignores->ignore_case, repo, GIT_CVAR_IGNORECASE)) < 0)
 		goto cleanup;
 
 	if ((error = git_attr_cache__init(repo)) < 0)
@@ -331,13 +337,16 @@ int git_ignore__for_path(
 			goto cleanup;
 	}
 
-	/* load .git/info/exclude if possible */
-	if ((error = git_repository_item_path(&infopath, repo, GIT_REPOSITORY_ITEM_INFO)) < 0 ||
-		(error = push_ignore_file(ignores, &ignores->ign_global, infopath.ptr, GIT_IGNORE_FILE_INREPO)) < 0) {
-		if (error != GIT_ENOTFOUND)
-			goto cleanup;
-		error = 0;
-	}
+	if ((error = git_repository_item_path(&infopath,
+			repo, GIT_REPOSITORY_ITEM_INFO)) < 0)
+		goto cleanup;
+
+	/* load .git/info/exclude */
+	error = push_ignore_file(
+		ignores, &ignores->ign_global,
+		infopath.ptr, GIT_IGNORE_FILE_INREPO);
+	if (error < 0)
+		goto cleanup;
 
 	/* load core.excludesfile */
 	if (git_repository_attr_cache(repo)->cfg_excl_file != NULL)
@@ -444,7 +453,7 @@ static bool ignore_lookup_in_rules(
 int git_ignore__lookup(
 	int *out, git_ignores *ignores, const char *pathname, git_dir_flag dir_flag)
 {
-	size_t i;
+	unsigned int i;
 	git_attr_file *file;
 	git_attr_path path;
 
@@ -458,11 +467,8 @@ int git_ignore__lookup(
 	if (ignore_lookup_in_rules(out, ignores->ign_internal, &path))
 		goto cleanup;
 
-	/* next process files in the path.
-	 * this process has to process ignores in reverse order
-	 * to ensure correct prioritization of rules
-	 */
-	git_vector_rforeach(&ignores->ign_path, i, file) {
+	/* next process files in the path */
+	git_vector_foreach(&ignores->ign_path, i, file) {
 		if (ignore_lookup_in_rules(out, file, &path))
 			goto cleanup;
 	}
@@ -486,7 +492,7 @@ int git_ignore_add_rule(git_repository *repo, const char *rules)
 	if ((error = get_internal_ignores(&ign_internal, repo)) < 0)
 		return error;
 
-	error = parse_ignore_file(repo, ign_internal, rules, false);
+	error = parse_ignore_file(repo, ign_internal, rules);
 	git_attr_file__free(ign_internal);
 
 	return error;
@@ -502,7 +508,7 @@ int git_ignore_clear_internal_rules(git_repository *repo)
 
 	if (!(error = git_attr_file__clear_rules(ign_internal, true)))
 		error = parse_ignore_file(
-				repo, ign_internal, GIT_IGNORE_DEFAULT_RULES, false);
+			repo, ign_internal, GIT_IGNORE_DEFAULT_RULES);
 
 	git_attr_file__free(ign_internal);
 	return error;