rails_app/app/views/repo/diffs.rhtml rails_app/vendor/plugins/grit/grit.rb rails_app/vendor/plugins/grit/grit/actor.rb rails_app/vendor/plugins/grit/grit/blame.rb rails_app/vendor/plugins/grit/grit/blob.rb rails_app/vendor/plugins/grit/grit/commit.rb rails_app/vendor/plugins/grit/grit/commit_stats.rb rails_app/vendor/plugins/grit/grit/config.rb rails_app/vendor/plugins/grit/grit/diff.rb rails_app/vendor/plugins/grit/grit/errors.rb rails_app/vendor/plugins/grit/grit/git-ruby.rb rails_app/vendor/plugins/grit/grit/git-ruby/commit_db.rb rails_app/vendor/plugins/grit/grit/git-ruby/file_index.rb rails_app/vendor/plugins/grit/grit/git-ruby/git_object.rb rails_app/vendor/plugins/grit/grit/git-ruby/internal/loose.rb rails_app/vendor/plugins/grit/grit/git-ruby/internal/mmap.rb rails_app/vendor/plugins/grit/grit/git-ruby/internal/pack.rb rails_app/vendor/plugins/grit/grit/git-ruby/internal/raw_object.rb rails_app/vendor/plugins/grit/grit/git-ruby/object.rb rails_app/vendor/plugins/grit/grit/git-ruby/repository.rb rails_app/vendor/plugins/grit/grit/git.rb rails_app/vendor/plugins/grit/grit/head.rb rails_app/vendor/plugins/grit/grit/index.rb rails_app/vendor/plugins/grit/grit/lazy.rb rails_app/vendor/plugins/grit/grit/merge.rb rails_app/vendor/plugins/grit/grit/ref.rb rails_app/vendor/plugins/grit/grit/repo.rb rails_app/vendor/plugins/grit/grit/status.rb rails_app/vendor/plugins/grit/grit/submodule.rb rails_app/vendor/plugins/grit/grit/tag.rb rails_app/vendor/plugins/grit/grit/tree.rb rails_app/vendor/plugins/grit/open3_detach.rb @@ -11,6 +11,19 @@ class RepoController < ApplicationController @repos = Repodb.public? end + def diffs + @additional_styles = 'repo' + @repo = repo? + @title = "#{SITE_PROPS['sitename']} :: #{@repo.name} :: Diffs" + username = params[:username] + @repopath = full_repo_path(@repo.loc, username) + @git = Repo.new(@repopath) + @privateurl = SITE_PROPS["gituser"] + '@' + SITE_PROPS["privatehost"] + ':' + @repo.user.username + '/' + @repo.unixname + '.git' + @publicurl = SITE_PROPS["publicurl"] + '/' + @repo.user.username + '/' + @repo.unixname + '.git' + @commit = @git.commit(params[:branch]) + diff_text = '[code lang="diff"]' + @git.diff(@commit.parents[0], @commit) + '[/code]' + @syntax = Syntaxi.new(diff_text).process + end def show rails_app/app/controllers/repo_controller.rb @@ -42,11 +42,13 @@ <div class="right"> <div class="cdate">Tree : <%= link_to(commit.id, :type => 'tree', :branch => commit.id, :action => 'show')%></div> <% for c in commit.parents %> - <div class="cdate">Parent : <%=link_to(c.id, :type => 'tree', :branch => c.id, :action => 'show')%> + <div class="cdate">Parent : <%=link_to(c.id, :branch => c.id, :action => 'diffs')%> </div> <%end%> - <div class="cdate">View Diffs</div> + <div class="cdate"> + <%= link_to('Diffs', :type => 'diffs', :branch => commit.id, :action => 'show')%> + </div> </div> <div class="cmessage"><%=commit.message %></div> rails_app/app/views/repo/commits.rhtml @@ -25,12 +25,12 @@ <%=if @myrepos.empty? then "<div class='recent'>You don't have any repos yet</div>" end%> <% for repo in @myrepos%> - <div class="yrepo"><img src="/images/icons/happy.png" alt="you own it"/><%=if repo.is_private then "<img src='/images/icons/private.png' alt='private'/>" end%> <%= link_to(repo.name, :controller=>'repo', :action => 'show', :username => @user.username, :reponame => repo.unixname)%></div> + <div class="yrepo"><img src="/images/icons/happy.png" alt="you own it"/><%=if repo.is_private then "<img src='/images/icons/private.png' alt='private'/>" end%> <%= link_to(repo.name, :controller=>'repo', :action => 'show', :username => repo.user.username, :reponame => repo.unixname, :type => 'tree', :branch => 'master' )%></div> <div class="yrepodesc"><%=repo.desc%></div> <div class="divide"><img src="/images/div.jpg" alt="---"/></div> <% end %> <% for repo in @memberrepos%> - <div class="yrepo"><%=if repo.repodb.is_private then "<img src='/images/icons/private.png' alt='private'/>" end%> <%= link_to(repo.repodb.name, :controller=>'repo', :action => 'show', :id => repo.repodb.id)%></div> + <div class="yrepo"><%=if repo.repodb.is_private then "<img src='/images/icons/private.png' alt='private'/>" end%> <%=link_to(repo.repodb.name, :controller=>'repo', :action => 'show', :username => repo.repodb.user.username, :reponame => repo.repodb.unixname, :type => 'tree', :branch => 'master' )%></div> <div class="yrepodesc"><%=repo.repodb.desc%></div> <div class="yrepodesc">Owner: <%=link_to repo.repodb.user.username, :action=>'profile', :username => repo.repodb.user.username%></div> <div class="divide"><img src="/images/div.jpg" alt="---"/></div> @@ -42,7 +42,7 @@ <%=if @watchedrepos.empty? then "<div class='recent'>Your are not watching any repos</div>" end%> <% for repo in @watchedrepos%> - <div class="watched"><%= link_to(repo.repodb.name, :controller=>'repo', :action => 'show', :username => repo.repodb.user.username, :reponame => repo.repodb.unixname)%> [<%=link_to 'Un-Watch', {:controller => 'repo', :action => "unwatch", :reponame => repo.repodb.name, :username => repo.repodb.user.username, :repo_id => repo.repodb.id}, :method => :post %>]</div> + <div class="watched"><%= link_to(repo.repodb.name, :controller=>'repo', :action => 'show', :username => repo.repodb.user.username, :reponame => repo.repodb.unixname, :type => 'tree', :branch => 'master' )%> [<%=link_to 'Un-Watch', {:controller => 'repo', :action => "unwatch", :reponame => repo.repodb.name, :username => repo.repodb.user.username, :repo_id => repo.repodb.id}, :method => :post %>]</div> <div class="watcheddesc"><%=repo.repodb.desc%></div> <div class="watcheddesc">Owner: <%=link_to repo.repodb.user.username, :action=>'profile', :username => repo.repodb.user.username%></div> <div class="divide"><img src="/images/div.jpg"/></div> rails_app/app/views/user/index.rhtml @@ -33,16 +33,16 @@ Rails::Initializer.run do |config| # config.gem "aws-s3", :lib => "aws/s3" config.gem "open4" #config.gem "mime/types" - config.gem 'mojombo-grit', :lib => 'grit' + #config.gem 'mojombo-grit', :lib => 'grit' config.gem "syntaxi" # Only load the plugins named here, in the order given. By default, all plugins # in vendor/plugins are loaded in alphabetical order. # :all can be used as a placeholder for all plugins not explicitly named - # config.plugins = [ :exception_notification, :ssl_requirement, :all ] + # config.plugins = [ :all ] # Add additional load paths for your own custom dirs - # config.load_paths += %W( #{RAILS_ROOT}/thirdparty/lib ) + config.load_paths += %W( #{RAILS_ROOT}/vendor/plugins/grit ) # Force all environments to use the same logger level # (by default production uses :info, the others :debug) rails_app/config/environment.rb @@ -13,6 +13,7 @@ ActionController::Routing::Routes.draw do |map| map.connect ':username/:reponame/unwatch', :controller => 'repo', :action => 'unwatch' map.connect ':username/:reponame/commits/:branch', :controller => 'repo', :action => 'commits' map.connect ':username/:reponame/commits/:branch/*path', :controller => 'repo', :action => 'commits' + map.connect ':username/:reponame/diffs/:branch', :controller => 'repo', :action => 'diffs' map.connect ':username/:reponame/tags/:branch/*path', :controller => 'repo', :action => 'tags' map.connect ':username/:reponame/:type/:branch' , :controller => 'repo' , :action => 'show' map.connect ':username/:reponame/:type/:branch/*path' , :controller => 'repo' , :action => 'show' rails_app/config/routes.rb @@ -31,6 +31,10 @@ font-size: 12px; } +.treeitem{ + font-size: 16px; +} + .blist { font-size: 14px; position: absolute; rails_app/public/stylesheets/repo.css 93ec2bce7caa0b5aad6043544a72a4e1ba891227 Mike parabuzzle@gmail.com http://github.com/parabuzzle/lookgit/commit/8a9490aeb5a65a72688d6fa8bcc166c2c2f304e5 8a9490aeb5a65a72688d6fa8bcc166c2c2f304e5 2008-12-26T11:26:14-08:00 2008-12-26T11:26:14-08:00 Working on diffs viewing. Pulled in the edge grit to try and fix a bug in the diff method ad8b8c5e5c5ea2aa3a04709f96879a0ca753ff1a Mike parabuzzle@gmail.com