jro_apps/redmine Commit - r934:8c65cc47122b

Added Annotate/Blame view for Subversion, CVS and Mercurial repositories....

Jean-Philippe Lang -

r934:8c65cc47122b

parent child

Context file:

r934:8c65cc47122b

Expand all files

app/views/repositories/annotate.rhtml created 644 +26 0

@@ -0,0 +1,26
	1	<h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => 'file', :revision => @rev } %></h2>
	2
	3	<% colors = Hash.new {\|k,v\| k[v] = (k.size % 12) } %>
	4
	5	<div class="autoscroll">
	6	<table class="filecontent annotate CodeRay">
	7	<tbody>
	8	<% line_num = 1 %>
	9	<% syntax_highlight(@path, to_utf8(@annotate.content)).each_line do \|line\| %>
	10	<% revision = @annotate.revisions[line_num-1] %>
	11	<tr class="bloc-<%= revision.nil? ? 0 : colors[revision.identifier \|\| revision.revision] %>">
	12	<th class="line-num"><%= line_num %></th>
	13	<td class="revision">
	14	<%= (revision.identifier ? link_to(revision.identifier, :action => 'revision', :id => @project, :rev => revision.identifier) : revision.revision) if revision %></td>
	15	<td class="author"><%= h(revision.author) if revision %></td>
	16	<td class="line-code"><pre><%= line %></pre></td>
	17	</tr>
	18	<% line_num += 1 %>
	19	<% end %>
	20	<tbody>
	21	</table>
	22	</div>
	23
	24	<% content_for :header_tags do %>
	25	<%= stylesheet_link_tag 'scm' %>
	26	<% end %>

app/controllers/repositories_controller.rb +5 0

                 end
               end
+              def annotate
+                @annotate = @repository.scm.annotate(@path, @rev)
+                show_error and return if @annotate.nil? || @annotate.empty?
+              end
               def revision
                 @changeset = @repository.changesets.find_by_revision(@rev)
                 raise ChangesetNotFound unless @changeset

app/models/repository.rb +4 0

               def supports_cat?
                 scm.supports_cat?
               end
+              def supports_annotate?
+                scm.supports_annotate?
+              end
               def entries(path=nil, identifier=nil)
                 scm.entries(path, identifier)

app/views/repositories/changes.rhtml +7 -4

             <h3><%=h @entry.name %></h3>
-            <% if @repository.supports_cat? %>
             <p>
             <% if @entry.is_text? %>
-            <%= link_to l(:button_view), {:action => 'entry', :id => @project, :path => @path, :rev => @rev } %> |
+                <% if @repository.supports_cat? %>
+                    <%= link_to l(:button_view), {:action => 'entry', :id => @project, :path => @path, :rev => @rev } %> |
+                <% end %>
+                <% if @repository.supports_annotate? %>
+                    <%= link_to l(:button_annotate), {:action => 'annotate', :id => @project, :path => @path, :rev => @rev } %> |
+                <% end %>
             <% end %>
-            <%= link_to l(:button_download), {:action => 'entry', :id => @project, :path => @path, :rev => @rev, :format => 'raw' } %>
+            <%= link_to(l(:button_download), {:action => 'entry', :id => @project, :path => @path, :rev => @rev, :format => 'raw' }) if @repository.supports_cat? %>
             <%= "(#{number_to_human_size(@entry.size)})" if @entry.size %>
             </p>
-            <% end %>
             <%= render :partial => 'revisions', :locals => {:project => @project, :path => @path, :revisions => @changesets, :entry => @entry }%>

app/views/repositories/entry.rhtml 0 -5

             <div class="autoscroll">
             <table class="filecontent CodeRay">
-              <thead>
-                <tr>
-                  <th colspan="2" class="filename"><%= @path %></th>
-                </tr>
-              </thead>
               <tbody>
                 <% line_num = 1 %>
                 <% syntax_highlight(@path, to_utf8(@content)).each_line do |line| %>

config/routes.rb +1 0

                 omap.repositories_changes 'repositories/changes/:id/*path', :action => 'changes'
                 omap.repositories_diff 'repositories/diff/:id/*path', :action => 'diff'
                 omap.repositories_entry 'repositories/entry/:id/*path', :action => 'entry'
+                omap.repositories_entry 'repositories/annotate/:id/*path', :action => 'annotate'
               end
               # Allow downloading Web Service WSDL as a file with an extension

lang/bg.yml +1 0

             field_time_zone: Time zone
             text_caracters_minimum: Must be at least %d characters long.
             setting_bcc_recipients: Blind carbon copy recipients (bcc)
+            button_annotate: Annotate

lang/cs.yml +1 0

             field_time_zone: Time zone
             text_caracters_minimum: Must be at least %d characters long.
             setting_bcc_recipients: Blind carbon copy recipients (bcc)
+            button_annotate: Annotate

lang/de.yml +1 0

             field_time_zone: Zeitzone
             text_caracters_minimum: Muss mindestens %d Zeichen lang sein.
             setting_bcc_recipients: Blind carbon copy recipients (bcc)
+            button_annotate: Annotate

lang/en.yml +1 0

             button_rename: Rename
             button_change_password: Change password
             button_copy: Copy
+            button_annotate: Annotate
             status_active: active
             status_registered: registered

lang/es.yml +1 0

             notice_account_pending: "Su cuenta ha sido creada y está pendiende de la aprobación por parte de administrador"
             setting_time_format: Formato de hora
             setting_bcc_recipients: Blind carbon copy recipients (bcc)
+            button_annotate: Annotate

lang/fr.yml +1 0

             button_rename: Renommer
             button_change_password: Changer de mot de passe
             button_copy: Copier
+            button_annotate: Annoter
             status_active: actif
             status_registered: enregistré

lang/he.yml +1 0

             field_time_zone: Time zone
             text_caracters_minimum: Must be at least %d characters long.
             setting_bcc_recipients: Blind carbon copy recipients (bcc)
+            button_annotate: Annotate

lang/it.yml +1 0

             field_time_zone: Time zone
             text_caracters_minimum: Must be at least %d characters long.
             setting_bcc_recipients: Blind carbon copy recipients (bcc)
+            button_annotate: Annotate

lang/ja.yml +1 0

             field_time_zone: Time zone
             text_caracters_minimum: Must be at least %d characters long.
             setting_bcc_recipients: Blind carbon copy recipients (bcc)
+            button_annotate: Annotate

lang/ko.yml +1 0

             field_time_zone: Time zone
             text_caracters_minimum: Must be at least %d characters long.
             setting_bcc_recipients: Blind carbon copy recipients (bcc)
+            button_annotate: Annotate

lang/nl.yml +1 0

             field_time_zone: Time zone
             text_caracters_minimum: Must be at least %d characters long.
             setting_bcc_recipients: Blind carbon copy recipients (bcc)
+            button_annotate: Annotate

lang/pl.yml +1 0

             field_time_zone: Strefa czasowa
             text_caracters_minimum: Must be at least %d characters long.
             setting_bcc_recipients: Blind carbon copy recipients (bcc)
+            button_annotate: Annotate

lang/pt-br.yml +1 0

             field_time_zone: Time zone
             text_caracters_minimum: Must be at least %d characters long.
             setting_bcc_recipients: Blind carbon copy recipients (bcc)
+            button_annotate: Annotate

lang/pt.yml +1 0

             field_time_zone: Time zone
             text_caracters_minimum: Must be at least %d characters long.
             setting_bcc_recipients: Blind carbon copy recipients (bcc)
+            button_annotate: Annotate

lang/ro.yml +1 0

             field_time_zone: Time zone
             text_caracters_minimum: Must be at least %d characters long.
             setting_bcc_recipients: Blind carbon copy recipients (bcc)
+            button_annotate: Annotate

lang/ru.yml +1 0

             field_time_zone: Часовой пояс
             text_caracters_minimum: Must be at least %d characters long.
             setting_bcc_recipients: Blind carbon copy recipients (bcc)
+            button_annotate: Annotate

lang/sr.yml +1 0

             field_time_zone: Time zone
             text_caracters_minimum: Must be at least %d characters long.
             setting_bcc_recipients: Blind carbon copy recipients (bcc)
+            button_annotate: Annotate

lang/sv.yml +1 0

             field_time_zone: Time zone
             text_caracters_minimum: Must be at least %d characters long.
             setting_bcc_recipients: Blind carbon copy recipients (bcc)
+            button_annotate: Annotate

