rugged 0.18.0.gh.de28323 → 0.19.0

data/test/repo_reset_test.rb

@@ -1,3 +1,5 @@
+require "test_helper"
+
 class RepositoryResetTest < Rugged::TestCase
   include Rugged::TempRepositoryAccess
 

data/test/repo_test.rb

@@ -1,8 +1,12 @@
 require 'test_helper'
 require 'base64'
 
-class RepositoryTest < Rugged::TestCase
-  include Rugged::RepositoryAccess
+class RepositoryTest < Rugged::SandboxedTestCase
+  def setup
+    super
+
+    @repo = sandbox_init "testrepo.git"
+  end
 
   def test_last_commit
     assert @repo.respond_to? :last_commit
@@ -78,8 +82,8 @@ class RepositoryTest < Rugged::TestCase
   end
 
   def test_match_all_refs
-    refs = @repo.refs 'refs/heads'
-    assert_equal 2, refs.length
+    refs = @repo.refs 'refs/heads/*'
+    assert_equal 2, refs.count
   end
 
   def test_return_all_ref_names
@@ -100,40 +104,58 @@ class RepositoryTest < Rugged::TestCase
 
   def test_return_all_remotes
     remotes = @repo.remotes
-    assert_equal 1, remotes.count
+    assert_equal 2, remotes.count
   end
 
   def test_lookup_head
     head = @repo.head
+    assert_equal "refs/heads/master", head.name
     assert_equal "36060c58702ed4c2a40832c51758d5344201d89a", head.target
     assert_equal :direct, head.type
   end
 
+  def test_set_head_ref
+    @repo.head = "refs/heads/packed"
+    assert_equal "refs/heads/packed", @repo.head.name
+  end
+
+  def test_set_head_invalid
+    assert_raises Rugged::ReferenceError do
+      @repo.head = "36060c58702ed4c2a40832c51758d5344201d89a"
+    end
+  end
+
   def test_access_a_file
     sha = '36060c58702ed4c2a40832c51758d5344201d89a'
     blob = @repo.blob_at(sha, 'new.txt')
     assert_equal "new file\n", blob.content
   end
 
+  def test_access_a_missing_file
+    sha = '36060c58702ed4c2a40832c51758d5344201d89a'
+    blob = @repo.blob_at(sha, 'file-not-found.txt')
+    assert_nil blob
+  end
+
   def test_garbage_collection
-    Rugged::Repository.new(@path)
+    Rugged::Repository.new(@repo.path)
     ObjectSpace.garbage_collect
   end
 
   def test_enumerate_all_objects
-    assert_equal 36, @repo.each_id.to_a.length
+    assert_equal 37, @repo.each_id.to_a.length
   end
 
   def test_loading_alternates
     alt_path = File.dirname(__FILE__) + '/fixtures/alternate/objects'
-    repo = Rugged::Repository.new(@path, :alternates => [alt_path])
-    assert_equal 39, repo.each_id.to_a.length
+    repo = Rugged::Repository.new(@repo.path, :alternates => [alt_path])
+    assert_equal 40, repo.each_id.to_a.length
     assert repo.read('146ae76773c91e3b1d00cf7a338ec55ae58297e2')
   end
 
   def test_alternates_with_invalid_path_type
     assert_raises TypeError do
-      Rugged::Repository.new(@path, :alternates => [:invalid_input])
+      Rugged::Repository.new(@repo.path, :alternates => [:invalid_input])
     end
   end
 
@@ -157,6 +179,33 @@ class RepositoryTest < Rugged::TestCase
     base    = '5b5b025afb0b4c913b4c338a42934a3863bf3644'
     assert_equal base, @repo.merge_base(commit1, commit2)
   end
+
+  def test_find_merge_base_between_many
+    commit1 = 'a4a7dce85cf63874e984719f4fdd239f5145052f'
+    commit2 = "refs/heads/packed"
+    commit3 = @repo.lookup('36060c58702ed4c2a40832c51758d5344201d89a')
+
+    base    = '5b5b025afb0b4c913b4c338a42934a3863bf3644'
+    assert_equal base, @repo.merge_base(commit1, commit2, commit3)
+  end
+
+  def test_ahead_behind_with_oids
+    ahead, behind = @repo.ahead_behind(
+      'a4a7dce85cf63874e984719f4fdd239f5145052f',
+      '36060c58702ed4c2a40832c51758d5344201d89a'
+    )
+    assert_equal 1, ahead
+    assert_equal 4, behind
+  end
+
+  def test_ahead_behind_with_commits
+    ahead, behind = @repo.ahead_behind(
+      @repo.lookup('a4a7dce85cf63874e984719f4fdd239f5145052f'),
+      @repo.lookup('36060c58702ed4c2a40832c51758d5344201d89a')
+    )
+    assert_equal 1, ahead
+    assert_equal 4, behind
+  end
 end
 
 class RepositoryWriteTest < Rugged::TestCase
@@ -213,6 +262,94 @@ class RepositoryInitTest < Rugged::TestCase
   end
 end
 
+class RepositoryCloneTest < Rugged::TestCase
+  def setup
+    @tmppath = Dir.mktmpdir
+    @source_path = File.join(Rugged::TestCase::TEST_DIR, 'fixtures', 'testrepo.git')
+  end
+
+  def teardown
+    FileUtils.remove_entry_secure(@tmppath)
+  end
+
+  def test_clone
+    repo = Rugged::Repository.clone_at(@source_path, @tmppath)
+    assert_equal "hey", File.read(File.join(@tmppath, "README")).chomp
+    assert_equal "36060c58702ed4c2a40832c51758d5344201d89a", repo.head.target
+    assert_equal "36060c58702ed4c2a40832c51758d5344201d89a", repo.ref("refs/heads/master").target
+    assert_equal "36060c58702ed4c2a40832c51758d5344201d89a", repo.ref("refs/remotes/origin/master").target
+    assert_equal "41bc8c69075bbdb46c5c6f0566cc8cc5b46e8bd9", repo.ref("refs/remotes/origin/packed").target
+  end
+
+  def test_clone_bare
+    repo = Rugged::Repository.clone_at(@source_path, @tmppath, :bare => true)
+    assert repo.bare?
+  end
+
+  def test_clone_with_progress
+    total_objects = indexed_objects = received_objects = received_bytes = nil
+    callsback = 0
+    Rugged::Repository.clone_at(@source_path, @tmppath,
+      :progress => lambda { |*args| callsback += 1 ; total_objects, indexed_objects, received_objects, received_bytes = args })
+    assert_equal 22,   callsback
+    assert_equal 19,   total_objects
+    assert_equal 19,   indexed_objects
+    assert_equal 19,   received_objects
+    assert_equal 1563, received_bytes
+  end
+
+  def test_clone_quits_on_error
+    begin
+      Rugged::Repository.clone_at(@source_path, @tmppath, :progress => lambda { |*_| raise 'boom' })
+    rescue => e
+      assert_equal 'boom', e.message
+    end
+    assert_no_dotgit_dir(@tmppath)
+  end
+
+  def test_clone_with_bad_progress_callback
+    assert_raises ArgumentError do
+      Rugged::Repository.clone_at(@source_path, @tmppath, :progress => Object.new)
+    end
+    assert_no_dotgit_dir(@tmppath)
+  end
+
+  def assert_no_dotgit_dir(path)
+    assert_equal [], Dir[File.join(path, ".git/**")], "new repository's .git dir should not exist"
+  end
+end
+
+class RepositoryNamespaceTest < Rugged::SandboxedTestCase
+  def setup
+    super
+
+    @repo = sandbox_init("testrepo.git")
+  end
+
+  def test_no_namespace
+    assert_nil @repo.namespace
+  end
+
+  def test_changing_namespace
+    @repo.namespace = "foo"
+    assert_equal "foo", @repo.namespace
+
+    @repo.namespace = "bar"
+    assert_equal "bar", @repo.namespace
+
+    @repo.namespace = "foo/bar"
+    assert_equal "foo/bar", @repo.namespace
+
+    @repo.namespace = nil
+    assert_equal nil, @repo.namespace
+  end
+
+  def test_refs_in_namespaces
+    @repo.namespace = "foo"
+    assert_equal [], @repo.refs.to_a
+  end
+end
+
 class RepositoryPushTest < Rugged::SandboxedTestCase
   def setup
     super

data/test/test_helper.rb

@@ -8,6 +8,9 @@ require 'pp'
 
 module Rugged
   class TestCase < MiniTest::Unit::TestCase
+    # Ruby 1.8 / 1.9 Shim
+    Enumerator = defined?(::Enumerator) ? ::Enumerator : ::Enumerable::Enumerator
+
     TEST_DIR = File.dirname(File.expand_path(__FILE__))
 
     protected
@@ -65,12 +68,12 @@ module Rugged
   end
 
   module TempRepositoryAccess
-    def setup 
+    def setup
       @path = temp_repo("testrepo.git")
       @repo = Rugged::Repository.new(@path)
     end
 
-    def teardown 
+    def teardown
       destroy_temp_repo(@path)
     end
 

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

@@ -141,7 +141,7 @@ GIT_EXTERN(git_attr_t) git_attr_value(const char *attr);
  */
 GIT_EXTERN(int) git_attr_get(
 	const char **value_out,
-    git_repository *repo,
+	git_repository *repo,
 	uint32_t flags,
 	const char *path,
 	const char *name);
@@ -162,7 +162,7 @@ GIT_EXTERN(int) git_attr_get(
  * Then you could loop through the 3 values to get the settings for
  * the three attributes you asked about.
  *
- * @param values An array of num_attr entries that will have string
+ * @param values_out An array of num_attr entries that will have string
  *             pointers written into it for the values of the attributes.
  *             You should not modify or free the values that are written
  *             into this array (although of course, you should free the
@@ -228,7 +228,7 @@ GIT_EXTERN(void) git_attr_cache_flush(
  * function allows you to add others.  For example, to add the default
  * macro, you would call:
  *
- *    git_attr_add_macro(repo, "binary", "-diff -crlf");
+ *     git_attr_add_macro(repo, "binary", "-diff -crlf");
  */
 GIT_EXTERN(int) git_attr_add_macro(
 	git_repository *repo,

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

@@ -29,10 +29,7 @@ GIT_BEGIN_DECL
  * @param id identity of the blob to locate.
  * @return 0 or an error code
  */
-GIT_INLINE(int) git_blob_lookup(git_blob **blob, git_repository *repo, const git_oid *id)
-{
-	return git_object_lookup((git_object **)blob, repo, id, GIT_OBJ_BLOB);
-}
+GIT_EXTERN(int) git_blob_lookup(git_blob **blob, git_repository *repo, const git_oid *id);
 
 /**
  * Lookup a blob object from a repository,
@@ -46,10 +43,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, size_t len)
-{
-	return git_object_lookup_prefix((git_object **)blob, repo, id, len, GIT_OBJ_BLOB);
-}
+GIT_EXTERN(int) git_blob_lookup_prefix(git_blob **blob, git_repository *repo, const git_oid *id, size_t len);
 
 /**
  * Close an open blob
@@ -62,11 +56,7 @@ GIT_INLINE(int) git_blob_lookup_prefix(git_blob **blob, git_repository *repo, co
  *
  * @param blob the blob to close
  */
-
-GIT_INLINE(void) git_blob_free(git_blob *blob)
-{
-	git_object_free((git_object *) blob);
-}
+GIT_EXTERN(void) git_blob_free(git_blob *blob);
 
 /**
  * Get the id of a blob.
@@ -74,11 +64,15 @@ GIT_INLINE(void) git_blob_free(git_blob *blob)
  * @param blob a previously loaded blob.
  * @return SHA1 hash for this blob.
  */
-GIT_INLINE(const git_oid *) git_blob_id(const git_blob *blob)
-{
-	return git_object_id((const git_object *)blob);
-}
+GIT_EXTERN(const git_oid *) git_blob_id(const git_blob *blob);
 
+/**
+ * Get the repository that contains the blob.
+ *
+ * @param blob A previously loaded blob.
+ * @return Repository that contains this blob.
+ */
+GIT_EXTERN(git_repository *) git_blob_owner(const git_blob *blob);
 
 /**
  * Get a read-only buffer with the raw content of a blob.

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

@@ -58,7 +58,8 @@ GIT_EXTERN(int) git_branch_create(
  * Delete an existing branch reference.
  *
  * If the branch is successfully deleted, the passed reference
- * object will be freed and invalidated.
+ * object will be invalidated. The reference must be freed manually
+ * by the user.
  *
  * @param branch A valid reference representing a branch
  * @return 0 on success, or an error code.
@@ -237,7 +238,7 @@ GIT_EXTERN(int) git_branch_is_head(
  *
  * @return Number of characters in the reference name
  *     including the trailing NUL byte; GIT_ENOTFOUND
- *     when no remote matching remote was gound,
+ *     when no remote matching remote was found,
  *     GIT_EAMBIGUOUS when the branch maps to several remotes,
  *     otherwise an error code.
  */

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

@@ -134,6 +134,9 @@ typedef enum {
 	/** Treat pathspec as simple list of exact match file paths */
 	GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH = (1u << 13),
 
+	/** Ignore directories in use, they will be left empty */
+	GIT_CHECKOUT_SKIP_LOCKED_DIRECTORIES = (1u << 18),
+
 	/**
 	 * THE FOLLOWING OPTIONS ARE NOT YET IMPLEMENTED
 	 */
@@ -180,6 +183,8 @@ typedef enum {
 	GIT_CHECKOUT_NOTIFY_UPDATED   = (1u << 2),
 	GIT_CHECKOUT_NOTIFY_UNTRACKED = (1u << 3),
 	GIT_CHECKOUT_NOTIFY_IGNORED   = (1u << 4),
+
+	GIT_CHECKOUT_NOTIFY_ALL       = 0x0FFFFu
 } git_checkout_notify_t;
 
 /** Checkout notification callback function */
@@ -231,6 +236,8 @@ typedef struct git_checkout_opts {
 	git_strarray paths;
 
 	git_tree *baseline; /** expected content of workdir, defaults to HEAD */
+
+	const char *target_directory; /** alternative checkout path to workdir */
 } git_checkout_opts;
 
 #define GIT_CHECKOUT_OPTS_VERSION 1

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

@@ -51,6 +51,8 @@ GIT_BEGIN_DECL
  * - `cred_acquire_cb` is a callback to be used if credentials are required
  *   during the initial fetch.
  * - `cred_acquire_payload` is the payload for the above callback.
+ * - `transport_flags` is flags used to create transport if no transport is
+ *   provided.
  * - `transport` is a custom transport to be used for the initial fetch.  NULL
  *   means use the transport autodetected from the URL.
  * - `remote_callbacks` may be used to specify custom progress callbacks for
@@ -75,6 +77,7 @@ typedef struct git_clone_options {
 	const char *push_spec;
 	git_cred_acquire_cb cred_acquire_cb;
 	void *cred_acquire_payload;
+    git_transport_flags_t transport_flags;
 	git_transport *transport;
 	git_remote_callbacks *remote_callbacks;
 	git_remote_autotag_option_t remote_autotag;

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

@@ -30,10 +30,7 @@ GIT_BEGIN_DECL
  *		an annotated tag it will be peeled back to the commit.
  * @return 0 or an error code
  */
-GIT_INLINE(int) git_commit_lookup(git_commit **commit, git_repository *repo, const git_oid *id)
-{
-	return git_object_lookup((git_object **)commit, repo, id, GIT_OBJ_COMMIT);
-}
+GIT_EXTERN(int) git_commit_lookup(git_commit **commit, git_repository *repo, const git_oid *id);
 
 /**
  * Lookup a commit object from a repository,
@@ -48,10 +45,7 @@ GIT_INLINE(int) git_commit_lookup(git_commit **commit, git_repository *repo, con
  * @param len the length of the short identifier
  * @return 0 or an error code
  */
-GIT_INLINE(int) git_commit_lookup_prefix(git_commit **commit, git_repository *repo, const git_oid *id, size_t len)
-{
-	return git_object_lookup_prefix((git_object **)commit, repo, id, len, GIT_OBJ_COMMIT);
-}
+GIT_EXTERN(int) git_commit_lookup_prefix(git_commit **commit, git_repository *repo, const git_oid *id, size_t len);
 
 /**
  * Close an open commit
@@ -65,10 +59,7 @@ GIT_INLINE(int) git_commit_lookup_prefix(git_commit **commit, git_repository *re
  * @param commit the commit to close
  */
 
-GIT_INLINE(void) git_commit_free(git_commit *commit)
-{
-	git_object_free((git_object *) commit);
-}
+GIT_EXTERN(void) git_commit_free(git_commit *commit);
 
 /**
  * Get the id of a commit.
@@ -76,10 +67,15 @@ GIT_INLINE(void) git_commit_free(git_commit *commit)
  * @param commit a previously loaded commit.
  * @return object identity for the commit.
  */
-GIT_INLINE(const git_oid *) git_commit_id(const git_commit *commit)
-{
-	return git_object_id((const git_object *)commit);
-}
+GIT_EXTERN(const git_oid *) git_commit_id(const git_commit *commit);
+
+/**
+ * Get the repository that contains the commit.
+ *
+ * @param commit A previously loaded commit.
+ * @return Repository that contains this commit.
+ */
+GIT_EXTERN(git_repository *) git_commit_owner(const git_commit *commit);
 
 /**
  * Get the encoding for the message of a commit,
@@ -168,7 +164,10 @@ GIT_EXTERN(unsigned int) git_commit_parentcount(const git_commit *commit);
  * @param n the position of the parent (from 0 to `parentcount`)
  * @return 0 or an error code
  */
-GIT_EXTERN(int) git_commit_parent(git_commit **out, git_commit *commit, unsigned int n);
+GIT_EXTERN(int) git_commit_parent(
+	git_commit **out,
+	const git_commit *commit,
+	unsigned int n);
 
 /**
  * Get the oid of a specified parent for a commit. This is different from
@@ -179,7 +178,9 @@ GIT_EXTERN(int) git_commit_parent(git_commit **out, git_commit *commit, unsigned
  * @param n the position of the parent (from 0 to `parentcount`)
  * @return the id of the parent, NULL on error.
  */
-GIT_EXTERN(const git_oid *) git_commit_parent_id(git_commit *commit, unsigned int n);
+GIT_EXTERN(const git_oid *) git_commit_parent_id(
+	const git_commit *commit,
+	unsigned int n);
 
 /**
  * Get the commit object that is the <n>th generation ancestor
@@ -201,14 +202,12 @@ GIT_EXTERN(int) git_commit_nth_gen_ancestor(
 	unsigned int n);
 
 /**
- * Create a new commit in the repository using `git_object`
- * instances as parameters.
+ * Create new commit in the repository from a list of `git_object` pointers
  *
- * The message will not be cleaned up. This can be achieved
- * through `git_message_prettify()`.
+ * The message will not be cleaned up automatically. You can do that with
+ * the `git_message_prettify()` function.
  *
- * @param id Pointer where to store the OID of the
- *	newly created commit
+ * @param id Pointer in which to store the OID of the newly created commit
  *
  * @param repo Repository where to store the commit
  *
@@ -219,73 +218,69 @@ GIT_EXTERN(int) git_commit_nth_gen_ancestor(
  *	make it point to this commit. If the reference doesn't
  *	exist yet, it will be created.
  *
- * @param author Signature representing the author and the authory
- *	time of this commit
+ * @param author Signature with author and author time of commit
  *
- * @param committer Signature representing the committer and the
- * commit time of this 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.
+ *  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`.
+ *  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`.
+ * @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
  *	The created commit will be written to the Object Database and
  *	the given reference will be updated to point to it
  */
 GIT_EXTERN(int) git_commit_create(
-		git_oid *id,
-		git_repository *repo,
-		const char *update_ref,
-		const git_signature *author,
-		const git_signature *committer,
-		const char *message_encoding,
-		const char *message,
-		const git_tree *tree,
-		int parent_count,
-		const git_commit *parents[]);
+	git_oid *id,
+	git_repository *repo,
+	const char *update_ref,
+	const git_signature *author,
+	const git_signature *committer,
+	const char *message_encoding,
+	const char *message,
+	const git_tree *tree,
+	int parent_count,
+	const git_commit *parents[]);
 
 /**
- * Create a new commit in the repository using a variable
- * argument list.
+ * Create new commit in the repository using a variable argument list.
  *
- * The message will be cleaned up from excess whitespace
- * it will be made sure that the last line ends with a '\n'.
+ * The message will be cleaned up from excess whitespace and it will be made
+ * sure that the last line ends with a '\n'.
  *
- * The parents for the commit are specified as a variable
- * list of pointers to `const git_commit *`. Note that this
- * is a convenience method which may not be safe to export
- * for certain languages or compilers
+ * The parents for the commit are specified as a variable list of pointers
+ * to `const git_commit *`. Note that this is a convenience method which may
+ * not be safe to export for certain languages or compilers
  *
- * All other parameters remain the same
+ * All other parameters remain the same at `git_commit_create()`.
  *
  * @see git_commit_create
  */
 GIT_EXTERN(int) git_commit_create_v(
-		git_oid *id,
-		git_repository *repo,
-		const char *update_ref,
-		const git_signature *author,
-		const git_signature *committer,
-		const char *message_encoding,
-		const char *message,
-		const git_tree *tree,
-		int parent_count,
-		...);
+	git_oid *id,
+	git_repository *repo,
+	const char *update_ref,
+	const git_signature *author,
+	const git_signature *committer,
+	const char *message_encoding,
+	const char *message,
+	const git_tree *tree,
+	int parent_count,
+	...);
 
 /** @} */
 GIT_END_DECL