From f1366b39891402b0db9de661ad181089bfd79053 Mon Sep 17 00:00:00 2001 From: scott Chacon Date: Fri, 23 Nov 2007 11:16:46 -0800 Subject: got log and cat-file moved to pure ruby --- camping/gitweb.rb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'camping') diff --git a/camping/gitweb.rb b/camping/gitweb.rb index 092649d..8dc40ba 100644 --- a/camping/gitweb.rb +++ b/camping/gitweb.rb @@ -13,6 +13,7 @@ require 'lib/git' # todo # - diff/patch between any two objects # - expand patch to entire file +# - set title properly # - grep / search function # - prettify : http://projects.wh.techno-weenie.net/changesets/3030 # - add user model (add/remove repos) @@ -90,10 +91,7 @@ module GitWeb::Controllers class View < R '/view/(\d+)' def get repo_id @repo = Repository.find repo_id - logger = Logger.new('/tmp/git.log') - logger.level = Logger::INFO - - @git = Git.bare(@repo.path, :log => logger) + @git = Git.bare(@repo.path) render :view end end @@ -109,7 +107,10 @@ module GitWeb::Controllers class Commit < R '/commit/(\d+)/(\w+)' def get repo_id, sha @repo = Repository.find repo_id - @git = Git.bare(@repo.path) + logger = Logger.new('/tmp/git.log') + logger.level = Logger::INFO + + @git = Git.bare(@repo.path, :log => logger) @commit = @git.gcommit(sha) render :commit end @@ -212,7 +213,7 @@ module GitWeb::Views body :onload => "sh_highlightDocument();" do before = Time.now().usec self << yield - self << ((Time.now().usec - before).to_f / 60).to_s + ' sec' + self << '
' + ((Time.now().usec - before).to_f / 60).to_s + ' sec' end end end -- cgit From 07ebb951368ed31bdaebc2e820c62ced22c8bbe4 Mon Sep 17 00:00:00 2001 From: scott Chacon Date: Tue, 27 Nov 2007 08:06:51 -0800 Subject: added Matthias and Simon to credits for the gitrb code fixed an issue with raw object tree formatting added ls_tree implementation in raw git --- camping/gitweb.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'camping') diff --git a/camping/gitweb.rb b/camping/gitweb.rb index 8dc40ba..3d1b5d6 100644 --- a/camping/gitweb.rb +++ b/camping/gitweb.rb @@ -107,10 +107,7 @@ module GitWeb::Controllers class Commit < R '/commit/(\d+)/(\w+)' def get repo_id, sha @repo = Repository.find repo_id - logger = Logger.new('/tmp/git.log') - logger.level = Logger::INFO - - @git = Git.bare(@repo.path, :log => logger) + @git = Git.bare(@repo.path) @commit = @git.gcommit(sha) render :commit end @@ -119,7 +116,10 @@ module GitWeb::Controllers class Tree < R '/tree/(\d+)/(\w+)' def get repo_id, sha @repo = Repository.find repo_id - @git = Git.bare(@repo.path) + logger = Logger.new('/tmp/git.log') + logger.level = Logger::INFO + + @git = Git.bare(@repo.path, :log => logger) @tree = @git.gtree(sha) render :tree end -- cgit From 6a9db968e8563bc27b8f56f9d413159a2e14cf67 Mon Sep 17 00:00:00 2001 From: scott Chacon Date: Tue, 27 Nov 2007 08:21:28 -0800 Subject: fixed issue with running a 'git log' with an object that won't rev-parse (file) --- camping/gitweb.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'camping') diff --git a/camping/gitweb.rb b/camping/gitweb.rb index 3d1b5d6..29a4ab3 100644 --- a/camping/gitweb.rb +++ b/camping/gitweb.rb @@ -116,10 +116,7 @@ module GitWeb::Controllers class Tree < R '/tree/(\d+)/(\w+)' def get repo_id, sha @repo = Repository.find repo_id - logger = Logger.new('/tmp/git.log') - logger.level = Logger::INFO - - @git = Git.bare(@repo.path, :log => logger) + @git = Git.bare(@repo.path) @tree = @git.gtree(sha) render :tree end @@ -128,7 +125,10 @@ module GitWeb::Controllers class Blob < R '/blob/(\d+)/(.*?)/(\w+)' def get repo_id, file, sha @repo = Repository.find repo_id - @git = Git.bare(@repo.path) + logger = Logger.new('/tmp/git.log') + logger.level = Logger::INFO + + @git = Git.bare(@repo.path, :log => logger) @blob = @git.gblob(sha) @file = file render :blob -- cgit