schacon-grit 0.9.4 → 1.1.1

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

@@ -115,7 +115,7 @@ module Grit
     def initialize(mode, filename, sha1o)
       @mode = 0
       mode.each_byte do |i|
-        @mode = (@mode << 3) | (i-'0'[0])
+        @mode = (@mode << 3) | (i-'0'.getord(0))
       end
       @name = filename
       @sha1 = sha1o
@@ -179,8 +179,14 @@ module Grit
 
   def self.read_bytes_until(io, char)
     string = ''
-    while ((next_char = io.getc.chr) != char) && !io.eof
-      string += next_char
+    if RUBY_VERSION > '1.9'
+      while ((next_char = io.getc) != char) && !io.eof
+        string += next_char
+      end
+    else
+      while ((next_char = io.getc.chr) != char) && !io.eof
+        string += next_char
+      end
     end
     string
   end
@@ -219,6 +225,16 @@ module Grit
       @entry.collect { |e| [[e.format_mode, e.format_type, e.sha1].join(' '), e.name].join("\t") }.join("\n")
     end
     
+    def to_hash
+      hash = {}
+      @entry.each do |e| 
+        hash[e.name] = { 'mode' => e.format_mode, 
+                          'type' => e.format_type, 
+                          'sha' => e.sha1 } 
+      end
+      hash
+    end
+    
     def actual_raw
       #@entry.collect { |e| e.raw.join(' '), e.name].join("\t") }.join("\n")
     end
@@ -243,9 +259,6 @@ module Grit
           author = UserInfo.new(value)
         when "committer"
           committer = UserInfo.new(value)
-        else
-          warn "unknown header '%s' in commit %s" % \
-            [key, rawobject.sha1.unpack("H*")[0]]
         end
       end
       if not tree && author && committer
@@ -281,6 +294,16 @@ module Grit
       output += @message.split("\n").map { |l| '    ' + l }.join("\n") + "\n\n"
     end
     
+    def to_hash
+      h = {}
+      h['tree'] = @tree
+      h['author'] = @author
+      h['committer'] = @committer
+      h['message'] = @message
+      h['parents'] = @parent
+      h
+    end
+    
   end
 
   class Tag < GitObject

data/lib/grit/git-ruby/internal/{mmap.rb → file_window.rb}

@@ -12,7 +12,7 @@
 module Grit 
   module GitRuby 
     module Internal
-      class Mmap
+      class FileWindow
         def initialize(file, version = 1)
           @file = file
           @offset = nil
@@ -46,7 +46,7 @@ module Grit
           end
           @offset = offset + len ? len : 1
           if not len
-            @file.read(1)[0]
+            @file.read(1).getord(0)
           else
             @file.read(len)
           end

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

@@ -29,7 +29,7 @@ module Grit
           begin
             return nil unless sha1[0...2] && sha1[2..39]
             path = @directory + '/' + sha1[0...2] + '/' + sha1[2..39]
-            get_raw_object(File.read(path))
+            get_raw_object(File.open(path, 'rb').read)
           rescue Errno::ENOENT
             nil
           end
@@ -76,7 +76,7 @@ module Grit
             content = Zlib::Deflate.deflate(store)
           
             FileUtils.mkdir_p(@directory+'/'+sha1[0...2])
-            File.open(path, 'w') do |f|
+            File.open(path, 'wb') do |f|
               f.write content
             end
           end
@@ -102,7 +102,7 @@ module Grit
         # private
         def unpack_object_header_gently(buf)
           used = 0
-          c = buf[used]
+          c = buf.getord(used)
           used += 1
 
           type = (c >> 4) & 7;
@@ -112,7 +112,7 @@ module Grit
             if buf.length <= used
               raise LooseObjectError, "object file too short"
             end
-            c = buf[used]
+            c = buf.getord(used)
             used += 1
 
             size += (c & 0x7f) << shift
@@ -127,8 +127,8 @@ module Grit
         private :unpack_object_header_gently
 
         def legacy_loose_object?(buf)
-          word = (buf[0] << 8) + buf[1]
-          buf[0] == 0x78 && word % 31 == 0
+          word = (buf.getord(0) << 8) + buf.getord(1)
+          buf.getord(0) == 0x78 && word % 31 == 0
         end
         private :legacy_loose_object?
       end

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

@@ -11,7 +11,7 @@
 
 require 'zlib'
 require 'grit/git-ruby/internal/raw_object'
-require 'grit/git-ruby/internal/mmap'
+require 'grit/git-ruby/internal/file_window'
 
 PACK_SIGNATURE = "PACK" 
 PACK_IDX_SIGNATURE = "\377tOc" 
@@ -36,6 +36,8 @@ module Grit
         EntrySize = OffsetSize + SHA1Size
         EntrySizeV2 = SHA1Size + CrcSize + OffsetSize
 
+        attr_reader :size, :name
+
         def initialize(file)
           if file =~ /\.idx$/
             file = file[0...-3] + 'pack'
@@ -48,9 +50,9 @@ module Grit
         def with_idx(index_file = nil)
           if !index_file
             index_file = @name
-            idxfile = File.open(@name[0...-4]+'idx')
+            idxfile = File.open(@name[0...-4]+'idx', 'rb')
           else
-            idxfile = File.open(index_file)
+            idxfile = File.open(index_file, 'rb')
           end
           
           # read header
@@ -66,14 +68,14 @@ module Grit
             @version = 1
           end
                     
-          idx = Mmap.new(idxfile, @version)
+          idx = FileWindow.new(idxfile, @version)
           yield idx
           idx.unmap
           idxfile.close
         end
         
         def with_packfile
-          packfile = File.open(@name)
+          packfile = File.open(@name, 'rb')
           yield packfile
           packfile.close
         end
@@ -189,7 +191,7 @@ module Grit
         end
 
         def find_object_in_index(idx, sha1)
-          slot = sha1[0]
+          slot = sha1.getord(0)
           return nil if !slot
           first, last = @offsets[slot,2] 
           while first < last
@@ -248,13 +250,13 @@ module Grit
           obj_offset = offset
           packfile.seek(offset)
 
-          c = packfile.read(1)[0]
+          c = packfile.read(1).getord(0)
           size = c & 0xf
           type = (c >> 4) & 7
           shift = 4
           offset += 1
           while c & 0x80 != 0
-            c = packfile.read(1)[0]
+            c = packfile.read(1).getord(0)
             size |= ((c & 0x7f) << shift)
             shift += 7
             offset += 1
@@ -265,7 +267,7 @@ module Grit
           case type
           when OBJ_OFS_DELTA, OBJ_REF_DELTA
             data, type = unpack_deltified(packfile, type, offset, obj_offset, size, options)
-            #puts type
+            #puts "Type: #{type}"
           when OBJ_COMMIT, OBJ_TREE, OBJ_BLOB, OBJ_TAG
             data = unpack_compressed(offset, size)
           else
@@ -281,10 +283,10 @@ module Grit
 
           if type == OBJ_OFS_DELTA
             i = 0
-            c = data[i]
+            c = data.getord(i)
             base_offset = c & 0x7f
             while c & 0x80 != 0
-              c = data[i += 1]
+              c = data.getord(i += 1)
               base_offset += 1
               base_offset <<= 7
               base_offset |= c & 0x7f
@@ -335,18 +337,18 @@ module Grit
           dest_size, pos = patch_delta_header_size(delta, pos)
           dest = ""
           while pos < delta.size
-            c = delta[pos]
+            c = delta.getord(pos)
             pos += 1
             if c & 0x80 != 0
               pos -= 1
               cp_off = cp_size = 0
-              cp_off = delta[pos += 1] if c & 0x01 != 0
-              cp_off |= delta[pos += 1] << 8 if c & 0x02 != 0
-              cp_off |= delta[pos += 1] << 16 if c & 0x04 != 0
-              cp_off |= delta[pos += 1] << 24 if c & 0x08 != 0
-              cp_size = delta[pos += 1] if c & 0x10 != 0
-              cp_size |= delta[pos += 1] << 8 if c & 0x20 != 0
-              cp_size |= delta[pos += 1] << 16 if c & 0x40 != 0
+              cp_off = delta.getord(pos += 1) if c & 0x01 != 0
+              cp_off |= delta.getord(pos += 1) << 8 if c & 0x02 != 0
+              cp_off |= delta.getord(pos += 1) << 16 if c & 0x04 != 0
+              cp_off |= delta.getord(pos += 1) << 24 if c & 0x08 != 0
+              cp_size = delta.getord(pos += 1) if c & 0x10 != 0
+              cp_size |= delta.getord(pos += 1) << 8 if c & 0x20 != 0
+              cp_size |= delta.getord(pos += 1) << 16 if c & 0x40 != 0
               cp_size = 0x10000 if cp_size == 0
               pos += 1
               dest += base[cp_off,cp_size]
@@ -365,7 +367,7 @@ module Grit
           size = 0
           shift = 0
           begin
-            c = delta[pos]
+            c = delta.getord(pos)
             if c == nil
               raise PackFormatError, 'invalid delta header'
             end

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

@@ -163,8 +163,14 @@ module Grit
 
   def self.read_bytes_until(io, char)
     string = ''
-    while ((next_char = io.getc.chr) != char) && !io.eof
-      string += next_char
+    if RUBY_VERSION > '1.9'
+      while ((next_char = io.getc) != char) && !io.eof
+        string += next_char
+      end
+    else
+      while ((next_char = io.getc.chr) != char) && !io.eof
+        string += next_char
+      end
     end
     string
   end

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

@@ -37,7 +37,7 @@ module Grit
       def initialize(git_dir, options = {})
         @git_dir = git_dir
         @options = options
-        @packs = []
+        #@packs = []
       end
       
       # returns the loose objects object lazily
@@ -92,7 +92,7 @@ module Grit
           return o if o
         end
 
-#        puts "*#{sha1o}*"
+        puts "*#{sha1o}*"
         raise NoSuchShaFound
       end
 
@@ -185,16 +185,15 @@ module Grit
       def get_raw_tree(sha)
         o = get_raw_object_by_sha1(sha)
         if o.type == :commit
-          tree = cat_file(get_object_by_sha1(sha).tree)
+          cat_file(get_object_by_sha1(sha).tree)
         elsif o.type == :tag
           commit_sha = get_object_by_sha1(sha).object
-          tree = cat_file(get_object_by_sha1(commit_sha).tree)
-        else
-          tree = cat_file(sha)
+          cat_file(get_object_by_sha1(commit_sha).tree)
+        elsif o.type == :tree
+          cat_file(sha)
         end
-        return tree
       end
-      
+
       # return array of tree entries
       ## TODO : refactor this to remove the fugly
       def ls_tree_path(sha, path, append = nil)
@@ -376,37 +375,41 @@ module Grit
         else
           tree2 = get_object_by_sha1(commit_obj1.parent.first).tree
         end
-        
+
         qdiff = quick_diff(tree1, tree2)
-        
+
         qdiff.sort.each do |diff_arr|
+          path, status, treeSHA1, treeSHA2 = *diff_arr
           format, lines, output = :unified, 3, ''
           file_length_difference = 0
-          
-          fileA = (diff_arr[2]) ? cat_file(diff_arr[2]) : ''
-          fileB = (diff_arr[3]) ? cat_file(diff_arr[3]) : ''
-          
-          sha1 = (diff_arr[2]) ? diff_arr[2] : '0000000000000000000000000000000000000000'
-          sha2 = (diff_arr[3]) ? diff_arr[3] : '0000000000000000000000000000000000000000'
+
+          fileA = treeSHA1 ? cat_file(treeSHA1) : ''
+          fileB = treeSHA2 ? cat_file(treeSHA2) : ''
+
+          sha1 = treeSHA1 || '0000000000000000000000000000000000000000'
+          sha2 = treeSHA2 || '0000000000000000000000000000000000000000'
 
           data_old = fileA.split(/\n/).map! { |e| e.chomp }
           data_new = fileB.split(/\n/).map! { |e| e.chomp }
-          
-          diffs = Difference::LCS.diff(data_old, data_new)    
+
+          diffs = Difference::LCS.diff(data_old, data_new)
           next if diffs.empty?
 
-          header = 'diff --git a/' + diff_arr[0].gsub('./', '') + ' b/' + diff_arr[0].gsub('./', '')
+          a_path = "a/#{path.gsub('./', '')}"
+          b_path = "b/#{path.gsub('./', '')}"
+
+          header = "diff --git #{a_path} #{b_path}"
           if options[:full_index]
             header << "\n" + 'index ' + sha1 + '..' + sha2
-            header << ' 100644' if diff_arr[3] # hard coding this because i don't think we use it
+            header << ' 100644' if treeSHA2 # hard coding this because i don't think we use it
           else
             header << "\n" + 'index ' + sha1[0,7] + '..' + sha2[0,7]
-            header << ' 100644' if diff_arr[3] # hard coding this because i don't think we use it
+            header << ' 100644' if treeSHA2 # hard coding this because i don't think we use it
           end
-          header << "\n--- " + 'a/' + diff_arr[0].gsub('./', '')
-          header << "\n+++ " + 'b/' + diff_arr[0].gsub('./', '')
+          header << "\n--- " + (treeSHA1 ? a_path : '/dev/null')
+          header << "\n+++ " + (treeSHA2 ? b_path : '/dev/null')
           header += "\n"
-          
+
           oldhunk = hunk = nil
 
           diffs.each do |piece|
@@ -664,6 +667,7 @@ module Grit
       private 
       
         def initloose
+          @loaded = []
           @loose = []
           load_loose(git_path('objects'))
           load_alternate_loose(git_path('objects'))
@@ -675,6 +679,7 @@ module Grit
           alt = File.join(path, 'info/alternates')
           if File.exists?(alt)
             File.readlines(alt).each do |line|
+              next if @loaded.include?(line.chomp)
               if line[0, 2] == '..'
                 line = File.expand_path(File.join(@git_dir, line))
               end
@@ -685,12 +690,14 @@ module Grit
         end
       
         def load_loose(path)
+          @loaded << path
           return if !File.exists?(path)
           @loose << Grit::GitRuby::Internal::LooseStorage.new(path)
         end
         
         def initpacks
           close
+          @loaded_packs = []
           @packs = []
           load_packs(git_path("objects/pack"))
           load_alternate_packs(git_path('objects'))
@@ -705,6 +712,7 @@ module Grit
                 line = File.expand_path(File.join(@git_dir, line))
               end
               full_pack = File.join(line.chomp, 'pack')
+              next if @loaded_packs.include?(full_pack)
               load_packs(full_pack)
               load_alternate_packs(File.join(line.chomp))
             end
@@ -712,6 +720,7 @@ module Grit
         end
         
         def load_packs(path)
+          @loaded_packs << path
           return if !File.exists?(path)
            Dir.open(path) do |dir|
             dir.each do |entry|

data/lib/grit/git.rb

@@ -1,3 +1,4 @@
+require 'tempfile'
 module Grit
   
   class Git
@@ -13,13 +14,33 @@ module Grit
     undef_method :clone
     
     include GitRuby
-    
+
+    def exist?
+      File.exist?(self.git_dir)
+    end
+
+    def put_raw_object(content, type)
+      ruby_git.put_raw_object(content, type)
+    end
+
+    def object_exists?(object_id)
+      ruby_git.object_exists?(object_id)
+    end
+
     class << self
-      attr_accessor :git_binary, :git_timeout
+      attr_accessor :git_binary, :git_timeout, :git_max_size
     end
   
-    self.git_binary  = "/usr/bin/env git"
-    self.git_timeout = 10
+    self.git_binary   = "/usr/bin/env git"
+    self.git_timeout  = 10
+    self.git_max_size = 5242880 # 5.megabytes
+    
+    def self.with_timeout(timeout = 10.seconds)
+      old_timeout = Grit::Git.git_timeout
+      Grit::Git.git_timeout = timeout
+      yield
+      Grit::Git.git_timeout = old_timeout
+    end
     
     attr_accessor :git_dir, :bytes_read
     
@@ -28,6 +49,152 @@ module Grit
       self.bytes_read = 0
     end
     
+    def shell_escape(str)
+      str.to_s.gsub("'", "\\\\'").gsub(";", '\\;')
+    end
+    alias_method :e, :shell_escape
+    
+    # Check if a normal file exists on the filesystem
+    #   +file+ is the relative path from the Git dir
+    #
+    # Returns Boolean
+    def fs_exist?(file)
+      File.exist?(File.join(self.git_dir, file))
+    end
+    
+    # Read a normal file from the filesystem.
+    #   +file+ is the relative path from the Git dir
+    #
+    # Returns the String contents of the file
+    def fs_read(file)
+      File.open(File.join(self.git_dir, file)).read
+    end
+    
+    # Write a normal file to the filesystem.
+    #   +file+ is the relative path from the Git dir
+    #   +contents+ is the String content to be written
+    #
+    # Returns nothing
+    def fs_write(file, contents)
+      path = File.join(self.git_dir, file)
+      FileUtils.mkdir_p(File.dirname(path))
+      File.open(path, 'w') do |f|
+        f.write(contents)
+      end
+    end
+    
+    # Delete a normal file from the filesystem
+    #   +file+ is the relative path from the Git dir
+    #
+    # Returns nothing
+    def fs_delete(file)
+      FileUtils.rm_rf(File.join(self.git_dir, file))
+    end
+    
+    # Move a normal file
+    #   +from+ is the relative path to the current file
+    #   +to+ is the relative path to the destination file
+    #
+    # Returns nothing
+    def fs_move(from, to)
+      FileUtils.mv(File.join(self.git_dir, from), File.join(self.git_dir, to))
+    end
+    
+    # Make a directory
+    #   +dir+ is the relative path to the directory to create
+    #
+    # Returns nothing
+    def fs_mkdir(dir)
+      FileUtils.mkdir_p(File.join(self.git_dir, dir))
+    end
+    
+    # Chmod the the file or dir and everything beneath
+    #   +file+ is the relative path from the Git dir
+    #
+    # Returns nothing
+    def fs_chmod(mode, file = '/')
+      FileUtils.chmod_R(mode, File.join(self.git_dir, file))
+    end
+    
+    # Create a new directory
+    #   +path+ is an absolute path
+    #
+    # Returns nothing
+    def fs_mkdir(path)
+      FileUtils.mkdir_p(path)
+    end
+    
+    def fs_exist(path)
+      File.exist?(path)
+    end
+
+    def list_remotes
+      remotes = []
+      Dir.chdir(File.join(self.git_dir, 'refs/remotes')) do
+        remotes = Dir.glob('*')
+      end
+      remotes
+    rescue
+      []
+    end
+        
+    def create_tempfile(seed, unlink = false)
+      path = Tempfile.new(seed).path
+      File.unlink(path) if unlink
+      return path
+    end
+    
+    def check_applies(head_sha, applies_sha)
+      git_index = create_tempfile('index', true)
+      (o1, exit1) = raw_git("git read-tree #{head_sha} 2>/dev/null", git_index)
+      (o2, exit2) = raw_git("git diff #{applies_sha}^ #{applies_sha} | git apply --check --cached >/dev/null 2>/dev/null", git_index)
+      return (exit1 + exit2)
+    end
+    
+    def get_patch(applies_sha)
+      git_index = create_tempfile('index', true)
+      (patch, exit2) = raw_git("git diff #{applies_sha}^ #{applies_sha}", git_index)
+      patch
+    end
+    
+    def apply_patch(head_sha, patch)
+      git_index = create_tempfile('index', true)
+      
+      git_patch = create_tempfile('patch')
+      File.open(git_patch, 'w+') { |f| f.print patch }
+      
+      raw_git("git read-tree #{head_sha} 2>/dev/null", git_index)
+      (op, exit) = raw_git("git apply --cached < #{git_patch}", git_index)
+      if exit == 0
+        return raw_git("git write-tree", git_index).first.chomp
+      end
+      false
+    end
+    
+    # RAW CALLS WITH ENV SETTINGS
+    def raw_git_call(command, index)
+      tmp = ENV['GIT_INDEX_FILE']
+      ENV['GIT_INDEX_FILE'] = index
+      out = `#{command}`
+      after = ENV['GIT_INDEX_FILE'] # someone fucking with us ??
+      ENV['GIT_INDEX_FILE'] = tmp
+      if after != index
+        raise 'environment was changed for the git call'
+      end
+      [out, $?.exitstatus]
+    end
+
+    def raw_git(command, index)
+      output = nil
+      Dir.chdir(self.git_dir) do
+        output = raw_git_call(command, index)
+      end
+      output
+    end
+    # RAW CALLS WITH ENV SETTINGS END
+    
+    
+    
     # Run the given git command with the specified arguments and return
     # the result as a String
     #   +cmd+ is the command
@@ -42,14 +209,21 @@ module Grit
       run('', cmd, '', options, args)
     end
 
+    # Bypass any pure Ruby implementations and go straight to the native Git command
+    #
+    # Returns String
+    def native(cmd, options = {}, *args)
+      method_missing(cmd, options, *args)
+    end
+
     def run(prefix, cmd, postfix, options, args)
-      timeout  = options.delete(:timeout)
+      timeout  = options.delete(:timeout) rescue nil
       timeout  = true if timeout.nil?
 
       opt_args = transform_options(options)
-      ext_args = args.reject { |a| a.empty? }.map { |a| (a == '--' || a[0].chr == '|') ? a : "'#{a}'" }
-      
-      call = "#{prefix}#{Git.git_binary} --git-dir='#{self.git_dir}' #{cmd.to_s.gsub(/_/, '-')} #{(opt_args + ext_args).join(' ')}#{postfix}"
+      ext_args = args.reject { |a| a.empty? }.map { |a| (a == '--' || a[0].chr == '|' || Grit.no_quote) ? a : "'#{e(a)}'" }
+
+      call = "#{prefix}#{Git.git_binary} --git-dir='#{self.git_dir}' #{cmd.to_s.gsub(/_/, '-')} #{(opt_args + ext_args).join(' ')}#{e(postfix)}"
       Grit.log(call) if Grit.debug
       response, err = timeout ? sh(call) : wild_sh(call)
       Grit.log(response) if Grit.debug
@@ -63,7 +237,7 @@ module Grit
         Timeout.timeout(self.class.git_timeout) do
           while tmp = stdout.read(1024)
             ret += tmp
-            if (@bytes_read += tmp.size) > 5242880 # 5.megabytes
+            if (@bytes_read += tmp.size) > self.class.git_max_size
               bytes = @bytes_read
               @bytes_read = 0
               raise GitTimeout.new(command, bytes)
@@ -107,16 +281,20 @@ module Grit
         if opt.to_s.size == 1
           if options[opt] == true
             args << "-#{opt}"
+          elsif options[opt] == false
+            # ignore
           else
             val = options.delete(opt)
-            args << "-#{opt.to_s} '#{val}'"
+            args << "-#{opt.to_s} '#{e(val)}'"
           end
         else
           if options[opt] == true
             args << "--#{opt.to_s.gsub(/_/, '-')}"
+          elsif options[opt] == false
+            # ignore
           else
             val = options.delete(opt)
-            args << "--#{opt.to_s.gsub(/_/, '-')}='#{val}'"
+            args << "--#{opt.to_s.gsub(/_/, '-')}='#{e(val)}'"
           end
         end
       end