jro_apps/redmine Commit - r1500:b78b62df8d1f

SCM browser: ability to download raw unified diffs....

Jean-Philippe Lang -

r1500:b78b62df8d1f

parent child

Context file:

r1500:b78b62df8d1f

Collapse all files

app/controllers/repositories_controller.rb +22 -12

              # 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.
              require 'SVG/Graph/Bar'
              require 'SVG/Graph/BarHorizontal'
              require 'digest/sha1'
              class ChangesetNotFound < Exception; end
              class InvalidRevisionParam < Exception; end
              class RepositoriesController < ApplicationController
                layout 'base'
                menu_item :repository
                before_filter :find_repository, :except => :edit
                before_filter :find_project, :only => :edit
                before_filter :authorize
                accept_key_auth :revisions
                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) {|page| page.replace_html "tab-content-repository", :partial => 'projects/settings/repository'}
                end
                def destroy
                  @repository.destroy
                  redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'repository'
                end
                def show
                  # check if new revisions have been committed in the repository
                  @repository.fetch_changesets if Setting.autofetch_changesets?
                  # root entries
                  @entries = @repository.entries('', @rev)
                  # latest changesets
                  @changesets = @repository.changesets.find(:all, :limit => 10, :order => "committed_on DESC")
                  show_error_not_found unless @entries || @changesets.any?
                rescue Redmine::Scm::Adapters::CommandFailed => e
                  show_error_command_failed(e.message)
                end
                def browse
                  @entries = @repository.entries(@path, @rev)
                  if request.xhr?
                    @entries ? render(:partial => 'dir_list_content') : render(:nothing => true)
                  else
                    show_error_not_found and return unless @entries
                    render :action => 'browse'
                  end
                rescue Redmine::Scm::Adapters::CommandFailed => e
                  show_error_command_failed(e.message)
                end
                def changes
                  @entry = @repository.scm.entry(@path, @rev)
                  show_error_not_found and return unless @entry
                  @changesets = @repository.changesets_for_path(@path)
                rescue Redmine::Scm::Adapters::CommandFailed => e
                  show_error_command_failed(e.message)
                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)
                  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.scm.entry(@path, @rev)
                  show_error_not_found and return unless @entry
                  # If the entry is a dir, show the browser
                  browse and return if @entry.is_dir?
                  @content = @repository.scm.cat(@path, @rev)
                  show_error_not_found and return unless @content
                  if 'raw' == params[:format] || @content.is_binary_data?
                    # Force the download if it's a binary file
                    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
                rescue Redmine::Scm::Adapters::CommandFailed => e
                  show_error_command_failed(e.message)
                end
                def annotate
                  @annotate = @repository.scm.annotate(@path, @rev)
                  render_error l(:error_scm_annotate) and return if @annotate.nil? || @annotate.empty?
                rescue Redmine::Scm::Adapters::CommandFailed => e
                  show_error_command_failed(e.message)
                end
                def revision
                  @changeset = @repository.changesets.find_by_revision(@rev)
                  raise ChangesetNotFound unless @changeset
                  @changes_count = @changeset.changes.size
                  @changes_pages = Paginator.new self, @changes_count, 150, params['page']
                  @changes = @changeset.changes.find(:all,
                						:limit  =>  @changes_pages.items_per_page,
                						:offset =>  @changes_pages.current.offset)
                  respond_to do |format|
                    format.html
                    format.js {render :layout => false}
                  end
                rescue ChangesetNotFound
                  show_error_not_found
                rescue Redmine::Scm::Adapters::CommandFailed => e
                  show_error_command_failed(e.message)
                end
                def diff
-                 @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)
+                 if params[:format] == 'diff'
                    @diff = @repository.diff(@path, @rev, @rev_to)
