gitrb 0.2.3 → 0.2.4

data/gitrb.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'gitrb'
-  s.version = '0.2.3'
+  s.version = '0.2.4'
   s.summary = 'Pure ruby git implementation'
   s.author = 'Daniel Mendler'
   s.email = 'mail@daniel-mendler.de'

data/lib/gitrb.rb

@@ -4,7 +4,6 @@ require 'fileutils'
 require 'logger'
 require 'enumerator'
 require 'stringio'
-require 'thread'
 
 require 'gitrb/util'
 require 'gitrb/gitobject'

data/lib/gitrb/repository.rb

@@ -42,8 +42,6 @@ module Gitrb
       @branch  = options[:branch] || 'master'
       @logger  = options[:logger] || Logger.new(nil)
       @encoding = options[:encoding] || DEFAULT_ENCODING
-      @lock = {}
-      @transaction = Mutex.new
 
       @path = options[:path]
       @path.chomp!('/')
@@ -56,6 +54,14 @@ module Gitrb
       load
     end
 
+    def dup
+      super.instance_eval do
+        @objects = Trie.new
+        load
+        self
+      end
+    end
+
     # Bare repository?
     def bare?
       @bare
@@ -63,10 +69,8 @@ module Gitrb
 
     # Switch branch
     def branch=(branch)
-      @transaction.synchronize do
-        @branch = branch
-        load
-      end
+      @branch = branch
+      load
     end
 
     # Has our repository been changed on disk?
@@ -81,22 +85,15 @@ module Gitrb
 
     # Clear cached objects
     def clear
-      @transaction.synchronize do
-        @objects.clear
-        load
-      end
-    end
-
-    # Is there any transaction going on?
-    def in_transaction?
-      !!@lock[Thread.current.object_id]
+      @objects.clear
+      load
     end
 
     # Difference between versions
     # Options:
     #   :to             - Required target commit
     #   :from           - Optional source commit (otherwise comparision with empty tree)
-    #   :path           - Restrict to path
+    #   :path           - Restrict to path/or paths
     #   :detect_renames - Detect renames O(n^2)
     #   :detect_copies  - Detect copies O(n^2), very slow
     def diff(opts)
@@ -112,7 +109,7 @@ module Gitrb
       Diff.new(from, to, git_diff_tree('--root', '--full-index', '-u',
                                        opts[:detect_renames] ? '-M' : nil,
                                        opts[:detect_copies] ? '-C' : nil,
-                                       from ? from.id : nil, to.id, '--', opts[:path]))
+                                       from ? from.id : nil, to.id, '--', *opts[:path]))
     end
 
     # All changes made inside a transaction are atomic. If some
@@ -122,19 +119,20 @@ module Gitrb
     #   repository.transaction { repository['a'] = 'b' }
     #
     def transaction(message = '', author = nil, committer = nil)
-      @transaction.synchronize do
-        begin
-          start_transaction
-          result = yield
-          commit(message, author, committer)
-          result
-        rescue
-          rollback_transaction
-          raise
-        ensure
-          finish_transaction
-        end
-      end
+      lock = File.open("#{head_path}.lock", 'w')
+      lock.flock(File::LOCK_EX)
+      refresh
+
+      result = yield
+      commit(message, author, committer)
+      result
+    rescue
+      @objects.clear
+      load
+      raise
+    ensure
+      lock.close rescue nil
+      File.unlink("#{head_path}.lock") rescue nil
     end
 
     # Write a commit object to disk and set the head of the current branch.
@@ -162,15 +160,19 @@ module Gitrb
     end
 
     # Returns a list of commits starting from head commit.
+    # Options:
+    #   :path      - Restrict to path/or paths
+    #   :max_count - Maximum count of commits
+    #   :skip      - Skip n commits
+    #   :start     - Commit to start from
     def log(opts = {})
       max_count = opts[:max_count]
       skip = opts[:skip]
       start = opts[:start]
-      path = opts[:path]
       raise ArgumentError, "Invalid commit: #{start}" if start.to_s =~ /^\-/
       log = git_log('--pretty=tformat:%H%n%P%n%T%n%an%n%ae%n%at%n%cn%n%ce%n%ct%n%x00%s%n%b%x00',
                     skip ? "--skip=#{skip.to_i}" : nil,
-                    max_count ? "--max-count=#{max_count.to_i}" : nil, start, '--', path).split(/\n*\x00\n*/)
+                    max_count ? "--max-count=#{max_count.to_i}" : nil, start, '--', *opts[:path]).split(/\n*\x00\n*/)
       commits = []
       log.each_slice(2) do |data, message|
         data = data.split("\n")
