rugged 0.24.6.1 → 0.25.0b1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4b1489ad0847a3a4701d7f5f9ea3e6e78a9d556
-  data.tar.gz: be07145f99c3be07bf0c970c70932e2ef4b7a94c
+  metadata.gz: bbcf49a26d55dbaaf0d89824638a58cf8897df0e
+  data.tar.gz: 5ce5dbfce098463431aad99034c49c58396d2216
 SHA512:
-  metadata.gz: 2ff1cce3c75a0027c9003ce19021cd589a3fdffeaf2c69ccd5dd6614c77e80964256580a230c7e61fa1fd9dbe871fd79029c17d3f027f7f2d3eb6a7346f3633d
-  data.tar.gz: c63797d882cf388ad42a9d83c054dfe4b1bd5091654c89433fe2fa43481d9b7122d659a3ed53de95241e74125f030c8e06f375216b8618e57effe5f19de1ef08
+  metadata.gz: 059bab3bb87c0bd0070cffef4b33140a667cf31cbf612cab3f2b89131251d8c1e47de635e88fcda80e2b3f8d572c906e3bddc875e3937bf49a5f471db1866687
+  data.tar.gz: 6e119cf6ccad1b2112885fe8b78f9bd93c46ffda7e9df8ec9bc6e2003710fc95400e25ef8bf9be1e8577dc5510ad4255e08390caf110c10a9b59d5843326e672

data/ext/rugged/rugged_repo.c

@@ -1045,10 +1045,13 @@ static VALUE rb_git_repo_read_header(VALUE self, VALUE hex)
 /**
  *  call-seq:
  *    repo.expand_oids([oid..], object_type = :any) -> hash
+ *    repo.expand_oids([oid..], object_type = [type..]) -> hash
  *
  *  Expand a list of short oids to their full value, assuming they exist
- *  in the repository. If `object_type` is passed, OIDs are expected to be
- *  of the given type.
+ *  in the repository. If `object_type` is passed and is an array, it must
+ *  be the same length as the OIDs array. If it's a single type name, all
+ *  OIDs will be expected to resolve to that object type. OIDs that don't
+ *  match the expected object types will not be expanded.
  *
  *  Returns a hash of `{ short_oid => full_oid }` for the short OIDs which
  *  exist in the repository and match the expected object type. Missing OIDs
@@ -1058,59 +1061,64 @@ static VALUE rb_git_repo_expand_oids(int argc, VALUE *argv, VALUE self)
 {
 	VALUE rb_result, rb_oids, rb_expected_type;
 
-	git_otype expected_type = GIT_OBJ_ANY;
-
 	git_repository *repo;
-	git_oid oid;
 	git_odb *odb;
-	int i, error;
+	git_odb_expand_id *expand;
+	long i, expand_count;
+	int error;
 
 	Data_Get_Struct(self, git_repository, repo);
-
 	rb_scan_args(argc, argv, "11", &rb_oids, &rb_expected_type);
 
 	Check_Type(rb_oids, T_ARRAY);
-	expected_type = rugged_otype_get(rb_expected_type);
+	expand_count = RARRAY_LEN(rb_oids);
+	expand = alloca(expand_count * sizeof(git_odb_expand_id));
 
-	error = git_repository_odb(&odb, repo);
-	rugged_exception_check(error);
+	for (i = 0; i < expand_count; ++i) {
+		VALUE rb_hex = rb_ary_entry(rb_oids, i);
+		Check_Type(rb_hex, T_STRING);
 
-	rb_result = rb_hash_new();
+		rugged_exception_check(
+			git_oid_fromstrn(&expand[i].id, RSTRING_PTR(rb_hex), RSTRING_LEN(rb_hex))
+		);
+		expand[i].length = RSTRING_LEN(rb_hex);
+	}
 
-	for (i = 0; i < RARRAY_LEN(rb_oids); ++i) {
-		VALUE hex_oid = rb_ary_entry(rb_oids, i);
-		git_oid found_oid;
+	if (TYPE(rb_expected_type) == T_ARRAY) {
+		if (RARRAY_LEN(rb_expected_type) != expand_count)
+			rb_raise(rb_eRuntimeError,
+				"the `object_type` array must be the same length as the `oids` array");
 
-		if (TYPE(hex_oid) != T_STRING) {
-			git_odb_free(odb);
-			rb_raise(rb_eTypeError, "Expected a SHA1 OID");
+		for (i = 0; i < expand_count; ++i) {
+			VALUE rb_type = rb_ary_entry(rb_expected_type, i);
+			expand[i].type = rugged_otype_get(rb_type);
 		}
+	} else {
+		git_otype expected_type = GIT_OBJ_ANY;
 
-		error = git_oid_fromstrn(&oid, RSTRING_PTR(hex_oid), RSTRING_LEN(hex_oid));
-		if (error < 0) {
-			git_odb_free(odb);
-			rugged_exception_check(error);
-		}
+		if (!NIL_P(rb_expected_type))
+			expected_type = rugged_otype_get(rb_expected_type);
 
-		error = git_odb_exists_prefix(&found_oid, odb, &oid, RSTRING_LEN(hex_oid));
+		for (i = 0; i < expand_count; ++i)
+			expand[i].type = expected_type;
+	}
 
-		if (!error) {
-			if (expected_type != GIT_OBJ_ANY) {
-				size_t found_size;
-				git_otype found_type;
+	error = git_repository_odb(&odb, repo);
+	rugged_exception_check(error);
 
-				if (git_odb_read_header(&found_size, &found_type, odb, &found_oid) < 0)
-					continue;
+	error = git_odb_expand_ids(odb, expand, (size_t)expand_count);
+	git_odb_free(odb);
+	rugged_exception_check(error);
 
-				if (found_type != expected_type)
-					continue;
-			}
+	rb_result = rb_hash_new();
 
-			rb_hash_aset(rb_result, hex_oid, rugged_create_oid(&found_oid));
+	for (i = 0; i < expand_count; ++i) {
+		if (expand[i].length) {
+			rb_hash_aset(rb_result,
+				rb_ary_entry(rb_oids, i), rugged_create_oid(&expand[i].id));
 		}
 	}
 
-	git_odb_free(odb);
 	return rb_result;
 }
 
@@ -1945,7 +1953,7 @@ void rugged_parse_checkout_options(git_checkout_options *opts, VALUE rb_options)
 
 	rb_value = rb_hash_aref(rb_options, CSTR2SYM("progress"));
 	if (!NIL_P(rb_value)) {
-		struct rugged_cb_payload *payload = malloc(sizeof(struct rugged_cb_payload));
+		struct rugged_cb_payload *payload = xmalloc(sizeof(struct rugged_cb_payload));
 		payload->rb_data = rb_value;
 		payload->exception = 0;
 
@@ -1955,7 +1963,7 @@ void rugged_parse_checkout_options(git_checkout_options *opts, VALUE rb_options)
 
 	rb_value = rb_hash_aref(rb_options, CSTR2SYM("notify"));
 	if (!NIL_P(rb_value)) {
-		struct rugged_cb_payload *payload = malloc(sizeof(struct rugged_cb_payload));
+		struct rugged_cb_payload *payload = xmalloc(sizeof(struct rugged_cb_payload));
 		payload->rb_data = rb_value;
 		payload->exception = 0;
 

data/lib/rugged/version.rb

@@ -1,3 +1,3 @@
 module Rugged
-  Version = VERSION = '0.24.6.1'
+  Version = VERSION = '0.25.0b1'
 end

data/vendor/libgit2/CMakeLists.txt

@@ -40,7 +40,7 @@ OPTION( USE_ICONV			"Link with and use iconv library" 		OFF )
 OPTION( USE_SSH				"Link with libssh to enable SSH support" ON )
 OPTION( USE_GSSAPI			"Link with libgssapi for SPNEGO auth"   OFF )
 OPTION( VALGRIND			"Configure build for valgrind"			OFF )
-OPTION( CURL			"Use curl for HTTP if available" ON)
+OPTION( CURL			"User curl for HTTP if available" ON)
 OPTION( DEBUG_POOL			"Enable debug pool allocator"			OFF )
 
 IF(DEBUG_POOL)
@@ -109,7 +109,7 @@ ELSE ()
 ENDIF()
 
 IF (HAVE_STRUCT_STAT_NSEC OR WIN32)
-	OPTION( USE_NSEC		"Care about sub-second file mtimes and ctimes"	OFF )
+	OPTION( USE_NSEC		"Care about sub-second file mtimes and ctimes"	ON  )
 ENDIF()
 
 # This variable will contain the libraries we need to put into
@@ -151,10 +151,6 @@ FUNCTION(TARGET_OS_LIBRARIES target)
 		TARGET_LINK_LIBRARIES(${target} socket nsl)
 		LIST(APPEND LIBGIT2_PC_LIBS "-lsocket" "-lnsl")
 		SET(LIBGIT2_PC_LIBS ${LIBGIT2_PC_LIBS} PARENT_SCOPE)
-	ELSEIF(CMAKE_SYSTEM_NAME MATCHES "Haiku")
-		TARGET_LINK_LIBRARIES(${target} network)
-		LIST(APPEND LIBGIT2_PC_LIBS "-lnetwork")
-		SET(LIBGIT2_PC_LIBS ${LIBGIT2_PC_LIBS} PARENT_SCOPE)
 	ENDIF()
 	CHECK_LIBRARY_EXISTS(rt clock_gettime "time.h" NEED_LIBRT)
 	IF(NEED_LIBRT)
@@ -165,8 +161,6 @@ FUNCTION(TARGET_OS_LIBRARIES target)
 
 	IF(THREADSAFE)
 		TARGET_LINK_LIBRARIES(${target} ${CMAKE_THREAD_LIBS_INIT})
-		LIST(APPEND LIBGIT2_PC_LIBS ${CMAKE_THREAD_LIBS_INIT})
-		SET(LIBGIT2_PC_LIBS ${LIBGIT2_PC_LIBS} PARENT_SCOPE)
 	ENDIF()
 ENDFUNCTION()
 
@@ -286,7 +280,6 @@ ELSE ()
 	IF (CURL_FOUND)
 		ADD_DEFINITIONS(-DGIT_CURL)
 		INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS})
-		LINK_DIRECTORIES(${CURL_LIBRARY_DIRS})
 		LINK_LIBRARIES(${CURL_LIBRARIES})
 		LIST(APPEND LIBGIT2_PC_LIBS ${CURL_LDFLAGS})
 	ENDIF()
@@ -419,7 +412,7 @@ IF (MSVC)
 	# /MTd - Statically link the multithreaded debug version of the CRT
 	# /MDd - Dynamically link the multithreaded debug version of the CRT
 	# /RTC1 - Run time checks
-	SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /Zi /Od /D_DEBUG /RTC1 ${CRT_FLAG_DEBUG}")
+	SET(CMAKE_C_FLAGS_DEBUG "/Zi /Od /D_DEBUG /RTC1 ${CRT_FLAG_DEBUG}")
 
 	# /DNDEBUG - Disables asserts
 	# /MT - Statically link the multithreaded release version of the CRT
@@ -471,22 +464,20 @@ ELSE ()
 	ENDIF()
 
 	IF (WIN32 AND NOT CYGWIN)
-		SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
+		SET(CMAKE_C_FLAGS_DEBUG "-D_DEBUG")
 	ENDIF ()
 
-	IF (MINGW OR MSYS) # MinGW and MSYS always do PIC and complain if we tell them to
+	IF (MINGW) # MinGW always does PIC and complains if we tell it to
 		STRING(REGEX REPLACE "-fPIC" "" CMAKE_SHARED_LIBRARY_C_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}")
-	ELSEIF (BUILD_SHARED_LIBS)
-		ADD_C_FLAG_IF_SUPPORTED(-fvisibility=hidden)
-
-		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
-	ENDIF ()
-
-	IF (MINGW)
 		# MinGW >= 3.14 uses the C99-style stdio functions
 		# automatically, but forks like mingw-w64 still want
 		# us to define this in order to use them
 		ADD_DEFINITIONS(-D__USE_MINGW_ANSI_STDIO=1)
+
+	ELSEIF (BUILD_SHARED_LIBS)
+		ADD_C_FLAG_IF_SUPPORTED(-fvisibility=hidden)
+
+		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
 	ENDIF ()
 
 	ADD_C_FLAG_IF_SUPPORTED(-Wdocumentation)
@@ -617,8 +608,6 @@ IF (SONAME)
 	IF (LIBGIT2_FILENAME)
 		ADD_DEFINITIONS(-DLIBGIT2_FILENAME=\"${LIBGIT2_FILENAME}\")
 		SET_TARGET_PROPERTIES(git2 PROPERTIES OUTPUT_NAME ${LIBGIT2_FILENAME})
-	ELSEIF (DEFINED LIBGIT2_PREFIX)
-		SET_TARGET_PROPERTIES(git2 PROPERTIES PREFIX "${LIBGIT2_PREFIX}")
 	ENDIF()
 ENDIF()
 STRING(REPLACE ";" " " LIBGIT2_PC_LIBS "${LIBGIT2_PC_LIBS}")

data/vendor/libgit2/include/git2/checkout.h

@@ -313,13 +313,6 @@ GIT_EXTERN(int) git_checkout_init_options(
  * Updates files in the index and the working tree to match the content of
  * the commit pointed at by HEAD.
  *
- * Note that this is _not_ the correct mechanism used to switch branches;
- * do not change your `HEAD` and then call this method, that would leave
- * you with checkout conflicts since your working directory would then
- * appear to be dirty.  Instead, checkout the target of the branch and
- * then update `HEAD` using `git_repository_set_head` to point to the
- * branch you checked out.
- *
  * @param repo repository to check out (must be non-bare)
  * @param opts specifies checkout options (may be NULL)
  * @return 0 on success, GIT_EUNBORNBRANCH if HEAD points to a non

data/vendor/libgit2/include/git2/commit.h

@@ -394,6 +394,52 @@ GIT_EXTERN(int) git_commit_amend(
 	const char *message,
 	const git_tree *tree);
 
+/**
+ * Create a commit and write it into a buffer
+ *
+ * Create a commit as with `git_commit_create()` but instead of
+ * writing it to the objectdb, write the contents of the object into a
+ * buffer.
+ *
+ * @param out the buffer into which to write the commit object content
+ *
+ * @param repo Repository where the referenced tree and parents live
+ *
+ * @param author Signature with author and author time of commit
+ *
+ * @param committer Signature with committer and * commit time of commit
+ *
+ * @param message_encoding The encoding for the message in the
+ *  commit, represented with a standard encoding name.
+ *  E.g. "UTF-8". If NULL, no encoding header is written and
+ *  UTF-8 is assumed.
+ *
+ * @param message Full message for this commit
+ *
+ * @param tree An instance of a `git_tree` object that will
+ *  be used as the tree for the commit. This tree object must
+ *  also be owned by the given `repo`.
+ *
+ * @param parent_count Number of parents for this commit
+ *
+ * @param parents Array of `parent_count` pointers to `git_commit`
+ *  objects that will be used as the parents for this commit. This
+ *  array may be NULL if `parent_count` is 0 (root commit). All the
+ *  given commits must be owned by the `repo`.
+ *
+ * @return 0 or an error code
+ */
+GIT_EXTERN(int) git_commit_create_buffer(
+	git_buf *out,
+	git_repository *repo,
+	const git_signature *author,
+	const git_signature *committer,
+	const char *message_encoding,
+	const char *message,
+	const git_tree *tree,
+	size_t parent_count,
+	const git_commit *parents[]);
+
 /** @} */
 GIT_END_DECL
 #endif

