grit 2.4.1 → 2.5.0

data/History.txt

@@ -1,3 +1,19 @@
+== 2.5.0 / 2012-04-22
+  * Minor Enhancements
+    * 100% Git-compliant actor creation.
+    * Handle newlines in author/committer.
+    * Grit::Git check_applies/patch related methods take command hash.
+    * Tags api now resty.
+    * Remove all the grit jruby hacks in favor of updated posix-spawn.
+    * Add Grit::Commit#patch_id.
+    * Support large packfiles with index v2.
+  * Bug Fixes
+    * Fix Loose Objects with non-ASCII content in Ruby 1.9
+    * Fix bugs in Grit::Repo #objects, #commit_objects, and #diff_objects
+      due to passing multiple arguments in a single argv element.
+    * ruby rev_list passes --verify to native rev_parse in fallback.
+    * Git ls-tree raises on non-zero exit.
+
 == 2.4.1 / 2011-01-13
   * Minor Enhancements
     * Grit::Process is used to implement Grit::Git#check_applies,

data/grit.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'grit'
-  s.version           = '2.4.1'
-  s.date              = '2011-01-13'
+  s.version           = '2.5.0'
+  s.date              = '2012-04-22'
   s.rubyforge_project = 'grit'
 
   s.summary     = "Ruby Git bindings."
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = %w[README.md LICENSE]
 
+  s.add_dependency('posix-spawn', "~> 0.3.6")
   s.add_dependency('mime-types', "~> 1.15")
   s.add_dependency('diff-lcs', "~> 1.1")
 
@@ -49,20 +50,16 @@ Gem::Specification.new do |s|
     lib/grit/errors.rb
     lib/grit/git-ruby.rb
     lib/grit/git-ruby/commit_db.rb
-    lib/grit/git-ruby/file_index.rb
     lib/grit/git-ruby/git_object.rb
     lib/grit/git-ruby/internal/file_window.rb
     lib/grit/git-ruby/internal/loose.rb
     lib/grit/git-ruby/internal/pack.rb
     lib/grit/git-ruby/internal/raw_object.rb
-    lib/grit/git-ruby/object.rb
     lib/grit/git-ruby/repository.rb
     lib/grit/git.rb
     lib/grit/index.rb
-    lib/grit/jruby.rb
     lib/grit/lazy.rb
     lib/grit/merge.rb
-    lib/grit/process.rb
     lib/grit/ref.rb
     lib/grit/repo.rb
     lib/grit/ruby1.9.rb

data/lib/grit.rb

@@ -28,7 +28,6 @@ end
 require 'grit/ruby1.9'
 
 # internal requires
-require 'grit/process'
 require 'grit/lazy'
 require 'grit/errors'
 require 'grit/git-ruby'
@@ -49,13 +48,8 @@ require 'grit/submodule'
 require 'grit/blame'
 require 'grit/merge'
 
-# platform specific requires
-if defined?(RUBY_ENGINE) && RUBY_ENGINE =~ /jruby/
-  require 'grit/jruby'
-end
-
 module Grit
-  VERSION = '2.4.1'
+  VERSION = '2.5.0'
 
   class << self
     # Set +debug+ to true to log all git calls and responses

data/lib/grit/actor.rb

@@ -34,13 +34,13 @@ module Grit
     #
     # Returns a String.
     def output(time)
-      out = @name.to_s.dup
-      if @email
-        out << " <#{@email}>"
-      end
-      hours = (time.utc_offset.to_f / 3600).to_i # 60 * 60, seconds to hours
-      rem   = time.utc_offset.abs % 3600
-      out << " #{time.to_i} #{hours >= 0 ? :+ : :-}#{hours.abs.to_s.rjust(2, '0')}#{rem.to_s.rjust(2, '0')}"
+      offset = time.utc_offset / 60
+      "%s <%s> %d %+.2d%.2d" % [
+        @name,
+        @email || "null",
+        time.to_i,
+        offset / 60,
+        offset.abs % 60]
     end
 
     # Pretty object inspection

data/lib/grit/blame.rb

@@ -4,12 +4,16 @@ module Grit
 
     attr_reader :lines
 
-    def initialize(repo, file, commit)
+    def initialize(repo, file, commit, lines=nil)
       @repo = repo
       @file = file
       @commit = commit
-      @lines = []
-      load_blame
+      if lines.nil?
+        @lines = []
+        load_blame
+      else
+        @lines = lines
+      end
     end
 
     def load_blame

data/lib/grit/commit.rb

@@ -13,7 +13,6 @@ module Grit
     lazy_reader :committed_date
     lazy_reader :message
     lazy_reader :short_message
-    lazy_reader :author_string
 
     # Parses output from the `git-cat-file --batch'.
     #
@@ -61,7 +60,7 @@ module Grit
       @committer = committer
       @committed_date = committed_date
       @message = message.join("\n")
-      @short_message = message.select { |x| !x.strip.empty? }[0] || ''
+      @short_message = message.find { |x| !x.strip.empty? } || ''
     end
 
     def id_abbrev
@@ -149,8 +148,13 @@ module Grit
         parents = []
         parents << lines.shift.split.last while lines.first =~ /^parent/
 
-        author, authored_date = self.actor(lines.shift)
-        committer, committed_date = self.actor(lines.shift)
+        author_line = lines.shift
+        author_line << lines.shift if lines[0] !~ /^committer /
+        author, authored_date = self.actor(author_line)
+
+        committer_line = lines.shift
+        committer_line << lines.shift if lines[0] && lines[0] != '' && lines[0] !~ /^encoding/
+        committer, committed_date = self.actor(committer_line)
 
         # not doing anything with this yet, but it's sometimes there
         encoding = lines.shift.split.last if lines.first =~ /^encoding/
@@ -252,6 +256,21 @@ module Grit
       ret
     end
 
+    # Calculates the commit's Patch ID. The Patch ID is essentially the SHA1
+    # of the diff that the commit is introducing.
+    #
+    # Returns the 40 character hex String if a patch-id could be calculated
+    #   or nil otherwise.
+    def patch_id
+      show = @repo.git.show({}, @id)
+      patch_line = @repo.git.native(:patch_id, :input => show)
+      if patch_line =~ /^([0-9a-f]{40}) [0-9a-f]{40}\n$/
+        $1
+      else
+        nil
+      end
+    end
+
     # Pretty object inspection
     def inspect
       %Q{#<Grit::Commit "#{@id}">}

data/lib/grit/git-ruby.rb

@@ -1,5 +1,4 @@
 require 'grit/git-ruby/repository'
-require 'grit/git-ruby/file_index'
 
 module Grit
 
@@ -48,30 +47,33 @@ module Grit
       try_run { ruby_git.diff(sha1, sha2, options) }
     end
 
-    def rev_list(options, ref = 'master')
+    def rev_list(options, *refs)
+      refs = ['master'] if refs.empty?
       options.delete(:skip) if options[:skip].to_i == 0
       allowed_options = [:max_count, :since, :until, :pretty]  # this is all I can do right now
-      if ((options.keys - allowed_options).size > 0)
-        return method_missing('rev-list', options, ref)
+      if ((options.keys - allowed_options).size > 0) || refs.size > 1
+        method_missing('rev-list', options, *refs)
       elsif (options.size == 0)
         # pure rev-list
+        ref = refs.first
         begin
-          return file_index.commits_from(rev_parse({}, ref)).join("\n") + "\n"
+          file_index.commits_from(rev_parse({}, ref)).join("\n") + "\n"
         rescue
-          return method_missing('rev-list', options, ref)
+          method_missing('rev-list', options, *refs)
         end
       else
-        aref = rev_parse({}, ref)
+        ref = refs.first
+        aref = rev_parse({:verify => true}, ref)
         if aref.is_a? Array
-          return method_missing('rev-list', options, ref)
+          method_missing('rev-list', options, *refs)
         else
-          return try_run { ruby_git.rev_list(aref, options) }
+          try_run { ruby_git.rev_list(aref, options) }
         end
       end
     end
 
     def rev_parse(options, string)
-      raise RuntimeError, "invalid string: #{string}" unless string.is_a?(String)
+      raise RuntimeError, "invalid string: #{string.inspect}" unless string.is_a?(String)
 
       if string =~ /\.\./
         (sha1, sha2) = string.split('..')
@@ -197,21 +199,6 @@ module Grit
       try_run { ruby_git.cat_file_type(ref).to_s }
     end
 
-    def blame_tree(commit, path = nil)
-      begin
-        path = [path].join('/').to_s + '/' if (path && path != '')
-        path = '' if !path.is_a? String
-        commits = file_index.last_commits(rev_parse({}, commit), looking_for(commit, path))
-        clean_paths(commits)
-      rescue FileIndex::IndexFileNotFound
-        {}
-      end
-    end
-
-    def file_index
-      @git_file_index ||= FileIndex.new(@git_dir)
-    end
-
     def ruby_git
       @ruby_git_repo ||= Repository.new(@git_dir)
     end

data/lib/grit/git-ruby/git_object.rb

@@ -49,6 +49,7 @@ module Grit
   # base class for all git objects (blob, tree, commit, tag)
   class GitObject
     attr_accessor :repository
+    attr_accessor :sha
 
     def GitObject.from_raw(rawobject, repository = nil)
       case rawobject.type
@@ -290,7 +291,8 @@ module Grit
   end
 
   class Tag < GitObject
-    attr_accessor :object, :type, :tag, :tagger, :message
+    attr_accessor :object, :tag, :tagger, :message, :object_type
+    attr_writer :type
 
     def self.from_raw(rawobject, repository=nil)
 
@@ -330,6 +332,7 @@ module Grit
     def initialize(object, type, tag, tagger, message, repository=nil)
       @object = object
       @type = type
+      @object_type = type
       @tag = tag
       @tagger = tagger
       @repository = repository

data/lib/grit/git-ruby/internal/loose.rb

@@ -36,7 +36,7 @@ module Grit
         end
 
         def get_raw_object(buf)
-          if buf.length < 2
+          if buf.bytesize < 2
             raise LooseObjectError, "object file too small"
           end
 
@@ -56,14 +56,14 @@ module Grit
             type, size, used = unpack_object_header_gently(buf)
             content = Zlib::Inflate.inflate(buf[used..-1])
           end
-          raise LooseObjectError, "size mismatch" if content.length != size
+          raise LooseObjectError, "size mismatch" if content.bytesize != size
           return RawObject.new(type, content)
         end
 
         # currently, I'm using the legacy format because it's easier to do
         # this function takes content and a type and writes out the loose object and returns a sha
         def put_raw_object(content, type)
-          size = content.length.to_s
+          size = content.bytesize.to_s
           LooseStorage.verify_header(type, size)
 
           header = "#{type} #{size}\0"
@@ -85,7 +85,7 @@ module Grit
 
         # simply figure out the sha
         def self.calculate_sha(content, type)
-          size = content.length.to_s
+          size = content.bytesize.to_s
           verify_header(type, size)
           header = "#{type} #{size}\0"
           store = header + content
@@ -109,7 +109,7 @@ module Grit
           size = c & 15;
           shift = 4;
           while c & 0x80 != 0
-            if buf.length <= used
+            if buf.bytesize <= used
               raise LooseObjectError, "object file too short"
             end
             c = buf.getord(used)

data/lib/grit/git-ruby/internal/pack.rb

@@ -30,6 +30,7 @@ module Grit
         SHA1Size = 20
         IdxOffsetSize = 4
         OffsetSize = 4
+        ExtendedOffsetSize = 8
         CrcSize = 4
         OffsetStart = FanOutCount * IdxOffsetSize
         SHA1Start = OffsetStart + OffsetSize
@@ -46,11 +47,13 @@ module Grit
         end
 
         def with_idx(index_file = nil)
-          if !index_file
-            index_file = @name
-            idxfile = File.open(@name[0...-4]+'idx', 'rb')
-          else
+          index_file ||= @name[0...-4] + 'idx'
+
+          begin
             idxfile = File.open(index_file, 'rb')
+          rescue Errno::ENOENT => boom
+            # file went away. bail out without yielding.
+            return
           end
 
           # read header
@@ -70,14 +73,19 @@ module Grit
           yield idx
           idx.unmap
         ensure
-          idxfile.close
+          idxfile.close if idxfile
         end
 
         def with_packfile
-          packfile = File.open(@name, 'rb')
+          begin
+            packfile = File.open(@name, 'rb')
+          rescue Errno::ENOENT
+            # file went away. bail out without yielding.
+            return
+          end
           yield packfile
         ensure
-          packfile.close
+          packfile.close if packfile
         end
 
         def cache_objects
@@ -207,6 +215,12 @@ module Grit
               else
                 pos = OffsetStart + (@size * (SHA1Size + CrcSize)) + (mid * OffsetSize)
                 offset = idx[pos, OffsetSize].unpack('N')[0]
+                if offset & 0x80000000 > 0
+                  offset &= 0x7fffffff
+                  pos = OffsetStart + (@size * (SHA1Size + CrcSize + OffsetSize)) + (offset * ExtendedOffsetSize)
+                  words = idx[pos, ExtendedOffsetSize].unpack('NN')
+                  offset = (words[0] << 32) | words[1]
+                end
                 return offset
               end
             else

data/lib/grit/git-ruby/internal/raw_object.rb

@@ -31,6 +31,13 @@ module Grit
         def sha1
           Digest::SHA1.digest("%s %d\0" % [@type, @content.length] + @content)
         end
+
+        def to_hash
+          {
+            :type => @type,
+            :content => @content
+          }
+        end
       end
     end
   end

data/lib/grit/git-ruby/repository.rb

@@ -475,60 +475,60 @@ module Grit
       #   [full_path, 'modified', tree1_hash, tree2_hash]
       #  ]
       def quick_diff(tree1, tree2, path = '.', recurse = true)
-         # handle empty trees
-         changed = []
-         return changed if tree1 == tree2
-
-         t1 = list_tree(tree1) if tree1
-         t2 = list_tree(tree2) if tree2
-
-         # finding files that are different
-         t1['blob'].each do |file, hsh|
-           t2_file = t2['blob'][file] rescue nil
-           full = File.join(path, file)
-           if !t2_file
-             changed << [full, 'added', hsh[:sha], nil]      # not in parent
-           elsif (hsh[:sha] != t2_file[:sha])
-             changed << [full, 'modified', hsh[:sha], t2_file[:sha]]   # file changed
-           end
-         end if t1
-         t2['blob'].each do |file, hsh|
-           if !t1 || !t1['blob'][file]
-             changed << [File.join(path, file), 'removed', nil, hsh[:sha]]
-           end
-         end if t2
-
-         t1['tree'].each do |dir, hsh|
-           t2_tree = t2['tree'][dir] rescue nil
-           full = File.join(path, dir)
-           if !t2_tree
-             if recurse
-               changed += quick_diff(hsh[:sha], nil, full, true)
-             else
-               changed << [full, 'added', hsh[:sha], nil]      # not in parent
-             end
-           elsif (hsh[:sha] != t2_tree[:sha])
-             if recurse
-               changed += quick_diff(hsh[:sha], t2_tree[:sha], full, true)
-             else
-               changed << [full, 'modified', hsh[:sha], t2_tree[:sha]]   # file changed
-             end
-           end
-         end if t1
-         t2['tree'].each do |dir, hsh|
-           t1_tree = t1['tree'][dir] rescue nil
-           full = File.join(path, dir)
-           if !t1_tree
-             if recurse
-               changed += quick_diff(nil, hsh[:sha], full, true)
-             else
-               changed << [full, 'removed', nil, hsh[:sha]]
-             end
-           end
-         end if t2
-
-         changed
-       end
+        # handle empty trees
+        changed = []
+        return changed if tree1 == tree2
+
+        t1 = list_tree(tree1) if tree1
+        t2 = list_tree(tree2) if tree2
+
+        # finding files that are different
+        t1['blob'].each do |file, hsh|
+          t2_file = t2['blob'][file] rescue nil
+          full = File.join(path, file)
+          if !t2_file
+            changed << [full, 'added', hsh[:sha], nil]      # not in parent
+          elsif (hsh[:sha] != t2_file[:sha])
+            changed << [full, 'modified', hsh[:sha], t2_file[:sha]]   # file changed
+          end
+        end if t1
+        t2['blob'].each do |file, hsh|
+          if !t1 || !t1['blob'][file]
+            changed << [File.join(path, file), 'removed', nil, hsh[:sha]]
+          end
+        end if t2
+
+        t1['tree'].each do |dir, hsh|
+          t2_tree = t2['tree'][dir] rescue nil
+          full = File.join(path, dir)
+          if !t2_tree
+            if recurse
+              changed += quick_diff(hsh[:sha], nil, full, true)
+            else
+              changed << [full, 'added', hsh[:sha], nil]      # not in parent
+            end
+          elsif (hsh[:sha] != t2_tree[:sha])
+            if recurse
+              changed += quick_diff(hsh[:sha], t2_tree[:sha], full, true)
+            else
+              changed << [full, 'modified', hsh[:sha], t2_tree[:sha]]   # file changed
+            end
+          end
+        end if t1
+        t2['tree'].each do |dir, hsh|
+          t1_tree = t1['tree'][dir] rescue nil
+          full = File.join(path, dir)
+          if !t1_tree
+            if recurse
+              changed += quick_diff(nil, hsh[:sha], full, true)
+            else
+              changed << [full, 'removed', nil, hsh[:sha]]
+            end
+          end
+        end if t2
+
+        changed
+      end
 
       # returns true if the files in path_limiter were changed, or no path limiter
       # used by the log() function when passed with a path_limiter
@@ -551,9 +551,9 @@ module Grit
 
         if path && !(path == '' || path == '.' || path == './')
           paths = path.split('/')
-          paths.each do |path|
+          paths.each do |pathname|
             tree = get_object_by_sha1(tree_sha)
-            if entry = tree.entry.select { |e| e.name == path }.first
+            if entry = tree.entry.select { |e| e.name == pathname }.first
               tree_sha = entry.sha1 rescue nil
             else
               return false
@@ -720,9 +720,9 @@ module Grit
           end
         end
 
-        def load_alternate_loose(path)
+        def load_alternate_loose(pathname)
           # load alternate loose, too
-          each_alternate_path path do |path|
+          each_alternate_path pathname do |path|
             next if @loaded.include?(path)
             next if !File.exist?(path)
             load_loose(path)
@@ -745,8 +745,8 @@ module Grit
           @packs
         end
 
-        def load_alternate_packs(path)
-          each_alternate_path path do |path|
+        def load_alternate_packs(pathname)
+          each_alternate_path pathname do |path|
             full_pack = File.join(path, 'pack')
             next if @loaded_packs.include?(full_pack)
             load_packs(full_pack)