@@ -261,7 +263,7 @@ module Gitrb
 
       content = object.dump
       data = "#{object.type} #{content.bytesize rescue content.length}\0#{content}"
-      id = sha(data)
+      id = Digest::SHA1.hexdigest(data)
       path = object_path(id)
 
       @logger.debug "gitrb: Storing #{id}"
@@ -348,34 +350,6 @@ module Gitrb
       end
     end
 
-    # Start a transaction.
-    #
-    # Tries to get lock on lock file, load the this repository if
-    # has changed in the repository.
-    def start_transaction
-      file = File.open("#{head_path}.lock", 'w')
-      file.flock(File::LOCK_EX)
-      @lock[Thread.current.object_id] = file
-      refresh
-    end
-
-    # Rerepository the state of the repository.
-    #
-    # Any changes made to the repository are discarded.
-    def rollback_transaction
-      @objects.clear
-      load
-    end
-
-    # Finish the transaction.
-    #
-    # Release the lock file.
-    def finish_transaction
-      @lock[Thread.current.object_id].close rescue nil
-      @lock.delete(Thread.current.object_id)
-      File.unlink("#{head_path}.lock") rescue nil
-    end
-
     def get_type(id, expected)
       object = get(id)
       raise NotFound, "Wrong type #{object.type}, expected #{expected}" if object && object.type != expected
@@ -384,7 +358,7 @@ module Gitrb
 
     def load_packs
       @packs   = Trie.new
-      @objects = Util::Synchronized.new(Trie.new)
+      @objects = Trie.new
 
       packs_path = "#{@path}/objects/pack"
       if File.directory?(packs_path)
@@ -410,11 +384,6 @@ module Gitrb
       @logger.debug "gitrb: Reloaded, head is #{head ? head.id : 'nil'}"
     end
 
-    # Returns the hash value of an object string.
-    def sha(str)
-      Digest::SHA1.hexdigest(str)[0, 40]
-    end
-
     # Returns the path to the current head file.
     def head_path
       "#{path}/refs/heads/#{branch}"

data/lib/gitrb/util.rb

@@ -17,17 +17,6 @@ module Gitrb
         str
       end
     end
-
-    class Synchronized
-      def initialize(obj)
-        @obj = obj
-        @mutex = Mutex.new
-      end
-
-      def method_missing(*args)
-        @mutex.synchronize { @obj.send(*args) }
-      end
-    end
   end
 end
 

data/test/repository_test.rb

@@ -190,31 +190,6 @@ describe Gitrb do
     repo.git_show(c).should.equal 'c'
   end
 
-  it 'should allow only one transaction' do
-    file 'a/b', 'Hello'
-
-    ready = false
-
-    # This test case produces a deadlock in old ruby versions
-    # (Works in 1.8.7_p302 and 1.9)
-    repo.transaction do
-      Thread.start do
-        repo.transaction do
-          sleep 0.1
-          repo.root['a/b'] = Gitrb::Blob.new(:data => 'Changed by second thread')
-        end
-        ready = true
-      end
-      repo.root['a/b'] = Gitrb::Blob.new(:data => 'Changed')
-    end
-
-    repo.root['a/b'].data.should.equal 'Changed'
-
-    sleep 0.01 until ready
-
-    repo.root['a/b'].data.should.equal 'Changed by second thread'
-  end
-
   it 'should find all objects' do
     repo.root['c'] = Gitrb::Blob.new(:data => 'Hello')
     repo.root['d'] = Gitrb::Blob.new(:data => 'World')
@@ -272,32 +247,6 @@ describe Gitrb do
     repo.root['a'].data.should.equal 'data'
   end
 
-  it 'should forbid branch switching from within transaction' do
-    repo.transaction do
-      lambda { repo.branch = 'test' }.should.raise(ThreadError)
-    end
-  end
-
-  it 'should forbid clearing from within transaction' do
-    repo.transaction do
-      lambda { repo.clear }.should.raise(ThreadError)
-    end
-  end
-
-  it 'should forbid nested transactions' do
-    repo.transaction do
-      lambda { repo.transaction {} }.should.raise(ThreadError)
-    end
-  end
-
-  it 'should be in transaction' do
-    repo.should.not.be.in_transaction
-    repo.transaction do
-      repo.should.be.in_transaction
-    end
-    repo.should.not.be.in_transaction
-  end
-
   it "should diff 2 commits" do
     repo.root['x'] = Gitrb::Blob.new(:data => 'a')
     repo.root['y'] = Gitrb::Blob.new(:data => "\nFirst Line.\nSecond Line.\nLast Line.\n")

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Daniel Mendler
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-03 00:00:00 +02:00
+date: 2010-09-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency