rugged 0.21.0 → 0.21.2

data/vendor/libgit2/src/tree.c

@@ -17,8 +17,6 @@
 #define DEFAULT_TREE_SIZE 16
 #define MAX_FILEMODE_BYTES 6
 
-GIT__USE_STRMAP;
-
 static bool valid_filemode(const int filemode)
 {
 	return (filemode == GIT_FILEMODE_TREE
@@ -367,8 +365,7 @@ size_t git_tree_entrycount(const git_tree *tree)
 unsigned int git_treebuilder_entrycount(git_treebuilder *bld)
 {
 	assert(bld);
-
-	return git_strmap_num_entries(bld->map);
+	return (unsigned int)bld->entrycount;
 }
 
 static int tree_error(const char *str, const char *path)
@@ -453,7 +450,6 @@ static int append_entry(
 	git_filemode_t filemode)
 {
 	git_tree_entry *entry;
-	int error = 0;
 
 	if (!valid_entry_name(filename))
 		return tree_error("Failed to insert entry. Invalid name for a tree entry", filename);
@@ -464,13 +460,12 @@ static int append_entry(
 	git_oid_cpy(&entry->oid, id);
 	entry->attr = (uint16_t)filemode;
 
-	git_strmap_insert(bld->map, entry->filename, entry, error);
-	if (error < 0) {
-		git_tree_entry_free(entry);
-		giterr_set(GITERR_TREE, "failed to append entry %s to the tree builder", filename);
+	if (git_vector_insert_sorted(&bld->entries, entry, NULL) < 0) {
+		git__free(entry);
 		return -1;
 	}
 
+	bld->entrycount++;
 	return 0;
 }
 
@@ -615,17 +610,18 @@ int git_tree__write_index(
 int git_treebuilder_create(git_treebuilder **builder_p, const git_tree *source)
 {
 	git_treebuilder *bld;
-	size_t i;
+	size_t i, source_entries = DEFAULT_TREE_SIZE;
 
 	assert(builder_p);
 
 	bld = git__calloc(1, sizeof(git_treebuilder));
 	GITERR_CHECK_ALLOC(bld);
 
-	if (git_strmap_alloc(&bld->map) < 0) {
-		git__free(bld);
-		return -1;
-	}
+	if (source != NULL)
+		source_entries = source->entries.length;
+
+	if (git_vector_init(&bld->entries, source_entries, entry_sort_cmp) < 0)
+		goto on_error;
 
 	if (source != NULL) {
 		git_tree_entry *entry_src;
@@ -655,8 +651,7 @@ int git_treebuilder_insert(
 	git_filemode_t filemode)
 {
 	git_tree_entry *entry;
-	int error;
-	git_strmap_iter pos;
+	size_t pos;
 
 	assert(bld && id && filename);
 
@@ -666,24 +661,29 @@ int git_treebuilder_insert(
 	if (!valid_entry_name(filename))
 		return tree_error("Failed to insert entry. Invalid name for a tree entry", filename);
 
-	pos = git_strmap_lookup_index(bld->map, filename);
-	if (git_strmap_valid_index(bld->map, pos)) {
-		entry = git_strmap_value_at(bld->map, pos);
+	if (!tree_key_search(&pos, &bld->entries, filename, strlen(filename))) {
+		entry = git_vector_get(&bld->entries, pos);
+		if (entry->removed) {
+			entry->removed = 0;
+			bld->entrycount++;
+		}
+
+		entry->attr = filemode;
+		git_oid_cpy(&entry->oid, id);
 	} else {
 		entry = alloc_entry(filename);
 		GITERR_CHECK_ALLOC(entry);
 
-		git_strmap_insert(bld->map, entry->filename, entry, error);
+		entry->attr = filemode;
+		git_oid_cpy(&entry->oid, id);
 
-		if (error < 0) {
-			git_tree_entry_free(entry);
-			giterr_set(GITERR_TREE, "failed to insert %s", filename);
+		if (git_vector_insert_sorted(&bld->entries, entry, NULL) < 0) {
+			git__free(entry);
 			return -1;
 		}
-	}
 
-	git_oid_cpy(&entry->oid, id);
-	entry->attr = filemode;
+		bld->entrycount++;
+	}
 
 	if (entry_out)
 		*entry_out = entry;
@@ -693,14 +693,17 @@ int git_treebuilder_insert(
 
 static git_tree_entry *treebuilder_get(git_treebuilder *bld, const char *filename)
 {
-	git_tree_entry *entry = NULL;
-	git_strmap_iter pos;
+	size_t idx;
+	git_tree_entry *entry;
 
 	assert(bld && filename);
 
-	pos = git_strmap_lookup_index(bld->map, filename);
-	if (git_strmap_valid_index(bld->map, pos))
-		entry = git_strmap_value_at(bld->map, pos);
+	if (tree_key_search(&idx, &bld->entries, filename, strlen(filename)) < 0)
+		return NULL;
+
+	entry = git_vector_get(&bld->entries, idx);
+	if (entry->removed)
+		return NULL;
 
 	return entry;
 }
@@ -712,44 +715,35 @@ const git_tree_entry *git_treebuilder_get(git_treebuilder *bld, const char *file
 
 int git_treebuilder_remove(git_treebuilder *bld, const char *filename)
 {
-	git_tree_entry *entry = treebuilder_get(bld, filename);
+	git_tree_entry *remove_ptr = treebuilder_get(bld, filename);
 
-	if (entry == NULL)
+	if (remove_ptr == NULL || remove_ptr->removed)
 		return tree_error("Failed to remove entry. File isn't in the tree", filename);
 
-	git_strmap_delete(bld->map, filename);
-	git_tree_entry_free(entry);
-
+	remove_ptr->removed = 1;
+	bld->entrycount--;
 	return 0;
 }
 
 int git_treebuilder_write(git_oid *oid, git_repository *repo, git_treebuilder *bld)
 {
 	int error = 0;
-	size_t i, entrycount;
+	size_t i;
 	git_buf tree = GIT_BUF_INIT;
 	git_odb *odb;
-	git_tree_entry *entry;
-	git_vector entries;
 
 	assert(bld);
 
-	entrycount = git_strmap_num_entries(bld->map);
-	if (git_vector_init(&entries, entrycount, entry_sort_cmp) < 0)
-		return -1;
-
-	git_strmap_foreach_value(bld->map, entry, {
-		if (git_vector_insert(&entries, entry) < 0)
-			return -1;
-	});
-
-	git_vector_sort(&entries);
+	git_vector_sort(&bld->entries);
 
 	/* Grow the buffer beforehand to an estimated size */
-	error = git_buf_grow(&tree, entrycount * 72);
+	error = git_buf_grow(&tree, bld->entries.length * 72);
+
+	for (i = 0; i < bld->entries.length && !error; ++i) {
+		git_tree_entry *entry = git_vector_get(&bld->entries, i);
 
-	for (i = 0; i < entries.length && !error; ++i) {
-		git_tree_entry *entry = git_vector_get(&entries, i);
+		if (entry->removed)
+			continue;
 
 		git_buf_printf(&tree, "%o ", entry->attr);
 		git_buf_put(&tree, entry->filename, entry->filename_len + 1);
@@ -759,8 +753,6 @@ int git_treebuilder_write(git_oid *oid, git_repository *repo, git_treebuilder *b
 			error = -1;
 	}
 
-	git_vector_free(&entries);
-
 	if (!error &&
 		!(error = git_repository_odb__weakptr(&odb, repo)))
 		error = git_odb_write(oid, odb, tree.ptr, tree.size, GIT_OBJ_TREE);
@@ -774,27 +766,31 @@ void git_treebuilder_filter(
 	git_treebuilder_filter_cb filter,
 	void *payload)
 {
-	const char *filename;
+	size_t i;
 	git_tree_entry *entry;
 
 	assert(bld && filter);
 
-	git_strmap_foreach(bld->map, filename, entry, {
-			if (filter(entry, payload)) {
-				git_strmap_delete(bld->map, filename);
-				git_tree_entry_free(entry);
-			}
-	});
+	git_vector_foreach(&bld->entries, i, entry) {
+		if (!entry->removed && filter(entry, payload)) {
+			entry->removed = 1;
+			bld->entrycount--;
+		}
+	}
 }
 
 void git_treebuilder_clear(git_treebuilder *bld)
 {
+	size_t i;
 	git_tree_entry *e;
 
 	assert(bld);
 
-	git_strmap_foreach_value(bld->map, e, git_tree_entry_free(e));
-	git_strmap_clear(bld->map);
+	git_vector_foreach(&bld->entries, i, e)
+		git_tree_entry_free(e);
+
+	git_vector_clear(&bld->entries);
+	bld->entrycount = 0;
 }
 
 void git_treebuilder_free(git_treebuilder *bld)
@@ -803,7 +799,7 @@ void git_treebuilder_free(git_treebuilder *bld)
 		return;
 
 	git_treebuilder_clear(bld);
-	git_strmap_free(bld->map);
+	git_vector_free(&bld->entries);
 	git__free(bld);
 }
 

data/vendor/libgit2/src/tree.h

@@ -11,9 +11,9 @@
 #include "repository.h"
 #include "odb.h"
 #include "vector.h"
-#include "strmap.h"
 
 struct git_tree_entry {
+	uint16_t removed;
 	uint16_t attr;
 	git_oid oid;
 	size_t filename_len;
@@ -26,7 +26,8 @@ struct git_tree {
 };
 
 struct git_treebuilder {
-	git_strmap *map;
+	git_vector entries;
+	size_t entrycount; /* vector may contain "removed" entries */
 };
 
 GIT_INLINE(bool) git_tree_entry__is_tree(const struct git_tree_entry *e)

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

@@ -110,6 +110,11 @@ GIT_INLINE(time_t) filetime_to_time_t(const FILETIME *ft)
 	return (time_t)winTime;
 }
 
+static bool path_is_volume(wchar_t *target, size_t target_len)
+{
+	return (target_len && wcsncmp(target, L"\\??\\Volume{", 11) == 0);
+}
+
 /* On success, returns the length, in characters, of the path stored in dest.
  * On failure, returns a negative value. */
 static int readlink_w(
@@ -156,7 +161,13 @@ static int readlink_w(
 		goto on_error;
 	}
 
-	if (target_len) {
+	if (path_is_volume(target, target_len)) {
+		/* This path is a reparse point that represents another volume mounted
+		 * at this location, it is not a symbolic link our input was canonical.
+		 */
+		errno = EINVAL;
+		error = -1;
+	} else if (target_len) {
 		/* The path may need to have a prefix removed. */
 		target_len = git_win32__canonicalize_path(target, target_len);
 
@@ -591,31 +602,6 @@ int p_access(const char* path, mode_t mode)
 	return _waccess(buf, mode);
 }
 
-static int ensure_writable(wchar_t *fpath)
-{
-	DWORD attrs;
-
-	attrs = GetFileAttributesW(fpath);
-	if (attrs == INVALID_FILE_ATTRIBUTES) {
-		if (GetLastError() == ERROR_FILE_NOT_FOUND)
-			return 0;
-
-		giterr_set(GITERR_OS, "failed to get attributes");
-		return -1;
-	}
-
-	if (!(attrs & FILE_ATTRIBUTE_READONLY))
-		return 0;
-
-	attrs &= ~FILE_ATTRIBUTE_READONLY;
-	if (!SetFileAttributesW(fpath, attrs)) {
-		giterr_set(GITERR_OS, "failed to set attributes");
-		return -1;
-	}
-
-	return 0;
-}
-
 int p_rename(const char *from, const char *to)
 {
 	git_win32_path wfrom;
@@ -627,13 +613,12 @@ int p_rename(const char *from, const char *to)
 	if (utf8_to_16_with_errno(wfrom, from) < 0 ||
 		utf8_to_16_with_errno(wto, to) < 0)
 		return -1;
-
+	
 	/* wait up to 50ms if file is locked by another thread or process */
 	rename_tries = 0;
 	rename_succeeded = 0;
 	while (rename_tries < 10) {
-		if (ensure_writable(wto) == 0 &&
-		    MoveFileExW(wfrom, wto, MOVEFILE_REPLACE_EXISTING | MOVEFILE_COPY_ALLOWED) != 0) {
+		if (MoveFileExW(wfrom, wto, MOVEFILE_REPLACE_EXISTING | MOVEFILE_COPY_ALLOWED) != 0) {
 			rename_succeeded = 1;
 			break;
 		}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rugged
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.21.2
 platform: ruby
 authors:
 - Scott Chacon
@@ -9,48 +9,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-26 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
 description: |
@@ -62,27 +62,9 @@ extensions:
 - ext/rugged/extconf.rb
 extra_rdoc_files: []
 files:
-- README.md
 - LICENSE
-- lib/rugged/branch.rb
-- lib/rugged/commit.rb
-- lib/rugged/console.rb
-- lib/rugged/credentials.rb
-- lib/rugged/diff/delta.rb
-- lib/rugged/diff/hunk.rb
-- lib/rugged/diff/line.rb
-- lib/rugged/diff.rb
-- lib/rugged/index.rb
-- lib/rugged/object.rb
-- lib/rugged/patch.rb
-- lib/rugged/reference.rb
-- lib/rugged/remote.rb
-- lib/rugged/repository.rb
-- lib/rugged/tag.rb
-- lib/rugged/tree.rb
-- lib/rugged/version.rb
-- lib/rugged/walker.rb
-- lib/rugged.rb
+- README.md
+- ext/rugged/extconf.rb
 - ext/rugged/rugged.c
 - ext/rugged/rugged.h
 - ext/rugged/rugged_blame.c
@@ -111,10 +93,62 @@ files:
 - ext/rugged/rugged_tag.c
 - ext/rugged/rugged_tag_collection.c
 - ext/rugged/rugged_tree.c
+- lib/rugged.rb
+- lib/rugged/branch.rb
+- lib/rugged/commit.rb
+- lib/rugged/console.rb
+- lib/rugged/credentials.rb
+- lib/rugged/diff.rb
+- lib/rugged/diff/delta.rb
+- lib/rugged/diff/hunk.rb
+- lib/rugged/diff/line.rb
+- lib/rugged/index.rb
+- lib/rugged/object.rb
+- lib/rugged/patch.rb
+- lib/rugged/reference.rb
+- lib/rugged/remote.rb
+- lib/rugged/repository.rb
+- lib/rugged/tag.rb
+- lib/rugged/tree.rb
+- lib/rugged/version.rb
+- lib/rugged/walker.rb
+- vendor/libgit2/AUTHORS
+- vendor/libgit2/CMakeLists.txt
+- vendor/libgit2/COPYING
+- vendor/libgit2/Makefile.embed
 - vendor/libgit2/cmake/Modules/AddCFlagIfSupported.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
+- vendor/libgit2/deps/regex/config.h
+- vendor/libgit2/deps/regex/regcomp.c
+- vendor/libgit2/deps/regex/regex.c
+- vendor/libgit2/deps/regex/regex.h
+- vendor/libgit2/deps/regex/regex_internal.c
+- vendor/libgit2/deps/regex/regex_internal.h
+- vendor/libgit2/deps/regex/regexec.c
+- vendor/libgit2/deps/zlib/adler32.c
+- vendor/libgit2/deps/zlib/crc32.c
+- vendor/libgit2/deps/zlib/crc32.h
+- vendor/libgit2/deps/zlib/deflate.c
+- vendor/libgit2/deps/zlib/deflate.h
+- vendor/libgit2/deps/zlib/inffast.c
+- vendor/libgit2/deps/zlib/inffast.h
+- vendor/libgit2/deps/zlib/inffixed.h
+- vendor/libgit2/deps/zlib/inflate.c
+- vendor/libgit2/deps/zlib/inflate.h
+- vendor/libgit2/deps/zlib/inftrees.c
+- vendor/libgit2/deps/zlib/inftrees.h
+- vendor/libgit2/deps/zlib/trees.c
+- vendor/libgit2/deps/zlib/trees.h
+- vendor/libgit2/deps/zlib/zconf.h
+- vendor/libgit2/deps/zlib/zlib.h
+- vendor/libgit2/deps/zlib/zutil.c
+- vendor/libgit2/deps/zlib/zutil.h
+- vendor/libgit2/include/git2.h
 - vendor/libgit2/include/git2/attr.h
 - vendor/libgit2/include/git2/blame.h
 - vendor/libgit2/include/git2/blob.h
@@ -181,7 +215,7 @@ files:
 - vendor/libgit2/include/git2/tree.h
 - vendor/libgit2/include/git2/types.h
 - vendor/libgit2/include/git2/version.h
-- vendor/libgit2/include/git2.h
+- vendor/libgit2/libgit2.pc.in
 - vendor/libgit2/src/array.h
 - vendor/libgit2/src/attr.c
 - vendor/libgit2/src/attr.h
@@ -256,13 +290,13 @@ files:
 - vendor/libgit2/src/global.c
 - vendor/libgit2/src/global.h
 - vendor/libgit2/src/graph.c
+- vendor/libgit2/src/hash.c
+- vendor/libgit2/src/hash.h
 - vendor/libgit2/src/hash/hash_generic.c
 - vendor/libgit2/src/hash/hash_generic.h
 - vendor/libgit2/src/hash/hash_openssl.h
 - vendor/libgit2/src/hash/hash_win32.c
 - vendor/libgit2/src/hash/hash_win32.h
-- vendor/libgit2/src/hash.c
-- vendor/libgit2/src/hash.h
 - vendor/libgit2/src/hashsig.c
 - vendor/libgit2/src/hashsig.h
 - vendor/libgit2/src/ident.c
@@ -422,40 +456,6 @@ files:
 - vendor/libgit2/src/xdiff/xutils.h
 - vendor/libgit2/src/zstream.c
 - vendor/libgit2/src/zstream.h
-- vendor/libgit2/deps/http-parser/http_parser.c
-- vendor/libgit2/deps/http-parser/http_parser.h
-- vendor/libgit2/deps/http-parser/LICENSE-MIT
-- vendor/libgit2/deps/regex/config.h
-- vendor/libgit2/deps/regex/regcomp.c
-- vendor/libgit2/deps/regex/regex.c
-- vendor/libgit2/deps/regex/regex.h
-- vendor/libgit2/deps/regex/regex_internal.c
-- vendor/libgit2/deps/regex/regex_internal.h
-- vendor/libgit2/deps/regex/regexec.c
-- vendor/libgit2/deps/zlib/adler32.c
-- vendor/libgit2/deps/zlib/crc32.c
-- vendor/libgit2/deps/zlib/crc32.h
-- vendor/libgit2/deps/zlib/deflate.c
-- vendor/libgit2/deps/zlib/deflate.h
-- vendor/libgit2/deps/zlib/inffast.c
-- vendor/libgit2/deps/zlib/inffast.h
-- vendor/libgit2/deps/zlib/inffixed.h
-- vendor/libgit2/deps/zlib/inflate.c
-- vendor/libgit2/deps/zlib/inflate.h
-- vendor/libgit2/deps/zlib/inftrees.c
-- vendor/libgit2/deps/zlib/inftrees.h
-- vendor/libgit2/deps/zlib/trees.c
-- vendor/libgit2/deps/zlib/trees.h
-- vendor/libgit2/deps/zlib/zconf.h
-- vendor/libgit2/deps/zlib/zlib.h
-- vendor/libgit2/deps/zlib/zutil.c
-- vendor/libgit2/deps/zlib/zutil.h
-- vendor/libgit2/CMakeLists.txt
-- vendor/libgit2/Makefile.embed
-- vendor/libgit2/AUTHORS
-- vendor/libgit2/COPYING
-- vendor/libgit2/libgit2.pc.in
-- ext/rugged/extconf.rb
 homepage: https://github.com/libgit2/rugged
 licenses:
 - MIT
@@ -466,17 +466,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rugged is a Ruby binding to the libgit2 linkable library