added ls-tree to gitr

scott Chacon · scott Chacon · commit 6bbead02aa2a · 2007-11-27T08:42:26.000-08:00
diff --git a/bin/gitr b/bin/gitr
@@ -12,9 +12,9 @@
 #   add --log-file 
 #   add --help
 
-#require 'lib/git'
-require 'rubygems'
-require 'git'
+require 'lib/git'
+#require 'rubygems'
+#require 'git'
 require 'logger'
 
 command = ARGV[0]
@@ -25,15 +25,17 @@ if !command
   puts
   puts 'commands: log'
   puts '          log-shas'
-  puts '          cat-file'
-  puts '          rev-parse'
+  puts '          cat-file (treeish)'
+  puts '          rev-parse (treeish)'
   puts '          branches'
   puts '          config'
+  puts '          ls-tree (tree)'
   exit
 end
 
 git_dir = ENV['GIT_DIR'] || '.git'
-@git = Git.bare(git_dir, :log => Logger.new(STDOUT))
+#@git = Git.bare(git_dir, :log => Logger.new(STDOUT))
+@git = Git.bare(git_dir)
 
 case command
 when 'log'
@@ -60,10 +62,17 @@ when 'config'
   @git.config.sort.each do |k,v|
     puts "#{k} : #{v}"
   end
+when 'ls-tree'
+  # gitr ls-tree
+  tree = @git.gtree(ARGV[1])
+  tree.blobs.sort.each do |name, c|
+    puts [[c.mode, c.type, c.sha].join(" "), name].join("\t")
+  end
+  tree.trees.sort.each do |name, c|
+    puts [[c.mode, c.type, c.sha].join(" "), name].join("\t")
+  end
 end
 
-# gitr ls-tree
-# gitr pack-browse
-
-# gitr diff / stats ?
-# output in yaml?
+# todo:
+#  gitr pack-browse
+#  gitr diff / stats ?
diff --git a/lib/git/base.rb b/lib/git/base.rb
@@ -428,7 +428,11 @@ def with_temp_working &blk
     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
diff --git a/lib/git/object.rb b/lib/git/object.rb
@@ -136,8 +136,8 @@ def check_tree
             @trees = {}
             @blobs = {}
             data = @base.lib.ls_tree(@objectish)
-            data['tree'].each { |k, d| @trees[k] = Tree.new(@base, d[:sha], d[:mode]) }
-            data['blob'].each { |k, d| @blobs[k] = Blob.new(@base, d[:sha], d[:mode]) }
+            data['tree'].each { |k, d| @trees[k] = Git::Object::Tree.new(@base, d[:sha], d[:mode]) }
+            data['blob'].each { |k, d| @blobs[k] = Git::Object::Blob.new(@base, d[:sha], d[:mode]) }
           end
         end
       
@@ -213,8 +213,8 @@ def set_commit(data)
         end
         @committer = Git::Author.new(data['committer'])
         @author = Git::Author.new(data['author'])
-        @tree = Tree.new(@base, data['tree'])
-        @parents = data['parent'].map{ |sha| Commit.new(@base, sha) }
+        @tree = Git::Object::Tree.new(@base, data['tree'])
+        @parents = data['parent'].map{ |sha| Git::Object::Commit.new(@base, sha) }
         @message = data['message'].chomp
       end
             
@@ -259,7 +259,7 @@ def new(base, objectish, type = nil, is_tag = false)
           if sha == ''
             raise Git::GitTagNameDoesNotExist.new(objectish)
           end
-          return Tag.new(base, sha, objectish)
+          return Git::Object::Tag.new(base, sha, objectish)
         else
           if !type
             type = base.lib.object_type(objectish) 
