jro_apps/redmine Commit - r9922:65524cc1cc63

Don't repeat revision on annotate view....

Jean-Philippe Lang -

r9922:65524cc1cc63

parent child

Context file:

r9922:65524cc1cc63

Collapse all files

app/views/repositories/annotate.html.erb +4 -4

             <div class="autoscroll">
             <table class="filecontent annotate syntaxhl">
               <tbody>
-                <% line_num = 1 %>
+                <% line_num = 1; previous_revision = nil %>
                 <% syntax_highlight_lines(@path, Redmine::CodesetUtil.to_utf8_by_setting(@annotate.content)).each do |line| %>
                   <% revision = @annotate.revisions[line_num - 1] %>
                   <tr class="bloc-<%= revision.nil? ? 0 : colors[revision.identifier || revision.revision] %>">
                     <th class="line-num" id="L<%= line_num %>"><a href="#L<%= line_num %>"><%= line_num %></a></th>
                     <td class="revision">
-                    <%= (revision.identifier ? link_to_revision(revision, @repository) : format_revision(revision)) if revision %></td>
+                    <%= (revision.identifier ? link_to_revision(revision, @repository) : format_revision(revision)) if revision && revision != previous_revision %></td>
-                    <td class="author"><%= h(revision.author.to_s.split('<').first) if revision %></td>
+                    <td class="author"><%= h(revision.author.to_s.split('<').first) if revision && revision != previous_revision %></td>
                     <td class="line-code"><pre><%= line.html_safe %></pre></td>
                   </tr>
-                  <% line_num += 1 %>
+                  <% line_num += 1; previous_revision = revision %>
                 <% end %>
               </tbody>
             </table>

lib/redmine/scm/adapters/abstract_adapter.rb +12 0

@@ -366,6 +366,18 module Redmine
366	def format_identifier	366	def format_identifier
367	self.identifier.to_s	367	self.identifier.to_s
368	end	368	end
		369
		370	def ==(other)
		371	if other.nil?
		372	false
		373	elsif scmid.present?
		374	scmid == other.scmid
		375	elsif identifier.present?
		376	identifier == other.identifier
		377	elsif revision.present?
		378	revision == other.revision
		379	end
		380	end
369	end	381	end
370		382
371	class Annotate	383	class Annotate

test/functional/repositories_cvs_controller_test.rb +1 -1

                   # 1.1 line
                   assert_tag :tag => 'th',
                              :attributes => { :class => 'line-num' },
-                             :content => '18',
+                             :content => '21',
                              :sibling => {
                                :tag => 'td',
                                :attributes => { :class => 'revision' },

test/functional/repositories_git_controller_test.rb +6 -6

                       :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
                   assert_response :success
                   assert_template 'annotate'
-                  # Line 24, changeset 2f9c0091
+                  # Line 23, changeset 2f9c0091
-                  assert_tag :tag => 'th', :content => '24',
+                  assert_tag :tag => 'th', :content => '23',
                              :sibling => {
                                 :tag => 'td',
                                 :child => {
                                    :content => /2f9c0091/
                                    }
                                 }
-                  assert_tag :tag => 'th', :content => '24',
+                  assert_tag :tag => 'th', :content => '23',
                              :sibling => { :tag => 'td', :content => /jsmith/ }
-                  assert_tag :tag => 'th', :content => '24',
+                  assert_tag :tag => 'th', :content => '23',
                              :sibling => {
                                 :tag => 'td',
                                 :child => {
                                    :content => /2f9c0091/
                                    }
                                 }
-                  assert_tag :tag => 'th', :content => '24',
+                  assert_tag :tag => 'th', :content => '23',
-                             :sibling => { :tag => 'td', :content => /watcher =/ }
+                             :sibling => { :tag => 'td', :content => /remove_watcher/ }
                 end
                 def test_annotate_at_given_revision

test/functional/repositories_mercurial_controller_test.rb +5 -5

                       :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
                   assert_response :success
                   assert_template 'annotate'
-                  # Line 23, revision 4:def6d2f1254a
+                  # Line 22, revision 4:def6d2f1254a
                   assert_tag :tag => 'th',
-                             :content => '23',
+                             :content => '22',
                              :attributes => { :class => 'line-num' },
                              :sibling =>
                                    {
                                      :child => { :tag => 'a', :content => '4:def6d2f1254a' }
                                    }
                   assert_tag :tag => 'th',
-                             :content => '23',
+                             :content => '22',
                              :attributes => { :class => 'line-num' },
                              :sibling =>
                                    {
                                       :attributes => { :class   => 'author' },
                                     }
                   assert_tag :tag => 'th',
-                             :content => '23',
+                             :content => '22',
                              :attributes => { :class => 'line-num' },
-                             :sibling => { :tag => 'td', :content => /watcher =/ }
+                             :sibling => { :tag => 'td', :content => /remove_watcher/ }
                 end
                 def test_annotate_not_in_tip

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