Skip to content

O
OHR Support
Commit ebb19c58 authored by Toshi MARUYAMA's avatar Toshi MARUYAMA
Browse files
Options

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
parent fdd0a2ca
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 3 deletions
app/controllers/repositories_controller.rb
View file @ ebb19c58
......@@ -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
......
app/models/repository.rb
View file @ ebb19c58
......@@ -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
......
app/views/repositories/diff.rhtml
View file @ ebb19c58
<h2><%= l(:label_revision) %> <%= format_revision(@changeset_to) + ':' if @changeset_to %><%= format_revision(@changeset) %> <%=h @path %></h2>
<h2><%= l(:label_revision) %> <%= @diff_format_revisions %> <%=h @path %></h2>
<!-- Choose view type -->
<% form_tag({:path => to_path_param(@path)}, :method => 'get') do %>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment