rugged 0.17.0b2 → 0.17.0.b6

data/test/reference_test.rb

@@ -1,4 +1,5 @@
-require "test_helper"
+# encoding: UTF-8
+require File.expand_path "../test_helper", __FILE__
 
 context "Rugged::Reference stuff" do
   setup do
@@ -8,6 +9,7 @@ context "Rugged::Reference stuff" do
 
   teardown do
     FileUtils.remove_entry_secure(@path + '/refs/heads/unit_test', true)
+    FileUtils.remove_entry_secure(@path + '/refs/heads/Ångström', true)
   end
 
   test "can list references" do
@@ -15,6 +17,12 @@ context "Rugged::Reference stuff" do
     assert_equal "heads/master:heads/packed:tags/v0.9:tags/v1.0", refs
   end
 
+  test "can list references with non 7-bit ASCII characters" do
+    Rugged::Reference.create(@repo, "refs/heads/Ångström", "refs/heads/master")
+    refs = @repo.refs.map { |r| r.name.gsub("refs/", '') }.sort.join(':')
+    assert_equal "heads/master:heads/packed:heads/Ångström:tags/v0.9:tags/v1.0", refs
+  end
+
   test "can list filtered references from regex" do
     refs = @repo.refs(/tags/).map { |r| r.name.gsub("refs/", '') }.sort.join(':')
     assert_equal "tags/v0.9:tags/v1.0", refs
@@ -109,5 +117,62 @@ context "Rugged::Reference stuff" do
     assert_equal "36060c58702ed4c2a40832c51758d5344201d89a", head.target
     assert_equal :direct, head.type
   end
+end
+
+context "Rugged::Reference#name" do
+  setup do
+    @path = temp_repo 'testrepo.git'
+    @repo = Rugged::Repository.new(@path)
+  end
+
+  it "returns the reference name with UTF-8 encoding" do
+    ref = Rugged::Reference.create(@repo, "refs/heads/Ångström", "refs/heads/master")
+    assert_equal "refs/heads/Ångström", ref.name
+  end
+end
+
+context "Rugged::Reference#target" do
+  setup do
+    @path = temp_repo 'testrepo.git'
+    @repo = Rugged::Repository.new(@path)
+  end
 
+  it "returns the reference target name with UTF-8 encoding" do
+    Rugged::Reference.create(@repo, "refs/heads/Ångström", "refs/heads/master")
+
+    ref = Rugged::Reference.create(@repo, "refs/heads/foobar", "refs/heads/Ångström")
+    assert_equal "refs/heads/Ångström", ref.target
+  end
+end
+
+context "Rugged::Reference#log!" do
+  setup do
+    @path = temp_repo 'testrepo.git'
+    @repo = Rugged::Repository.new(@path)
+
+    @ref = Rugged::Reference.create(@repo, "refs/heads/test-reflog", "36060c58702ed4c2a40832c51758d5344201d89a")
+  end
+
+  it "creates reflog entries" do
+    @ref.log!({ :name => "foo", :email => "foo@bar", :time => Time.now })
+    @ref.log!({ :name => "foo", :email => "foo@bar", :time => Time.now }, "commit: bla bla")
+
+    reflog = @ref.log
+    assert_equal reflog.size, 2
+
+    assert_equal reflog[0][:oid_old], "0000000000000000000000000000000000000000"
+    assert_equal reflog[0][:oid_new], "36060c58702ed4c2a40832c51758d5344201d89a"
+    assert_equal reflog[0][:message], nil
+    assert_equal reflog[0][:committer][:name], "foo"
+    assert_equal reflog[0][:committer][:email], "foo@bar"
+    assert_kind_of Time, reflog[0][:committer][:time]
+
+    assert_equal reflog[1][:oid_old], "36060c58702ed4c2a40832c51758d5344201d89a"
+    assert_equal reflog[1][:oid_new], "36060c58702ed4c2a40832c51758d5344201d89a"
+    assert_equal reflog[1][:message], "commit: bla bla"
+    assert_equal reflog[1][:committer][:name], "foo"
+    assert_equal reflog[1][:committer][:email], "foo@bar"
+    assert_kind_of Time, reflog[1][:committer][:time]
+
+  end
 end

data/test/repo_test.rb

@@ -16,12 +16,12 @@ context "Rugged::Repository stuff" do
   end
 
   test "fails to open unexisting repositories" do
-    assert_raise Rugged::OSError do
-      repo = Rugged::Repository.new("fakepath/123/")
+    assert_raises Rugged::OSError do
+      Rugged::Repository.new("fakepath/123/")
     end
 
-    assert_raise Rugged::RepositoryError do
-      repo = Rugged::Repository.new("/home/")
+    assert_raises Rugged::RepositoryError do
+      Rugged::Repository.new("/home/")
     end
   end
 

data/test/tree_test.rb

@@ -58,7 +58,7 @@ context "Rugged::Tree tests" do
     entry = {:type => :blob,
              :name => "README.txt",
              :oid  => "1385f264afb75a56a5bec74243be9b367ba4ca08",
-             :attributes => 33188}
+             :filemode => 33188}
 
     builder = Rugged::Tree::Builder.new
     builder << entry

data/test/walker_test.rb

@@ -56,7 +56,7 @@ context "Rugged::Walker stuff" do
 
   def revlist_with_sorting(sorting)
     data = do_sort sorting
-    oids = data.map {|a| a.oid[0,5] if a }.join('.')
+    data.map {|a| a.oid[0,5] if a }.join('.')
   end
 
   def is_toposorted(list)

data/vendor/libgit2/Makefile.embed

@@ -0,0 +1,42 @@
+PLATFORM=$(shell uname -o)
+
+rm=rm -f
+AR=ar cq
+RANLIB=ranlib
+LIBNAME=libgit2.a
+ifeq ($(PLATFORM),Msys)
+	CC=gcc
+else
+	CC=cc
+endif
+
+INCLUDES= -I. -Isrc -Iinclude -Ideps/http-parser -Ideps/zlib
+
+DEFINES= $(INCLUDES) -DNO_VIZ -DSTDC -DNO_GZIP -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $(EXTRA_DEFINES)
+CFLAGS= -g $(DEFINES) -Wall -Wextra -O2 $(EXTRA_CFLAGS)
+
+SRCS = $(wildcard src/*.c) $(wildcard src/transports/*.c) $(wildcard src/xdiff/*.c) $(wildcard deps/http-parser/*.c) $(wildcard deps/zlib/*.c)
+
+ifeq ($(PLATFORM),Msys)
+	SRCS += $(wildcard src/win32/*.c) $(wildcard src/compat/*.c) deps/regex/regex.c
+	INCLUDES += -Ideps/regex
+	DEFINES += -DWIN32 -D_WIN32_WINNT=0x0501
+else
+	SRCS += $(wildcard src/unix/*.c) 
+	CFLAGS += -fPIC
+endif
+
+OBJS = $(patsubst %.c,%.o,$(SRCS))
+
+%.c.o:
+	$(CC) $(CFLAGS) -c $*.c
+
+all: $(LIBNAME)
+
+$(LIBNAME): $(OBJS)
+	$(rm) $@
+	$(AR) $@ $(OBJS)
+	$(RANLIB) $@
+
+clean:
+	$(rm) $(OBJS) $(LIBNAME)

data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2.h

@@ -37,7 +37,12 @@
 #include "git2/index.h"
 #include "git2/config.h"
 #include "git2/remote.h"
+#include "git2/clone.h"
+#include "git2/checkout.h"
 
+#include "git2/attr.h"
+#include "git2/ignore.h"
+#include "git2/branch.h"
 #include "git2/refspec.h"
 #include "git2/net.h"
 #include "git2/status.h"
@@ -45,5 +50,6 @@
 #include "git2/submodule.h"
 #include "git2/notes.h"
 #include "git2/reset.h"
+#include "git2/message.h"
 
 #endif

data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/attr.h

@@ -30,7 +30,7 @@ GIT_BEGIN_DECL
  * Then for file `xyz.c` looking up attribute "foo" gives a value for
  * which `GIT_ATTR_TRUE(value)` is true.
  */
-#define GIT_ATTR_TRUE(attr)		((attr) == git_attr__true)
+#define GIT_ATTR_TRUE(attr)	(git_attr_value(attr) == GIT_ATTR_TRUE_T)
 
 /**
  * GIT_ATTR_FALSE checks if an attribute is set off.  In core git
@@ -44,7 +44,7 @@ GIT_BEGIN_DECL
  * Then for file `zyx.h` looking up attribute "foo" gives a value for
  * which `GIT_ATTR_FALSE(value)` is true.
  */
-#define GIT_ATTR_FALSE(attr)	((attr) == git_attr__false)
+#define GIT_ATTR_FALSE(attr) (git_attr_value(attr) == GIT_ATTR_FALSE_T)
 
 /**
  * GIT_ATTR_UNSPECIFIED checks if an attribute is unspecified.  This
@@ -62,7 +62,7 @@ GIT_BEGIN_DECL
  * file `onefile.rb` or looking up "bar" on any file will all give
  * `GIT_ATTR_UNSPECIFIED(value)` of true.
  */
-#define GIT_ATTR_UNSPECIFIED(attr)	(!(attr) || (attr) == git_attr__unset)
+#define GIT_ATTR_UNSPECIFIED(attr) (git_attr_value(attr) == GIT_ATTR_UNSPECIFIED_T)
 
 /**
  * GIT_ATTR_HAS_VALUE checks if an attribute is set to a value (as
@@ -74,13 +74,29 @@ GIT_BEGIN_DECL
  * Given this, looking up "eol" for `onefile.txt` will give back the
  * string "lf" and `GIT_ATTR_SET_TO_VALUE(attr)` will return true.
  */
-#define GIT_ATTR_HAS_VALUE(attr) \
-	((attr) && (attr) != git_attr__unset && \
-	 (attr) != git_attr__true && (attr) != git_attr__false)
+#define GIT_ATTR_HAS_VALUE(attr) (git_attr_value(attr) == GIT_ATTR_VALUE_T)
 
-GIT_EXTERN(const char *) git_attr__true;
-GIT_EXTERN(const char *) git_attr__false;
-GIT_EXTERN(const char *) git_attr__unset;
+typedef enum {
+	GIT_ATTR_UNSPECIFIED_T = 0,
+	GIT_ATTR_TRUE_T,
+	GIT_ATTR_FALSE_T,
+	GIT_ATTR_VALUE_T,
+} git_attr_t;
+
+/*
+ *	Return the value type for a given attribute.
+ *
+ *	This can be either `TRUE`, `FALSE`, `UNSPECIFIED` (if the attribute
+ *	was not set at all), or `VALUE`, if the attribute was set to
+ *	an actual string.
+ *
+ *	If the attribute has a `VALUE` string, it can be accessed normally
+ *	as a NULL-terminated C string.
+ *
+ *	@param attr The attribute
+ *	@return the value type for the attribute
+ */
+GIT_EXTERN(git_attr_t) git_attr_value(const char *attr);
 
 /**
  * Check attribute flags: Reading values from index and working directory.
@@ -172,18 +188,17 @@ GIT_EXTERN(int) git_attr_get_many(
  *
  * @param repo The repository containing the path.
  * @param flags A combination of GIT_ATTR_CHECK... flags.
- * @param path The path inside the repo to check attributes.  This
- *             does not have to exist, but if it does not, then
- *             it will be treated as a plain file (i.e. not a directory).
- * @param callback The function that will be invoked on each attribute
- *             and attribute value.  The name parameter will be the name
- *             of the attribute and the value will be the value it is
- *             set to, including possibly NULL if the attribute is
- *             explicitly set to UNSPECIFIED using the ! sign.  This
- *             will be invoked only once per attribute name, even if
- *             there are multiple rules for a given file.  The highest
- *             priority rule will be used.
+ * @param path Path inside the repo to check attributes.  This does not have
+ *             to exist, but if it does not, then it will be treated as a
+ *             plain file (i.e. not a directory).
+ * @param callback Function to invoke on each attribute name and value.  The
+ *             value may be NULL is the attribute is explicitly set to
+ *             UNSPECIFIED using the '!' sign.  Callback will be invoked
+ *             only once per attribute name, even if there are multiple
+ *             rules for a given file.  The highest priority rule will be
+ *             used.  Return a non-zero value from this to stop looping.
  * @param payload Passed on as extra parameter to callback function.
+ * @return 0 on success, GIT_EUSER on non-zero callback, or error code
  */
 GIT_EXTERN(int) git_attr_foreach(
 	git_repository *repo,

data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/blob.h

@@ -46,7 +46,7 @@ GIT_INLINE(int) git_blob_lookup(git_blob **blob, git_repository *repo, const git
  * @param len the length of the short identifier
  * @return 0 or an error code
  */
-GIT_INLINE(int) git_blob_lookup_prefix(git_blob **blob, git_repository *repo, const git_oid *id, unsigned int len)
+GIT_INLINE(int) git_blob_lookup_prefix(git_blob **blob, git_repository *repo, const git_oid *id, size_t len)
 {
 	return git_object_lookup_prefix((git_object **)blob, repo, id, len, GIT_OBJ_BLOB);
 }

data/{ext/rugged/vendor/libgit2-dist → vendor/libgit2}/include/git2/branch.h

@@ -26,9 +26,9 @@ GIT_BEGIN_DECL
  * this target commit. If `force` is true and a reference
  * already exists with the given name, it'll be replaced.
  *
- * @param oid_out Pointer where to store the OID of the target commit.
+ * The returned reference must be freed by the user.
  *
- * @param repo Repository where to store the branch.
+ * @param branch_out Pointer where to store the underlying reference.
  *
  * @param branch_name Name for the branch; this name is
  * validated for consistency. It should also not conflict with
@@ -46,7 +46,7 @@ GIT_BEGIN_DECL
  * pointing to the provided target commit.
  */
 GIT_EXTERN(int) git_branch_create(
-		git_oid *oid_out,
+		git_reference **branch_out,
 		git_repository *repo,
 		const char *branch_name,
 		const git_object *target,
@@ -72,15 +72,9 @@ GIT_EXTERN(int) git_branch_delete(
 		git_branch_t branch_type);
 
 /**
- * Fill a list with all the branches in the Repository
+ * Loop over all the branches and issue a callback for each one.
  *
- * The string array will be filled with the names of the
- * matching branches; these values are owned by the user and
- * should be free'd manually when no longer needed, using
- * `git_strarray_free`.
- *
- * @param branch_names Pointer to a git_strarray structure
- * where the branch names will be stored.
+ * If the callback returns a non-zero value, this will stop looping.
  *
  * @param repo Repository where to find the branches.
  *
@@ -88,35 +82,79 @@ GIT_EXTERN(int) git_branch_delete(
  * listing. Valid values are GIT_BRANCH_LOCAL, GIT_BRANCH_REMOTE
  * or a combination of the two.
  *
- * @return 0 or an error code.
+ * @param branch_cb Callback to invoke per found branch.
+ *
+ * @param payload Extra parameter to callback function.
+ *
+ * @return 0 on success, GIT_EUSER on non-zero callback, or error code
  */
-GIT_EXTERN(int) git_branch_list(
-		git_strarray *branch_names,
+GIT_EXTERN(int) git_branch_foreach(
 		git_repository *repo,
-		unsigned int list_flags);
+		unsigned int list_flags,
+		int (*branch_cb)(
+			const char *branch_name,
+			git_branch_t branch_type,
+			void *payload),
+		void *payload
+);
 
 /**
- * Move/rename an existing branch reference.
+ * Move/rename an existing local branch reference.
  *
- * @param repo Repository where lives the branch.
- *
- * @param old_branch_name Current name of the branch to be moved;
- * this name is validated for consistency.
+ * @param branch Current underlying reference of the branch.
  *
  * @param new_branch_name Target name of the branch once the move
  * is performed; this name is validated for consistency.
  *
  * @param force Overwrite existing branch.
  *
- * @return 0 on success, GIT_ENOTFOUND if the branch
- * doesn't exist or an error code.
+ * @return 0 on success, or an error code.
  */
 GIT_EXTERN(int) git_branch_move(
-		git_repository *repo,
-		const char *old_branch_name,
+		git_reference *branch,
 		const char *new_branch_name,
 		int force);
 
+/**
+ * Lookup a branch by its name in a repository.
+ *
+ * The generated reference must be freed by the user.
+ *
+ * @param branch_out pointer to the looked-up branch reference
+ *
+ * @param repo the repository to look up the branch
+ *
+ * @param branch_name Name of the branch to be looked-up;
+ * this name is validated for consistency.
+ *
+ * @param branch_type Type of the considered branch. This should
+ * be valued with either GIT_BRANCH_LOCAL or GIT_BRANCH_REMOTE.
+ *
+ * @return 0 on success; GIT_ENOTFOUND when no matching branch
+ * exists, otherwise an error code.
+ */
+GIT_EXTERN(int) git_branch_lookup(
+		git_reference **branch_out,
+		git_repository *repo,
+		const char *branch_name,
+		git_branch_t branch_type);
+
+/**
+ * Return the reference supporting the remote tracking branch,
+ * given a local branch reference.
+ *
+ * @param tracking_out Pointer where to store the retrieved
+ * reference.
+ *
+ * @param branch Current underlying reference of the branch.
+ *
+ * @return 0 on success; GIT_ENOTFOUND when no remote tracking
+ * reference exists, otherwise an error code.
+ */
+GIT_EXTERN(int) git_branch_tracking(
+		git_reference **tracking_out,
+		git_reference *branch);
+
 /** @} */
 GIT_END_DECL
 #endif