From: Toshi MARUYAMA Date: Tue, 11 Jan 2011 16:04:07 +0000 (+0000) Subject: scm: changing two revision diff text at SCM adapter level (#3724). X-Git-Tag: 1.2.0~1088 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ebb19c58637cfd9af4264d28e9aaa924a68f294e;p=redmine.git scm: changing two revision diff text at SCM adapter level (#3724). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4698 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 6195c6409..4b0a83464 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -177,9 +177,10 @@ class RepositoriesController < ApplicationController @changeset = @repository.find_changeset_by_name(@rev) @changeset_to = @rev_to ? @repository.find_changeset_by_name(@rev_to) : nil + @diff_format_revisions = @repository.diff_format_revisions(@changeset, @changeset_to) end end - + def stats end diff --git a/app/models/repository.rb b/app/models/repository.rb index dee705c97..3a84a691a 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -86,7 +86,14 @@ class Repository < ActiveRecord::Base def diff(path, rev, rev_to) scm.diff(path, rev, rev_to) end - + + def diff_format_revisions(cs, cs_to, sep=':') + text = "" + text << cs_to.format_identifier + sep if cs_to + text << cs.format_identifier if cs + text + end + # Returns a path relative to the url of the repository def relative_path(path) path diff --git a/app/views/repositories/diff.rhtml b/app/views/repositories/diff.rhtml index e2323549e..efb84a44d 100644 --- a/app/views/repositories/diff.rhtml +++ b/app/views/repositories/diff.rhtml @@ -1,4 +1,4 @@ -

<%= l(:label_revision) %> <%= format_revision(@changeset_to) + ':' if @changeset_to %><%= format_revision(@changeset) %> <%=h @path %>

+

<%= l(:label_revision) %> <%= @diff_format_revisions %> <%=h @path %>

<% form_tag({:path => to_path_param(@path)}, :method => 'get') do %>