jro_apps/redmine Commit - r4493:2e1bcb2abff6

Changing revision label and identifier at SCM adapter level (#3724, #6092)...

Toshi MARUYAMA -

r4493:2e1bcb2abff6

parent child

Context file:

r4493:2e1bcb2abff6

Collapse all files

app/controllers/repositories_controller.rb +3 0

                     @diff = @repository.diff(@path, @rev, @rev_to)
                     show_error_not_found unless @diff
                   end
+                  @changeset = @repository.find_changeset_by_name(@rev)
+                  @changeset_to = @rev_to ? @repository.find_changeset_by_name(@rev_to) : nil
                 end
               end

app/helpers/application_helper.rb +3 -1

               # * :text - Link text (default to the formatted revision)
               def link_to_revision(revision, project, options={})
                 text = options.delete(:text) || format_revision(revision)
+                rev = revision.respond_to?(:identifier) ? revision.identifier : revision
-                link_to(text, {:controller => 'repositories', :action => 'revision', :id => project, :rev => revision}, :title => l(:label_revision_id, revision))
+                link_to(text, {:controller => 'repositories', :action => 'revision', :id => project, :rev => rev},
+                        :title => l(:label_revision_id, format_revision(revision)))
               end
               # Generates a link to a project if active

app/helpers/repositories_helper.rb +9 -5

             require 'iconv'
             module RepositoriesHelper
-              def format_revision(txt)
+              def format_revision(revision)
-                txt.to_s[0,8]
+                if revision.respond_to? :format_identifier
+                  revision.format_identifier
+                else
+                  revision.to_s
+                end
               end
               def truncate_at_line_break(text, length = 255)
                                          :action => 'show',
                                          :id => @project,
                                          :path => path_param,
-                                         :rev => @changeset.revision)
+                                         :rev => @changeset.identifier)
                     output << "<li class='#{style}'>#{text}</li>"
                     output << render_changes_tree(s)
                   elsif c = tree[file][:c]
                                          :action => 'entry',
                                          :id => @project,
                                          :path => path_param,
-                                         :rev => @changeset.revision) unless c.action == 'D'
+                                         :rev => @changeset.identifier) unless c.action == 'D'
                     text << " - #{c.revision}" unless c.revision.blank?
                     text << ' (' + link_to('diff', :controller => 'repositories',
                                                    :action => 'diff',
                                                    :id => @project,
                                                    :path => path_param,
-                                                   :rev => @changeset.revision) + ') ' if c.action == 'M'
+                                                   :rev => @changeset.identifier) + ') ' if c.action == 'M'
                     text << ' ' + content_tag('span', c.from_path, :class => 'copied-from') unless c.from_path.blank?
                     output << "<li class='#{style}'>#{text}</li>"
                   end

app/models/changeset.rb +20 -2

               has_many :changes, :dependent => :delete_all
               has_and_belongs_to_many :issues
-              acts_as_event :title => Proc.new {|o| "#{l(:label_revision)} #{o.revision}" + (o.short_comments.blank? ? '' : (': ' + o.short_comments))},
+              acts_as_event :title => Proc.new {|o| "#{l(:label_revision)} #{o.format_identifier}" + (o.short_comments.blank? ? '' : (': ' + o.short_comments))},
                             :description => :long_comments,
                             :datetime => :committed_on,
-                            :url => Proc.new {|o| {:controller => 'repositories', :action => 'revision', :id => o.repository.project, :rev => o.revision}}
+                            :url => Proc.new {|o| {:controller => 'repositories', :action => 'revision', :id => o.repository.project, :rev => o.identifier}}
               acts_as_searchable :columns => 'comments',
                                  :include => {:repository => :project},
               def revision=(r)
                 write_attribute :revision, (r.nil? ? nil : r.to_s)
               end
+              # Returns the identifier of this changeset; depending on repository backends
+              def identifier
+                if repository.class.respond_to? :changeset_identifier
+                  repository.class.changeset_identifier self
+                else
+                  revision.to_s
+                end
+              end
               def comments=(comment)
                 write_attribute(:comments, Changeset.normalize_comments(comment))
                 self.commit_date = date
                 super
               end
+              # Returns the readable identifier
+              def format_identifier
+                if repository.class.respond_to? :format_changeset_identifier
+                  repository.class.format_changeset_identifier self
+                else
+                  identifier
+                end
+              end
               def committer=(arg)
                 write_attribute(:committer, self.class.to_utf8(arg.to_s))

app/models/repository/git.rb +10 0

@@ -29,6 +29,16 class Repository::Git < Repository
29	'Git'	29	'Git'
30	end	30	end
31		31
		32	# Returns the identifier for the given git changeset
		33	def self.changeset_identifier(changeset)
		34	changeset.scmid
		35	end
		36
		37	# Returns the readable identifier for the given git changeset
		38	def self.format_changeset_identifier(changeset)
		39	changeset.revision[0, 8]
		40	end
		41
32	def branches	42	def branches
33	scm.branches	43	scm.branches
34	end	44	end

app/views/repositories/_dir_list_content.rhtml +1 -1

             </td>
             <td class="size"><%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>
             <% changeset = @project.repository.changesets.find_by_revision(entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %>
-            <td class="revision"><%= link_to_revision(changeset.revision, @project) if changeset %></td>
+            <td class="revision"><%= link_to_revision(changeset, @project) if changeset %></td>
             <td class="age"><%= distance_of_time_in_words(entry.lastrev.time, Time.now) if entry.lastrev && entry.lastrev.time %></td>
             <td class="author"><%= changeset.nil? ? h(entry.lastrev.author.to_s.split('<').first) : changeset.author if entry.lastrev %></td>
             <td class="comments"><%=h truncate(changeset.comments, :length => 50) unless changeset.nil? %></td>

app/views/repositories/_revisions.rhtml +3 -3

             <% line_num = 1 %>
             <% revisions.each do |changeset| %>
             <tr class="changeset <%= cycle 'odd', 'even' %>">
-            <td class="id"><%= link_to_revision(changeset.revision, project) %></td>
+            <td class="id"><%= link_to_revision(changeset, project) %></td>
-            <td class="checkbox"><%= radio_button_tag('rev', changeset.revision, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < revisions.size) %></td>
+            <td class="checkbox"><%= radio_button_tag('rev', changeset.identifier, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < revisions.size) %></td>
-            <td class="checkbox"><%= radio_button_tag('rev_to', changeset.revision, (line_num==2), :id => "cbto-#{line_num}", :onclick => "if ($('cb-#{line_num}').checked==true) {$('cb-#{line_num-1}').checked=true;}") if show_diff && (line_num > 1) %></td>
+            <td class="checkbox"><%= radio_button_tag('rev_to', changeset.identifier, (line_num==2), :id => "cbto-#{line_num}", :onclick => "if ($('cb-#{line_num}').checked==true) {$('cb-#{line_num-1}').checked=true;}") if show_diff && (line_num > 1) %></td>
             <td class="committed_on"><%= format_time(changeset.committed_on) %></td>
             <td class="author"><%=h changeset.author %></td>
             <td class="comments"><%= textilizable(truncate_at_line_break(changeset.comments)) %></td>

app/views/repositories/annotate.rhtml +1 -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(format_revision(revision.identifier), :action => 'revision', :id => @project, :rev => revision.identifier) : format_revision(revision.revision)) if revision %></td>
+                  <%= (revision.identifier ? link_to_revision(revision, @project) : format_revision(revision)) if revision %></td>
                   <td class="author"><%= h(revision.author.to_s.split('<').first) if revision %></td>
                   <td class="line-code"><pre><%= line %></pre></td>
                 </tr>

app/views/repositories/diff.rhtml +1 -1

-            <h2><%= l(:label_revision) %> <%= format_revision(@rev_to) + ':' if @rev_to %><%= format_revision(@rev) %> <%=h @path %></h2>
+            <h2><%= l(:label_revision) %> <%= format_revision(@changeset_to) + ':' if @changeset_to %><%= format_revision(@changeset) %> <%=h @path %></h2>
             <!-- Choose view type -->
             <% form_tag({:path => to_path_param(@path)}, :method => 'get') do %>

app/views/repositories/revision.rhtml +6 -6

             <div class="contextual">
               &#171;
               <% unless @changeset.previous.nil? -%>
-                <%= link_to_revision(@changeset.previous.revision, @project, :text => l(:label_previous)) %>
+                <%= link_to_revision(@changeset.previous, @project, :text => l(:label_previous)) %>
               <% else -%>
                 <%= l(:label_previous) %>
               <% end -%>
             |
               <% unless @changeset.next.nil? -%>
-                <%= link_to_revision(@changeset.next.revision, @project, :text => l(:label_next)) %>
+                <%= link_to_revision(@changeset.next, @project, :text => l(:label_next)) %>
               <% else -%>
                 <%= l(:label_next) %>
               <% end -%>
               &#187;&nbsp;
               <% form_tag({:controller => 'repositories', :action => 'revision', :id => @project, :rev => nil}, :method => :get) do %>
-                <%= text_field_tag 'rev', @rev[0,8], :size => 8 %>
+                <%= text_field_tag 'rev', @rev, :size => 8 %>
                 <%= submit_tag 'OK', :name => nil %>
               <% end %>
             </div>
-            <h2><%= l(:label_revision) %> <%= format_revision(@changeset.revision) %></h2>
+            <h2><%= l(:label_revision) %> <%= format_revision(@changeset) %></h2>
             <p><% if @changeset.scmid %>ID: <%= @changeset.scmid %><br /><% end %>
             <span class="author"><%= authoring(@changeset.committed_on, @changeset.author) %></span></p>
             <li class="change change-D"><%= l(:label_deleted) %></li>
             </ul>
-            <p><%= link_to(l(:label_view_diff), :action => 'diff', :id => @project, :path => "", :rev => @changeset.revision) if @changeset.changes.any? %></p>
+            <p><%= link_to(l(:label_view_diff), :action => 'diff', :id => @project, :path => "", :rev => @changeset.identifier) if @changeset.changes.any? %></p>
             <div class="changeset-changes">
             <%= render_changeset_changes %>
             <%= stylesheet_link_tag "scm" %>
             <% end %>
-            <% html_title("#{l(:label_revision)} #{@changeset.revision}") -%>
+            <% html_title("#{l(:label_revision)} #{format_revision(@changeset)}") -%>

lib/redmine/scm/adapters/abstract_adapter.rb +12 -1

                   end
                   class Revision
-                    attr_accessor :identifier, :scmid, :name, :author, :time, :message, :paths, :revision, :branch
+                    attr_accessor :scmid, :name, :author, :time, :message, :paths, :revision, :branch
+                    attr_writer :identifier
                     def initialize(attributes={})
                       self.identifier = attributes[:identifier]
                       self.branch = attributes[:branch]
                     end
+                    # Returns the identifier of this revision; see also Changeset model
+                    def identifier
+                      (@identifier || revision).to_s
+                    end
+                    # Returns the readable identifier.
+                    def format_identifier
+                      identifier
+                    end
                     def save(repo)
                       Changeset.transaction do
                         changeset = Changeset.new(

lib/redmine/scm/adapters/git_adapter.rb +7 0

                       return nil if $? && $?.exitstatus != 0
                       cat
                     end
+                    class Revision < Redmine::Scm::Adapters::Revision
+                      # Returns the readable identifier
+                      def format_identifier
+                        identifier[0,8]
+                      end
+                    end
                   end
                 end
               end

test/unit/changeset_test.rb +5 0

                 c.comments = File.read("#{RAILS_ROOT}/test/fixtures/encoding/iso-8859-1.txt")
                 assert_equal "Texte encod en ISO-8859-1.", c.comments
               end
+              def test_identifier
+                c = Changeset.find_by_revision('1')
+                assert_equal c.revision, c.identifier
+              end
             end

test/unit/repository_bazaar_test.rb +1 -1

                 def test_annotate
                   annotate = @repository.scm.annotate('doc-mkdir.txt')
                   assert_equal 17, annotate.lines.size
-                  assert_equal 1, annotate.revisions[0].identifier
+                  assert_equal '1', annotate.revisions[0].identifier
                   assert_equal 'jsmith@', annotate.revisions[0].author
                   assert_equal 'mkdir', annotate.lines[0]
                 end

test/unit/repository_git_test.rb +27 -1

@@ -18,7 +18,7
18	require File.expand_path('../../test_helper', __FILE__)	18	require File.expand_path('../../test_helper', __FILE__)
19		19
20	class RepositoryGitTest < ActiveSupport::TestCase	20	class RepositoryGitTest < ActiveSupport::TestCase
21	fixtures :projects	21	fixtures :projects, :repositories, :enabled_modules, :users, :roles
22		22
23	# No '..' in the repository path	23	# No '..' in the repository path
24	REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/git_repository'	24	REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/git_repository'
@@ -62,6 +62,32 class RepositoryGitTest < ActiveSupport::TestCase
62	@repository.fetch_changesets	62	@repository.fetch_changesets
63	assert_equal 15, @repository.changesets.count	63	assert_equal 15, @repository.changesets.count
64	end	64	end
		65
		66	def test_identifier
		67	@repository.fetch_changesets
		68	@repository.reload
		69	c = @repository.changesets.find_by_revision('7234cb2750b63f47bff735edc50a1c0a433c2518')
		70	assert_equal c.scmid, c.identifier
		71	end
		72
		73	def test_format_identifier
		74	@repository.fetch_changesets
		75	@repository.reload
		76	c = @repository.changesets.find_by_revision('7234cb2750b63f47bff735edc50a1c0a433c2518')
		77	assert_equal c.format_identifier, '7234cb27'
		78	end
		79
		80	def test_activities
		81	@repository.fetch_changesets
		82	@repository.reload
		83	f = Redmine::Activity::Fetcher.new(User.anonymous, :project => Project.find(1))
		84	f.scope = ['changesets']
		85	events = f.events
		86	assert_kind_of Array, events
		87	eve = events[-9]
		88	assert eve.event_title.include?('7234cb27:')
		89	assert_equal eve.event_url[:rev], '7234cb2750b63f47bff735edc50a1c0a433c2518'
		90	end
65	else	91	else
66	puts "Git test repository NOT FOUND. Skipping unit tests !!!"	92	puts "Git test repository NOT FOUND. Skipping unit tests !!!"
67	def test_fake; assert true end	93	def test_fake; assert true end

test/unit/repository_subversion_test.rb +52 -1

@@ -18,7 +18,7
18	require File.expand_path('../../test_helper', __FILE__)	18	require File.expand_path('../../test_helper', __FILE__)
19		19
20	class RepositorySubversionTest < ActiveSupport::TestCase	20	class RepositorySubversionTest < ActiveSupport::TestCase
21	fixtures :projects, :repositories	21	fixtures :projects, :repositories, :enabled_modules, :users, :roles
22		22
23	def setup	23	def setup
24	@project = Project.find(1)	24	@project = Project.find(1)
@@ -88,6 +88,57 class RepositorySubversionTest < ActiveSupport::TestCase
88	assert_equal 1, entries.size, 'Expect a single entry'	88	assert_equal 1, entries.size, 'Expect a single entry'
89	assert_equal 'README.txt', entries.first.name	89	assert_equal 'README.txt', entries.first.name
90	end	90	end
		91
		92	def test_identifier
		93	@repository.fetch_changesets
		94	@repository.reload
		95	c = @repository.changesets.find_by_revision('1')
		96	assert_equal c.revision, c.identifier
		97	end
		98
		99	def test_identifier_nine_digit
		100	c = Changeset.new(:repository => @repository, :committed_on => Time.now,
		101	:revision => '123456789', :comments => 'test')
		102	assert_equal c.identifier, c.revision
		103	end
		104
		105	def test_format_identifier
		106	@repository.fetch_changesets
		107	@repository.reload
		108	c = @repository.changesets.find_by_revision('1')
		109	assert_equal c.format_identifier, c.revision
		110	end
		111
		112	def test_format_identifier_nine_digit
		113	c = Changeset.new(:repository => @repository, :committed_on => Time.now,
		114	:revision => '123456789', :comments => 'test')
		115	assert_equal c.format_identifier, c.revision
		116	end
		117
		118	def test_activities
		119	@repository.fetch_changesets
		120	@repository.reload
		121	f = Redmine::Activity::Fetcher.new(User.anonymous, :project => Project.find(1))
		122	f.scope = ['changesets']
		123	events = f.events
		124	assert_kind_of Array, events
		125	eve = events[-9]
		126	assert eve.event_title.include?('1:')
		127	assert_equal eve.event_url[:rev], '1'
		128	end
		129
		130	def test_activities_nine_digit
		131	c = Changeset.new(:repository => @repository, :committed_on => Time.now,
		132	:revision => '123456789', :comments => 'test')
		133	assert( c.save )
		134	f = Redmine::Activity::Fetcher.new(User.anonymous, :project => Project.find(1))
		135	f.scope = ['changesets']
		136	events = f.events
		137	assert_kind_of Array, events
		138	eve = events[-11]
		139	assert eve.event_title.include?('123456789:')
		140	assert_equal eve.event_url[:rev], '123456789'
		141	end
91	else	142	else
92	puts "Subversion test repository NOT FOUND. Skipping unit tests !!!"	143	puts "Subversion test repository NOT FOUND. Skipping unit tests !!!"
93	def test_fake; assert true end	144	def test_fake; assert true end

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