mercurial-ruby 0.4.0 → 0.5.0

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/lib/mercurial-ruby.rb

@@ -4,7 +4,7 @@
 #
 module Mercurial
   
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
   
   class Error < RuntimeError; end
   

data/lib/mercurial-ruby/diff.rb

@@ -9,9 +9,6 @@ module Mercurial
   #
   class Diff
     
-    # Instance of {Mercurial::Commit Commit}.
-    attr_reader :commit
-    
     # SHA1 hash of version a of the file.
     attr_reader :hash_a
     
@@ -27,8 +24,7 @@ module Mercurial
     # Diff body.
     attr_reader :body
     
-    def initialize(commit, opts={})
-      @commit = commit
+    def initialize(opts={})
       @hash_a = opts[:hash_a]
       @hash_b = opts[:hash_b]
       @file_a = opts[:file_a]

data/lib/mercurial-ruby/factories/diff_factory.rb

@@ -27,15 +27,19 @@ module Mercurial
         unless chunks.nil?
           chunks.map do |piece| 
             piece = "diff" << piece
-            returning << build(commit, piece)
+            returning << build(piece)
           end
         end
       end
     end
     
+    def for_path(path, revision_a, revision_b)
+      build(hg(["diff ? -r ? -r ?", path, revision_a, revision_b]))
+    end
+    
   private
   
-    def build(commit, data)
+    def build(data)
       return if data.empty?      
       hash_a, hash_b = *data.scan(/^diff -r (\w+) -r (\w+)/).first
 
@@ -48,7 +52,7 @@ module Mercurial
         body = data[data.index("\n")+1..-1]
       end
 
-      Mercurial::Diff.new(commit,
+      Mercurial::Diff.new(
         :hash_a => hash_a,
         :hash_b => hash_b,
         :file_a => file_a,

data/mercurial-ruby.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mercurial-ruby}
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ilya Sabanin"]
-  s.date = %q{2011-09-15}
+  s.date = %q{2011-09-16}
   s.description = %q{Ruby API for Mercurial DVCS.}
   s.email = %q{ilya.sabanin@gmail.com}
   s.extra_rdoc_files = [

data/test/test_commit_factory.rb

@@ -60,7 +60,7 @@ describe Mercurial::CommitFactory do
   
   it "should count commits" do
     count = @repository.commits.count
-    count.must_equal 36
+    count.must_equal 40
   end
   
   it "should iterate through commits" do

data/test/test_diff_factory.rb

@@ -35,4 +35,44 @@ describe Mercurial::DiffFactory do
     commit.diffs.size.must_equal 0
   end
   
+  it "should find diffs for path" do
+    diff = @repository.diffs.for_path('diff-test.rb', '57a6efe309bf', '9f76ea916c51')
+    diff.must_be_kind_of Mercurial::Diff
+    diff.hash_a.must_equal '57a6efe309bf'
+    diff.hash_b.must_equal'9f76ea916c51'
+    diff.file_a.must_equal 'diff-test.rb'
+    diff.file_b.must_equal 'diff-test.rb'
+    diff.body.must_equal diff_sample
+  end
+  
+private
+
+  def diff_sample
+    %Q[--- a/diff-test.rb	Thu Sep 15 23:43:02 2011 +0800
++++ b/diff-test.rb	Thu Sep 15 23:43:52 2011 +0800
+@@ -5,19 +5,17 @@
+ 
+   before_filter :repository_detected?, :except => :index
+   before_filter :welcome_screen,       :only => :index
+-  before_filter :prepare_to_show,      :only => [:show, :differences, :message]
+   before_filter :setup_page,           :only => [:index, :repository]
+ 
+   caches_action :message, :differences
+ 
++  helper_method :current_branch
+   helper_method :repository_scope?
+-  helper_method :quick_changeset
+   helper_method :changesets_changes_limit
+-  helper_method :current_branch
+   helper_method :diff_taking_too_much_time_msg
+ 
+   def repository
+-    if current_repository.import_in_progress?
++    unless current_repository.import_in_progress?
+       return render(:template => "changesets/import_in_progress")
+     end
+     @changesets         = find_changesets_for_current_scope
+]
+  end
+  
 end

data/test/test_file_index.rb

@@ -24,7 +24,7 @@ describe Mercurial::FileIndex do
   end
   
   it "should count all commits" do
-    @file_index.count_all.must_equal 36
+    @file_index.count_all.must_equal 40
   end
   
   it "should count commits reachable by specific hash id" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mercurial-ruby
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Ilya Sabanin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-15 00:00:00 +08:00
+date: 2011-09-16 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency