rugged 1.6.3 → 1.9.0

data/vendor/libgit2/include/git2/sys/commit_graph.h

@@ -12,13 +12,52 @@
 
 /**
  * @file git2/sys/commit_graph.h
- * @brief Git commit-graph
- * @defgroup git_commit_graph Git commit-graph APIs
+ * @brief Commit graphs store information about commit relationships
+ * @defgroup git_commit_graph Commit graphs
  * @ingroup Git
  * @{
  */
 GIT_BEGIN_DECL
 
+/**
+ * Options structure for `git_commit_graph_open_new`.
+ *
+ * Initialize with `GIT_COMMIT_GRAPH_OPEN_OPTIONS_INIT`. Alternatively,
+ * you can use `git_commit_graph_open_options_init`.
+ */
+typedef struct {
+	unsigned int version;
+
+#ifdef GIT_EXPERIMENTAL_SHA256
+	/** The object ID type that this commit graph contains. */
+	git_oid_t oid_type;
+#endif
+} git_commit_graph_open_options;
+
+/** Current version for the `git_commit_graph_open_options` structure */
+#define GIT_COMMIT_GRAPH_OPEN_OPTIONS_VERSION 1
+
+/** Static constructor for `git_commit_graph_open_options` */
+#define GIT_COMMIT_GRAPH_OPEN_OPTIONS_INIT { \
+		GIT_COMMIT_GRAPH_OPEN_OPTIONS_VERSION \
+	}
+
+/**
+ * Initialize git_commit_graph_open_options structure
+ *
+ * Initializes a `git_commit_graph_open_options` with default values.
+ * Equivalent to creating an instance with
+ * `GIT_COMMIT_GRAPH_OPEN_OPTIONS_INIT`.
+ *
+ * @param opts The `git_commit_graph_open_options` struct to initialize.
+ * @param version The struct version; pass `GIT_COMMIT_GRAPH_OPEN_OPTIONS_VERSION`.
+ * @return Zero on success; -1 on failure.
+ */
+GIT_EXTERN(int) git_commit_graph_open_options_init(
+	git_commit_graph_open_options *opts,
+	unsigned int version);
+
+
 /**
  * Opens a `git_commit_graph` from a path to an objects directory.
  *
@@ -28,7 +67,13 @@ GIT_BEGIN_DECL
  * @param objects_dir the path to a git objects directory.
  * @return Zero on success; -1 on failure.
  */
-GIT_EXTERN(int) git_commit_graph_open(git_commit_graph **cgraph_out, const char *objects_dir);
+GIT_EXTERN(int) git_commit_graph_open(
+	git_commit_graph **cgraph_out,
+	const char *objects_dir
+#ifdef GIT_EXPERIMENTAL_SHA256
+	, const git_commit_graph_open_options *options
+#endif
+	);
 
 /**
  * Frees commit-graph data. This should only be called when memory allocated
@@ -40,50 +85,6 @@ GIT_EXTERN(int) git_commit_graph_open(git_commit_graph **cgraph_out, const char
  */
 GIT_EXTERN(void) git_commit_graph_free(git_commit_graph *cgraph);
 
-/**
- * Create a new writer for `commit-graph` files.
- *
- * @param out Location to store the writer pointer.
- * @param objects_info_dir The `objects/info` directory.
- * The `commit-graph` file will be written in this directory.
- * @return 0 or an error code
- */
-GIT_EXTERN(int) git_commit_graph_writer_new(
-		git_commit_graph_writer **out,
-		const char *objects_info_dir);
-
-/**
- * Free the commit-graph writer and its resources.
- *
- * @param w The writer to free. If NULL no action is taken.
- */
-GIT_EXTERN(void) git_commit_graph_writer_free(git_commit_graph_writer *w);
-
-/**
- * Add an `.idx` file (associated to a packfile) to the writer.
- *
- * @param w The writer.
- * @param repo The repository that owns the `.idx` file.
- * @param idx_path The path of an `.idx` file.
- * @return 0 or an error code
- */
-GIT_EXTERN(int) git_commit_graph_writer_add_index_file(
-		git_commit_graph_writer *w,
-		git_repository *repo,
-		const char *idx_path);
-
-/**
- * Add a revwalk to the writer. This will add all the commits from the revwalk
- * to the commit-graph.
- *
- * @param w The writer.
- * @param walk The git_revwalk.
- * @return 0 or an error code
- */
-GIT_EXTERN(int) git_commit_graph_writer_add_revwalk(
-		git_commit_graph_writer *w,
-		git_revwalk *walk);
-
 
 /**
  * The strategy to use when adding a new set of commits to a pre-existing
@@ -98,15 +99,19 @@ typedef enum {
 } git_commit_graph_split_strategy_t;
 
 /**
- * Options structure for
- * `git_commit_graph_writer_commit`/`git_commit_graph_writer_dump`.
+ * Options structure for `git_commit_graph_writer_new`.
  *
- * Initialize with `GIT_COMMIT_GRAPH_WRITER_OPTIONS_INIT`. Alternatively, you
- * can use `git_commit_graph_writer_options_init`.
+ * Initialize with `GIT_COMMIT_GRAPH_WRITER_OPTIONS_INIT`. Alternatively,
+ * you can use `git_commit_graph_writer_options_init`.
  */
 typedef struct {
 	unsigned int version;
 
+#ifdef GIT_EXPERIMENTAL_SHA256
+	/** The object ID type that this commit graph contains. */
+	git_oid_t oid_type;
+#endif
+
 	/**
 	 * The strategy to use when adding new commits to a pre-existing commit-graph
 	 * chain.
@@ -126,7 +131,10 @@ typedef struct {
 	size_t max_commits;
 } git_commit_graph_writer_options;
 
+/** Current version for the `git_commit_graph_writer_options` structure */
 #define GIT_COMMIT_GRAPH_WRITER_OPTIONS_VERSION 1
+
+/** Static constructor for `git_commit_graph_writer_options` */
 #define GIT_COMMIT_GRAPH_WRITER_OPTIONS_INIT { \
 		GIT_COMMIT_GRAPH_WRITER_OPTIONS_VERSION \
 	}
@@ -145,30 +153,73 @@ GIT_EXTERN(int) git_commit_graph_writer_options_init(
 	git_commit_graph_writer_options *opts,
 	unsigned int version);
 
+/**
+ * Create a new writer for `commit-graph` files.
+ *
+ * @param out Location to store the writer pointer.
+ * @param objects_info_dir The `objects/info` directory.
+ * The `commit-graph` file will be written in this directory.
+ * @param options The options for the commit graph writer.
+ * @return 0 or an error code
+ */
+GIT_EXTERN(int) git_commit_graph_writer_new(
+		git_commit_graph_writer **out,
+		const char *objects_info_dir,
+		const git_commit_graph_writer_options *options);
+
+/**
+ * Free the commit-graph writer and its resources.
+ *
+ * @param w The writer to free. If NULL no action is taken.
+ */
+GIT_EXTERN(void) git_commit_graph_writer_free(git_commit_graph_writer *w);
+
+/**
+ * Add an `.idx` file (associated to a packfile) to the writer.
+ *
+ * @param w The writer.
+ * @param repo The repository that owns the `.idx` file.
+ * @param idx_path The path of an `.idx` file.
+ * @return 0 or an error code
+ */
+GIT_EXTERN(int) git_commit_graph_writer_add_index_file(
+		git_commit_graph_writer *w,
+		git_repository *repo,
+		const char *idx_path);
+
+/**
+ * Add a revwalk to the writer. This will add all the commits from the revwalk
+ * to the commit-graph.
+ *
+ * @param w The writer.
+ * @param walk The git_revwalk.
+ * @return 0 or an error code
+ */
+GIT_EXTERN(int) git_commit_graph_writer_add_revwalk(
+		git_commit_graph_writer *w,
+		git_revwalk *walk);
+
 /**
  * Write a `commit-graph` file to a file.
  *
  * @param w The writer
- * @param opts Pointer to git_commit_graph_writer_options struct.
  * @return 0 or an error code
  */
 GIT_EXTERN(int) git_commit_graph_writer_commit(
-		git_commit_graph_writer *w,
-		git_commit_graph_writer_options *opts);
+		git_commit_graph_writer *w);
 
 /**
  * Dump the contents of the `commit-graph` to an in-memory buffer.
  *
- * @param buffer Buffer where to store the contents of the `commit-graph`.
+ * @param[out] buffer Buffer where to store the contents of the `commit-graph`.
  * @param w The writer.
- * @param opts Pointer to git_commit_graph_writer_options struct.
  * @return 0 or an error code
  */
 GIT_EXTERN(int) git_commit_graph_writer_dump(
 		git_buf *buffer,
-		git_commit_graph_writer *w,
-		git_commit_graph_writer_options *opts);
+		git_commit_graph_writer *w);
 
 /** @} */
 GIT_END_DECL
+
 #endif

data/vendor/libgit2/include/git2/sys/config.h

@@ -13,13 +13,28 @@
 
 /**
  * @file git2/sys/config.h
- * @brief Git config backend routines
- * @defgroup git_backend Git custom backend APIs
+ * @brief Custom configuration database backends
+ * @defgroup git_backend Custom configuration database backends
  * @ingroup Git
  * @{
  */
 GIT_BEGIN_DECL
 
+/**
+ * An entry in a configuration backend. This is provided so that
+ * backend implementors can have a mechanism to free their data.
+ */
+typedef struct git_config_backend_entry {
+	/** The base configuration entry */
+	struct git_config_entry entry;
+
+	/**
+	 * Free function for this entry; for internal purposes. Callers
+	 * should call `git_config_entry_free` to free data.
+	 */
+	void GIT_CALLBACK(free)(struct git_config_backend_entry *entry);
+} git_config_backend_entry;
+
 /**
  * Every iterator must have this struct as its first element, so the
  * API can talk to it. You'd define your iterator as
@@ -39,7 +54,7 @@ struct git_config_iterator {
 	 * Return the current entry and advance the iterator. The
 	 * memory belongs to the library.
 	 */
-	int GIT_CALLBACK(next)(git_config_entry **entry, git_config_iterator *iter);
+	int GIT_CALLBACK(next)(git_config_backend_entry **entry, git_config_iterator *iter);
 
 	/**
 	 * Free the iterator
@@ -59,7 +74,7 @@ struct git_config_backend {
 
 	/* Open means open the file/database and parse if necessary */
 	int GIT_CALLBACK(open)(struct git_config_backend *, git_config_level_t level, const git_repository *repo);
-	int GIT_CALLBACK(get)(struct git_config_backend *, const char *key, git_config_entry **entry);
+	int GIT_CALLBACK(get)(struct git_config_backend *, const char *key, git_config_backend_entry **entry);
 	int GIT_CALLBACK(set)(struct git_config_backend *, const char *key, const char *value);
 	int GIT_CALLBACK(set_multivar)(git_config_backend *cfg, const char *name, const char *regexp, const char *value);
 	int GIT_CALLBACK(del)(struct git_config_backend *, const char *key);
@@ -83,7 +98,11 @@ struct git_config_backend {
 	int GIT_CALLBACK(unlock)(struct git_config_backend *, int success);
 	void GIT_CALLBACK(free)(struct git_config_backend *);
 };
+
+/** Current version for the `git_config_backend_options` structure */
 #define GIT_CONFIG_BACKEND_VERSION 1
+
+/** Static constructor for `git_config_backend_options` */
 #define GIT_CONFIG_BACKEND_INIT {GIT_CONFIG_BACKEND_VERSION}
 
 /**
@@ -125,6 +144,63 @@ GIT_EXTERN(int) git_config_add_backend(
 	const git_repository *repo,
 	int force);
 
+/** Options for in-memory configuration backends. */
+typedef struct {
+	unsigned int version;
+
+	/**
+	 * The type of this backend (eg, "command line"). If this is
+	 * NULL, then this will be "in-memory".
+	 */
+	const char *backend_type;
+
+	/**
+	 * The path to the origin; if this is NULL then it will be
+	 * left unset in the resulting configuration entries.
+	 */
+	const char *origin_path;
+} git_config_backend_memory_options;
+
+/** Current version for the `git_config_backend_memory_options` structure */
+#define GIT_CONFIG_BACKEND_MEMORY_OPTIONS_VERSION 1
+
+/** Static constructor for `git_config_backend_memory_options` */
+#define GIT_CONFIG_BACKEND_MEMORY_OPTIONS_INIT { GIT_CONFIG_BACKEND_MEMORY_OPTIONS_VERSION }
+
+
+/**
+ * Create an in-memory configuration backend from a string in standard
+ * git configuration file format.
+ *
+ * @param out the new backend
+ * @param cfg the configuration that is to be parsed
+ * @param len the length of the string pointed to by `cfg`
+ * @param opts the options to initialize this backend with, or NULL
+ * @return 0 on success or an error code
+ */
+extern int git_config_backend_from_string(
+	git_config_backend **out,
+	const char *cfg,
+	size_t len,
+	git_config_backend_memory_options *opts);
+
+/**
+ * Create an in-memory configuration backend from a list of name/value
+ * pairs.
+ *
+ * @param out the new backend
+ * @param values the configuration values to set (in "key=value" format)
+ * @param len the length of the values array
+ * @param opts the options to initialize this backend with, or NULL
+ * @return 0 on success or an error code
+ */
+extern int git_config_backend_from_values(
+	git_config_backend **out,
+	const char **values,
+	size_t len,
+	git_config_backend_memory_options *opts);
+
 /** @} */
 GIT_END_DECL
+
 #endif

data/vendor/libgit2/include/git2/sys/credential.h

@@ -11,9 +11,9 @@
 #include "git2/credential.h"
 
 /**
- * @file git2/sys/cred.h
- * @brief Git credentials low-level implementation
- * @defgroup git_credential Git credentials low-level implementation
+ * @file git2/sys/credential.h
+ * @brief Low-level credentials implementation
+ * @defgroup git_credential Low-level credentials implementation
  * @ingroup Git
  * @{
  */
@@ -85,6 +85,7 @@ struct git_credential_ssh_custom {
 	void *payload;         /**< Payload passed to prompt_callback */
 };
 
+/** @} */
 GIT_END_DECL
 
 #endif

data/vendor/libgit2/include/git2/sys/diff.h

@@ -15,7 +15,7 @@
 
 /**
  * @file git2/sys/diff.h
- * @brief Low-level Git diff utilities
+ * @brief Low-level diff utilities
  * @ingroup Git
  * @{
  */
@@ -33,6 +33,12 @@ GIT_BEGIN_DECL
  * must pass a `git_buf *` value as the payload to the `git_diff_print`
  * and/or `git_patch_print` function.  The data will be appended to the
  * buffer (after any existing content).
+ *
+ * @param delta the delta being processed
+ * @param hunk the hunk being processed
+ * @param line the line being processed
+ * @param payload the payload provided by the diff generator
+ * @return 0 on success or an error code
  */
 GIT_EXTERN(int) git_diff_print_callback__to_buf(
 	const git_diff_delta *delta,
@@ -53,6 +59,12 @@ GIT_EXTERN(int) git_diff_print_callback__to_buf(
  * value from `fopen()`) as the payload to the `git_diff_print`
  * and/or `git_patch_print` function.  If you pass NULL, this will write
  * data to `stdout`.
+ *
+ * @param delta the delta being processed
+ * @param hunk the hunk being processed
+ * @param line the line being processed
+ * @param payload the payload provided by the diff generator
+ * @return 0 on success or an error code
  */
 GIT_EXTERN(int) git_diff_print_callback__to_file_handle(
 	const git_diff_delta *delta,
@@ -70,7 +82,10 @@ typedef struct {
 	size_t oid_calculations; /**< Number of ID calculations */
 } git_diff_perfdata;
 
+/** Current version for the `git_diff_perfdata_options` structure */
 #define GIT_DIFF_PERFDATA_VERSION 1
+
+/** Static constructor for `git_diff_perfdata_options` */
 #define GIT_DIFF_PERFDATA_INIT {GIT_DIFF_PERFDATA_VERSION,0,0}
 
 /**
@@ -85,10 +100,15 @@ GIT_EXTERN(int) git_diff_get_perfdata(
 
 /**
  * Get performance data for diffs from a git_status_list
+ *
+ * @param out Structure to be filled with diff performance data
+ * @param status Diff to read performance data from
+ * @return 0 for success, <0 for error
  */
 GIT_EXTERN(int) git_status_list_get_perfdata(
 	git_diff_perfdata *out, const git_status_list *status);
 
 /** @} */
 GIT_END_DECL
+
 #endif

data/vendor/libgit2/include/git2/sys/email.h

@@ -7,6 +7,11 @@
 #ifndef INCLUDE_sys_git_email_h__
 #define INCLUDE_sys_git_email_h__
 
+#include "git2/common.h"
+#include "git2/diff.h"
+#include "git2/email.h"
+#include "git2/types.h"
+
 /**
  * @file git2/sys/email.h
  * @brief Advanced git email creation routines
@@ -28,6 +33,7 @@ GIT_BEGIN_DECL
  * @param body optional text to include above the diffstat
  * @param author the person who authored this commit
  * @param opts email creation options
+ * @return 0 on success or an error code
  */
 GIT_EXTERN(int) git_email_create_from_diff(
 	git_buf *out,
@@ -42,4 +48,5 @@ GIT_EXTERN(int) git_email_create_from_diff(
 
 /** @} */
 GIT_END_DECL
+
 #endif

data/vendor/libgit2/include/git2/sys/errors.h

@@ -0,0 +1,76 @@
+/*
+ * 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_sys_git_errors_h__
+#define INCLUDE_sys_git_errors_h__
+
+#include "git2/common.h"
+
+/**
+ * @file git2/sys/errors.h
+ * @brief Advanced error handling
+ * @ingroup Git
+ *
+ * Error handling for advanced consumers; those who use callbacks
+ * or those who create custom databases.
+ * @{
+ */
+GIT_BEGIN_DECL
+
+/**
+ * Clear the last library error that occurred for this thread.
+ */
+GIT_EXTERN(void) git_error_clear(void);
+
+/**
+ * Set the error message string for this thread, using `printf`-style
+ * formatting.
+ *
+ * This function is public so that custom ODB backends and the like can
+ * relay an error message through libgit2.  Most regular users of libgit2
+ * will never need to call this function -- actually, calling it in most
+ * circumstances (for example, calling from within a callback function)
+ * will just end up having the value overwritten by libgit2 internals.
+ *
+ * This error message is stored in thread-local storage and only applies
+ * to the particular thread that this libgit2 call is made from.
+ *
+ * @param error_class One of the `git_error_t` enum above describing the
+ *                    general subsystem that is responsible for the error.
+ * @param fmt The `printf`-style format string; subsequent arguments must
+ *            be the arguments for the format string.
+ */
+GIT_EXTERN(void) git_error_set(int error_class, const char *fmt, ...)
+                 GIT_FORMAT_PRINTF(2, 3);
+
+/**
+ * Set the error message string for this thread.  This function is like
+ * `git_error_set` but takes a static string instead of a `printf`-style
+ * format.
+ *
+ * @param error_class One of the `git_error_t` enum above describing the
+ *                    general subsystem that is responsible for the error.
+ * @param string The error message to keep
+ * @return 0 on success or -1 on failure
+ */
+GIT_EXTERN(int) git_error_set_str(int error_class, const char *string);
+
+/**
+ * Set the error message to a special value for memory allocation failure.
+ *
+ * The normal `git_error_set_str()` function attempts to `strdup()` the
+ * string that is passed in.  This is not a good idea when the error in
+ * question is a memory allocation failure.  That circumstance has a
+ * special setter function that sets the error string to a known and
+ * statically allocated internal value.
+ */
+GIT_EXTERN(void) git_error_set_oom(void);
+
+/** @} */
+GIT_END_DECL
+
+#endif