mojombo-grit 0.9.4 → 1.1.1

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" 
@@ -48,9 +48,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 +66,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 +189,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 +248,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
@@ -281,10 +281,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 +335,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 +365,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

@@ -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)
@@ -664,6 +663,7 @@ module Grit
       private 
       
         def initloose
+          @loaded = []
           @loose = []
           load_loose(git_path('objects'))
           load_alternate_loose(git_path('objects'))
@@ -675,6 +675,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 +686,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 +708,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 +716,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

@@ -15,11 +15,19 @@ module Grit
     include GitRuby
     
     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 +36,11 @@ module Grit
       self.bytes_read = 0
     end
     
+    def shell_escape(str)
+      str.to_s.gsub("'", "\\\\'").gsub(";", '\\;')
+    end
+    alias_method :e, :shell_escape
+    
     # Run the given git command with the specified arguments and return
     # the result as a String
     #   +cmd+ is the command
@@ -43,13 +56,13 @@ module Grit
     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 == '|') ? 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 +76,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)
@@ -109,14 +122,14 @@ module Grit
             args << "-#{opt}"
           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(/_/, '-')}"
           else
             val = options.delete(opt)
-            args << "--#{opt.to_s.gsub(/_/, '-')}='#{val}'"
+            args << "--#{opt.to_s.gsub(/_/, '-')}='#{e(val)}'"
           end
         end
       end

data/lib/grit/index.rb

@@ -29,12 +29,20 @@ module Grit
       current[filename] = data
     end
         
+    # Sets the current tree
+    #   +tree+ the branch/tag/sha... to use - a string
+    #
+    # Returns index (self)
     def read_tree(tree)
       self.current_tree = self.repo.tree(tree)
     end
     
     # Commit the contents of the index
-    #   +message+ is the commit message
+    #   +message+ is the commit message [nil]
+    #   +parents+ is one or more commits to attach this commit to to form a new head [nil]
+    #   +actor+ is the details of the user making the commit [nil]
+    #   +last_tree+ is a tree to compare with - to avoid making empty commits [nil]
+    #   +head+ is the branch to write this head to [master]
     #
     # Returns a String of the SHA1 of the commit
     def commit(message, parents = nil, actor = nil, last_tree = nil, head = 'master')
@@ -64,14 +72,7 @@ module Grit
       
       commit_sha1 = self.repo.git.ruby_git.put_raw_object(contents.join("\n"), 'commit')      
       
-      # self.repo.git.update_ref({}, 'HEAD', commit_sha1)
-      ref_heads = File.join(self.repo.path, 'refs', 'heads')
-      FileUtils.mkdir_p(ref_heads)
-      File.open(File.join(ref_heads, head), 'w') do |f|
-        f.write(commit_sha1)
-      end if commit_sha1
-      
-      commit_sha1
+      self.repo.update_ref(head, commit_sha1)
     end
     
     # Recursively write a tree to the index
@@ -92,12 +93,12 @@ module Grit
       # overwrite with new tree contents
       tree.each do |k, v|
         case v
-          when String:
+          when String
             sha = write_blob(v)
             sha = [sha].pack("H*")
             str = "%s %s\0%s" % ['100644', k, sha]
             tree_contents[k] = str
-          when Hash:
+          when Hash
             ctree = now_tree/k if now_tree
             sha = write_tree(v, ctree)
             sha = [sha].pack("H*")

data/lib/grit/merge.rb

@@ -0,0 +1,45 @@
+module Grit
+  
+  class Merge
+    
+    STATUS_BOTH = 'both'
+    STATUS_OURS = 'ours'
+    STATUS_THEIRS = 'theirs'
+    
+    attr_reader :conflicts, :text, :sections
+    
+    def initialize(str)
+      status = STATUS_BOTH
+      
+      section = 1
+      @conflicts = 0
+      @text = {}
+      
+      lines = str.split("\n")
+      lines.each do |line|
+        if /^<<<<<<< (.*?)/.match(line)
+          status = STATUS_OURS
+          @conflicts += 1
+          section += 1
+        elsif line == '======='
+          status = STATUS_THEIRS
+        elsif /^>>>>>>> (.*?)/.match(line)
+          status = STATUS_BOTH          
+          section += 1
+        else
+          @text[section] ||= {}
+          @text[section][status] ||= []
+          @text[section][status] << line
+        end
+      end
+      @text = @text.values
+      @sections = @text.size
+    end
+    
+    # Pretty object inspection
+    def inspect
+      %Q{#<Grit::Merge}
+    end
+  end # Merge
+  
+end # Grit

data/lib/grit/ref.rb

@@ -9,31 +9,37 @@ module Grit
       #   +options+ is a Hash of options
       #
       # Returns Grit::Ref[] (baked)
-      def find_all(repo, options = {})      
+      def find_all(repo, options = {})
         refs = []
-
+        already = {}
         Dir.chdir(repo.path) do
+          files = Dir.glob(prefix + '/**/*')
+          files.each do |ref|
+            next if !File.file?(ref)
+            id = File.read(ref).chomp
+            name = ref.sub("#{prefix}/", '')
+            commit = Commit.create(repo, :id => id)
+            if !already[name]
+              refs << self.new(name, commit)
+              already[name] = true
+            end
+          end
+
           if File.file?('packed-refs')
             File.readlines('packed-refs').each do |line|
               if m = /^(\w{40}) (.*?)$/.match(line)
                 next if !Regexp.new('^' + prefix).match(m[2])
                 name = m[2].sub("#{prefix}/", '')
                 commit = Commit.create(repo, :id => m[1])
-                refs << self.new(name, commit)
+                if !already[name]
+                  refs << self.new(name, commit)
+                  already[name] = true
+                end
               end
             end
           end
-          
-          files = Dir.glob(prefix + '/**/*')
-          files.each do |ref|
-            next if !File.file?(ref)
-            id = File.read(ref).chomp
-            name = ref.sub("#{prefix}/", '')
-            commit = Commit.create(repo, :id => id)
-            refs << self.new(name, commit)
-          end
         end
-                
+
         refs
       end
 
@@ -88,8 +94,6 @@ module Grit
 
   end # Head
 
-  class Tag < Ref ; end
-
   class Remote < Ref; end
-  
+
 end # Grit

data/lib/grit/repo.rb

@@ -13,6 +13,7 @@ module Grit
     
     # Create a new Repo instance
     #   +path+ is the path to either the root git directory or the bare git repo
+    #   +options+ :is_bare force to load a bare repo
     #
     # Examples
     #   g = Repo.new("/Users/tom/dev/grit")
@@ -37,7 +38,8 @@ module Grit
       
       self.git = Git.new(self.path)
     end
-    
+   
+    # Does nothing yet...
     def self.init(path)
       # !! TODO !!
       # create directory
@@ -51,6 +53,11 @@ module Grit
     def description
       File.open(File.join(self.path, 'description')).read.chomp
     end
+
+    def blame(file, commit = nil)
+      Blame.new(self, file, commit)
+    end
+
     
     # An array of Head objects representing the branch heads in
     # this repo
@@ -62,10 +69,14 @@ module Grit
     
     alias_method :branches, :heads
 
-    def is_head?(head_name)
+    def get_head(head_name)
       heads.find { |h| h.name == head_name }
     end
     
+    def is_head?(head_name)
+      get_head(head_name)
+    end
+    
     # Object reprsenting the current repo head.
     #
     # Returns Grit::Head (baked)
@@ -93,7 +104,7 @@ module Grit
       self.git.add({}, *files.flatten)
     end
 
-    # Adds files to the index
+    # Remove files from the index
     def remove(*files)
       self.git.rm({}, *files.flatten)
     end
@@ -198,6 +209,20 @@ module Grit
       Commit.find_all(self, id, options).first
     end
     
+    # Returns a list of commits that is in +other_repo+ but not in self
+    #
+    # Returns Grit::Commit[]
+    def commit_deltas_from(other_repo, ref = "master", other_ref = "master")
+      # TODO: we should be able to figure out the branch point, rather than
+      # rev-list'ing the whole thing
+      repo_refs       = self.git.rev_list({}, ref).strip.split("\n")
+      other_repo_refs = other_repo.git.rev_list({}, other_ref).strip.split("\n")
+      
+      (other_repo_refs - repo_refs).map do |ref|
+        Commit.find_all(other_repo, ref, {:max_count => 1}).first
+      end
+    end
+    
     # The Tree object for the given treeish reference
     #   +treeish+ is the reference (default 'master')
     #   +paths+ is an optional Array of directory paths to restrict the tree (deafult [])
@@ -261,7 +286,7 @@ module Grit
     
     # Fork a bare git repository from this repo
     #   +path+ is the full path of the new repo (traditionally ends with /<name>.git)
-    #   +options+ is any additional options to the git clone command
+    #   +options+ is any additional options to the git clone command (:bare and :shared are true by default)
     #
     # Returns Grit::Repo (the newly forked repo)
     def fork_bare(path, options = {})
@@ -313,14 +338,21 @@ module Grit
       self.git.archive(options, treeish, "| gzip")
     end
 
-    # run archive directly to a file
-    def archive_to_file(treeish = 'master', prefix = nil, filename = 'archive.tar.gz')
+    # Write an archive directly to a file
+    #   +treeish+ is the treeish name/id (default 'master')
+    #   +prefix+ is the optional prefix (default nil)
+    #   +filename+ is the name of the file (default 'archive.tar.gz')
+    #   +format+ is the optional format (default nil)
+    #   +pipe+ is the command to run the output through (default 'gzip')
+    #
+    # Returns nothing
+    def archive_to_file(treeish = 'master', prefix = nil, filename = 'archive.tar.gz', format = nil, pipe = "gzip")
       options = {}
       options[:prefix] = prefix if prefix
-      self.git.archive(options, treeish, "| gzip > #{filename}")
+      options[:format] = format if format
+      self.git.archive(options, treeish, "| #{pipe} > #{filename}")
     end
 
-    
     # Enable git-daemon serving of this repository by writing the
     # git-daemon-export-ok file to its git directory
     #
@@ -337,6 +369,10 @@ module Grit
       FileUtils.rm_f(File.join(self.path, DAEMON_EXPORT_FILE))
     end
     
+    def gc_auto
+      self.git.gc({:auto => true})
+    end
+    
     # The list of alternates for this repo
     #
     # Returns Array[String] (pathnames of alternates)
@@ -362,7 +398,9 @@ module Grit
       end
       
       if alts.empty?
-        File.delete(File.join(self.path, *%w{objects info alternates}))
+        File.open(File.join(self.path, *%w{objects info alternates}), 'w') do |f|
+          f.write ''
+        end
       else
         File.open(File.join(self.path, *%w{objects info alternates}), 'w') do |f|
           f.write alts.join("\n")
@@ -378,6 +416,18 @@ module Grit
       Index.new(self)
     end
     
+    def update_ref(head, commit_sha)
+      return nil if !commit_sha || (commit_sha.size != 40)
+   
+      ref_heads = File.join(self.path, 'refs', 'heads')
+      FileUtils.mkdir_p(ref_heads)
+      File.open(File.join(ref_heads, head), 'w') do |f|
+        f.write(commit_sha)
+      end
+      commit_sha
+
+    end
+    
     # Pretty object inspection
     def inspect
       %Q{#<Grit::Repo "#{@path}">}