rugged 0.17.0.b6 → 0.17.0.b7

data/vendor/libgit2/src/win32/pthread.c

@@ -54,6 +54,74 @@ int pthread_mutex_unlock(pthread_mutex_t *mutex)
 	return 0;
 }
 
+int pthread_cond_init(pthread_cond_t *cond, const pthread_condattr_t *attr)
+{
+	/* We don't support non-default attributes. */
+	if (attr)
+		return EINVAL;
+
+	/* This is an auto-reset event. */
+	*cond = CreateEventW(NULL, FALSE, FALSE, NULL);
+	assert(*cond);
+
+	/* If we can't create the event, claim that the reason was out-of-memory.
+	 * The actual reason can be fetched with GetLastError(). */
+	return *cond ? 0 : ENOMEM;
+}
+
+int pthread_cond_destroy(pthread_cond_t *cond)
+{
+	BOOL closed;
+
+	if (!cond)
+		return EINVAL;
+
+	closed = CloseHandle(*cond);
+	assert(closed);
+	GIT_UNUSED(closed);
+
+	*cond = NULL;
+	return 0;
+}
+
+int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex)
+{
+	int error;
+	DWORD wait_result;
+
+	if (!cond || !mutex)
+		return EINVAL;
+
+	/* The caller must be holding the mutex. */
+	error = pthread_mutex_unlock(mutex);
+
+	if (error)
+		return error;
+
+	wait_result = WaitForSingleObject(*cond, INFINITE);
+	assert(WAIT_OBJECT_0 == wait_result);
+	GIT_UNUSED(wait_result);
+
+	return pthread_mutex_lock(mutex);
+}
+
+int pthread_cond_signal(pthread_cond_t *cond)
+{
+	BOOL signaled;
+
+	if (!cond)
+		return EINVAL;
+
+	signaled = SetEvent(*cond);
+	assert(signaled);
+	GIT_UNUSED(signaled);
+
+	return 0;
+}
+
+/* pthread_cond_broadcast is not implemented because doing so with just Win32 events
+ * is quite complicated, and no caller in libgit2 uses it yet. */
+
 int pthread_num_processors_np(void)
 {
 	DWORD_PTR p, s;

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

@@ -21,6 +21,7 @@ typedef int pthread_condattr_t;
 typedef int pthread_attr_t;
 typedef CRITICAL_SECTION pthread_mutex_t;
 typedef HANDLE pthread_t;
+typedef HANDLE pthread_cond_t;
 
 #define PTHREAD_MUTEX_INITIALIZER {(void*)-1};
 
@@ -35,6 +36,12 @@ int pthread_mutex_destroy(pthread_mutex_t *);
 int pthread_mutex_lock(pthread_mutex_t *);
 int pthread_mutex_unlock(pthread_mutex_t *);
 
+int pthread_cond_init(pthread_cond_t *, const pthread_condattr_t *);
+int pthread_cond_destroy(pthread_cond_t *);
+int pthread_cond_wait(pthread_cond_t *, pthread_mutex_t *);
+int pthread_cond_signal(pthread_cond_t *);
+/* pthread_cond_broadcast is not supported on Win32 yet. */
+
 int pthread_num_processors_np(void);
 
 #endif

data/vendor/libgit2/src/win32/utf-conv.c

@@ -7,86 +7,75 @@
 
 #include "common.h"
 #include "utf-conv.h"
-#include "git2/windows.h"
 
-/*
- * Default codepage value
- */
-static int _active_codepage = CP_UTF8;
-
-void gitwin_set_codepage(unsigned int codepage)
-{
-	_active_codepage = codepage;
-}
-
-unsigned int gitwin_get_codepage(void)
-{
-	return _active_codepage;
-}
-
-void gitwin_set_utf8(void)
-{
-	_active_codepage = CP_UTF8;
-}
+#define U16_LEAD(c) (wchar_t)(((c)>>10)+0xd7c0)
+#define U16_TRAIL(c) (wchar_t)(((c)&0x3ff)|0xdc00)
 
-wchar_t* gitwin_to_utf16(const char* str)
+#if 0
+void git__utf8_to_16(wchar_t *dest, size_t length, const char *src)
 {
-	wchar_t* ret;
-	int cb;
-
-	if (!str)
-		return NULL;
-
-	cb = MultiByteToWideChar(_active_codepage, 0, str, -1, NULL, 0);
-	if (cb == 0)
-		return (wchar_t *)git__calloc(1, sizeof(wchar_t));
-
-	ret = (wchar_t *)git__malloc(cb * sizeof(wchar_t));
-	if (!ret)
-		return NULL;
-
-	if (MultiByteToWideChar(_active_codepage, 0, str, -1, ret, (int)cb) == 0) {
-		giterr_set(GITERR_OS, "Could not convert string to UTF-16");
-		git__free(ret);
-		ret = NULL;
+	wchar_t *pDest = dest;
+	uint32_t ch;
+	const uint8_t* pSrc = (uint8_t*) src;
+
+	assert(dest && src && length);
+
+	length--;
+
+	while(*pSrc && length > 0) {
+		ch = *pSrc++;
+		length--;
+
+		if(ch < 0xc0) {
+			/*
+			 * ASCII, or a trail byte in lead position which is treated like
+			 * a single-byte sequence for better character boundary
+			 * resynchronization after illegal sequences.
+			 */
+			*pDest++ = (wchar_t)ch;
+			continue;
+		} else if(ch < 0xe0) { /* U+0080..U+07FF */
+			if (pSrc[0]) {
+				/* 0x3080 = (0xc0 << 6) + 0x80 */
+				*pDest++ = (wchar_t)((ch << 6) + *pSrc++ - 0x3080);
+				continue;
+			}
+		} else if(ch < 0xf0) { /* U+0800..U+FFFF */
+			if (pSrc[0] && pSrc[1]) {
+				/* no need for (ch & 0xf) because the upper bits are truncated after <<12 in the cast to (UChar) */
+				/* 0x2080 = (0x80 << 6) + 0x80 */
+				ch = (ch << 12) + (*pSrc++ << 6);
+				*pDest++ = (wchar_t)(ch + *pSrc++ - 0x2080);
+				continue;
+			}
+		} else /* f0..f4 */ { /* U+10000..U+10FFFF */
+			if (length >= 1 && pSrc[0] && pSrc[1] && pSrc[2]) {
+				/* 0x3c82080 = (0xf0 << 18) + (0x80 << 12) + (0x80 << 6) + 0x80 */
+				ch = (ch << 18) + (*pSrc++ << 12);
+				ch += *pSrc++ << 6;
+				ch += *pSrc++ - 0x3c82080;
+				*(pDest++) = U16_LEAD(ch);
+				*(pDest++) = U16_TRAIL(ch);
+				length--; /* two bytes for this character */
+				continue;
+			}
+		}
+
+		/* truncated character at the end */
+		*pDest++ = 0xfffd;
+		break;
 	}
 
-	return ret;
+	*pDest++ = 0x0;
 }
+#endif
 
-int gitwin_append_utf16(wchar_t *buffer, const char *str, size_t len)
+void git__utf8_to_16(wchar_t *dest, size_t length, const char *src)
 {
-	int result = MultiByteToWideChar(
-		_active_codepage, 0, str, -1, buffer, (int)len);
-	if (result == 0)
-		giterr_set(GITERR_OS, "Could not convert string to UTF-16");
-	return result;
+	MultiByteToWideChar(CP_UTF8, 0, src, -1, dest, (int)length);
 }
 
-char* gitwin_from_utf16(const wchar_t* str)
+void git__utf16_to_8(char *out, const wchar_t *input)
 {
-	char* ret;
-	int cb;
-
-	if (!str)
-		return NULL;
-
-	cb = WideCharToMultiByte(_active_codepage, 0, str, -1, NULL, 0, NULL, NULL);
-	if (cb == 0)
-		return (char *)git__calloc(1, sizeof(char));
-
-	ret = (char*)git__malloc(cb);
-	if (!ret)
-		return NULL;
-
-	if (WideCharToMultiByte(
-		_active_codepage, 0, str, -1, ret, (int)cb, NULL, NULL) == 0)
-	{
-		giterr_set(GITERR_OS, "Could not convert string to UTF-8");
-		git__free(ret);
-		ret = NULL;
-	}
-
-	return ret;
-
+	WideCharToMultiByte(CP_UTF8, 0, input, -1, out, GIT_WIN_PATH, NULL, NULL);
 }

data/vendor/libgit2/src/win32/utf-conv.h

@@ -10,9 +10,10 @@
 #ifndef INCLUDE_git_utfconv_h__
 #define INCLUDE_git_utfconv_h__
 
-wchar_t* gitwin_to_utf16(const char* str);
-int gitwin_append_utf16(wchar_t *buffer, const char *str, size_t len);
-char* gitwin_from_utf16(const wchar_t* str);
+#define GIT_WIN_PATH (260 + 1)
+
+void git__utf8_to_16(wchar_t *dest, size_t length, const char *src);
+void git__utf16_to_8(char *dest, const wchar_t *src);
 
 #endif
 

metadata

@@ -1,71 +1,65 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rugged
-version: !ruby/object:Gem::Version 
-  hash: 2854922145
+version: !ruby/object:Gem::Version
+  version: 0.17.0.b7
   prerelease: 7
-  segments: 
-  - 0
-  - 17
-  - 0
-  - b
-  - 6
-  version: 0.17.0.b6
 platform: ruby
-authors: 
+authors:
 - Scott Chacon
 - Vicent Marti
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-08-22 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake-compiler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
-  version_requirements: *id002
-description: |
-  Rugged is a Ruby bindings to the libgit2 linkable C Git library. This is
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+description: ! 'Rugged is a Ruby bindings to the libgit2 linkable C Git library. This
+  is
+
   for testing and using the libgit2 library in a language that is awesome.
 
+'
 email: schacon@gmail.com
 executables: []
-
-extensions: 
+extensions:
 - ext/rugged/extconf.rb
 extra_rdoc_files: []
-
-files: 
+files:
 - README.md
 - Rakefile
 - LICENSE
+- lib/rugged/branch.rb
 - lib/rugged/commit.rb
 - lib/rugged/index.rb
 - lib/rugged/object.rb
@@ -77,6 +71,7 @@ files:
 - lib/rugged/walker.rb
 - lib/rugged.rb
 - test/blob_test.rb
+- test/branch_test.rb
 - test/commit_test.rb
 - test/config_test.rb
 - test/coverage/cover.rb
@@ -96,6 +91,7 @@ files:
 - test/fixtures/testrepo.git/objects/36/060c58702ed4c2a40832c51758d5344201d89a
 - test/fixtures/testrepo.git/objects/45/b983be36b73c0788dc9cbcb76cbb80fc7bb057
 - test/fixtures/testrepo.git/objects/4a/202b346bb0fb0db7eff3cffeb3c70babbd2045
+- test/fixtures/testrepo.git/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904
 - test/fixtures/testrepo.git/objects/5b/5b025afb0b4c913b4c338a42934a3863bf3644
 - test/fixtures/testrepo.git/objects/61/9f9935957e010c419cb9d15621916ddfcc0b96
 - test/fixtures/testrepo.git/objects/75/057dd4114e74cca1d750d0aee1647c903cb60a
@@ -103,6 +99,7 @@ files:
 - test/fixtures/testrepo.git/objects/81/4889a078c031f61ed08ab5fa863aea9314344d
 - test/fixtures/testrepo.git/objects/84/96071c1b46c854b31185ea97743be6a8774479
 - test/fixtures/testrepo.git/objects/9f/d738e8f7967c078dceed8190330fc8648ee56a
+- test/fixtures/testrepo.git/objects/a3/e05719b428a2d0ed7a55c4ce53dcc5768c6d5e
 - test/fixtures/testrepo.git/objects/a4/a7dce85cf63874e984719f4fdd239f5145052f
 - test/fixtures/testrepo.git/objects/a7/1586c1dfe8a71c6cbf6c129f404c5642ff31bd
 - test/fixtures/testrepo.git/objects/a8/233120f6ad708f843d861ce2b7228ec4e3dec6
@@ -120,6 +117,7 @@ files:
 - test/fixtures/testrepo.git/refs/tags/v0.9
 - test/fixtures/testrepo.git/refs/tags/v1.0
 - test/index_test.rb
+- test/index_test.rb~
 - test/lib_test.rb
 - test/object_test.rb
 - test/reference_test.rb
@@ -133,6 +131,7 @@ files:
 - ext/rugged/rugged.c
 - ext/rugged/rugged.h
 - ext/rugged/rugged_blob.c
+- ext/rugged/rugged_branch.c
 - ext/rugged/rugged_commit.c
 - ext/rugged/rugged_config.c
 - ext/rugged/rugged_index.c
@@ -166,6 +165,7 @@ files:
 - vendor/libgit2/include/git2/odb.h
 - vendor/libgit2/include/git2/odb_backend.h
 - vendor/libgit2/include/git2/oid.h
+- vendor/libgit2/include/git2/pack.h
 - vendor/libgit2/include/git2/reflog.h
 - vendor/libgit2/include/git2/refs.h
 - vendor/libgit2/include/git2/refspec.h
@@ -177,13 +177,13 @@ files:
 - vendor/libgit2/include/git2/signature.h
 - vendor/libgit2/include/git2/status.h
 - vendor/libgit2/include/git2/stdint.h
+- vendor/libgit2/include/git2/strarray.h
 - vendor/libgit2/include/git2/submodule.h
 - vendor/libgit2/include/git2/tag.h
 - vendor/libgit2/include/git2/threads.h
 - vendor/libgit2/include/git2/tree.h
 - vendor/libgit2/include/git2/types.h
 - vendor/libgit2/include/git2/version.h
-- vendor/libgit2/include/git2/windows.h
 - vendor/libgit2/include/git2.h
 - vendor/libgit2/src/amiga/map.c
 - vendor/libgit2/src/attr.c
@@ -204,8 +204,8 @@ files:
 - vendor/libgit2/src/commit.c
 - vendor/libgit2/src/commit.h
 - vendor/libgit2/src/common.h
-- vendor/libgit2/src/compat/fnmatch.c
-- vendor/libgit2/src/compat/fnmatch.h
+- vendor/libgit2/src/compress.c
+- vendor/libgit2/src/compress.h
 - vendor/libgit2/src/config.c
 - vendor/libgit2/src/config.h
 - vendor/libgit2/src/config_cache.c
@@ -215,9 +215,12 @@ files:
 - vendor/libgit2/src/date.c
 - vendor/libgit2/src/delta-apply.c
 - vendor/libgit2/src/delta-apply.h
+- vendor/libgit2/src/delta.c
+- vendor/libgit2/src/delta.h
 - vendor/libgit2/src/diff.c
 - vendor/libgit2/src/diff.h
 - vendor/libgit2/src/diff_output.c
+- vendor/libgit2/src/diff_output.h
 - vendor/libgit2/src/errors.c
 - vendor/libgit2/src/fetch.c
 - vendor/libgit2/src/fetch.h
@@ -227,6 +230,8 @@ files:
 - vendor/libgit2/src/fileops.h
 - vendor/libgit2/src/filter.c
 - vendor/libgit2/src/filter.h
+- vendor/libgit2/src/fnmatch.c
+- vendor/libgit2/src/fnmatch.h
 - vendor/libgit2/src/global.c
 - vendor/libgit2/src/global.h
 - vendor/libgit2/src/hash.c
@@ -249,12 +254,15 @@ files:
 - vendor/libgit2/src/notes.c
 - vendor/libgit2/src/notes.h
 - vendor/libgit2/src/object.c
+- vendor/libgit2/src/object.h
 - vendor/libgit2/src/odb.c
 - vendor/libgit2/src/odb.h
 - vendor/libgit2/src/odb_loose.c
 - vendor/libgit2/src/odb_pack.c
 - vendor/libgit2/src/oid.c
 - vendor/libgit2/src/oidmap.h
+- vendor/libgit2/src/pack-objects.c
+- vendor/libgit2/src/pack-objects.h
 - vendor/libgit2/src/pack.c
 - vendor/libgit2/src/pack.h
 - vendor/libgit2/src/path.c
@@ -279,12 +287,13 @@ files:
 - vendor/libgit2/src/refspec.h
 - vendor/libgit2/src/remote.c
 - vendor/libgit2/src/remote.h
+- vendor/libgit2/src/repo_template.h
 - vendor/libgit2/src/repository.c
 - vendor/libgit2/src/repository.h
 - vendor/libgit2/src/reset.c
 - vendor/libgit2/src/revparse.c
 - vendor/libgit2/src/revwalk.c
-- vendor/libgit2/src/sha1.c
+- vendor/libgit2/src/sha1/sha1.c
 - vendor/libgit2/src/sha1.h
 - vendor/libgit2/src/sha1_lookup.c
 - vendor/libgit2/src/sha1_lookup.h
@@ -293,6 +302,7 @@ files:
 - vendor/libgit2/src/status.c
 - vendor/libgit2/src/strmap.h
 - vendor/libgit2/src/submodule.c
+- vendor/libgit2/src/submodule.h
 - vendor/libgit2/src/tag.c
 - vendor/libgit2/src/tag.h
 - vendor/libgit2/src/thread-utils.c
@@ -315,6 +325,8 @@ files:
 - vendor/libgit2/src/vector.h
 - vendor/libgit2/src/win32/dir.c
 - vendor/libgit2/src/win32/dir.h
+- vendor/libgit2/src/win32/findfile.c
+- vendor/libgit2/src/win32/findfile.h
 - vendor/libgit2/src/win32/map.c
 - vendor/libgit2/src/win32/mingw-compat.h
 - vendor/libgit2/src/win32/msvc-compat.h
@@ -370,41 +382,28 @@ files:
 - vendor/libgit2/deps/zlib/zutil.h
 - vendor/libgit2/Makefile.embed
 - ext/rugged/extconf.rb
-has_rdoc: true
 homepage: http://github.com/libgit2/rugged
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Rugged is a Ruby binding to the libgit2 linkable library
 test_files: []
-