Feature #6092 » revision-truncate-20101213.diff
| app/controllers/repositories_controller.rb | ||
|---|---|---|
|
@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 | ||
|---|---|---|
|
# * :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 | ||
|---|---|---|
|
require 'iconv'
|
||
|
module RepositoriesHelper
|
||
|
def format_revision(txt)
|
||
|
txt.to_s[0,8]
|
||
|
def format_revision(revision)
|
||
|
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 | ||
|---|---|---|
|
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 | ||
|---|---|---|
|
'Git'
|
||
|
end
|
||
|
# Returns the identifier for the given git changeset
|
||
|
def self.changeset_identifier(changeset)
|
||
|
changeset.scmid
|
||
|
end
|
||
|
# Returns the readable identifier for the given git changeset
|
||
|
def self.format_changeset_identifier(changeset)
|
||
|
changeset.revision[0, 8]
|
||
|
end
|
||
|
def branches
|
||
|
scm.branches
|
||
|
end
|
||
| app/views/repositories/_dir_list_content.rhtml | ||
|---|---|---|
|
</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 | ||
|---|---|---|
|
<% 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="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_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="id"><%= link_to_revision(changeset, project) %></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.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 | ||
|---|---|---|
|
<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 | ||
|---|---|---|
|
<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 | ||
|---|---|---|
|
<div class="contextual">
|
||
|
«
|
||
|
<% 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 -%>
|
||
| ... | ... | |
|
<% 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 | ||
|---|---|---|
|
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 | ||
|---|---|---|
|
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 | ||
|---|---|---|
|
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 | ||
|---|---|---|
|
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 | ||
|---|---|---|
|
@repository.fetch_changesets
|
||
|
assert_equal 15, @repository.changesets.count
|
||
|
end
|
||
|
def test_identifier
|
||
|
@repository.fetch_changesets
|
||
|
@repository.reload
|
||
|
c = @repository.changesets.find_by_revision('7234cb2750b63f47bff735edc50a1c0a433c2518')
|
||
|
assert_equal c.scmid, c.identifier
|
||
|
end
|
||
|
def test_format_identifier
|
||
|
@repository.fetch_changesets
|
||
|
@repository.reload
|
||
|
c = @repository.changesets.find_by_revision('7234cb2750b63f47bff735edc50a1c0a433c2518')
|
||
|
assert_equal c.format_identifier, '7234cb27'
|
||
|
end
|
||
|
def test_activities
|
||
|
@repository.fetch_changesets
|
||
|
@repository.reload
|
||
|
f = Redmine::Activity::Fetcher.new(User.anonymous, :project => Project.find(1))
|
||
|
f.scope = ['changesets']
|
||
|
events = f.events
|
||
|
assert_kind_of Array, events
|
||
|
eve = events[-1]
|
||
|
assert eve.event_title.include?('7234cb27:')
|
||
|
assert_equal eve.event_url[:rev], '7234cb2750b63f47bff735edc50a1c0a433c2518'
|
||
|
end
|
||
|
else
|
||
|
puts "Git test repository NOT FOUND. Skipping unit tests !!!"
|
||
|
def test_fake; assert true end
|
||
| test/unit/repository_subversion_test.rb | ||
|---|---|---|
|
assert_equal 1, entries.size, 'Expect a single entry'
|
||
|
assert_equal 'README.txt', entries.first.name
|
||
|
end
|
||
|
def test_identifier
|
||
|
@repository.fetch_changesets
|
||
|
@repository.reload
|
||
|
c = @repository.changesets.find_by_revision('1')
|
||
|
assert_equal c.revision, c.identifier
|
||
|
end
|
||
|
def test_identifier_nine_digit
|
||
|
c = Changeset.new(:repository => @repository, :committed_on => Time.now,
|
||
|
:revision => '123456789', :comments => 'test')
|
||
|
assert_equal c.identifier, c.revision
|
||
|
end
|
||
|
def test_format_identifier
|
||
|
@repository.fetch_changesets
|
||
|
@repository.reload
|
||
|
c = @repository.changesets.find_by_revision('1')
|
||
|
assert_equal c.format_identifier, c.revision
|
||
|
end
|
||
|
def test_format_identifier_nine_digit
|
||
|
c = Changeset.new(:repository => @repository, :committed_on => Time.now,
|
||
|
:revision => '123456789', :comments => 'test')
|
||
|
assert_equal c.format_identifier, c.revision
|
||
|
end
|
||
|
def test_activities
|
||
|
@repository.fetch_changesets
|
||
|
@repository.reload
|
||
|
f = Redmine::Activity::Fetcher.new(User.anonymous, :project => Project.find(1))
|
||
|
f.scope = ['changesets']
|
||
|
events = f.events
|
||
|
assert_kind_of Array, events
|
||
|
eve = events[-1]
|
||
|
assert eve.event_title.include?('1:')
|
||
|
assert_equal eve.event_url[:rev], '1'
|
||
|
end
|
||
|
def test_activities_nine_digit
|
||
|
c = Changeset.new(:repository => @repository, :committed_on => Time.now,
|
||
|
:revision => '123456789', :comments => 'test')
|
||
|
assert( c.save )
|
||
|
f = Redmine::Activity::Fetcher.new(User.anonymous, :project => Project.find(1))
|
||
|
f.scope = ['changesets']
|
||
|
events = f.events
|
||
|
assert_kind_of Array, events
|
||
|
eve = events[-1]
|
||
|
assert eve.event_title.include?('123456789:')
|
||
|
assert_equal eve.event_url[:rev], '123456789'
|
||
|
end
|
||
|
else
|
||
|
puts "Subversion test repository NOT FOUND. Skipping unit tests !!!"
|
||
|
def test_fake; assert true end
|
||