jro_apps/redmine Commit - r4578:ebb19c58637c

scm: changing two revision diff text at SCM adapter level (#3724)....

Toshi MARUYAMA -

r4578:ebb19c58637c

parent child

Context file:

r4578:ebb19c58637c

Collapse all files

app/controllers/repositories_controller.rb +2 -1

              # Redmine - project management software
              # Copyright (C) 2006-2009  Jean-Philippe Lang
              #
              # This program is free software; you can redistribute it and/or
              # modify it under the terms of the GNU General Public License
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
              #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
              #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              require 'SVG/Graph/Bar'
              require 'SVG/Graph/BarHorizontal'
              require 'digest/sha1'
              class ChangesetNotFound < Exception; end
              class InvalidRevisionParam < Exception; end
              class RepositoriesController < ApplicationController
                menu_item :repository
                menu_item :settings, :only => :edit
                default_search_scope :changesets
                before_filter :find_repository, :except => :edit
                before_filter :find_project, :only => :edit
                before_filter :authorize
                accept_key_auth :revisions
                rescue_from Redmine::Scm::Adapters::CommandFailed, :with => :show_error_command_failed
                def edit
                  @repository = @project.repository
                  if !@repository
                    @repository = Repository.factory(params[:repository_scm])
                    @repository.project = @project if @repository
                  end
                  if request.post? && @repository
                    @repository.attributes = params[:repository]
                    @repository.save
                  end
                  render(:update) do |page|
                    page.replace_html "tab-content-repository", :partial => 'projects/settings/repository'
                    if @repository && !@project.repository
                      @project.reload #needed to reload association
                      page.replace_html "main-menu", render_main_menu(@project)
                    end
                  end
                end
                def committers
                  @committers = @repository.committers
                  @users = @project.users
                  additional_user_ids = @committers.collect(&:last).collect(&:to_i) - @users.collect(&:id)
                  @users += User.find_all_by_id(additional_user_ids) unless additional_user_ids.empty?
                  @users.compact!
                  @users.sort!
                  if request.post? && params[:committers].is_a?(Hash)
                    # Build a hash with repository usernames as keys and corresponding user ids as values
                    @repository.committer_ids = params[:committers].values.inject({}) {|h, c| h[c.first] = c.last; h}
                    flash[:notice] = l(:notice_successful_update)
                    redirect_to :action => 'committers', :id => @project
                  end
                end
                def destroy
                  @repository.destroy
                  redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'repository'
                end
                def show
                  @repository.fetch_changesets if Setting.autofetch_changesets? && @path.empty?
                  @entries = @repository.entries(@path, @rev)
                  if request.xhr?
                    @entries ? render(:partial => 'dir_list_content') : render(:nothing => true)
                  else
                    (show_error_not_found; return) unless @entries
                    @changesets = @repository.latest_changesets(@path, @rev)
                    @properties = @repository.properties(@path, @rev)
                    render :action => 'show'
                  end
                end
                alias_method :browse, :show
                def changes
                  @entry = @repository.entry(@path, @rev)
                  (show_error_not_found; return) unless @entry
                  @changesets = @repository.latest_changesets(@path, @rev, Setting.repository_log_display_limit.to_i)
                  @properties = @repository.properties(@path, @rev)
                end
                def revisions
                  @changeset_count = @repository.changesets.count
                  @changeset_pages = Paginator.new self, @changeset_count,
              								      per_page_option,
              								      params['page']
                  @changesets = @repository.changesets.find(:all,
              						:limit  =>  @changeset_pages.items_per_page,
              						:offset =>  @changeset_pages.current.offset,
                          :include => [:user, :repository])
                  respond_to do |format|
                    format.html { render :layout => false if request.xhr? }
                    format.atom { render_feed(@changesets, :title => "#{@project.name}: #{l(:label_revision_plural)}") }
                  end
                end
                def entry
                  @entry = @repository.entry(@path, @rev)
                  (show_error_not_found; return) unless @entry
                  # If the entry is a dir, show the browser
                  (show; return) if @entry.is_dir?
                  @content = @repository.cat(@path, @rev)
                  (show_error_not_found; return) unless @content
                  if 'raw' == params[:format] || @content.is_binary_data? || (@entry.size && @entry.size > Setting.file_max_size_displayed.to_i.kilobyte)
                    # Force the download
                    send_data @content, :filename => @path.split('/').last
                  else
                    # Prevent empty lines when displaying a file with Windows style eol
                    @content.gsub!("\r\n", "\n")
                 end
                end
                def annotate
                  @entry = @repository.entry(@path, @rev)
                  (show_error_not_found; return) unless @entry
                  @annotate = @repository.scm.annotate(@path, @rev)
                  (render_error l(:error_scm_annotate); return) if @annotate.nil? || @annotate.empty?
                end
                def revision
                  @changeset = @repository.find_changeset_by_name(@rev)
                  raise ChangesetNotFound unless @changeset
                  respond_to do |format|
                    format.html
                    format.js {render :layout => false}
                  end
                rescue ChangesetNotFound
                  show_error_not_found
                end
                def diff
                  if params[:format] == 'diff'
                    @diff = @repository.diff(@path, @rev, @rev_to)
                    (show_error_not_found; return) unless @diff
                    filename = "changeset_r#{@rev}"
                    filename << "_r#{@rev_to}" if @rev_to
                    send_data @diff.join, :filename => "#{filename}.diff",
                                          :type => 'text/x-patch',
                                          :disposition => 'attachment'
                  else
                    @diff_type = params[:type] || User.current.pref[:diff_type] || 'inline'
                    @diff_type = 'inline' unless %w(inline sbs).include?(@diff_type)
                    # Save diff type as user preference
                    if User.current.logged? && @diff_type != User.current.pref[:diff_type]
                      User.current.pref[:diff_type] = @diff_type
                      User.current.preference.save
                    end
                    @cache_key = "repositories/diff/#{@repository.id}/" + Digest::MD5.hexdigest("#{@path}-#{@rev}-#{@rev_to}-#{@diff_type}")
                    unless read_fragment(@cache_key)
                      @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
+                   @diff_format_revisions = @repository.diff_format_revisions(@changeset, @changeset_to)
                  end
                end
                def stats
                end
                def graph
                  data = nil
                  case params[:graph]
                  when "commits_per_month"
                    data = graph_commits_per_month(@repository)
                  when "commits_per_author"
                    data = graph_commits_per_author(@repository)
                  end
                  if data
                    headers["Content-Type"] = "image/svg+xml"
                    send_data(data, :type => "image/svg+xml", :disposition => "inline")
                  else
                    render_404
                  end
                end
                private
                REV_PARAM_RE = %r{\A[a-f0-9]*\Z}i
                def find_repository
                  @project = Project.find(params[:id])
                  @repository = @project.repository
                  (render_404; return false) unless @repository
                  @path = params[:path].join('/') unless params[:path].nil?
                  @path ||= ''
                  @rev = params[:rev].blank? ? @repository.default_branch : params[:rev].strip
                  @rev_to = params[:rev_to]
                  unless @rev.to_s.match(REV_PARAM_RE) && @rev.to_s.match(REV_PARAM_RE)
                    if @repository.branches.blank?
                      raise InvalidRevisionParam
                    end
                  end
                rescue ActiveRecord::RecordNotFound
                  render_404
                rescue InvalidRevisionParam
                  show_error_not_found
                end
                def show_error_not_found
                  render_error l(:error_scm_not_found)
                end
                # Handler for Redmine::Scm::Adapters::CommandFailed exception
                def show_error_command_failed(exception)
                  render_error l(:error_scm_command_failed, exception.message)
                end
                def graph_commits_per_month(repository)
                  @date_to = Date.today
                  @date_from = @date_to << 11
                  @date_from = Date.civil(@date_from.year, @date_from.month, 1)
                  commits_by_day = repository.changesets.count(:all, :group => :commit_date, :conditions => ["commit_date BETWEEN ? AND ?", @date_from, @date_to])
                  commits_by_month = [0] * 12
                  commits_by_day.each {|c| commits_by_month[c.first.to_date.months_ago] += c.last }
                  changes_by_day = repository.changes.count(:all, :group => :commit_date, :conditions => ["commit_date BETWEEN ? AND ?", @date_from, @date_to])
                  changes_by_month = [0] * 12
                  changes_by_day.each {|c| changes_by_month[c.first.to_date.months_ago] += c.last }
                  fields = []
 .times {|m| fields << month_name(((Date.today.month - 1 - m) % 12) + 1)}
                  graph = SVG::Graph::Bar.new(
                    :height => 300,
                    :width => 800,
                    :fields => fields.reverse,
                    :stack => :side,
                    :scale_integers => true,
                    :step_x_labels => 2,
                    :show_data_values => false,
                    :graph_title => l(:label_commits_per_month),
                    :show_graph_title => true
                  )
                  graph.add_data(
                    :data => commits_by_month[0..11].reverse,
                    :title => l(:label_revision_plural)
                  )
                  graph.add_data(
                    :data => changes_by_month[0..11].reverse,
                    :title => l(:label_change_plural)
                  )
                  graph.burn
                end
                def graph_commits_per_author(repository)
                  commits_by_author = repository.changesets.count(:all, :group => :committer)
                  commits_by_author.to_a.sort! {|x, y| x.last <=> y.last}
                  changes_by_author = repository.changes.count(:all, :group => :committer)
                  h = changes_by_author.inject({}) {|o, i| o[i.first] = i.last; o}
                  fields = commits_by_author.collect {|r| r.first}
                  commits_data = commits_by_author.collect {|r| r.last}
                  changes_data = commits_by_author.collect {|r| h[r.first] || 0}
                  fields = fields + [""]*(10 - fields.length) if fields.length<10
                  commits_data = commits_data + [0]*(10 - commits_data.length) if commits_data.length<10
                  changes_data = changes_data + [0]*(10 - changes_data.length) if changes_data.length<10
                  # Remove email adress in usernames
                  fields = fields.collect {|c| c.gsub(%r{<.+@.+>}, '') }
                  graph = SVG::Graph::BarHorizontal.new(
                    :height => 400,
                    :width => 800,
                    :fields => fields,
                    :stack => :side,
                    :scale_integers => true,
                    :show_data_values => false,
                    :rotate_y_labels => false,
                    :graph_title => l(:label_commits_per_author),
                    :show_graph_title => true
                  )
                  graph.add_data(
                    :data => commits_data,
                    :title => l(:label_revision_plural)
                  )
                  graph.add_data(
                    :data => changes_data,
                    :title => l(:label_change_plural)
                  )
                  graph.burn
                end
              end
              class Date
                def months_ago(date = Date.today)
                  (date.year - self.year)*12 + (date.month - self.month)
                end
                def weeks_ago(date = Date.today)
                  (date.year - self.year)*52 + (date.cweek - self.cweek)
                end
              end
              class String
                def with_leading_slash
                  starts_with?('/') ? self : "/#{self}"
                end
              end

app/models/repository.rb +8 -1

              # redMine - project management software
              # Copyright (C) 2006-2007  Jean-Philippe Lang
              #
              # This program is free software; you can redistribute it and/or
              # modify it under the terms of the GNU General Public License
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
              #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
              #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              class Repository < ActiveRecord::Base
                belongs_to :project
                has_many :changesets, :order => "#{Changeset.table_name}.committed_on DESC, #{Changeset.table_name}.id DESC"
                has_many :changes, :through => :changesets
                # Raw SQL to delete changesets and changes in the database
                # has_many :changesets, :dependent => :destroy is too slow for big repositories
                before_destroy :clear_changesets
                # Checks if the SCM is enabled when creating a repository
                validate_on_create { |r| r.errors.add(:type, :invalid) unless Setting.enabled_scm.include?(r.class.name.demodulize) }
                # Removes leading and trailing whitespace
                def url=(arg)
                  write_attribute(:url, arg ? arg.to_s.strip : nil)
                end
                # Removes leading and trailing whitespace
                def root_url=(arg)
                  write_attribute(:root_url, arg ? arg.to_s.strip : nil)
                end
                def scm
                  @scm ||= self.scm_adapter.new url, root_url, login, password
                  update_attribute(:root_url, @scm.root_url) if root_url.blank?
                  @scm
                end
                def scm_name
                  self.class.scm_name
                end
                def supports_cat?
                  scm.supports_cat?
                end
                def supports_annotate?
                  scm.supports_annotate?
                end
                def entry(path=nil, identifier=nil)
                  scm.entry(path, identifier)
                end
                def entries(path=nil, identifier=nil)
                  scm.entries(path, identifier)
                end
                def branches
                  scm.branches
                end
                def tags
                  scm.tags
                end
                def default_branch
                  scm.default_branch
                end
                def properties(path, identifier=nil)
                  scm.properties(path, identifier)
                end
                def cat(path, identifier=nil)
                  scm.cat(path, identifier)
                end
                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
                end
                # Finds and returns a revision with a number or the beginning of a hash
                def find_changeset_by_name(name)
                  changesets.find(:first, :conditions => (name.match(/^\d*$/) ? ["revision = ?", name.to_s] : ["revision LIKE ?", name + '%']))
                end
                def latest_changeset
                  @latest_changeset ||= changesets.find(:first)
                end
                # Returns the latest changesets for +path+
                # Default behaviour is to search in cached changesets
                def latest_changesets(path, rev, limit=10)
                  if path.blank?
                    changesets.find(:all, :include => :user,
                                          :order => "#{Changeset.table_name}.committed_on DESC, #{Changeset.table_name}.id DESC",
                                          :limit => limit)
                  else
                    changes.find(:all, :include => {:changeset => :user},
                                       :conditions => ["path = ?", path.with_leading_slash],
                                       :order => "#{Changeset.table_name}.committed_on DESC, #{Changeset.table_name}.id DESC",
                                       :limit => limit).collect(&:changeset)
                  end
                end
                def scan_changesets_for_issue_ids
                  self.changesets.each(&:scan_comment_for_issue_ids)
                end
                # Returns an array of committers usernames and associated user_id
                def committers
                  @committers ||= Changeset.connection.select_rows("SELECT DISTINCT committer, user_id FROM #{Changeset.table_name} WHERE repository_id = #{id}")
                end
                # Maps committers username to a user ids
                def committer_ids=(h)
                  if h.is_a?(Hash)
                    committers.each do |committer, user_id|
                      new_user_id = h[committer]
                      if new_user_id && (new_user_id.to_i != user_id.to_i)
                        new_user_id = (new_user_id.to_i > 0 ? new_user_id.to_i : nil)
                        Changeset.update_all("user_id = #{ new_user_id.nil? ? 'NULL' : new_user_id }", ["repository_id = ? AND committer = ?", id, committer])
                      end
                    end
                    @committers = nil
                    @found_committer_users = nil
                    true
                  else
                    false
                  end
                end
                # Returns the Redmine User corresponding to the given +committer+
                # It will return nil if the committer is not yet mapped and if no User
                # with the same username or email was found
                def find_committer_user(committer)
                  unless committer.blank?
                    @found_committer_users ||= {}
                    return @found_committer_users[committer] if @found_committer_users.has_key?(committer)
                    user = nil
                    c = changesets.find(:first, :conditions => {:committer => committer}, :include => :user)
                    if c && c.user
                      user = c.user
                    elsif committer.strip =~ /^([^<]+)(<(.*)>)?$/
                      username, email = $1.strip, $3
                      u = User.find_by_login(username)
                      u ||= User.find_by_mail(email) unless email.blank?
                      user = u
                    end
                    @found_committer_users[committer] = user
                    user
                  end
                end
                # Fetches new changesets for all repositories of active projects
                # Can be called periodically by an external script
                # eg. ruby script/runner "Repository.fetch_changesets"
                def self.fetch_changesets
                  Project.active.has_module(:repository).find(:all, :include => :repository).each do |project|
                    if project.repository
                      project.repository.fetch_changesets
                    end
                  end
                end
                # scan changeset comments to find related and fixed issues for all repositories
                def self.scan_changesets_for_issue_ids
                  find(:all).each(&:scan_changesets_for_issue_ids)
                end
                def self.scm_name
                  'Abstract'
                end
                def self.available_scm
                  subclasses.collect {|klass| [klass.scm_name, klass.name]}
                end
                def self.factory(klass_name, *args)
                  klass = "Repository::#{klass_name}".constantize
                  klass.new(*args)
                rescue
                  nil
                end
                private
                def before_save
                  # Strips url and root_url
                  url.strip!
                  root_url.strip!
                  true
                end
                def clear_changesets
                  cs, ch, ci = Changeset.table_name, Change.table_name, "#{table_name_prefix}changesets_issues#{table_name_suffix}"
                  connection.delete("DELETE FROM #{ch} WHERE #{ch}.changeset_id IN (SELECT #{cs}.id FROM #{cs} WHERE #{cs}.repository_id = #{id})")
                  connection.delete("DELETE FROM #{ci} WHERE #{ci}.changeset_id IN (SELECT #{cs}.id FROM #{cs} WHERE #{cs}.repository_id = #{id})")
                  connection.delete("DELETE FROM #{cs} WHERE #{cs}.repository_id = #{id}")
                end
              end

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

-             <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 %>
                <%= hidden_field_tag('rev', params[:rev]) if params[:rev] %>
                <%= hidden_field_tag('rev_to', params[:rev_to]) if params[:rev_to] %>
                <p><label><%= l(:label_view_diff) %></label>
                <%= select_tag 'type', options_for_select([[l(:label_diff_inline), "inline"], [l(:label_diff_side_by_side), "sbs"]], @diff_type), :onchange => "if (this.value != '') {this.form.submit()}" %></p>
              <% end %>
              <% cache(@cache_key) do -%>
              <%= render :partial => 'common/diff', :locals => {:diff => @diff, :diff_type => @diff_type} %>
              <% end -%>
              <% other_formats_links do |f| %>
              	<%= f.link_to 'Diff', :url => params, :caption => 'Unified diff' %>
              <% end %>
              <% html_title(with_leading_slash(@path), 'Diff') -%>
              <% content_for :header_tags do %>
              <%= stylesheet_link_tag "scm" %>
              <% 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