-                   show_error_not_found unless @diff
+                   show_error_not_found and 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
                  end
                rescue Redmine::Scm::Adapters::CommandFailed => e
                  show_error_command_failed(e.message)
                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
                def find_project
                  @project = Project.find(params[:id])
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                REV_PARAM_RE = %r{^[a-f0-9]*$}
                def find_repository
                  @project = Project.find(params[:id])
                  @repository = @project.repository
                  render_404 and return false unless @repository
                  @path = params[:path].join('/') unless params[:path].nil?
                  @path ||= ''
                  @rev = params[:rev]
                  @rev_to = params[:rev_to]
                  raise InvalidRevisionParam unless @rev.to_s.match(REV_PARAM_RE) && @rev.to_s.match(REV_PARAM_RE)
                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
                def show_error_command_failed(msg)
                  render_error l(:error_scm_command_failed, msg)
                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 = []
                  month_names = l(:actionview_datehelper_select_month_names_abbr).split(',')
 .times {|m| fields << month_names[((Date.today.month - 1 - m) % 12)]}
                  graph = SVG::Graph::Bar.new(
                    :height => 300,
                    :width => 500,
                    :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.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 => 300,
                    :width => 500,
                    :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/views/repositories/diff.rhtml +5 0

              <h2><%= l(:label_revision) %> <%= format_revision(@rev) %> <%= @path.gsub(/^.*\//, '') %></h2>
              <!-- Choose view type -->
              <% form_tag({ :controller => 'repositories', :action => 'diff'}, :method => 'get') do %>
                <% params.each do |k, p| %>
                  <% if k != "type" %>
                    <%= hidden_field_tag(k,p) %>
                  <% end %>
                  <% end %>
                <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 -%>
              <% Redmine::UnifiedDiff.new(@diff, @diff_type).each do |table_file| -%>
              <div class="autoscroll">
              <% if @diff_type == 'sbs' -%>
              <table class="filecontent CodeRay">
              <thead>
              <tr><th colspan="4" class="filename"><%= table_file.file_name %></th></tr>
              <tr>
                <th colspan="2">@<%= format_revision @rev %></th>
                <th colspan="2">@<%= format_revision @rev_to %></th>
              </tr>
              </thead>
              <tbody>
              <% prev_line_left, prev_line_right = nil, nil -%>
              <% table_file.keys.sort.each do |key| -%>
              <% if prev_line_left && prev_line_right && (table_file[key].nb_line_left != prev_line_left+1) && (table_file[key].nb_line_right != prev_line_right+1) -%>
              <tr class="spacing"><td colspan="4"></td></tr>
              <% end -%>
              <tr>
                <th class="line-num"><%= table_file[key].nb_line_left %></th>
                <td class="line-code <%= table_file[key].type_diff_left %>">
                  <pre><%=to_utf8 table_file[key].line_left %></pre>
                </td>
                <th class="line-num"><%= table_file[key].nb_line_right %></th>
                <td class="line-code <%= table_file[key].type_diff_right %>">
                  <pre><%=to_utf8 table_file[key].line_right %></pre>
                </td>
              </tr>
              <% prev_line_left, prev_line_right = table_file[key].nb_line_left.to_i, table_file[key].nb_line_right.to_i -%>
              <% end -%>
              </tbody>
              </table>
              <% else -%>
              <table class="filecontent CodeRay">
              <thead>
              <tr><th colspan="3" class="filename"><%= table_file.file_name %></th></tr>
              <tr>
                <th>@<%= format_revision @rev %></th>
                <th>@<%= format_revision @rev_to %></th>
                <th></th>
              </tr>
              </thead>
              <tbody>
              <% prev_line_left, prev_line_right = nil, nil -%>
              <% table_file.keys.sort.each do |key, line| %>
              <% if prev_line_left && prev_line_right && (table_file[key].nb_line_left != prev_line_left+1) && (table_file[key].nb_line_right != prev_line_right+1) -%>
              <tr class="spacing"><td colspan="3"></td></tr>
              <% end -%>
              <tr>
                <th class="line-num"><%= table_file[key].nb_line_left %></th>
                <th class="line-num"><%= table_file[key].nb_line_right %></th>
                <% if table_file[key].line_left.empty? -%>
                <td class="line-code <%= table_file[key].type_diff_right %>">
                  <pre><%=to_utf8 table_file[key].line_right %></pre>
                </td>
                <% else -%>
                <td class="line-code <%= table_file[key].type_diff_left %>">
                  <pre><%=to_utf8 table_file[key].line_left %></pre>
                </td>
                <% end -%>
              </tr>
              <% prev_line_left = table_file[key].nb_line_left.to_i if table_file[key].nb_line_left.to_i > 0 -%>
              <% prev_line_right = table_file[key].nb_line_right.to_i if table_file[key].nb_line_right.to_i > 0 -%>
              <% end -%>
              </tbody>
              </table>
              <% end -%>
              </div>
              <% end -%>
              <% end -%>
+             <p class="other-formats">
+             <%= l(:label_export_to) %>
+             <span><%= link_to 'Unified diff', params.merge(:format => 'diff') %></span>
+             </p>
              <% 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