rugged 0.17.0.b6 → 0.17.0.b7

data/ext/rugged/rugged_index.c

@@ -404,6 +404,30 @@ VALUE rb_git_index_writetree(VALUE self)
 	return rugged_create_oid(&tree_oid);
 }
 
+/*
+ *	call-seq:
+ *		index.read_tree(tree)
+ *
+ *      Clear the current index and start the index again on top of +tree+
+ *
+ *      Further index operations (+add+, +update+, +remove+, etc) will
+ *      be considered changes on top of +tree+.
+ */
+VALUE rb_git_index_readtree(VALUE self, VALUE rb_tree)
+{
+	git_index *index;
+	git_tree *tree;
+	int error;
+
+	Data_Get_Struct(self, git_index, index);
+	Data_Get_Struct(rb_tree, git_tree, tree);
+
+	error = git_index_read_tree(index, tree, NULL);
+	rugged_exception_check(error);
+
+	return Qnil;
+}
+
 void Init_rugged_index()
 {
 	/*
@@ -431,6 +455,7 @@ void Init_rugged_index()
 
 	rb_define_method(rb_cRuggedIndex, "remove", rb_git_index_remove, 1);
 	rb_define_method(rb_cRuggedIndex, "write_tree", rb_git_index_writetree, 0);
+	rb_define_method(rb_cRuggedIndex, "read_tree", rb_git_index_readtree, 1);
 
 	rb_define_singleton_method(rb_cRuggedIndex, "index_pack", rb_git_indexer, 1);
 

data/ext/rugged/rugged_object.c

@@ -92,12 +92,16 @@ git_object *rugged_object_load(git_repository *repo, VALUE object_value, git_oty
 
 	if (TYPE(object_value) == T_STRING) {
 		git_oid oid;
+		int oid_length = (int)RSTRING_LEN(object_value);
 		int error;
 
-		error = git_oid_fromstr(&oid, StringValueCStr(object_value));
+		error = git_oid_fromstrn(&oid, RSTRING_PTR(object_value), oid_length);
 		rugged_exception_check(error);
 
-		error = git_object_lookup(&object, repo, &oid, type);
+		if (oid_length < GIT_OID_HEXSZ)
+			error = git_object_lookup_prefix(&object, repo, &oid, oid_length, type);
+		else
+			error = git_object_lookup(&object, repo, &oid, type);
 		rugged_exception_check(error);
 
 	} else if (rb_obj_is_kind_of(object_value, rb_cRuggedObject)) {

data/ext/rugged/rugged_reference.c

@@ -24,13 +24,6 @@
 
 #include "rugged.h"
 
-#define UNPACK_REFERENCE(_rb_obj, _rugged_obj) {\
-	if (DATA_PTR(_rb_obj) == NULL)\
-		rb_raise(rb_eRuntimeError,\
-			"This Git Reference has been deleted and no longer exists on the repository");\
-	Data_Get_Struct(_rb_obj, git_reference, _rugged_obj);\
-}
-
 extern VALUE rb_mRugged;
 extern VALUE rb_cRuggedRepo;
 VALUE rb_cRuggedReference;
@@ -235,7 +228,7 @@ static VALUE rb_git_ref_target(VALUE self)
 {
 	git_reference *ref;
 
-	UNPACK_REFERENCE(self, ref);
+	RUGGED_UNPACK_REFERENCE(self, ref);
 
 	if (git_reference_type(ref) == GIT_REF_OID) {
 		return rugged_create_oid(git_reference_oid(ref));
@@ -265,7 +258,7 @@ static VALUE rb_git_ref_set_target(VALUE self, VALUE rb_target)
 	git_reference *ref;
 	int error;
 
-	UNPACK_REFERENCE(self, ref);
+	RUGGED_UNPACK_REFERENCE(self, ref);
 	Check_Type(rb_target, T_STRING);
 
 	if (git_reference_type(ref) == GIT_REF_OID) {
@@ -292,7 +285,7 @@ static VALUE rb_git_ref_set_target(VALUE self, VALUE rb_target)
 static VALUE rb_git_ref_type(VALUE self)
 {
 	git_reference *ref;
-	UNPACK_REFERENCE(self, ref);
+	RUGGED_UNPACK_REFERENCE(self, ref);
 	switch (git_reference_type(ref)) {
 		case GIT_REF_OID:
 			return CSTR2SYM("direct");
@@ -312,7 +305,7 @@ static VALUE rb_git_ref_type(VALUE self)
 static VALUE rb_git_ref_packed(VALUE self)
 {
 	git_reference *ref;
-	UNPACK_REFERENCE(self, ref);
+	RUGGED_UNPACK_REFERENCE(self, ref);
 
 	return git_reference_is_packed(ref) ? Qtrue : Qfalse;
 }
@@ -327,7 +320,7 @@ static VALUE rb_git_ref_reload(VALUE self)
 {
 	int error;
 	git_reference *ref;
-	UNPACK_REFERENCE(self, ref);
+	RUGGED_UNPACK_REFERENCE(self, ref);
 
 	error = git_reference_reload(ref);
 
@@ -350,7 +343,7 @@ static VALUE rb_git_ref_reload(VALUE self)
 static VALUE rb_git_ref_name(VALUE self)
 {
 	git_reference *ref;
-	UNPACK_REFERENCE(self, ref);
+	RUGGED_UNPACK_REFERENCE(self, ref);
 	return rugged_str_new2(git_reference_name(ref), rb_utf8_encoding());
 }
 
@@ -373,7 +366,7 @@ static VALUE rb_git_ref_resolve(VALUE self)
 	git_reference *resolved;
 	int error;
 
-	UNPACK_REFERENCE(self, ref);
+	RUGGED_UNPACK_REFERENCE(self, ref);
 
 	error = git_reference_resolve(&resolved, ref);
 	rugged_exception_check(error);
@@ -398,7 +391,7 @@ static VALUE rb_git_ref_rename(int argc, VALUE *argv, VALUE self)
 	VALUE rb_name, rb_force;
 	int error, force = 0;
 
-	UNPACK_REFERENCE(self, ref);
+	RUGGED_UNPACK_REFERENCE(self, ref);
 	rb_scan_args(argc, argv, "11", &rb_name, &rb_force);
 
 	Check_Type(rb_name, T_STRING);
@@ -427,7 +420,7 @@ static VALUE rb_git_ref_delete(VALUE self)
 	git_reference *ref;
 	int error;
 
-	UNPACK_REFERENCE(self, ref);
+	RUGGED_UNPACK_REFERENCE(self, ref);
 
 	error = git_reference_delete(ref);
 	rugged_exception_check(error);
@@ -495,7 +488,7 @@ static VALUE rb_git_reflog(VALUE self)
 	VALUE rb_log;
 	unsigned int i, ref_count;
 
-	UNPACK_REFERENCE(self, ref);
+	RUGGED_UNPACK_REFERENCE(self, ref);
 
 	error = git_reflog_read(&reflog, ref);
 	rugged_exception_check(error);
@@ -533,7 +526,7 @@ static VALUE rb_git_reflog_write(int argc, VALUE *argv, VALUE self)
 	
 	git_oid oid;
 
-	UNPACK_REFERENCE(self, ref);
+	RUGGED_UNPACK_REFERENCE(self, ref);
 
 	rb_scan_args(argc, argv, "11", &rb_committer, &rb_message);
 

data/ext/rugged/rugged_revwalk.c

@@ -106,7 +106,7 @@ static VALUE rb_git_walker_each(VALUE self)
 		rb_yield(rugged_object_new(rugged_owner(self), (git_object *)commit));
 	}
 
-	if (error != GIT_REVWALKOVER)
+	if (error != GIT_ITEROVER)
 		rugged_exception_check(error);
 
 	return Qnil;

data/lib/rugged.rb

@@ -8,3 +8,4 @@ require 'rugged/reference'
 require 'rugged/walker'
 require 'rugged/tree'
 require 'rugged/tag'
+require 'rugged/branch'

data/lib/rugged/branch.rb

@@ -0,0 +1,28 @@
+module Rugged
+  class Branch < Rugged::Reference
+
+    # The object pointed at by the tip of this branch
+    def tip
+      @owner.lookup(self.resolve.target)
+    end
+
+    def ==(other)
+      other.instance_of?(Rugged::Branch) &&
+        other.canonical_name == self.canonical_name
+    end
+
+    # The full name of the branch, as a fully-qualified reference
+    # path.
+    #
+    # This is the same as calling Reference#name for the reference behind
+    # the path
+    alias_method 'canonical_name', 'name'
+
+    # The name of the branch, without a fully-qualified reference path
+    #
+    # E.g. 'master' instead of 'refs/heads/master'
+    def name
+      super.gsub(%r{^(refs/heads/|refs/remotes/)}, '')
+    end
+  end
+end

data/lib/rugged/commit.rb

@@ -1,8 +1,12 @@
 module Rugged
   class Commit
 
+    def self.prettify_message(msg, strip_comments = true)
+      Rugged::prettify_message(msg, strip_comments)
+    end
+
     def inspect
-      "#<Rugged::Commit:#{object_id} {message: #{message.inspect}, tree: #{tree.inspect}, parents: #{parent_ids}>"
+      "#<Rugged::Commit:#{object_id} {message: #{message.inspect}, tree: #{tree.inspect}, parents: #{parent_oids}>"
     end
 
     # The time when this commit was made effective. This is the same value
@@ -22,10 +26,6 @@ module Rugged
         :parents => parents,
       }
     end
-    
-    def parent_ids
-      parents.map { |parent| parent.oid }
-    end
 
     def modify(new_args, update_ref=nil)
       args = self.to_hash.merge(new_args)

data/lib/rugged/repository.rb

@@ -107,20 +107,45 @@ module Rugged
       Rugged::Reference.each(self)
     end
 
-    # All of the tags in the repository.
+    # All the tags in the repository.
     #
     # Returns an Enumerable::Enumerator containing all the String tag names.
     def tags(pattern="")
       Rugged::Tag.each(self, pattern)
     end
 
-    # All of the remotes in the repository.
+    # All the remotes in the repository.
     #
     # Returns an Enumerable::Enumerator containing all the String remote names.
     def remotes
       Rugged::Remote.each(self)
     end
 
+    # All the branches in the repository
+    #
+    # Returns an Enumerable::Enumerator containing Rugged::Branch objects
+    def branches
+      Rugged::Branch.each(self)
+    end
+
+    # Create a new branch in the repository
+    #
+    # name - The name of the branch (without a full reference path)
+    # sha_or_ref - The target of the branch; either a String representing
+    # an OID or a reference name, or a Rugged::Object instance.
+    #
+    # Returns a Rugged::Branch object
+    def create_branch(name, sha_or_ref = "HEAD")
+      case sha_or_ref
+      when Rugged::Object
+        target = sha_or_ref.oid
+      else
+        target = rev_parse_oid(sha_or_ref)
+      end
+
+      Branch.create(self, name, target)
+    end
+
     # Get the content of a file at a specific revision.
     #
     # revision - The String SHA1.
@@ -129,13 +154,13 @@ module Rugged
     # Returns a String.
     def file_at(revision, path)
       tree = Rugged::Commit.lookup(self, revision).tree
-	  begin
-		blob_data = tree.path(path)
-	  rescue Rugged::IndexerError
+      begin
+        blob_data = tree.path(path)
+      rescue Rugged::IndexerError
         return nil
-	  end
+      end
       blob = Rugged::Blob.lookup(self, blob_data[:oid])
-	  (blob.type == :blob) ? blob.content : nil
+      (blob.type == :blob) ? blob.content : nil
     end
   end
 end

data/lib/rugged/tag.rb

@@ -1,8 +1,12 @@
 module Rugged
   class Tag
 
+    def self.prettify_message(msg, strip_comments = true)
+      Rugged::prettify_message(msg, strip_comments)
+    end
+
     def inspect
-      "#<Rugged::Reference:#{object_id} {name: #{name.inspect}, message: #{message.inspect}, target: #{target.inspect}>"
+      "#<Rugged::Tag:#{object_id} {name: #{name.inspect}, message: #{message.inspect}, target: #{target.inspect}>"
     end
 
     def to_hash

data/lib/rugged/version.rb

@@ -1,3 +1,3 @@
 module Rugged
-  Version = VERSION = '0.17.0.b6'
+  Version = VERSION = '0.17.0.b7'
 end

data/test/branch_test.rb

@@ -0,0 +1,227 @@
+# encoding: UTF-8
+require "test_helper"
+
+context "Rugged::Branch.each_name" do
+  setup do
+    @path = temp_repo("testrepo.git")
+    @repo = Rugged::Repository.new(@path)
+  end
+
+  test "lists the names of all branches in a bare repository" do
+    assert_equal [
+      "master",
+      "origin/HEAD",
+      "origin/master",
+      "origin/packed",
+    ], Rugged::Branch.each_name(@repo).sort
+  end
+
+  test "can list only local branches" do
+    assert_equal ["master"], Rugged::Branch.each_name(@repo, :local).sort
+  end
+
+  test "can list only remote branches" do
+    assert_equal [
+      "origin/HEAD",
+      "origin/master",
+      "origin/packed",
+    ], Rugged::Branch.each_name(@repo, :remote).sort
+  end
+end
+
+context "Rugged::Branch#tip" do
+  setup do
+    @path = temp_repo("testrepo.git")
+    @repo = Rugged::Repository.new(@path)
+  end
+
+  test "returns the latest commit of the branch" do
+    tip = Rugged::Branch.lookup(@repo, "master").tip
+
+    assert_kind_of Rugged::Commit, tip
+    assert_equal "36060c58702ed4c2a40832c51758d5344201d89a", tip.oid
+  end
+end
+
+context "Rugged::Branch.lookup" do
+  setup do
+    @path = temp_repo("testrepo.git")
+    @repo = Rugged::Repository.new(@path)
+  end
+
+  test "can look up local branches" do
+    branch = Rugged::Branch.lookup(@repo, "master")
+    refute_nil branch
+
+    assert_equal "master", branch.name
+    assert_equal "refs/heads/master", branch.canonical_name
+    assert_equal "36060c58702ed4c2a40832c51758d5344201d89a", branch.tip.oid
+  end
+
+  test "can look up remote branches" do
+    branch = Rugged::Branch.lookup(@repo, "origin/packed", :remote)
+    refute_nil branch
+
+    assert_equal "origin/packed", branch.name
+    assert_equal "refs/remotes/origin/packed", branch.canonical_name
+    assert_equal "41bc8c69075bbdb46c5c6f0566cc8cc5b46e8bd9", branch.tip.oid
+  end
+
+  test "can look up branches with non 7-bit ASCII characters" do
+    new_branch = @repo.create_branch("Ångström", "5b5b025afb0b4c913b4c338a42934a3863bf3644")
+    refute_nil new_branch
+
+    retrieved_branch = Rugged::Branch.lookup(@repo, "Ångström")
+    refute_nil retrieved_branch
+
+    assert_equal new_branch, retrieved_branch
+  end
+end
+
+context "Rugged::Repository.delete" do
+  setup do
+    @path = temp_repo("testrepo.git")
+    @repo = Rugged::Repository.new(@path)
+  end
+
+  test "deletes a branch from the repository" do
+    branch = @repo.create_branch("test_branch")
+    branch.delete!
+    assert_nil Rugged::Branch.lookup(@repo, "test_branch")
+  end
+end
+
+context "Rugged::Repository.move" do
+  setup do
+    @path = temp_repo("testrepo.git")
+    @repo = Rugged::Repository.new(@path)
+  end
+
+  test "renames a branch" do
+    branch = @repo.create_branch("test_branch")
+
+    branch.move('other_branch')
+
+    assert_nil Rugged::Branch.lookup(@repo, "test_branch")
+    refute_nil Rugged::Branch.lookup(@repo, "other_branch")
+  end
+end
+
+context "Rugged::Repository#create_branch" do
+  setup do
+    @path = temp_repo("testrepo.git")
+    @repo = Rugged::Repository.new(@path)
+  end
+
+  test "can create a new branch" do
+    new_branch = @repo.create_branch("test_branch", "5b5b025afb0b4c913b4c338a42934a3863bf3644")
+
+    refute_nil new_branch
+    assert_equal "test_branch", new_branch.name
+    assert_equal "refs/heads/test_branch", new_branch.canonical_name
+
+    refute_nil new_branch.tip
+    assert_equal "5b5b025afb0b4c913b4c338a42934a3863bf3644", new_branch.tip.oid
+
+    refute_nil @repo.branches.find { |p| p.name == "test_branch" }
+  end
+
+  test "can create branches with non 7-bit ASCII names" do
+    branch_name = "A\314\212ngstro\314\210m"
+    new_branch = @repo.create_branch(branch_name, "5b5b025afb0b4c913b4c338a42934a3863bf3644")
+
+    refute_nil new_branch
+    assert_equal branch_name, new_branch.name
+    assert_equal "refs/heads/#{branch_name}", new_branch.canonical_name
+
+    refute_nil new_branch.tip
+    assert_equal "5b5b025afb0b4c913b4c338a42934a3863bf3644", new_branch.tip.oid
+
+    refute_nil @repo.branches.find { |p| p.name == branch_name }
+  end
+
+  test "can create a new branch with an abbreviated sha" do
+    new_branch = @repo.create_branch("test_branch", "5b5b025")
+
+    refute_nil new_branch
+    assert_equal "test_branch", new_branch.name
+    assert_equal "refs/heads/test_branch", new_branch.canonical_name
+
+    refute_nil new_branch.tip
+    assert_equal "5b5b025afb0b4c913b4c338a42934a3863bf3644", new_branch.tip.oid
+  end
+
+  test "can create a new branch from a tag name" do
+    new_branch = @repo.create_branch("test_branch", "refs/tags/v0.9")
+
+    refute_nil new_branch
+    assert_equal "test_branch", new_branch.name
+    assert_equal "refs/heads/test_branch", new_branch.canonical_name
+
+    refute_nil new_branch.tip
+    assert_equal "5b5b025afb0b4c913b4c338a42934a3863bf3644", new_branch.tip.oid
+  end
+
+  test "can create a new branch from implicit head" do
+    new_branch = @repo.create_branch("test_branch")
+
+    refute_nil new_branch
+    assert_equal "test_branch", new_branch.name
+    assert_equal "refs/heads/test_branch", new_branch.canonical_name
+
+    refute_nil new_branch.tip
+    assert_equal "36060c58702ed4c2a40832c51758d5344201d89a", new_branch.tip.oid
+  end
+
+  test "can create a new branch from explicit head" do
+    new_branch = @repo.create_branch("test_branch", "HEAD")
+
+    refute_nil new_branch
+    assert_equal "test_branch", new_branch.name
+    assert_equal "refs/heads/test_branch", new_branch.canonical_name
+
+    refute_nil new_branch.tip
+    assert_equal "36060c58702ed4c2a40832c51758d5344201d89a", new_branch.tip.oid
+  end
+
+  test "can create a new branch from a commit object" do
+    new_branch = @repo.create_branch("test_branch", Rugged::Commit.lookup(@repo, "5b5b025afb0b4c913b4c338a42934a3863bf3644"))
+
+    refute_nil new_branch
+    assert_equal "test_branch", new_branch.name
+    assert_equal "refs/heads/test_branch", new_branch.canonical_name
+
+    refute_nil new_branch.tip
+    assert_equal "5b5b025afb0b4c913b4c338a42934a3863bf3644", new_branch.tip.oid
+  end
+
+  test "can not create a new branch from a tree" do
+    assert_raises Rugged::InvalidError do
+      @repo.create_branch("test_branch", Rugged::Tree.lookup(@repo, "f60079018b664e4e79329a7ef9559c8d9e0378d1"))
+    end
+   end
+
+  test "can not create a new branch from a blob" do
+    assert_raises Rugged::InvalidError do
+      @repo.create_branch("test_branch", Rugged::Blob.lookup(@repo, "1385f264afb75a56a5bec74243be9b367ba4ca08"))
+    end
+  end
+
+  test "can not create a new branch from an unknown branch" do
+    assert_raises Rugged::ReferenceError do
+      @repo.create_branch("test_branch", "i_do_not_exist")
+    end
+  end
+
+  test "can not create a new branch from an unknown commit" do
+    assert_raises Rugged::ReferenceError do
+      @repo.create_branch("test_branch", "dd15de908706711b51b7acb24faab726d2b3cb16")
+    end
+  end
+
+  test "can not create a new branch from a non canonical branch name" do
+    assert_raises Rugged::ReferenceError do
+      @repo.create_branch("test_branch", "packed")
+    end
+  end
+end