@@ -1,4 +1,6 @@ == + * Backwards breaking changes + * Diff#a_commit -> Diff#a_blob, Diff#b_commit -> Diff#b_blob * Major Enhancments * Ruby 1.9 compatibility [github.com/chapados, github.com/js] * Minor Enhancements History.txt @@ -2,17 +2,17 @@ module Grit class Diff attr_reader :a_path, :b_path - attr_reader :a_commit, :b_commit + attr_reader :a_blob, :b_blob attr_reader :a_mode, :b_mode attr_reader :new_file, :deleted_file attr_reader :diff - def initialize(repo, a_path, b_path, a_commit, b_commit, a_mode, b_mode, new_file, deleted_file, diff) + def initialize(repo, a_path, b_path, a_blob, b_blob, a_mode, b_mode, new_file, deleted_file, diff) @repo = repo @a_path = a_path @b_path = b_path - @a_commit = a_commit =~ /^0{40}$/ ? nil : Commit.create(repo, :id => a_commit) - @b_commit = b_commit =~ /^0{40}$/ ? nil : Commit.create(repo, :id => b_commit) + @a_blob = a_blob =~ /^0{40}$/ ? nil : Blob.create(repo, :id => a_blob) + @b_blob = b_blob =~ /^0{40}$/ ? nil : Blob.create(repo, :id => b_blob) @a_mode = a_mode @b_mode = b_mode @new_file = new_file @@ -51,7 +51,7 @@ module Grit deleted_file = true end - m, a_commit, b_commit, b_mode = *lines.shift.match(%r{^index ([0-9A-Fa-f]+)\.\.([0-9A-Fa-f]+) ?(.+)?$}) + m, a_blob, b_blob, b_mode = *lines.shift.match(%r{^index ([0-9A-Fa-f]+)\.\.([0-9A-Fa-f]+) ?(.+)?$}) b_mode.strip! if b_mode diff_lines = [] @@ -60,7 +60,7 @@ module Grit end diff = diff_lines.join("\n") - diffs << Diff.new(repo, a_path, b_path, a_commit, b_commit, a_mode, b_mode, new_file, deleted_file, diff) + diffs << Diff.new(repo, a_path, b_path, a_blob, b_blob, a_mode, b_mode, new_file, deleted_file, diff) end diffs lib/grit/diff.rb @@ -40,16 +40,16 @@ class TestCommit < Test::Unit::TestCase assert_equal '.gitignore', diffs.first.a_path assert_equal '.gitignore', diffs.first.b_path - assert_equal '4ebc8aea50e0a67e000ba29a30809d0a7b9b2666', diffs.first.a_commit.id - assert_equal '2dd02534615434d88c51307beb0f0092f21fd103', diffs.first.b_commit.id + assert_equal '4ebc8aea50e0a67e000ba29a30809d0a7b9b2666', diffs.first.a_blob.id + assert_equal '2dd02534615434d88c51307beb0f0092f21fd103', diffs.first.b_blob.id assert_equal '100644', diffs.first.b_mode assert_equal false, diffs.first.new_file assert_equal false, diffs.first.deleted_file assert_equal "--- a/.gitignore\n+++ b/.gitignore\n@@ -1 +1,2 @@\n coverage\n+pkg", diffs.first.diff assert_equal 'lib/grit/actor.rb', diffs[5].a_path - assert_equal nil, diffs[5].a_commit - assert_equal 'f733bce6b57c0e5e353206e692b0e3105c2527f4', diffs[5].b_commit.id + assert_equal nil, diffs[5].a_blob + assert_equal 'f733bce6b57c0e5e353206e692b0e3105c2527f4', diffs[5].b_blob.id assert_equal true, diffs[5].new_file end @@ -92,16 +92,16 @@ class TestCommit < Test::Unit::TestCase assert_equal '.gitignore', diffs.first.a_path assert_equal '.gitignore', diffs.first.b_path - assert_equal '4ebc8aea50e0a67e000ba29a30809d0a7b9b2666', diffs.first.a_commit.id - assert_equal '2dd02534615434d88c51307beb0f0092f21fd103', diffs.first.b_commit.id + assert_equal '4ebc8aea50e0a67e000ba29a30809d0a7b9b2666', diffs.first.a_blob.id + assert_equal '2dd02534615434d88c51307beb0f0092f21fd103', diffs.first.b_blob.id assert_equal '100644', diffs.first.b_mode assert_equal false, diffs.first.new_file assert_equal false, diffs.first.deleted_file assert_equal "--- a/.gitignore\n+++ b/.gitignore\n@@ -1 +1,2 @@\n coverage\n+pkg", diffs.first.diff assert_equal 'lib/grit/actor.rb', diffs[5].a_path - assert_equal nil, diffs[5].a_commit - assert_equal 'f733bce6b57c0e5e353206e692b0e3105c2527f4', diffs[5].b_commit.id + assert_equal nil, diffs[5].a_blob + assert_equal 'f733bce6b57c0e5e353206e692b0e3105c2527f4', diffs[5].b_blob.id assert_equal true, diffs[5].new_file end @@ -116,17 +116,17 @@ class TestCommit < Test::Unit::TestCase assert_equal 'History.txt', diffs.first.a_path assert_equal 'History.txt', diffs.first.b_path - assert_equal nil, diffs.first.a_commit + assert_equal nil, diffs.first.a_blob assert_equal nil, diffs.first.b_mode - assert_equal '81d2c27608b352814cbe979a6acd678d30219678', diffs.first.b_commit.id + assert_equal '81d2c27608b352814cbe979a6acd678d30219678', diffs.first.b_blob.id assert_equal true, diffs.first.new_file assert_equal false, diffs.first.deleted_file assert_equal "--- /dev/null\n+++ b/History.txt\n@@ -0,0 +1,5 @@\n+== 1.0.0 / 2007-10-09\n+\n+* 1 major enhancement\n+ * Birthday!\n+", diffs.first.diff assert_equal 'lib/grit.rb', diffs[5].a_path - assert_equal nil, diffs[5].a_commit - assert_equal '32cec87d1e78946a827ddf6a8776be4d81dcf1d1', diffs[5].b_commit.id + assert_equal nil, diffs[5].a_blob + assert_equal '32cec87d1e78946a827ddf6a8776be4d81dcf1d1', diffs[5].b_blob.id assert_equal true, diffs[5].new_file end test/test_commit.rb @@ -326,8 +326,8 @@ class TestRepo < Test::Unit::TestCase @r.git.expects(:rev_list).with({}, "master").returns(fixture("rev_list_delta_b")) other_repo.git.expects(:rev_list).with({}, "master").returns(fixture("rev_list_delta_a")) - delta_commits = @r.commit_deltas_from(other_repo) - assert_equal 0, delta_commits.size + delta_blobs = @r.commit_deltas_from(other_repo) + assert_equal 0, delta_blobs.size end def test_commit_deltas_from_when_other_has_new @@ -341,7 +341,7 @@ class TestRepo < Test::Unit::TestCase ].each do |ref| Commit.expects(:find_all).with(other_repo, ref, :max_count => 1).returns([stub()]) end - delta_commits = @r.commit_deltas_from(other_repo) - assert_equal 3, delta_commits.size + delta_blobs = @r.commit_deltas_from(other_repo) + assert_equal 3, delta_blobs.size end end test/test_repo.rb cdf9d1663db66971ac8fbc8d929de312bd4da55b Tom Preston-Werner tom@mojombo.com http://github.com/mojombo/grit/commit/809025eaf61b22c2916a8eae59e42138f4cf9365 809025eaf61b22c2916a8eae59e42138f4cf9365 2009-03-03T16:14:54-08:00 2009-03-03T16:14:54-08:00 a_commit and b_commit are really a_blob and b_blob de22675c9dca6b9689cab7a5941e2d75d5506800 Tom Preston-Werner tom@mojombo.com