git 1.0.4 → 1.0.5

data/README

@@ -10,14 +10,7 @@ http://jointheconversation.org/rubygit
 
 Git public hosting of the project source code is at:
 
-http://repo.or.cz/w/rubygit.git
-
-= Roadmap
-
-Right now I'm forking calls to the 'git' binary, 
-but eventually I'll replace that with either C bindings
-to libgit or libgit-thin, or I'll write pure ruby
-handlers for at least some of the Git stuff.
+http://github/schacon/ruby-git
 
 = Major Objects
 
@@ -45,8 +38,7 @@ Git::Remote - A reference to a remote repository that is tracked by this reposit
 Git::Log - An Enumerable object that references all the Git::Object::Commit objects that encompass
 your log query, which can be constructed through methods on the Git::Log object, like:
 
- @git.log(20).object("HEAD^").since("2 weeks ago").between('v2.6', 'v2.7').each { |commit| [block] } 
-
+ @git.log(20).object("some_file").since("2 weeks ago").between('v2.6', 'v2.7').each { |commit| [block] } 
 
 = Examples
 
@@ -59,8 +51,7 @@ First you have to remember to require rubygems if it's not.  Then include the 'g
 
 Here are the operations that need read permission only.
       
-   g = Git.open (working_dir = '.')
- 	  (git_dir, index_file)
+   g = Git.open (working_dir, :log => Logger.new(STDOUT))
    
    g.index
    g.index.readable?
@@ -244,4 +235,4 @@ Some examples of more low-level index and tree operations
      # do file work
      g.commit # commits to index
    end
-   
+   

data/lib/git.rb

@@ -23,6 +23,10 @@ require 'git/diff'
 require 'git/status'
 require 'git/author'
 
+require 'git/stashes'
+require 'git/stash'
+
+
 # Git/Ruby Library
 #
 # This provides bindings for working with git in complex
@@ -48,8 +52,8 @@ module Git
   # it expects not to be able to use a working directory
   # so you can't checkout stuff, commit things, etc.
   # but you can do most read operations
-  def self.bare(git_dir)
-    Base.bare(git_dir)
+  def self.bare(git_dir, options = {})
+    Base.bare(git_dir, options)
   end
     
   # open an existing git working directory

data/lib/git/base.rb

@@ -7,10 +7,14 @@ module Git
     @index = nil
 
     @lib = nil
+    @logger = nil
     
     # opens a bare Git Repository - no working directory options
-    def self.bare(git_dir)
-      self.new :repository => git_dir
+    def self.bare(git_dir, opts = {})
+      default = {:repository => git_dir}
+      git_options = default.merge(opts)
+      
+      self.new(git_options)
     end
     
     # opens a new Git Project from a working directory
@@ -67,6 +71,10 @@ module Git
         options[:repository] = File.join(working_dir, '.git') if !options[:repository]
         options[:index] = File.join(working_dir, '.git', 'index') if !options[:index]
       end
+      if options[:log]
+        @logger = options[:log]
+        @logger.info("Starting Git")
+      end
       
       @working_directory = Git::WorkingDirectory.new(options[:working_directory]) if options[:working_directory]
       @repository = Git::Repository.new(options[:repository]) if options[:repository]
@@ -122,7 +130,7 @@ module Git
     def repo_size
       size = 0
       Dir.chdir(repo.path) do
-        (size, dot) = `du -d0`.chomp.split
+        (size, dot) = `du -s`.chomp.split
       end
       size.to_i
     end
@@ -199,7 +207,7 @@ module Git
     # actual 'git' forked system calls.  At some point I hope to replace the Git::Lib
     # class with one that uses native methods or libgit C bindings
     def lib
-      @lib ||= Git::Lib.new(self)
+      @lib ||= Git::Lib.new(self, @logger)
     end
     
     # will run a grep for 'string' on the HEAD of the git repository
@@ -269,6 +277,11 @@ module Git
       self.lib.checkout(branch, opts)
     end
     
+    # checks out an old version of a file
+    def checkout_file(version, file)
+      self.lib.checkout_file(version,file)
+    end
+
     # fetches changes from a remote branch - this does not modify the working directory,
     # it just gets the changes from the remote if there are any
     def fetch(remote = 'origin')
@@ -291,6 +304,13 @@ module Git
       self.lib.merge(branch, message)
     end
 
+    # iterates over the files which are unmerged
+    #
+    # yields file, your_version, their_version
+    def each_conflict(&block)
+      self.lib.conflicts(&block)
+    end
+
     # fetches a branch from a remote and merges it into the current working branch
     def pull(remote = 'origin', branch = 'master', message = 'origin pull')
       fetch(remote)
@@ -343,6 +363,10 @@ module Git
       self.lib.repack
     end
     
+    def gc
+      self.lib.gc
+    end
+    
     
     ## LOWER LEVEL INDEX OPERATIONS ##
     
@@ -420,6 +444,14 @@ module Git
     def revparse(objectish)
       self.lib.revparse(objectish)
     end
+    
+    def ls_tree(objectish)
+      self.lib.ls_tree(objectish)
+    end
+    
+    def cat_file(objectish)
+      self.lib.object_contents(objectish)
+    end
 
     # returns the name of the branch the working directory is currently on
     def current_branch
@@ -429,4 +461,4 @@ module Git
     
   end
   
-end
+end

data/lib/git/branch.rb

@@ -5,6 +5,7 @@ module Git
     
     @base = nil
     @gcommit = nil
+    @stashes = nil
     
     def initialize(base, name)
       @remote = nil
@@ -25,6 +26,10 @@ module Git
       @gcommit
     end
     
+    def stashes
+      @stashes ||= Git::Stashes.new(@base)
+    end
+    
     def checkout
       check_if_create
       @base.checkout(@full)

data/lib/git/branches.rb

@@ -41,5 +41,17 @@ module Git
       @branches[symbol.to_s]
     end
     
+    def to_s
+      out = ''
+      @branches.each do |k, b|
+        if b.current
+          out += "* " + b.to_s + "\n"
+        else
+          out += "  " + b.to_s + "\n"
+        end
+      end
+      out
+    end
+    
   end
 end

data/lib/git/lib.rb

@@ -11,8 +11,10 @@ module Git
     @git_index_file = nil
     @git_work_dir = nil
     @path = nil
-        
-    def initialize(base = nil)
+    
+    @logger = nil
+    
+    def initialize(base = nil, logger = nil)
       if base.is_a?(Git::Base)
         @git_dir = base.repo.path
         @git_index_file = base.index.path if base.index
@@ -22,6 +24,9 @@ module Git
         @git_index_file = base[:index] 
         @git_work_dir = base[:working_directory]
       end
+      if logger
+        @logger = logger
+      end
     end
     
     def init
@@ -85,6 +90,16 @@ module Git
       if /\w{40}/.match(string)  # passing in a sha - just no-op it
         return string
       end
+            
+      head = File.join(@git_dir, 'refs', 'heads', string)
+      return File.read(head).chomp if File.file?(head)
+
+      head = File.join(@git_dir, 'refs', 'remotes', string)
+      return File.read(head).chomp if File.file?(head)
+      
+      head = File.join(@git_dir, 'refs', 'tags', string)
+      return File.read(head).chomp if File.file?(head)
+      
       command('rev-parse', string)
     end
     
@@ -109,7 +124,7 @@ module Git
     
     def process_commit_data(data, sha = nil)
       in_message = false
-      
+            
       if sha
         hsh = {'sha' => sha, 'message' => '', 'parent' => []}
       else
@@ -117,6 +132,7 @@ module Git
       end
     
       data.each do |line|
+        line = line.chomp
         if in_message && line != ''
           hsh['message'] += line + "\n"
         end
@@ -156,14 +172,32 @@ module Git
 
     def ls_tree(sha)
       data = {'blob' => {}, 'tree' => {}}
+      
       command_lines('ls-tree', sha.to_s).each do |line|
         (info, filenm) = line.split("\t")
         (mode, type, sha) = info.split
         data[type][filenm] = {:mode => mode, :sha => sha}
       end
+      
       data
     end
 
+    def mv(file1, file2)
+      command_lines('mv', [file1, file2])
+    end
+        
+    def full_tree(sha)
+      command_lines('ls-tree', ['-r', sha.to_s])
+    end
+            
+    def tree_depth(sha)
+      full_tree(sha).size
+    end
+
+    def change_head_branch(branch_name)
+      command('symbolic-ref', ['HEAD', "refs/heads/#{branch_name}"])
+    end
+    
     def branches_all
       arr = []
       command_lines('branch', '-a').each do |b| 
@@ -174,6 +208,13 @@ module Git
       arr
     end
 
+    def list_files(ref_dir)
+      dir = File.join(@git_dir, 'refs', ref_dir)
+      files = []
+      Dir.chdir(dir) { files = Dir.glob('**/*').select { |f| File.file?(f) } } rescue nil
+      files
+    end
+    
     def branch_current
       branches_all.select { |b| b[1] }.first[0] rescue nil
     end
@@ -267,22 +308,47 @@ module Git
 
     def config_remote(name)
       hsh = {}
-      command_lines('config', ['--get-regexp', "remote.#{name}"]).each do |line|
-        (key, value) = line.split
-        hsh[key.gsub("remote.#{name}.", '')] = value
+      config_list.each do |key, value|
+        if /remote.#{name}/.match(key)
+          hsh[key.gsub("remote.#{name}.", '')] = value
+        end
       end
       hsh
     end
 
     def config_get(name)
-      command('config', ['--get', name])
+      c = config_list
+      c[name]
+      #command('config', ['--get', name])
     end
     
     def config_list
+      config = {}
+      config.merge!(parse_config('~/.gitconfig'))
+      config.merge!(parse_config(File.join(@git_dir, 'config')))
+      #hsh = {}
+      #command_lines('config', ['--list']).each do |line|
+      #  (key, value) = line.split('=')
+      #  hsh[key] = value
+      #end
+      #hsh
+    end
+    
+    def parse_config(file)
       hsh = {}
-      command_lines('config', ['--list']).each do |line|
-        (key, value) = line.split('=')
-        hsh[key] = value
+      file = File.expand_path(file)
+      if File.file?(file)
+        current_section = nil
+        File.readlines(file).each do |line|
+          if m = /\[(\w+)\]/.match(line)
+            current_section = m[1]
+          elsif m = /\[(\w+?) "(.*?)"\]/.match(line)
+            current_section = "#{m[1]}.#{m[2]}"
+          elsif m = /(\w+?) = (.*)/.match(line)
+            key = "#{current_section}.#{m[1]}"
+            hsh[key] = m[2] 
+          end
+        end
       end
       hsh
     end
@@ -320,14 +386,44 @@ module Git
       arr_opts << commit.to_s if commit
       command('reset', arr_opts)
     end
+    
+    def stashes_all
+      arr = []
+      filename = File.join(@git_dir, 'logs/refs/stash')
+      if File.exist?(filename)
+        File.open(filename).each_with_index { |line, i|
+          m = line.match(/:(.*)$/)
+          arr << [i, m[1].strip]
+        }
+      end
+      arr
+    end
+    
+    def stash_save(message)
+      output = command('stash save', [message])
+      return false unless output.match(/HEAD is now at/)
+      return true
+    end
 
-
+    def stash_apply(id)
+      command('stash apply', [id])
+      # Already uptodate! ---???? What then
+    end
+    
+    def stash_clear
+      command('stash clear')
+    end
+    
+    def stash_list
+      command('stash list')
+    end
+    
     def branch_new(branch)
       command('branch', branch)
     end
     
     def branch_delete(branch)
-      command('branch', ['-d', branch])
+      command('branch', ['-D', branch])
     end
     
     def checkout(branch, opts = {})
@@ -337,6 +433,13 @@ module Git
       
       command('checkout', arr_opts)
     end
+
+    def checkout_file(version, file)
+      arr_opts = []
+      arr_opts << version.to_s
+      arr_opts << file.to_s
+      command('checkout', arr_opts)
+    end
     
     def merge(branch, message = nil)      
       arr_opts = []
@@ -344,7 +447,28 @@ module Git
       arr_opts << branch.to_a.join(' ')
       command('merge', arr_opts)
     end
-    
+
+    def unmerged
+      unmerged = []
+      command_lines('diff', ["--cached"]).each do |line|
+        unmerged << $1 if line =~ /^\* Unmerged path (.*)/
+      end
+      unmerged
+    end
+
+    def conflicts #yields :file, :your, :their
+      self.unmerged.each do |f|
+        your = Tempfile.new("YOUR-#{File.basename(f)}").path
+        arr_opts = [":2:#{f}", ">#{your}"]
+        command('show', arr_opts) 
+
+        their = Tempfile.new("THEIR-#{File.basename(f)}").path
+        arr_opts = [":3:#{f}", ">#{their}"]
+        command('show', arr_opts) 
+        yield(f, your, their)
+      end
+    end
+
     def remote_add(name, url, opts = {})
       arr_opts = ['add']
       arr_opts << '-f' if opts[:with_fetch]
@@ -382,6 +506,9 @@ module Git
     end
     
     def tag_sha(tag_name)
+      head = File.join(@git_dir, 'refs', 'tags', tag_name)
+      return File.read(head).chomp if File.exists?(head)
+      
       command('show-ref',  ['--tags', '-s', tag_name])
     end  
     
@@ -389,6 +516,10 @@ module Git
       command('repack', ['-a', '-d'])
     end
     
+    def gc
+      command('gc', ['--prune', '--aggressive', '--auto'])
+    end
+    
     # reads a tree into the current index file
     def read_tree(treeish, opts = {})
       arr_opts = []
@@ -403,9 +534,9 @@ module Git
     
     def commit_tree(tree, opts = {})
       opts[:message] = "commit tree #{tree}" if !opts[:message]
-      t = Tempfile.new('commit-message') do |t|
-        t.write(opts[:message])
-      end
+      t = Tempfile.new('commit-message')
+      t.write(opts[:message])
+      t.close
       
       arr_opts = []
       arr_opts << tree
@@ -461,11 +592,11 @@ module Git
     
     private
     
-    def command_lines(cmd, opts = {}, chdir = true)
+    def command_lines(cmd, opts = [], chdir = true)
       command(cmd, opts, chdir).split("\n")
     end
     
-    def command(cmd, opts = {}, chdir = true)
+    def command(cmd, opts = [], chdir = true)
       ENV['GIT_DIR'] = @git_dir if (@git_dir != ENV['GIT_DIR'])
       ENV['GIT_INDEX_FILE'] = @git_index_file if (@git_index_file != ENV['GIT_INDEX_FILE'])
       ENV['GIT_WORK_TREE'] = @git_work_dir if (@git_work_dir != ENV['GIT_WORK_TREE'])
@@ -476,15 +607,16 @@ module Git
 
       out = nil
       if chdir && (Dir.getwd != path)
-        Dir.chdir(path) { out = `git #{cmd} #{opts} 2>&1`.chomp } 
+        Dir.chdir(path) { out = `#{git_cmd} 2>&1`.chomp } 
       else
-        out = `git #{cmd} #{opts} 2>&1`.chomp
+        out = `#{git_cmd} 2>&1`.chomp
       end
       
-      #puts git_cmd
-      #puts out
-      #puts
-      
+      if @logger
+        @logger.info(git_cmd)
+        @logger.debug(out)
+      end
+            
       if $?.exitstatus > 0
         if $?.exitstatus == 1 && out == ''
           return ''
@@ -495,4 +627,4 @@ module Git
     end
     
   end
-end
+end