rugged 1.3.1 → 1.9.0

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

@@ -10,7 +10,7 @@
 #include "common.h"
 
 #include "posix.h"
-#include "buffer.h"
+#include "str.h"
 
 /**
  * Find a "global" file (i.e. one in a user's home directory).
@@ -19,7 +19,7 @@
  * @param filename name of file to find in the home directory
  * @return 0 if found, GIT_ENOTFOUND if not found, or -1 on other OS error
  */
-extern int git_sysdir_find_global_file(git_buf *path, const char *filename);
+extern int git_sysdir_find_global_file(git_str *path, const char *filename);
 
 /**
  * Find an "XDG" file (i.e. one in user's XDG config path).
@@ -28,7 +28,7 @@ extern int git_sysdir_find_global_file(git_buf *path, const char *filename);
  * @param filename name of file to find in the home directory
  * @return 0 if found, GIT_ENOTFOUND if not found, or -1 on other OS error
  */
-extern int git_sysdir_find_xdg_file(git_buf *path, const char *filename);
+extern int git_sysdir_find_xdg_file(git_str *path, const char *filename);
 
 /**
  * Find a "system" file (i.e. one shared for all users of the system).
@@ -37,7 +37,7 @@ extern int git_sysdir_find_xdg_file(git_buf *path, const char *filename);
  * @param filename name of file to find in the home directory
  * @return 0 if found, GIT_ENOTFOUND if not found, or -1 on other OS error
  */
-extern int git_sysdir_find_system_file(git_buf *path, const char *filename);
+extern int git_sysdir_find_system_file(git_str *path, const char *filename);
 
 /**
  * Find a "ProgramData" file (i.e. one in %PROGRAMDATA%)
@@ -46,7 +46,7 @@ extern int git_sysdir_find_system_file(git_buf *path, const char *filename);
  * @param filename name of file to find in the ProgramData directory
  * @return 0 if found, GIT_ENOTFOUND if not found, or -1 on other OS error
  */
-extern int git_sysdir_find_programdata_file(git_buf *path, const char *filename);
+extern int git_sysdir_find_programdata_file(git_str *path, const char *filename);
 
 /**
  * Find template directory.
@@ -54,27 +54,51 @@ extern int git_sysdir_find_programdata_file(git_buf *path, const char *filename)
  * @param path buffer to write the full path into
  * @return 0 if found, GIT_ENOTFOUND if not found, or -1 on other OS error
  */
-extern int git_sysdir_find_template_dir(git_buf *path);
+extern int git_sysdir_find_template_dir(git_str *path);
 
 /**
- * Expand the name of a "global" file (i.e. one in a user's home
- * directory).  Unlike `find_global_file` (above), this makes no
- * attempt to check for the existence of the file, and is useful if
- * you want the full path regardless of existence.
+ * Find the home directory. On Windows, this will look at the `HOME`,
+ * `HOMEPATH`, and `USERPROFILE` environment variables (in that order)
+ * and return the first path that is set and exists. On other systems,
+ * this will simply return the contents of the `HOME` environment variable.
+ *
+ * @param path buffer to write the full path into
+ * @return 0 if found, GIT_ENOTFOUND if not found, or -1 on other OS error
+ */
+extern int git_sysdir_find_homedir(git_str *path);
+
+/**
+ * Expand the name of a "global" file -- by default inside the user's
+ * home directory, but can be overridden by the user configuration.
+ * Unlike `find_global_file` (above), this makes no attempt to check
+ * for the existence of the file, and is useful if you want the full
+ * path regardless of existence.
  *
  * @param path buffer to write the full path into
  * @param filename name of file in the home directory
  * @return 0 on success or -1 on error
  */
-extern int git_sysdir_expand_global_file(git_buf *path, const char *filename);
+extern int git_sysdir_expand_global_file(git_str *path, const char *filename);
+
+/**
+ * Expand the name of a file in the user's home directory. This
+ * function makes no attempt to check for the existence of the file,
+ * and is useful if you want the full path regardless of existence.
+ *
+ * @param path buffer to write the full path into
+ * @param filename name of file in the home directory
+ * @return 0 on success or -1 on error
+ */
+extern int git_sysdir_expand_homedir_file(git_str *path, const char *filename);
 
 typedef enum {
-	GIT_SYSDIR_SYSTEM = 0,
-	GIT_SYSDIR_GLOBAL = 1,
-	GIT_SYSDIR_XDG    = 2,
+	GIT_SYSDIR_SYSTEM      = 0,
+	GIT_SYSDIR_GLOBAL      = 1,
+	GIT_SYSDIR_XDG         = 2,
 	GIT_SYSDIR_PROGRAMDATA = 3,
-	GIT_SYSDIR_TEMPLATE = 4,
-	GIT_SYSDIR__MAX   = 5,
+	GIT_SYSDIR_TEMPLATE    = 4,
+	GIT_SYSDIR_HOME        = 5,
+	GIT_SYSDIR__MAX        = 6
 } git_sysdir_t;
 
 /**
@@ -87,11 +111,11 @@ extern int git_sysdir_global_init(void);
 /**
  * Get the search path for global/system/xdg files
  *
- * @param out pointer to git_buf containing search path
+ * @param out pointer to git_str containing search path
  * @param which which list of paths to return
  * @return 0 on success, <0 on failure
  */
-extern int git_sysdir_get(const git_buf **out, git_sysdir_t which);
+extern int git_sysdir_get(const git_str **out, git_sysdir_t which);
 
 /**
  * Set search paths for global/system/xdg files
@@ -105,4 +129,17 @@ extern int git_sysdir_get(const git_buf **out, git_sysdir_t which);
  */
 extern int git_sysdir_set(git_sysdir_t which, const char *paths);
 
+/**
+ * Reset search paths for global/system/xdg files.
+ */
+extern int git_sysdir_reset(void);
+
+#ifdef GIT_WIN32
+/** Sets the registry system dir to a mock; for testing.  */
+extern int git_win32__set_registry_system_dir(const wchar_t *mock_sysdir);
+
+/** Find the given system dir; for testing. */
+extern int git_win32__find_system_dirs(git_str *out, const char *subdir);
+#endif
+
 #endif

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

@@ -9,7 +9,6 @@
 
 #include "commit.h"
 #include "signature.h"
-#include "message.h"
 #include "wildmatch.h"
 #include "git2/object.h"
 #include "git2/repository.h"
@@ -63,10 +62,14 @@ const char *git_tag_message(const git_tag *t)
 static int tag_error(const char *str)
 {
 	git_error_set(GIT_ERROR_TAG, "failed to parse tag: %s", str);
-	return -1;
+	return GIT_EINVALID;
 }
 
-static int tag_parse(git_tag *tag, const char *buffer, const char *buffer_end)
+static int tag_parse(
+	git_tag *tag,
+	const char *buffer,
+	const char *buffer_end,
+	git_oid_t oid_type)
 {
 	static const char *tag_types[] = {
 		NULL, "commit\n", "tree\n", "blob\n", "tag\n"
@@ -74,8 +77,10 @@ static int tag_parse(git_tag *tag, const char *buffer, const char *buffer_end)
 	size_t text_len, alloc_len;
 	const char *search;
 	unsigned int i;
+	int error;
 
-	if (git_oid__parse(&tag->target, &buffer, buffer_end, "object ") < 0)
+	if (git_object__parse_oid_header(&tag->target,
+			&buffer, buffer_end, "object ", oid_type) < 0)
 		return tag_error("object field invalid");
 
 	if (buffer + 5 >= buffer_end)
@@ -131,8 +136,8 @@ static int tag_parse(git_tag *tag, const char *buffer, const char *buffer_end)
 		tag->tagger = git__malloc(sizeof(git_signature));
 		GIT_ERROR_CHECK_ALLOC(tag->tagger);
 
-		if (git_signature__parse(tag->tagger, &buffer, buffer_end, "tagger ", '\n') < 0)
-			return -1;
+		if ((error = git_signature__parse(tag->tagger, &buffer, buffer_end, "tagger ", '\n')) < 0)
+			return error;
 	}
 
 	tag->message = NULL;
@@ -160,23 +165,30 @@ static int tag_parse(git_tag *tag, const char *buffer, const char *buffer_end)
 	return 0;
 }
 
-int git_tag__parse_raw(void *_tag, const char *data, size_t size)
+int git_tag__parse_raw(
+	void *_tag,
+	const char *data,
+	size_t size,
+	git_oid_t oid_type)
 {
-	return tag_parse(_tag, data, data + size);
+	return tag_parse(_tag, data, data + size, oid_type);
 }
 
-int git_tag__parse(void *_tag, git_odb_object *odb_obj)
+int git_tag__parse(
+	void *_tag,
+	git_odb_object *odb_obj,
+	git_oid_t oid_type)
 {
 	git_tag *tag = _tag;
 	const char *buffer = git_odb_object_data(odb_obj);
 	const char *buffer_end = buffer + git_odb_object_size(odb_obj);
 
-	return tag_parse(tag, buffer, buffer_end);
+	return tag_parse(tag, buffer, buffer_end, oid_type);
 }
 
 static int retrieve_tag_reference(
 	git_reference **tag_reference_out,
-	git_buf *ref_name_out,
+	git_str *ref_name_out,
 	git_repository *repo,
 	const char *tag_name)
 {
@@ -185,7 +197,7 @@ static int retrieve_tag_reference(
 
 	*tag_reference_out = NULL;
 
-	if (git_buf_joinpath(ref_name_out, GIT_REFS_TAGS_DIR, tag_name) < 0)
+	if (git_str_joinpath(ref_name_out, GIT_REFS_TAGS_DIR, tag_name) < 0)
 		return -1;
 
 	error = git_reference_lookup(&tag_ref, repo, ref_name_out->ptr);
@@ -199,11 +211,11 @@ static int retrieve_tag_reference(
 
 static int retrieve_tag_reference_oid(
 	git_oid *oid,
-	git_buf *ref_name_out,
+	git_str *ref_name_out,
 	git_repository *repo,
 	const char *tag_name)
 {
-	if (git_buf_joinpath(ref_name_out, GIT_REFS_TAGS_DIR, tag_name) < 0)
+	if (git_str_joinpath(ref_name_out, GIT_REFS_TAGS_DIR, tag_name) < 0)
 		return -1;
 
 	return git_reference_name_to_id(oid, repo, ref_name_out->ptr);
@@ -217,16 +229,18 @@ static int write_tag_annotation(
 		const git_signature *tagger,
 		const char *message)
 {
-	git_buf tag = GIT_BUF_INIT;
+	git_str tag = GIT_STR_INIT;
 	git_odb *odb;
 
-	git_oid__writebuf(&tag, "object ", git_object_id(target));
-	git_buf_printf(&tag, "type %s\n", git_object_type2string(git_object_type(target)));
-	git_buf_printf(&tag, "tag %s\n", tag_name);
+	if (git_object__write_oid_header(&tag, "object ", git_object_id(target)) < 0)
+		goto on_error;
+
+	git_str_printf(&tag, "type %s\n", git_object_type2string(git_object_type(target)));
+	git_str_printf(&tag, "tag %s\n", tag_name);
 	git_signature__writebuf(&tag, "tagger ", tagger);
-	git_buf_putc(&tag, '\n');
+	git_str_putc(&tag, '\n');
 
-	if (git_buf_puts(&tag, message) < 0)
+	if (git_str_puts(&tag, message) < 0)
 		goto on_error;
 
 	if (git_repository_odb__weakptr(&odb, repo) < 0)
@@ -235,15 +249,24 @@ static int write_tag_annotation(
 	if (git_odb_write(oid, odb, tag.ptr, tag.size, GIT_OBJECT_TAG) < 0)
 		goto on_error;
 
-	git_buf_dispose(&tag);
+	git_str_dispose(&tag);
 	return 0;
 
 on_error:
-	git_buf_dispose(&tag);
+	git_str_dispose(&tag);
 	git_error_set(GIT_ERROR_OBJECT, "failed to create tag annotation");
 	return -1;
 }
 
+static bool tag_name_is_valid(const char *tag_name)
+{
+	/*
+	 * Discourage tag name starting with dash,
+	 * https://github.com/git/git/commit/4f0accd638b8d2
+	 */
+	return tag_name[0] != '-';
+}
+
 static int git_tag_create__internal(
 		git_oid *oid,
 		git_repository *repo,
@@ -255,7 +278,7 @@ static int git_tag_create__internal(
 		int create_tag_annotation)
 {
 	git_reference *new_ref = NULL;
-	git_buf ref_name = GIT_BUF_INIT;
+	git_str ref_name = GIT_STR_INIT;
 
 	int error;
 
@@ -269,6 +292,11 @@ static int git_tag_create__internal(
 		return -1;
 	}
 
+	if (!tag_name_is_valid(tag_name)) {
+		git_error_set(GIT_ERROR_TAG, "'%s' is not a valid tag name", tag_name);
+		return -1;
+	}
+
 	error = retrieve_tag_reference_oid(oid, &ref_name, repo, tag_name);
 	if (error < 0 && error != GIT_ENOTFOUND)
 		goto cleanup;
@@ -276,14 +304,16 @@ static int git_tag_create__internal(
 	/** Ensure the tag name doesn't conflict with an already existing
 	 *	reference unless overwriting has explicitly been requested **/
 	if (error == 0 && !allow_ref_overwrite) {
-		git_buf_dispose(&ref_name);
+		git_str_dispose(&ref_name);
 		git_error_set(GIT_ERROR_TAG, "tag already exists");
 		return GIT_EEXISTS;
 	}
 
 	if (create_tag_annotation) {
-		if (write_tag_annotation(oid, repo, tag_name, target, tagger, message) < 0)
+		if (write_tag_annotation(oid, repo, tag_name, target, tagger, message) < 0) {
+			git_str_dispose(&ref_name);
 			return -1;
+		}
 	} else
 		git_oid_cpy(oid, git_object_id(target));
 
@@ -291,7 +321,7 @@ static int git_tag_create__internal(
 
 cleanup:
 	git_reference_free(new_ref);
-	git_buf_dispose(&ref_name);
+	git_str_dispose(&ref_name);
 	return error;
 }
 
@@ -344,7 +374,7 @@ int git_tag_create_from_buffer(git_oid *oid, git_repository *repo, const char *b
 	git_odb_object *target_obj;
 
 	git_reference *new_ref = NULL;
-	git_buf ref_name = GIT_BUF_INIT;
+	git_str ref_name = GIT_STR_INIT;
 
 	GIT_ASSERT_ARG(oid);
 	GIT_ASSERT_ARG(buffer);
@@ -355,7 +385,7 @@ int git_tag_create_from_buffer(git_oid *oid, git_repository *repo, const char *b
 		return -1;
 
 	/* validate the buffer */
-	if (tag_parse(&tag, buffer, buffer + strlen(buffer)) < 0)
+	if (tag_parse(&tag, buffer, buffer + strlen(buffer), repo->oid_type) < 0)
 		return -1;
 
 	/* validate the target */
@@ -380,14 +410,17 @@ int git_tag_create_from_buffer(git_oid *oid, git_repository *repo, const char *b
 	/** Ensure the tag name doesn't conflict with an already existing
 	 *	reference unless overwriting has explicitly been requested **/
 	if (error == 0 && !allow_ref_overwrite) {
+		git_str_dispose(&ref_name);
 		git_error_set(GIT_ERROR_TAG, "tag already exists");
 		return GIT_EEXISTS;
 	}
 
 	/* write the buffer */
 	if ((error = git_odb_open_wstream(
-			&stream, odb, strlen(buffer), GIT_OBJECT_TAG)) < 0)
+			&stream, odb, strlen(buffer), GIT_OBJECT_TAG)) < 0) {
+		git_str_dispose(&ref_name);
 		return error;
+	}
 
 	if (!(error = git_odb_stream_write(stream, buffer, strlen(buffer))))
 		error = git_odb_stream_finalize_write(oid, stream);
@@ -395,7 +428,7 @@ int git_tag_create_from_buffer(git_oid *oid, git_repository *repo, const char *b
 	git_odb_stream_free(stream);
 
 	if (error < 0) {
-		git_buf_dispose(&ref_name);
+		git_str_dispose(&ref_name);
 		return error;
 	}
 
@@ -403,7 +436,7 @@ int git_tag_create_from_buffer(git_oid *oid, git_repository *repo, const char *b
 		&new_ref, repo, ref_name.ptr, oid, allow_ref_overwrite, NULL);
 
 	git_reference_free(new_ref);
-	git_buf_dispose(&ref_name);
+	git_str_dispose(&ref_name);
 
 	return error;
 
@@ -418,12 +451,12 @@ on_error:
 int git_tag_delete(git_repository *repo, const char *tag_name)
 {
 	git_reference *tag_ref;
-	git_buf ref_name = GIT_BUF_INIT;
+	git_str ref_name = GIT_STR_INIT;
 	int error;
 
 	error = retrieve_tag_reference(&tag_ref, &ref_name, repo, tag_name);
 
-	git_buf_dispose(&ref_name);
+	git_str_dispose(&ref_name);
 
 	if (error < 0)
 		return error;
@@ -515,7 +548,7 @@ int git_tag_list_match(git_strarray *tag_names, const char *pattern, git_reposit
 	error = git_tag_foreach(repo, &tag_list_cb, (void *)&filter);
 
 	if (error < 0)
-		git_vector_free(&taglist);
+		git_vector_dispose(&taglist);
 
 	tag_names->strings =
 		(char **)git_vector_detach(&tag_names->count, NULL, &taglist);
@@ -535,26 +568,24 @@ int git_tag_peel(git_object **tag_target, const git_tag *tag)
 
 int git_tag_name_is_valid(int *valid, const char *name)
 {
-	git_buf ref_name = GIT_BUF_INIT;
+	git_str ref_name = GIT_STR_INIT;
 	int error = 0;
 
 	GIT_ASSERT(valid);
 
-	/*
-	 * Discourage tag name starting with dash,
-	 * https://github.com/git/git/commit/4f0accd638b8d2
-	 */
-	if (!name || name[0] == '-')
+	*valid = 0;
+
+	if (!name || !tag_name_is_valid(name))
 		goto done;
 
-	if ((error = git_buf_puts(&ref_name, GIT_REFS_TAGS_DIR)) < 0 ||
-	    (error = git_buf_puts(&ref_name, name)) < 0)
+	if ((error = git_str_puts(&ref_name, GIT_REFS_TAGS_DIR)) < 0 ||
+	    (error = git_str_puts(&ref_name, name)) < 0)
 		goto done;
 
 	error = git_reference_name_is_valid(valid, ref_name.ptr);
 
 done:
-	git_buf_dispose(&ref_name);
+	git_str_dispose(&ref_name);
 	return error;
 }
 

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

@@ -25,7 +25,7 @@ struct git_tag {
 };
 
 void git_tag__free(void *tag);
-int git_tag__parse(void *tag, git_odb_object *obj);
-int git_tag__parse_raw(void *tag, const char *data, size_t size);
+int git_tag__parse(void *tag, git_odb_object *obj, git_oid_t oid_type);
+int git_tag__parse_raw(void *tag, const char *data, size_t size, git_oid_t oid_type);
 
 #endif

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

@@ -7,19 +7,14 @@
 
 #include "trace.h"
 
-#include "buffer.h"
+#include "str.h"
 #include "runtime.h"
 #include "git2/trace.h"
 
-#ifdef GIT_TRACE
-
 struct git_trace_data git_trace__data = {0};
 
-#endif
-
 int git_trace_set(git_trace_level_t level, git_trace_cb callback)
 {
-#ifdef GIT_TRACE
 	GIT_ASSERT_ARG(level == 0 || callback != NULL);
 
 	git_trace__data.level = level;
@@ -27,12 +22,4 @@ int git_trace_set(git_trace_level_t level, git_trace_cb callback)
 	GIT_MEMORY_BARRIER;
 
 	return 0;
-#else
-	GIT_UNUSED(level);
-	GIT_UNUSED(callback);
-
-	git_error_set(GIT_ERROR_INVALID,
-		"this version of libgit2 was not built with tracing.");
-	return -1;
-#endif
 }

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

@@ -10,9 +10,7 @@
 #include "common.h"
 
 #include <git2/trace.h>
-#include "buffer.h"
-
-#ifdef GIT_TRACE
+#include "str.h"
 
 struct git_trace_data {
 	git_trace_level_t level;
@@ -27,13 +25,13 @@ GIT_INLINE(void) git_trace__write_fmt(
 	va_list ap)
 {
 	git_trace_cb callback = git_trace__data.callback;
-	git_buf message = GIT_BUF_INIT;
+	git_str message = GIT_STR_INIT;
 
-	git_buf_vprintf(&message, fmt, ap);
+	git_str_vprintf(&message, fmt, ap);
 
-	callback(level, git_buf_cstr(&message));
+	callback(level, git_str_cstr(&message));
 
-	git_buf_dispose(&message);
+	git_str_dispose(&message);
 }
 
 #define git_trace_level()	(git_trace__data.level)
@@ -50,19 +48,4 @@ GIT_INLINE(void) git_trace(git_trace_level_t level, const char *fmt, ...)
 	}
 }
 
-#else
-
-GIT_INLINE(void) git_trace__null(
-	git_trace_level_t level,
-	const char *fmt, ...)
-{
-	GIT_UNUSED(level);
-	GIT_UNUSED(fmt);
-}
-
-#define git_trace_level()	((git_trace_level_t)0)
-#define git_trace		git_trace__null
-
-#endif
-
 #endif

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

@@ -24,7 +24,7 @@ static const char *const git_generated_prefixes[] = {
 static int is_blank_line(const char *str)
 {
 	const char *s = str;
-	while (*s && *s != '\n' && isspace(*s))
+	while (*s && *s != '\n' && git__isspace(*s))
 		s++;
 	return !*s || *s == '\n';
 }
@@ -93,7 +93,7 @@ static bool find_separator(size_t *out, const char *line, const char *separators
 			return true;
 		}
 
-		if (!whitespace_found && (isalnum(*c) || *c == '-'))
+		if (!whitespace_found && (git__isalnum(*c) || *c == '-'))
 			continue;
 		if (c != line && (*c == ' ' || *c == '\t')) {
 			whitespace_found = 1;
@@ -158,7 +158,7 @@ static size_t find_patch_start(const char *str)
 	const char *s;
 
 	for (s = str; *s; s = next_line(s)) {
-		if (git__prefixcmp(s, "---") == 0)
+		if (git__prefixcmp(s, "---") == 0 && git__isspace(s[3]))
 			return s - str;
 	}
 
@@ -233,12 +233,12 @@ static size_t find_trailer_start(const char *buf, size_t len)
 		}
 
 		find_separator(&separator_pos, bol, TRAILER_SEPARATORS);
-		if (separator_pos >= 1 && !isspace(bol[0])) {
+		if (separator_pos >= 1 && !git__isspace(bol[0])) {
 			trailer_lines++;
 			possible_continuation_lines = 0;
 			if (recognized_prefix)
 				continue;
-		} else if (isspace(bol[0]))
+		} else if (git__isspace(bol[0]))
 			possible_continuation_lines++;
 		else {
 			non_trailer_lines++;
@@ -286,7 +286,7 @@ enum trailer_state {
 	S_VALUE = 4,
 	S_VALUE_NL = 5,
 	S_VALUE_END = 6,
-	S_IGNORE = 7,
+	S_IGNORE = 7
 };
 
 #define NEXT(st) { state = (st); ptr++; continue; }
@@ -323,7 +323,7 @@ int git_message_trailers(git_message_trailer_array *trailer_arr, const char *mes
 					goto ret;
 				}
 
-				if (isalnum(*ptr) || *ptr == '-') {
+				if (git__isalnum(*ptr) || *ptr == '-') {
 					/* legal key character */
 					NEXT(S_KEY);
 				}