rugged 0.22.0b5 → 0.22.1b1

data/vendor/libgit2/src/transports/local.c

@@ -35,6 +35,9 @@ typedef struct {
 	int flags;
 	git_atomic cancelled;
 	git_repository *repo;
+	git_transport_message_cb progress_cb;
+	git_transport_message_cb error_cb;
+	void *message_cb_payload;
 	git_vector refs;
 	unsigned connected : 1,
 		have_refs : 1;
@@ -126,8 +129,10 @@ static int add_ref(transport_local *t, const char *name)
 	head = git__calloc(1, sizeof(git_remote_head));
 	GITERR_CHECK_ALLOC(head);
 
-	if (git_buf_join(&buf, 0, name, peeled) < 0)
+	if (git_buf_join(&buf, 0, name, peeled) < 0) {
+		free_head(head);
 		return -1;
+	}
 	head->name = git_buf_detach(&buf);
 
 	if (!(error = git_tag_peel(&target, (git_tag *)obj))) {
@@ -494,6 +499,8 @@ static int foreach_cb(void *buf, size_t len, void *payload)
 	return data->writepack->append(data->writepack, buf, len, data->stats);
 }
 
+static const char *counting_objects_fmt = "Counting objects %d\r";
+
 static int local_download_pack(
 		git_transport *transport,
 		git_repository *repo,
@@ -510,6 +517,7 @@ static int local_download_pack(
 	git_packbuilder *pack = NULL;
 	git_odb_writepack *writepack = NULL;
 	git_odb *odb = NULL;
+	git_buf progress_info = GIT_BUF_INIT;
 
 	if ((error = git_revwalk_new(&walk, t->repo)) < 0)
 		goto cleanup;
@@ -540,6 +548,13 @@ static int local_download_pack(
 		git_object_free(obj);
 	}
 
+	if ((error = git_buf_printf(&progress_info, counting_objects_fmt, git_packbuilder_object_count(pack))) < 0)
+		goto cleanup;
+
+	if (t->progress_cb &&
+	    (error = t->progress_cb(git_buf_cstr(&progress_info), git_buf_len(&progress_info), t->message_cb_payload)) < 0)
+		goto cleanup;
+
 	/* Walk the objects, building a packfile */
 	if ((error = git_repository_odb__weakptr(&odb, repo)) < 0)
 		goto cleanup;
@@ -561,9 +576,28 @@ static int local_download_pack(
 			}
 
 			git_commit_free(commit);
+
+			git_buf_clear(&progress_info);
+			if ((error = git_buf_printf(&progress_info, counting_objects_fmt, git_packbuilder_object_count(pack))) < 0)
+				goto cleanup;
+
+			if (t->progress_cb &&
+			    (error = t->progress_cb(git_buf_cstr(&progress_info), git_buf_len(&progress_info), t->message_cb_payload)) < 0)
+				goto cleanup;
+
 		}
 	}
 
+	/* One last one with the newline */
+	git_buf_clear(&progress_info);
+	git_buf_printf(&progress_info, counting_objects_fmt, git_packbuilder_object_count(pack));
+	if ((error = git_buf_putc(&progress_info, '\n')) < 0)
+		goto cleanup;
+
+	if (t->progress_cb &&
+	    (error = t->progress_cb(git_buf_cstr(&progress_info), git_buf_len(&progress_info), t->message_cb_payload)) < 0)
+		goto cleanup;
+
 	if ((error = git_odb_write_pack(&writepack, odb, progress_cb, progress_payload)) != 0)
 		goto cleanup;
 
@@ -582,11 +616,30 @@ static int local_download_pack(
 
 cleanup:
 	if (writepack) writepack->free(writepack);
+	git_buf_free(&progress_info);
 	git_packbuilder_free(pack);
 	git_revwalk_free(walk);
 	return error;
 }
 
+static int local_set_callbacks(
+	git_transport *transport,
+	git_transport_message_cb progress_cb,
+	git_transport_message_cb error_cb,
+	git_transport_certificate_check_cb certificate_check_cb,
+	void *message_cb_payload)
+{
+	transport_local *t = (transport_local *)transport;
+
+	GIT_UNUSED(certificate_check_cb);
+
+	t->progress_cb = progress_cb;
+	t->error_cb = error_cb;
+	t->message_cb_payload = message_cb_payload;
+
+	return 0;
+}
+
 static int local_is_connected(git_transport *transport)
 {
 	transport_local *t = (transport_local *)transport;
@@ -648,6 +701,7 @@ static void local_free(git_transport *transport)
 
 int git_transport_local(git_transport **out, git_remote *owner, void *param)
 {
+	int error;
 	transport_local *t;
 
 	GIT_UNUSED(param);
@@ -656,6 +710,7 @@ int git_transport_local(git_transport **out, git_remote *owner, void *param)
 	GITERR_CHECK_ALLOC(t);
 
 	t->parent.version = GIT_TRANSPORT_VERSION;
+	t->parent.set_callbacks = local_set_callbacks;
 	t->parent.connect = local_connect;
 	t->parent.negotiate_fetch = local_negotiate_fetch;
 	t->parent.download_pack = local_download_pack;
@@ -667,7 +722,11 @@ int git_transport_local(git_transport **out, git_remote *owner, void *param)
 	t->parent.read_flags = local_read_flags;
 	t->parent.cancel = local_cancel;
 
-	git_vector_init(&t->refs, 0, NULL);
+	if ((error = git_vector_init(&t->refs, 0, NULL)) < 0) {
+		git__free(t);
+		return error;
+	}
+
 	t->owner = owner;
 
 	*out = (git_transport *) t;

data/vendor/libgit2/src/transports/smart_protocol.c

@@ -82,7 +82,7 @@ static int append_symref(const char **out, git_vector *symrefs, const char *ptr)
 	int error;
 	const char *end;
 	git_buf buf = GIT_BUF_INIT;
-	git_refspec *mapping;
+	git_refspec *mapping = NULL;
 
 	ptr += strlen(GIT_CAP_SYMREF);
 	if (*ptr != '=')
@@ -97,7 +97,7 @@ static int append_symref(const char **out, git_vector *symrefs, const char *ptr)
 		return error;
 
 	/* symref mapping has refspec format */
-	mapping = git__malloc(sizeof(git_refspec));
+	mapping = git__calloc(1, sizeof(git_refspec));
 	GITERR_CHECK_ALLOC(mapping);
 
 	error = git_refspec__parse(mapping, git_buf_cstr(&buf), true);
@@ -119,6 +119,7 @@ static int append_symref(const char **out, git_vector *symrefs, const char *ptr)
 
 on_invalid:
 	giterr_set(GITERR_NET, "remote sent invalid symref");
+	git_refspec__free(mapping);
 	return -1;
 }
 
@@ -258,7 +259,7 @@ static int store_common(transport_smart *t)
 
 static int fetch_setup_walk(git_revwalk **out, git_repository *repo)
 {
-	git_revwalk *walk;
+	git_revwalk *walk = NULL;
 	git_strarray refs;
 	unsigned int i;
 	git_reference *ref;
@@ -294,6 +295,7 @@ static int fetch_setup_walk(git_revwalk **out, git_repository *repo)
 	return 0;
 
 on_error:
+	git_revwalk_free(walk);
 	git_reference_free(ref);
 	git_strarray_free(&refs);
 	return error;

data/vendor/libgit2/src/tree.c

@@ -490,7 +490,7 @@ static int write_tree(
 		return (int)find_next_dir(dirname, index, start);
 	}
 
-	if ((error = git_treebuilder_create(&bld, repo, NULL)) < 0 || bld == NULL)
+	if ((error = git_treebuilder_new(&bld, repo, NULL)) < 0 || bld == NULL)
 		return -1;
 
 	/*
@@ -624,7 +624,7 @@ int git_tree__write_index(
 	return ret;
 }
 
-int git_treebuilder_create(
+int git_treebuilder_new(
 	git_treebuilder **builder_p,
 	git_repository *repo,
 	const git_tree *source)

data/vendor/libgit2/src/util.h

@@ -317,12 +317,12 @@ GIT_INLINE(bool) git__isdigit(int c)
 
 GIT_INLINE(bool) git__isspace(int c)
 {
-	return (c == ' ' || c == '\t' || c == '\n' || c == '\f' || c == '\r' || c == '\v' || c == 0x85 /* Unicode CR+LF */);
+	return (c == ' ' || c == '\t' || c == '\n' || c == '\f' || c == '\r' || c == '\v');
 }
 
 GIT_INLINE(bool) git__isspace_nonlf(int c)
 {
-	return (c == ' ' || c == '\t' || c == '\f' || c == '\r' || c == '\v' || c == 0x85 /* Unicode CR+LF */);
+	return (c == ' ' || c == '\t' || c == '\f' || c == '\r' || c == '\v');
 }
 
 GIT_INLINE(bool) git__iswildcard(int c)
@@ -434,6 +434,17 @@ GIT_INLINE(double) git__timer(void)
    return (double)time * scaling_factor / 1.0E9;
 }
 
+#elif defined(AMIGA)
+
+#include <proto/timer.h>
+
+GIT_INLINE(double) git__timer(void)
+{
+	struct TimeVal tv;
+	ITimer->GetUpTime(&tv);
+	return (double)tv.Seconds + (double)tv.Microseconds / 1.0E6;
+}
+
 #else
 
 #include <sys/time.h>

data/vendor/libgit2/src/win32/mingw-compat.h

@@ -9,6 +9,8 @@
 
 #if defined(__MINGW32__)
 
+#undef stat
+
 #if _WIN32_WINNT >= 0x0601
 #define stat __stat64
 #else

data/vendor/libgit2/src/win32/path_w32.h

@@ -7,6 +7,8 @@
 #ifndef INCLUDE_git_path_w32_h__
 #define INCLUDE_git_path_w32_h__
 
+#include "common.h"
+
 /*
  * Provides a large enough buffer to support Windows paths:  MAX_PATH is
  * 260, corresponding to a maximum path length of 259 characters plus a

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rugged
 version: !ruby/object:Gem::Version
-  version: 0.22.0b5
+  version: 0.22.1b1
 platform: ruby
 authors:
 - Scott Chacon
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -67,6 +67,7 @@ files:
 - ext/rugged/extconf.rb
 - ext/rugged/rugged.c
 - ext/rugged/rugged.h
+- ext/rugged/rugged_backend.c
 - ext/rugged/rugged_blame.c
 - ext/rugged/rugged_blob.c
 - ext/rugged/rugged_branch.c
@@ -125,7 +126,6 @@ files:
 - vendor/libgit2/cmake/Modules/FindGSSAPI.cmake
 - vendor/libgit2/cmake/Modules/FindHTTP_Parser.cmake
 - vendor/libgit2/cmake/Modules/FindIconv.cmake
-- vendor/libgit2/cmake/Modules/FindLIBSSH2.cmake
 - vendor/libgit2/deps/http-parser/LICENSE-MIT
 - vendor/libgit2/deps/http-parser/http_parser.c
 - vendor/libgit2/deps/http-parser/http_parser.h
@@ -217,6 +217,7 @@ files:
 - vendor/libgit2/include/git2/sys/index.h
 - vendor/libgit2/include/git2/sys/mempack.h
 - vendor/libgit2/include/git2/sys/odb_backend.h
+- vendor/libgit2/include/git2/sys/openssl.h
 - vendor/libgit2/include/git2/sys/refdb_backend.h
 - vendor/libgit2/include/git2/sys/reflog.h
 - vendor/libgit2/include/git2/sys/refs.h
@@ -224,7 +225,6 @@ files:
 - vendor/libgit2/include/git2/sys/stream.h
 - vendor/libgit2/include/git2/sys/transport.h
 - vendor/libgit2/include/git2/tag.h
-- vendor/libgit2/include/git2/threads.h
 - vendor/libgit2/include/git2/trace.h
 - vendor/libgit2/include/git2/transaction.h
 - vendor/libgit2/include/git2/transport.h

data/vendor/libgit2/cmake/Modules/FindLIBSSH2.cmake

@@ -1,44 +0,0 @@
-if (LIBSSH2_LIBRARIES AND LIBSSH2_INCLUDE_DIRS)
-  set(LIBSSH2_FOUND TRUE)
-else (LIBSSH2_LIBRARIES AND LIBSSH2_INCLUDE_DIRS)
-  find_path(LIBSSH2_INCLUDE_DIR
-    NAMES
-      libssh2.h
-    PATHS
-      /usr/include
-      /usr/local/include
-      /opt/local/include
-      /sw/include
-      ${CMAKE_INCLUDE_PATH}
-      ${CMAKE_INSTALL_PREFIX}/include
-  )
-  
-  find_library(LIBSSH2_LIBRARY
-    NAMES
-      ssh2
-      libssh2
-    PATHS
-      /usr/lib
-      /usr/local/lib
-      /opt/local/lib
-      /sw/lib
-      ${CMAKE_LIBRARY_PATH}
-      ${CMAKE_INSTALL_PREFIX}/lib
-  )
-
-  if (LIBSSH2_INCLUDE_DIR AND LIBSSH2_LIBRARY)
-    set(LIBSSH2_FOUND TRUE)
-  endif (LIBSSH2_INCLUDE_DIR AND LIBSSH2_LIBRARY)
-
-  if (LIBSSH2_FOUND)
-    set(LIBSSH2_INCLUDE_DIRS
-      ${LIBSSH2_INCLUDE_DIR}
-    )
-
-    set(LIBSSH2_LIBRARIES
-      ${LIBSSH2_LIBRARIES}
-      ${LIBSSH2_LIBRARY}
-    )
-  endif (LIBSSH2_FOUND)
-endif (LIBSSH2_LIBRARIES AND LIBSSH2_INCLUDE_DIRS)
-