data/vendor/libgit2/include/git2/common.h

@@ -24,19 +24,10 @@
  GIT_BEGIN_DECL
 # include "inttypes.h"
  GIT_END_DECL
-/** This check is needed for importing this file in an iOS/OS X framework throws an error in Xcode otherwise.*/
-#elif !defined(__CLANG_INTTYPES_H)
+#else
 # include <inttypes.h>
 #endif
 
-#ifdef DOCURIUM
-/*
- * This is so clang's doc parser acknowledges comments on functions
- * with size_t parameters.
- */
-typedef size_t size_t;
-#endif
-
 /** Declare a public function exported for application use. */
 #if __GNUC__ >= 4
 # define GIT_EXTERN(type) extern \
@@ -157,7 +148,6 @@ typedef enum {
 	GIT_OPT_SET_SSL_CERT_LOCATIONS,
 	GIT_OPT_SET_USER_AGENT,
 	GIT_OPT_ENABLE_STRICT_OBJECT_CREATION,
-	GIT_OPT_SET_SSL_CIPHERS,
 } git_libgit2_opt_t;
 
 /**
@@ -269,11 +259,6 @@ typedef enum {
  *		> example, when this is enabled, the parent(s) and tree inputs
  *		> will be validated when creating a new commit.  This defaults
  *		> to disabled.
- *	* opts(GIT_OPT_SET_SSL_CIPHERS, const char *ciphers)
- *
- *		> Set the SSL ciphers use for HTTPS connections.
- *		>
- *		> - `ciphers` is the list of ciphers that are eanbled.
  *
  * @param option Option key
  * @param ... value to set the option

data/vendor/libgit2/include/git2/odb.h

@@ -10,6 +10,7 @@
 #include "common.h"
 #include "types.h"
 #include "oid.h"
+#include "oidarray.h"
 
 /**
  * @file git2/odb.h
@@ -159,7 +160,8 @@ GIT_EXTERN(int) git_odb_read_header(size_t *len_out, git_otype *type_out, git_od
 GIT_EXTERN(int) git_odb_exists(git_odb *db, const git_oid *id);
 
 /**
- * Determine if objects can be found in the object database from a short OID.
+ * Determine if an object can be found in the object database by an
+ * abbreviated object ID.
  *
  * @param out The full OID of the found object if just one is found.
  * @param db The database to be searched for the given object.
@@ -171,6 +173,50 @@ GIT_EXTERN(int) git_odb_exists(git_odb *db, const git_oid *id);
 GIT_EXTERN(int) git_odb_exists_prefix(
 	git_oid *out, git_odb *db, const git_oid *short_id, size_t len);
 
+/**
+ * The information about object IDs to query in `git_odb_expand_ids`,
+ * which will be populated upon return.
+ */
+typedef struct git_odb_expand_id {
+	/** The object ID to expand */
+	git_oid id;
+
+	/**
+	 * The length of the object ID (in nibbles, or packets of 4 bits; the
+	 * number of hex characters)
+	 * */
+	unsigned short length;
+
+	/**
+	 * The (optional) type of the object to search for; leave as `0` or set
+	 * to `GIT_OBJ_ANY` to query for any object matching the ID.
+	 */
+	git_otype type;
+} git_odb_expand_id;
+
+/**
+ * Determine if one or more objects can be found in the object database
+ * by their abbreviated object ID and type.  The given array will be
+ * updated in place:  for each abbreviated ID that is unique in the
+ * database, and of the given type (if specified), the full object ID,
+ * object ID length (`GIT_OID_HEXSZ`) and type will be written back to
+ * the array.  For IDs that are not found (or are ambiguous), the
+ * array entry will be zeroed.
+ *
+ * Note that since this function operates on multiple objects, the
+ * underlying database will not be asked to be reloaded if an object is
+ * not found (which is unlike other object database operations.)
+ *
+ * @param db The database to be searched for the given objects.
+ * @param ids An array of short object IDs to search for
+ * @param count The length of the `ids` array
+ * @return 0 on success or an error code on failure
+ */
+GIT_EXTERN(int) git_odb_expand_ids(
+	git_odb *db,
+	git_odb_expand_id *ids,
+	size_t count);
+
 /**
  * Refresh the object database to load newly added files.
  *

data/vendor/libgit2/include/git2/version.h

@@ -7,10 +7,10 @@
 #ifndef INCLUDE_git_version_h__
 #define INCLUDE_git_version_h__
 
-#define LIBGIT2_VERSION "0.24.6"
+#define LIBGIT2_VERSION "0.24.0"
 #define LIBGIT2_VER_MAJOR 0
 #define LIBGIT2_VER_MINOR 24
-#define LIBGIT2_VER_REVISION 6
+#define LIBGIT2_VER_REVISION 0
 #define LIBGIT2_VER_PATCH 0
 
 #define LIBGIT2_SOVERSION 24

data/vendor/libgit2/src/array.h

@@ -82,44 +82,4 @@ on_oom:
 
 #define git_array_valid_index(a, i) ((i) < (a).size)
 
-#define git_array_foreach(a, i, element) \
-	for ((i) = 0; (i) < (a).size && ((element) = &(a).ptr[(i)]); (i)++)
-
-
-GIT_INLINE(int) git_array__search(
-	size_t *out,
-	void *array_ptr,
-	size_t item_size,
-	size_t array_len,
-	int (*compare)(const void *, const void *),
-	const void *key)
-{
-	size_t lim;
-	unsigned char *part, *array = array_ptr, *base = array_ptr;
-	int cmp = -1;
-
-	for (lim = array_len; lim != 0; lim >>= 1) {
-		part = base + (lim >> 1) * item_size;
-		cmp = (*compare)(key, part);
-
-		if (cmp == 0) {
-			base = part;
-			break;
-		}
-		if (cmp > 0) { /* key > p; take right partition */
-			base = part + 1 * item_size;
-			lim--;
-		} /* else take left partition */
-	}
-
-	if (out)
-		*out = (base - array) / item_size;
-
-	return (cmp == 0) ? 0 : GIT_ENOTFOUND;
-}
-
-#define git_array_search(out, a, cmp, key) \
-	git_array__search(out, (a).ptr, sizeof(*(a).ptr), (a).size, \
-		(cmp), (key))
-
 #endif