lang/zh.yml +1 0

             field_time_zone: Time zone
             text_caracters_minimum: Must be at least %d characters long.
             setting_bcc_recipients: Blind carbon copy recipients (bcc)
+            button_annotate: Annotate

lib/redmine.rb +1 -1

               map.project_module :repository do |map|
                 map.permission :manage_repository, {:repositories => [:edit, :destroy]}, :require => :member
-                map.permission :browse_repository, :repositories => [:show, :browse, :entry, :changes, :diff, :stats, :graph]
+                map.permission :browse_repository, :repositories => [:show, :browse, :entry, :annotate, :changes, :diff, :stats, :graph]
                 map.permission :view_changesets, :repositories => [:show, :revisions, :revision]
               end

lib/redmine/scm/adapters/abstract_adapter.rb +29 -3

                     def supports_cat?
                       true
                     end
+                    def supports_annotate?
+                      respond_to?('annotate')
+                    end
                     def root_url
                       @root_url
                     def cat(path, identifier=nil)
                       return nil
                     end
                     def with_leading_slash(path)
                       path ||= ''
                       (path[0,1]!="/") ? "/#{path}" : path
                     # Initialize with a Diff file and the type of Diff View
                     # The type view must be inline or sbs (side_by_side)
-                    def initialize (type="inline")
+                    def initialize(type="inline")
                       @parsing = false
                       @nb_line = 1
                       @start = false
                         CGI.escapeHTML(line)
                     end
-                    def parse_line (line, type="inline")
+                    def parse_line(line, type="inline")
                       if line[0, 1] == "+"
                         diff = sbs? type, 'add'
                         @before = 'add'
                       end
                     end
                   end
+                  class Annotate
+                    attr_reader :lines, :revisions
+                    def initialize
+                      @lines = []
+                      @revisions = []
+                    end
+                    def add_line(line, revision)
+                      @lines << line
+                      @revisions << revision
+                    end
+                    def content
+                      content = lines.join("\n")
+                    end
+                    def empty?
+                      lines.empty?
+                    end
+                  end
                 end
               end
             end

lib/redmine/scm/adapters/cvs_adapter.rb +19 -1

@@ -268,7 +268,25 module Redmine
268	rescue Errno::ENOENT => e	268	rescue Errno::ENOENT => e
269	raise CommandFailed	269	raise CommandFailed
270	end	270	end
271		271
		272	def annotate(path, identifier=nil)
		273	identifier = (identifier) ? identifier : "HEAD"
		274	logger.debug "<cvs> annotate path:'#{path}',identifier #{identifier}"
		275	path_with_project="#{url}#{with_leading_slash(path)}"
		276	cmd = "#{CVS_BIN} -d #{root_url} rannotate -r#{identifier} #{path_with_project}"
		277	blame = Annotate.new
		278	shellout(cmd) do \|io\|
		279	io.each_line do \|line\|
		280	next unless line =~ %r{^([\d\.]+)\s+$([^$]+)\s+[^\)]+\):\s(.*)$}
		281	blame.add_line($3.rstrip, Revision.new(:revision => $1, :author => $2.strip))
		282	end
		283	end
		284	return nil if $? && $?.exitstatus != 0
		285	blame
		286	rescue Errno::ENOENT => e
		287	raise CommandFailed
		288	end
		289
272	private	290	private
273		291
274	# convert a date/time into the CVS-format	292	# convert a date/time into the CVS-format

lib/redmine/scm/adapters/mercurial_adapter.rb +19 0

@@ -157,6 +157,25 module Redmine
157	rescue Errno::ENOENT => e	157	rescue Errno::ENOENT => e
158	raise CommandFailed	158	raise CommandFailed
159	end	159	end
		160
		161	def annotate(path, identifier=nil)
		162	path \|\|= ''
		163	cmd = "#{HG_BIN} -R #{target('')}"
		164	cmd << " annotate -n -u"
		165	cmd << " -r #{identifier.to_i}" if identifier
		166	cmd << " #{target(path)}"
		167	blame = Annotate.new
		168	shellout(cmd) do \|io\|
		169	io.each_line do \|line\|
		170	next unless line =~ %r{^([^:]+)\s(\d+):(.*)$}
		171	blame.add_line($3.rstrip, Revision.new(:identifier => $2.to_i, :author => $1.strip))
		172	end
		173	end
		174	return nil if $? && $?.exitstatus != 0
		175	blame
		176	rescue Errno::ENOENT => e
		177	raise CommandFailed
		178	end
160	end	179	end
161	end	180	end
162	end	181	end

lib/redmine/scm/adapters/subversion_adapter.rb +17 0

@@ -173,6 +173,23 module Redmine
173	raise CommandFailed	173	raise CommandFailed
174	end	174	end
175		175
		176	def annotate(path, identifier=nil)
		177	identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
		178	cmd = "#{SVN_BIN} blame #{target(path)}@#{identifier}"
		179	cmd << credentials_string
		180	blame = Annotate.new
		181	shellout(cmd) do \|io\|
		182	io.each_line do \|line\|
		183	next unless line =~ %r{^\s(\d+)\s(\S+)\s(.*)$}
		184	blame.add_line($3.rstrip, Revision.new(:identifier => $1.to_i, :author => $2.strip))
		185	end
		186	end
		187	return nil if $? && $?.exitstatus != 0
		188	blame
		189	rescue Errno::ENOENT => e
		190	raise CommandFailed
		191	end
		192
176	private	193	private
177		194
178	def credentials_string	195	def credentials_string

public/stylesheets/scm.css +39 -7

@@ -2,20 +2,52
2	table.filecontent { border: 1px solid #ccc; border-collapse: collapse; width:98%; }	2	table.filecontent { border: 1px solid #ccc; border-collapse: collapse; width:98%; }
3	table.filecontent th { border: 1px solid #ccc; background-color: #eee; }	3	table.filecontent th { border: 1px solid #ccc; background-color: #eee; }
4	table.filecontent th.filename { background-color: #ddc; text-align: left; }	4	table.filecontent th.filename { background-color: #ddc; text-align: left; }
5	div.action_M { background: #fd8 }
6	div.action_D { background: #f88 }
7	div.action_A { background: #bfb }
8
9	table.filecontent tr.spacing { border: 1px solid #d7d7d7; }	5	table.filecontent tr.spacing { border: 1px solid #d7d7d7; }
10		6	table.filecontent th.line-num {
11	table.filecontent .line-num {
12	border: 1px solid #d7d7d7;	7	border: 1px solid #d7d7d7;
13	font-size: 0.8em;	8	font-size: 0.8em;
14	text-align: right;	9	text-align: right;
15	width: 3em;	10	width: 2%;
16	padding-right: 3px;	11	padding-right: 3px;
17	}	12	}
18		13
		14	/* 12 different colors for the annonate view */
		15	table.annotate tr.bloc-0 {background: #FFFFBF;}
		16	table.annotate tr.bloc-1 {background: #EABFFF;}
		17	table.annotate tr.bloc-2 {background: #BFFFFF;}
		18	table.annotate tr.bloc-3 {background: #FFD9BF;}
		19	table.annotate tr.bloc-4 {background: #E6FFBF;}
		20	table.annotate tr.bloc-5 {background: #BFCFFF;}
		21	table.annotate tr.bloc-6 {background: #FFBFEF;}
		22	table.annotate tr.bloc-7 {background: #FFE6BF;}
		23	table.annotate tr.bloc-8 {background: #FFE680;}
		24	table.annotate tr.bloc-9 {background: #AA80FF;}
		25	table.annotate tr.bloc-10 {background: #FFBFDC;}
		26	table.annotate tr.bloc-11 {background: #BFE4FF;}
		27
		28	table.annotate td.revision {
		29	text-align: center;
		30	width: 2%;
		31	padding-left: 1em;
		32	background: inherit;
		33	}
		34
		35	table.annotate td.author {
		36	text-align: center;
		37	border-right: 1px solid #d7d7d7;
		38	white-space: nowrap;
		39	padding-left: 1em;
		40	padding-right: 1em;
		41	width: 3%;
		42	background: inherit;
		43	}
		44
		45	table.annotate td.line-code { background-color: #fafafa; }
		46
		47	div.action_M { background: #fd8 }
		48	div.action_D { background: #f88 }
		49	div.action_A { background: #bfb }
		50
19	/*********** Coderay styles ***********/	51	/*********** Coderay styles ***********/
20		52
21	table.CodeRay {	53	table.CodeRay {

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages