jro_apps/redmine Commit - r9442:b0414ec1fbab

route: scm: split entry and raw actions...

Toshi MARUYAMA -

r9442:b0414ec1fbab

parent child

Context file:

r9442:b0414ec1fbab

Collapse all files

app/controllers/repositories_controller.rb +10 -1

             # Redmine - project management software
             # Copyright (C) 2006-2012  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'
             require 'redmine/scm/adapters/abstract_adapter'
             class ChangesetNotFound < Exception; end
             class InvalidRevisionParam < Exception; end
             class RepositoriesController < ApplicationController
               menu_item :repository
               menu_item :settings, :only => [:new, :create, :edit, :update, :destroy, :committers]
               default_search_scope :changesets
               before_filter :find_project_by_project_id, :only => [:new, :create]
               before_filter :find_repository, :only => [:edit, :update, :destroy, :committers]
               before_filter :find_project_repository, :except => [:new, :create, :edit, :update, :destroy, :committers]
               before_filter :find_changeset, :only => [:revision, :add_related_issue, :remove_related_issue]
               before_filter :authorize
               accept_rss_auth :revisions
               rescue_from Redmine::Scm::Adapters::CommandFailed, :with => :show_error_command_failed
               def new
                 scm = params[:repository_scm] || (Redmine::Scm::Base.all & Setting.enabled_scm).first
                 @repository = Repository.factory(scm)
                 @repository.is_default = @project.repository.nil?
                 @repository.project = @project
                 render :layout => !request.xhr?
               end
               def create
                 attrs = pickup_extra_info
                 @repository = Repository.factory(params[:repository_scm], attrs[:attrs])
                 if attrs[:attrs_extra].keys.any?
                   @repository.merge_extra_info(attrs[:attrs_extra])
                 end
                 @repository.project = @project
                 if request.post? && @repository.save
                   redirect_to settings_project_path(@project, :tab => 'repositories')
                 else
                   render :action => 'new'
                 end
               end
               def edit
               end
               def update
                 attrs = pickup_extra_info
                 @repository.attributes = attrs[:attrs]
                 if attrs[:attrs_extra].keys.any?
                   @repository.merge_extra_info(attrs[:attrs_extra])
                 end
                 @repository.project = @project
                 if request.put? && @repository.save
                   redirect_to settings_project_path(@project, :tab => 'repositories')
                 else
                   render :action => 'edit'
                 end
               end
               def pickup_extra_info
                 p       = {}
                 p_extra = {}
                 params[:repository].each do |k, v|
                   if k =~ /^extra_/
                     p_extra[k] = v
                   else
                     p[k] = v
                   end
                 end
                 {:attrs => p, :attrs_extra => p_extra}
               end
               private :pickup_extra_info
               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 settings_project_path(@project, :tab => 'repositories')
                 end
               end
               def destroy
                 @repository.destroy if request.delete?
                 redirect_to settings_project_path(@project, :tab => 'repositories')
               end
               def show
                 @repository.fetch_changesets if Setting.autofetch_changesets? && @path.empty?
                 @entries = @repository.entries(@path, @rev)
                 @changeset = @repository.find_changeset_by_name(@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)
                   @repositories = @project.repositories
                   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)
                 @changeset = @repository.find_changeset_by_name(@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, :parents])
                 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 raw
+                entry_and_raw(true)
+              end
               def entry
+                entry_and_raw(false)
+              end
+              def entry_and_raw(is_raw)
                 @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] ||
+                if is_raw ||
                      (@content.size && @content.size > Setting.file_max_size_displayed.to_i.kilobyte) ||
                      ! is_entry_text_data?(@content, @path)
                   # Force the download
                   send_opt = { :filename => filename_for_content_disposition(@path.split('/').last) }
                   send_type = Redmine::MimeType.of(@path)
                   send_opt[:type] = send_type.to_s if send_type
                   send_data @content, send_opt
                 else
                   # Prevent empty lines when displaying a file with Windows style eol
                   # TODO: UTF-16
                   # Is this needs? AttachmentsController reads file simply.
                   @content.gsub!("\r\n", "\n")
                   @changeset = @repository.find_changeset_by_name(@rev)
                 end
               end
+              private :entry_and_raw
               def is_entry_text_data?(ent, path)
                 # UTF-16 contains "\x00".
                 # It is very strict that file contains less than 30% of ascii symbols
                 # in non Western Europe.
                 return true if Redmine::MimeType.is_type?('text', path)
                 # Ruby 1.8.6 has a bug of integer divisions.
                 # http://apidock.com/ruby/v1_8_6_287/String/is_binary_data%3F
                 return false if ent.is_binary_data?
                 true
               end
               private :is_entry_text_data?
               def annotate
                 @entry = @repository.entry(@path, @rev)
                 (show_error_not_found; return) unless @entry
                 @annotate = @repository.scm.annotate(@path, @rev)
                 if @annotate.nil? || @annotate.empty?
                   (render_error l(:error_scm_annotate); return)
                 end
                 ann_buf_size = 0
                 @annotate.lines.each do |buf|
                   ann_buf_size += buf.size
                 end
                 if ann_buf_size > Setting.file_max_size_displayed.to_i.kilobyte
                   (render_error l(:error_scm_annotate_big_text_file); return)
                 end
                 @changeset = @repository.find_changeset_by_name(@rev)
               end
               def revision
                 respond_to do |format|
                   format.html
                   format.js {render :layout => false}
                 end
               end
               # Adds a related issue to a changeset
               # POST /projects/:project_id/repository/(:repository_id/)revisions/:rev/issues
               def add_related_issue
                 @issue = @changeset.find_referenced_issue_by_id(params[:issue_id])
                 if @issue && (!@issue.visible? || @changeset.issues.include?(@issue))
                   @issue = nil
                 end
                 if @issue
                   @changeset.issues << @issue
                   respond_to do |format|
                     format.js {
                       render :update do |page|
                         page.replace_html "related-issues", :partial => "related_issues"
                         page.visual_effect :highlight, "related-issue-#{@issue.id}"
                       end
                     }
                   end
                 else
                   respond_to do |format|
                     format.js {
                       render :update do |page|
                         page.alert(l(:label_issue) + ' ' + l('activerecord.errors.messages.invalid'))
                       end
                     }
                   end
                 end
               end
               # Removes a related issue from a changeset
               # DELETE /projects/:project_id/repository/(:repository_id/)revisions/:rev/issues/:issue_id
               def remove_related_issue
                 @issue = Issue.visible.find_by_id(params[:issue_id])
                 if @issue
                   @changeset.issues.delete(@issue)
                 end
                 respond_to do |format|
                   format.js {
                     render :update do |page|
                       page.remove "related-issue-#{@issue.id}"
                     end if @issue
                   }
                 end
               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}-#{current_language}")
                   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
               def find_repository
                 @repository = Repository.find(params[:id])
                 @project = @repository.project
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               REV_PARAM_RE = %r{\A[a-f0-9]*\Z}i
               def find_project_repository
                 @project = Project.find(params[:id])
                 if params[:repository_id].present?
                   @repository = @project.repositories.find_by_identifier_param(params[:repository_id])
                 else
                   @repository = @project.repository
                 end
                 (render_404; return false) unless @repository
                 @path = params[:path].is_a?(Array) ? params[:path].join('/') : params[:path].to_s
                 @rev = params[:rev].blank? ? @repository.default_branch : params[:rev].to_s.strip
                 @rev_to = params[:rev_to]
                 unless @rev.to_s.match(REV_PARAM_RE) && @rev_to.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 find_changeset
                 if @rev.present?
                   @changeset = @repository.find_changeset_by_name(@rev)
                 end
                 show_error_not_found unless @changeset
               end
               def show_error_not_found
                 render_error :message => l(:error_scm_not_found), :status => 404
               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 = Changeset.count(
                                       :all, :group => :commit_date,
                                       :conditions => ["repository_id = ? AND commit_date BETWEEN ? AND ?", repository.id, @date_from, @date_to])
                 commits_by_month = [0] * 12
                 commits_by_day.each {|c| commits_by_month[(@date_to.month - c.first.to_date.month) % 12] += c.last }
                 changes_by_day = Change.count(
                                       :all, :group => :commit_date, :include => :changeset,
                                       :conditions => ["#{Changeset.table_name}.repository_id = ? AND #{Changeset.table_name}.commit_date BETWEEN ? AND ?", repository.id, @date_from, @date_to])
                 changes_by_month = [0] * 12
                 changes_by_day.each {|c| changes_by_month[(@date_to.month - c.first.to_date.month) % 12] += 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 = Changeset.count(:all, :group => :committer, :conditions => ["repository_id = ?", repository.id])
                 commits_by_author.to_a.sort! {|x, y| x.last <=> y.last}
                 changes_by_author = Change.count(:all, :group => :committer, :include => :changeset, :conditions => ["#{Changeset.table_name}.repository_id = ?", repository.id])
                 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

app/views/repositories/_link_to_functions.html.erb +5 -1

             <% if @entry && @entry.kind == 'file' %>
             <p>
             <%= link_to_if action_name != 'changes', l(:label_history), {:action => 'changes', :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(@path), :rev => @rev } %> |
             <% if @repository.supports_cat? %>
                 <%= link_to_if action_name != 'entry', l(:button_view), {:action => 'entry', :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(@path), :rev => @rev } %> |
             <% end %>
             <% if @repository.supports_annotate? %>
                 <%= link_to_if action_name != 'annotate', l(:button_annotate), {:action => 'annotate', :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(@path), :rev => @rev } %> |
             <% end %>
-            <%= link_to(l(:button_download), {:action => 'entry', :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(@path), :rev => @rev, :format => 'raw' }) if @repository.supports_cat? %>
+            <%= link_to(l(:button_download),
+                        {:action => 'raw', :id => @project,
+                         :repository_id => @repository.identifier_param,
+                         :path => to_path_param(@path),
+                         :rev => @rev}) if @repository.supports_cat? %>
             <%= "(#{number_to_human_size(@entry.size)})" if @entry.size %>
             </p>
             <% end %>

config/routes.rb +8 -18

             # Redmine - project management software
             # Copyright (C) 2006-2012  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.
             RedmineApp::Application.routes.draw do
               root :to => 'welcome#index', :as => 'home'
               match 'login', :to => 'account#login', :as => 'signin'
               match 'logout', :to => 'account#logout', :as => 'signout'
               match 'account/register', :to => 'account#register', :via => [:get, :post]
               match 'account/lost_password', :to => 'account#lost_password', :via => [:get, :post]
               match 'account/activate', :to => 'account#activate', :via => :get
               match '/news/preview', :controller => 'previews', :action => 'news', :as => 'preview_news'
               match '/issues/preview/new/:project_id', :to => 'previews#issue', :as => 'preview_new_issue'
               match '/issues/preview/edit/:id', :to => 'previews#issue', :as => 'preview_edit_issue'
               match '/issues/preview', :to => 'previews#issue', :as => 'preview_issue'
               match 'projects/:id/wiki', :to => 'wikis#edit', :via => :post
               match 'projects/:id/wiki/destroy', :to => 'wikis#destroy', :via => [:get, :post]
               match 'boards/:board_id/topics/new', :to => 'messages#new', :via => [:get, :post]
               get 'boards/:board_id/topics/:id', :to => 'messages#show'
               match 'boards/:board_id/topics/quote/:id', :to => 'messages#quote', :via => [:get, :post]
               get 'boards/:board_id/topics/:id/edit', :to => 'messages#edit'
               post 'boards/:board_id/topics/preview', :to => 'messages#preview'
               post 'boards/:board_id/topics/:id/replies', :to => 'messages#reply'
               post 'boards/:board_id/topics/:id/edit', :to => 'messages#edit'
               post 'boards/:board_id/topics/:id/destroy', :to => 'messages#destroy'
               # Misc issue routes. TODO: move into resources
               match '/issues/auto_complete', :to => 'auto_completes#issues', :via => :get, :as => 'auto_complete_issues'
               match '/issues/context_menu', :to => 'context_menus#issues', :as => 'issues_context_menu'
               match '/issues/changes', :to => 'journals#index', :as => 'issue_changes'
               match '/issues/:id/quoted', :to => 'journals#new', :id => /\d+/, :via => :post, :as => 'quoted_issue'
               match '/journals/diff/:id', :to => 'journals#diff', :id => /\d+/, :via => :get
               match '/journals/edit/:id', :to => 'journals#edit', :id => /\d+/, :via => [:get, :post]
               match '/projects/:project_id/issues/gantt', :to => 'gantts#show'
               match '/issues/gantt', :to => 'gantts#show'
               match '/projects/:project_id/issues/calendar', :to => 'calendars#show'
               match '/issues/calendar', :to => 'calendars#show'
               match 'projects/:id/issues/report', :to => 'reports#issue_report', :via => :get
               match 'projects/:id/issues/report/:detail', :to => 'reports#issue_report_details', :via => :get
               match 'my/account', :controller => 'my', :action => 'account', :via => [:get, :post]
               match 'my/account/destroy', :controller => 'my', :action => 'destroy', :via => [:get, :post]
               match 'my/page', :controller => 'my', :action => 'page', :via => :get
               match 'my', :controller => 'my', :action => 'index', :via => :get # Redirects to my/page
               match 'my/reset_rss_key', :controller => 'my', :action => 'reset_rss_key', :via => :post
               match 'my/reset_api_key', :controller => 'my', :action => 'reset_api_key', :via => :post
               match 'my/password', :controller => 'my', :action => 'password', :via => [:get, :post]
               match 'my/page_layout', :controller => 'my', :action => 'page_layout', :via => :get
               match 'my/add_block', :controller => 'my', :action => 'add_block', :via => :post
               match 'my/remove_block', :controller => 'my', :action => 'remove_block', :via => :post
               match 'my/order_blocks', :controller => 'my', :action => 'order_blocks', :via => :post
               resources :users
               match 'users/:id/memberships/:membership_id', :to => 'users#edit_membership', :via => :put, :as => 'user_membership'
               match 'users/:id/memberships/:membership_id', :to => 'users#destroy_membership', :via => :delete
               match 'users/:id/memberships', :to => 'users#edit_membership', :via => :post, :as => 'user_memberships'
               match 'watchers/new', :controller=> 'watchers', :action => 'new', :via => :get
               match 'watchers', :controller=> 'watchers', :action => 'create', :via => :post
               match 'watchers/append', :controller=> 'watchers', :action => 'append', :via => :post
               match 'watchers/destroy', :controller=> 'watchers', :action => 'destroy', :via => :post
               match 'watchers/watch', :controller=> 'watchers', :action => 'watch', :via => :post
               match 'watchers/unwatch', :controller=> 'watchers', :action => 'unwatch', :via => :post
               match 'watchers/autocomplete_for_user', :controller=> 'watchers', :action => 'autocomplete_for_user', :via => :get
               match 'projects/:id/settings/:tab', :to => "projects#settings"
               resources :projects do
                 member do
                   get 'settings'
                   post 'modules'
                   post 'archive'
                   post 'unarchive'
                   match 'copy', :via => [:get, :post]
                 end
                 resources :memberships, :shallow => true, :controller => 'members', :only => [:index, :show, :create, :update, :destroy] do
                   collection do
                     get 'autocomplete'
                   end
                 end
                 resource :enumerations, :controller => 'project_enumerations', :only => [:update, :destroy]
                 match 'issues/:copy_from/copy', :to => 'issues#new'
                 resources :issues, :only => [:index, :new, :create] do
                   resources :time_entries, :controller => 'timelog' do
                     collection do
                       get 'report'
                     end
                   end
                 end
                 # issue form update
                 match 'issues/new', :controller => 'issues', :action => 'new', :via => [:put, :post], :as => 'issue_form'
                 resources :files, :only => [:index, :new, :create]
                 resources :versions, :except => [:index, :show, :edit, :update, :destroy] do
                   collection do
                     put 'close_completed'
                   end
                 end
                 match 'versions.:format', :to => 'versions#index'
                 match 'roadmap', :to => 'versions#index', :format => false
                 match 'versions', :to => 'versions#index'
                 resources :news, :except => [:show, :edit, :update, :destroy]
                 resources :time_entries, :controller => 'timelog' do
                   get 'report', :on => :collection
                 end
                 resources :queries, :only => [:new, :create]
                 resources :issue_categories, :shallow => true
                 resources :documents, :except => [:show, :edit, :update, :destroy]
                 resources :boards
                 resources :repositories, :shallow => true, :except => [:index, :show] do
                   member do
                     match 'committers', :via => [:get, :post]
                   end
                 end
                 match 'wiki/index', :controller => 'wiki', :action => 'index', :via => :get
                 match 'wiki/:id/diff/:version/vs/:version_from', :controller => 'wiki', :action => 'diff'
                 match 'wiki/:id/diff/:version', :controller => 'wiki', :action => 'diff'
                 resources :wiki, :except => [:index, :new, :create] do
                   member do
                     get 'rename'
                     post 'rename'
                     get 'history'
                     get 'diff'
                     match 'preview', :via => [:post, :put]
                     post 'protect'
                     post 'add_attachment'
                   end
                   collection do
                     get 'export'
                     get 'date_index'
                   end
                 end
                 match 'wiki', :controller => 'wiki', :action => 'show', :via => :get
                 match 'wiki/:id/annotate/:version', :controller => 'wiki', :action => 'annotate'
               end
               resources :issues do
                 collection do
                   match 'bulk_edit', :via => [:get, :post]
                   post 'bulk_update'
                 end
                 resources :time_entries, :controller => 'timelog' do
                   collection do
                     get 'report'
                   end
                 end
                 resources :relations, :shallow => true, :controller => 'issue_relations', :only => [:index, :show, :create, :destroy]
               end
               match '/issues', :controller => 'issues', :action => 'destroy', :via => :delete
               resources :queries, :except => [:show]
               resources :news, :only => [:index, :show, :edit, :update, :destroy]
               match '/news/:id/comments', :to => 'comments#create', :via => :post
               match '/news/:id/comments/:comment_id', :to => 'comments#destroy', :via => :delete
               resources :versions, :only => [:show, :edit, :update, :destroy] do
                 post 'status_by', :on => :member
               end
               resources :documents, :only => [:show, :edit, :update, :destroy] do
                 post 'add_attachment', :on => :member
               end
               match '/time_entries/context_menu', :to => 'context_menus#time_entries', :as => :time_entries_context_menu
               resources :time_entries, :controller => 'timelog', :except => :destroy do
                 collection do
                   get 'report'
                   get 'bulk_edit'
                   post 'bulk_update'
                 end
               end
               match '/time_entries/:id', :to => 'timelog#destroy', :via => :delete, :id => /\d+/
               # TODO: delete /time_entries for bulk deletion
               match '/time_entries/destroy', :to => 'timelog#destroy', :via => :delete
               # TODO: port to be part of the resources route(s)
               match 'projects/:id/settings/:tab', :to => 'projects#settings', :via => :get
               get 'projects/:id/activity', :to => 'activities#index'
               get 'projects/:id/activity.:format', :to => 'activities#index'
               get 'activity', :to => 'activities#index'
               # repositories routes
               get 'projects/:id/repository/:repository_id/statistics', :to => 'repositories#stats'
               get 'projects/:id/repository/:repository_id/graph', :to => 'repositories#graph'
               get 'projects/:id/repository/:repository_id/changes(/*path(.:ext))',
                   :to => 'repositories#changes'
               get 'projects/:id/repository/:repository_id/revisions/:rev', :to => 'repositories#revision'
               get 'projects/:id/repository/:repository_id/revision', :to => 'repositories#revision'
               post   'projects/:id/repository/:repository_id/revisions/:rev/issues', :to => 'repositories#add_related_issue'
               delete 'projects/:id/repository/:repository_id/revisions/:rev/issues/:issue_id', :to => 'repositories#remove_related_issue'
               get 'projects/:id/repository/:repository_id/revisions', :to => 'repositories#revisions'
-              get 'projects/:id/repository/:repository_id/revisions/:rev/:format(/*path(.:ext))',
-                  :to => 'repositories#entry',
-                  :constraints => {
-                        :format => 'raw',
-                        :rev    => /[a-z0-9\.\-_]+/
               get 'projects/:id/repository/:repository_id/revisions/:rev/:action(/*path(.:ext))',
                   :controller => 'repositories',
                   :constraints => {
-                        :action => /(browse|show|entry|annotate|diff)/,
+                        :action => /(browse|show|entry|raw|annotate|diff)/,
                         :rev    => /[a-z0-9\.\-_]+/
                       }
               get 'projects/:id/repository/statistics', :to => 'repositories#stats'
               get 'projects/:id/repository/graph', :to => 'repositories#graph'
               get 'projects/:id/repository/changes(/*path(.:ext))',
                   :to => 'repositories#changes'
               get 'projects/:id/repository/revisions', :to => 'repositories#revisions'
               get 'projects/:id/repository/revisions/:rev', :to => 'repositories#revision'
               get 'projects/:id/repository/revision', :to => 'repositories#revision'
               post   'projects/:id/repository/revisions/:rev/issues', :to => 'repositories#add_related_issue'
               delete 'projects/:id/repository/revisions/:rev/issues/:issue_id', :to => 'repositories#remove_related_issue'
-              get 'projects/:id/repository/revisions/:rev/:format(/*path(.:ext))',
-                  :to => 'repositories#entry',
-                  :constraints => {
-                        :format => 'raw',
-                        :rev    => /[a-z0-9\.\-_]+/
               get 'projects/:id/repository/revisions/:rev/:action(/*path(.:ext))',
                   :controller => 'repositories',
                   :constraints => {
-                        :action => /(browse|show|entry|annotate|diff)/,
+                        :action => /(browse|show|entry|raw|annotate|diff)/,
                         :rev    => /[a-z0-9\.\-_]+/
                       }
-              get 'projects/:id/repository/:repository_id/:format(/*path(.:ext))', :to => 'repositories#entry', :format => /raw/
+              get 'projects/:id/repository/:repository_id/:action(/*path(.:ext))',
-              get 'projects/:id/repository/:repository_id/:action(/*path(.:ext))', :controller => 'repositories', :action => /(browse|show|entry|changes|annotate|diff)/
+                  :controller => 'repositories',
+                  :action => /(browse|show|entry|raw|changes|annotate|diff)/
               get 'projects/:id/repository/:repository_id', :to => 'repositories#show', :path => nil
-              get 'projects/:id/repository/:format(/*path(.:ext))', :to => 'repositories#entry', :format => /raw/
+              get 'projects/:id/repository/:action(/*path(.:ext))',
-              get 'projects/:id/repository/:action(/*path(.:ext))', :controller => 'repositories', :action => /(browse|show|entry|changes|annotate|diff)/
+                  :controller => 'repositories',
+                  :action => /(browse|show|entry|raw|changes|annotate|diff)/
               get 'projects/:id/repository', :to => 'repositories#show', :path => nil
               # additional routes for having the file name at the end of url
               match 'attachments/:id/:filename', :controller => 'attachments', :action => 'show', :id => /\d+/, :filename => /.*/, :via => :get
               match 'attachments/download/:id/:filename', :controller => 'attachments', :action => 'download', :id => /\d+/, :filename => /.*/, :via => :get
               match 'attachments/download/:id', :controller => 'attachments', :action => 'download', :id => /\d+/, :via => :get
               resources :attachments, :only => [:show, :destroy]
               resources :groups do
                 member do
                   get 'autocomplete_for_user'
                 end
               end
               match 'groups/:id/users', :controller => 'groups', :action => 'add_users', :id => /\d+/, :via => :post, :as => 'group_users'
               match 'groups/:id/users/:user_id', :controller => 'groups', :action => 'remove_user', :id => /\d+/, :via => :delete, :as => 'group_user'
               match 'groups/destroy_membership/:id', :controller => 'groups', :action => 'destroy_membership', :id => /\d+/, :via => :post
               match 'groups/edit_membership/:id', :controller => 'groups', :action => 'edit_membership', :id => /\d+/, :via => :post
               resources :trackers, :except => :show
               resources :issue_statuses, :except => :show do
                 collection do
                   post 'update_issue_done_ratio'
                 end
               end
               resources :custom_fields, :except => :show
               resources :roles, :except => :show do
                 collection do
                   match 'permissions', :via => [:get, :post]
                 end
               end
               resources :enumerations, :except => :show
               get 'projects/:id/search', :controller => 'search', :action => 'index'
               get 'search', :controller => 'search', :action => 'index'
               match 'mail_handler', :controller => 'mail_handler', :action => 'index', :via => :post
               match 'admin', :controller => 'admin', :action => 'index', :via => :get
               match 'admin/projects', :controller => 'admin', :action => 'projects', :via => :get
               match 'admin/plugins', :controller => 'admin', :action => 'plugins', :via => :get
               match 'admin/info', :controller => 'admin', :action => 'info', :via => :get
               match 'admin/test_email', :controller => 'admin', :action => 'test_email', :via => :get
               match 'admin/default_configuration', :controller => 'admin', :action => 'default_configuration', :via => :post
               resources :auth_sources do
                 member do
                   get 'test_connection'
                 end
               end
               match 'workflows', :controller => 'workflows', :action => 'index', :via => :get
               match 'workflows/edit', :controller => 'workflows', :action => 'edit', :via => [:get, :post]
               match 'workflows/copy', :controller => 'workflows', :action => 'copy', :via => [:get, :post]
               match 'settings', :controller => 'settings', :action => 'index', :via => :get
               match 'settings/edit', :controller => 'settings', :action => 'edit', :via => [:get, :post]
               match 'settings/plugin/:id', :controller => 'settings', :action => 'plugin', :via => [:get, :post]
               match 'sys/projects', :to => 'sys#projects', :via => :get
               match 'sys/projects/:id/repository', :to => 'sys#create_project_repository', :via => :post
               match 'sys/fetch_changesets', :to => 'sys#fetch_changesets', :via => :get
               match 'uploads', :to => 'attachments#upload', :via => :post
               get 'robots.txt', :to => 'welcome#robots'
               Dir.glob File.expand_path("plugins/*", Rails.root) do |plugin_dir|
                 file = File.join(plugin_dir, "config/routes.rb")
                 if File.exists?(file)
                   begin
                     instance_eval File.read(file)
                   rescue Exception => e
                     puts "An error occurred while loading the routes definition of #{File.basename(plugin_dir)} plugin (#{file}): #{e.message}."
                     exit 1
                   end
                 end
               end
             end

lib/redmine.rb +1 -1

             require 'redmine/access_control'
             require 'redmine/menu_manager'
             require 'redmine/activity'
             require 'redmine/search'
             require 'redmine/custom_field_format'
             require 'redmine/mime_type'
             require 'redmine/core_ext'
             require 'redmine/themes'
             require 'redmine/hook'
             require 'redmine/plugin'
             require 'redmine/notifiable'
             require 'redmine/wiki_formatting'
             require 'redmine/scm/base'
             begin
               require 'RMagick' unless Object.const_defined?(:Magick)
             rescue LoadError
               # RMagick is not available
             end
             if RUBY_VERSION < '1.9'
               require 'fastercsv'
             else
               require 'csv'
               FCSV = CSV
             end
             Redmine::Scm::Base.add "Subversion"
             Redmine::Scm::Base.add "Darcs"
             Redmine::Scm::Base.add "Mercurial"
             Redmine::Scm::Base.add "Cvs"
             Redmine::Scm::Base.add "Bazaar"
             Redmine::Scm::Base.add "Git"
             Redmine::Scm::Base.add "Filesystem"
             Redmine::CustomFieldFormat.map do |fields|
               fields.register 'string'
               fields.register 'text'
               fields.register 'int', :label => :label_integer
               fields.register 'float'
               fields.register 'list'
               fields.register 'date'
               fields.register 'bool', :label => :label_boolean
               fields.register 'user', :only => %w(Issue TimeEntry Version Project), :edit_as => 'list'
               fields.register 'version', :only => %w(Issue TimeEntry Version Project), :edit_as => 'list'
             end
             # Permissions
             Redmine::AccessControl.map do |map|
               map.permission :view_project, {:projects => [:show], :activities => [:index]}, :public => true
               map.permission :search_project, {:search => :index}, :public => true
               map.permission :add_project, {:projects => [:new, :create]}, :require => :loggedin
               map.permission :edit_project, {:projects => [:settings, :edit, :update]}, :require => :member
               map.permission :select_project_modules, {:projects => :modules}, :require => :member
               map.permission :manage_members, {:projects => :settings, :members => [:index, :show, :create, :update, :destroy, :autocomplete]}, :require => :member
               map.permission :manage_versions, {:projects => :settings, :versions => [:new, :create, :edit, :update, :close_completed, :destroy]}, :require => :member
               map.permission :add_subprojects, {:projects => [:new, :create]}, :require => :member
               map.project_module :issue_tracking do |map|
                 # Issue categories
                 map.permission :manage_categories, {:projects => :settings, :issue_categories => [:index, :show, :new, :create, :edit, :update, :destroy]}, :require => :member
                 # Issues
                 map.permission :view_issues, {:issues => [:index, :show],
                                               :auto_complete => [:issues],
                                               :context_menus => [:issues],
                                               :versions => [:index, :show, :status_by],
                                               :journals => [:index, :diff],
                                               :queries => :index,
                                               :reports => [:issue_report, :issue_report_details]}
                 map.permission :add_issues, {:issues => [:new, :create, :update_form], :attachments => :upload}
                 map.permission :edit_issues, {:issues => [:edit, :update, :bulk_edit, :bulk_update, :update_form], :journals => [:new], :attachments => :upload}
                 map.permission :manage_issue_relations, {:issue_relations => [:index, :show, :create, :destroy]}
                 map.permission :manage_subtasks, {}
                 map.permission :set_issues_private, {}
                 map.permission :set_own_issues_private, {}, :require => :loggedin
                 map.permission :add_issue_notes, {:issues => [:edit, :update], :journals => [:new], :attachments => :upload}
                 map.permission :edit_issue_notes, {:journals => :edit}, :require => :loggedin
                 map.permission :edit_own_issue_notes, {:journals => :edit}, :require => :loggedin
                 map.permission :move_issues, {:issues => [:bulk_edit, :bulk_update]}, :require => :loggedin
                 map.permission :delete_issues, {:issues => :destroy}, :require => :member
                 # Queries
                 map.permission :manage_public_queries, {:queries => [:new, :create, :edit, :update, :destroy]}, :require => :member
                 map.permission :save_queries, {:queries => [:new, :create, :edit, :update, :destroy]}, :require => :loggedin
                 # Watchers
                 map.permission :view_issue_watchers, {}
                 map.permission :add_issue_watchers, {:watchers => :new}
                 map.permission :delete_issue_watchers, {:watchers => :destroy}
               end
               map.project_module :time_tracking do |map|
                 map.permission :log_time, {:timelog => [:new, :create]}, :require => :loggedin
                 map.permission :view_time_entries, :timelog => [:index, :report, :show]
                 map.permission :edit_time_entries, {:timelog => [:edit, :update, :destroy, :bulk_edit, :bulk_update]}, :require => :member
                 map.permission :edit_own_time_entries, {:timelog => [:edit, :update, :destroy,:bulk_edit, :bulk_update]}, :require => :loggedin
                 map.permission :manage_project_activities, {:project_enumerations => [:update, :destroy]}, :require => :member
               end
               map.project_module :news do |map|
                 map.permission :manage_news, {:news => [:new, :create, :edit, :update, :destroy], :comments => [:destroy]}, :require => :member
                 map.permission :view_news, {:news => [:index, :show]}, :public => true
                 map.permission :comment_news, {:comments => :create}
               end
               map.project_module :documents do |map|
                 map.permission :manage_documents, {:documents => [:new, :create, :edit, :update, :destroy, :add_attachment]}, :require => :loggedin
                 map.permission :view_documents, :documents => [:index, :show, :download]
               end
               map.project_module :files do |map|
                 map.permission :manage_files, {:files => [:new, :create]}, :require => :loggedin
                 map.permission :view_files, :files => :index, :versions => :download
               end
               map.project_module :wiki do |map|
                 map.permission :manage_wiki, {:wikis => [:edit, :destroy]}, :require => :member
                 map.permission :rename_wiki_pages, {:wiki => :rename}, :require => :member
                 map.permission :delete_wiki_pages, {:wiki => :destroy}, :require => :member
                 map.permission :view_wiki_pages, :wiki => [:index, :show, :special, :date_index]
                 map.permission :export_wiki_pages, :wiki => [:export]
                 map.permission :view_wiki_edits, :wiki => [:history, :diff, :annotate]
                 map.permission :edit_wiki_pages, :wiki => [:edit, :update, :preview, :add_attachment]
                 map.permission :delete_wiki_pages_attachments, {}
                 map.permission :protect_wiki_pages, {:wiki => :protect}, :require => :member
               end
               map.project_module :repository do |map|
                 map.permission :manage_repository, {:repositories => [:new, :create, :edit, :update, :committers, :destroy]}, :require => :member
-                map.permission :browse_repository, :repositories => [:show, :browse, :entry, :annotate, :changes, :diff, :stats, :graph]
+                map.permission :browse_repository, :repositories => [:show, :browse, :entry, :raw, :annotate, :changes, :diff, :stats, :graph]
                 map.permission :view_changesets, :repositories => [:show, :revisions, :revision]
                 map.permission :commit_access, {}
                 map.permission :manage_related_issues, {:repositories => [:add_related_issue, :remove_related_issue]}
               end
               map.project_module :boards do |map|
                 map.permission :manage_boards, {:boards => [:new, :create, :edit, :update, :destroy]}, :require => :member
                 map.permission :view_messages, {:boards => [:index, :show], :messages => [:show]}, :public => true
                 map.permission :add_messages, {:messages => [:new, :reply, :quote]}
                 map.permission :edit_messages, {:messages => :edit}, :require => :member
                 map.permission :edit_own_messages, {:messages => :edit}, :require => :loggedin
                 map.permission :delete_messages, {:messages => :destroy}, :require => :member
                 map.permission :delete_own_messages, {:messages => :destroy}, :require => :loggedin
               end
               map.project_module :calendar do |map|
                 map.permission :view_calendar, :calendars => [:show, :update]
               end
               map.project_module :gantt do |map|
                 map.permission :view_gantt, :gantts => [:show, :update]
               end
             end
             Redmine::MenuManager.map :top_menu do |menu|
               menu.push :home, :home_path
               menu.push :my_page, { :controller => 'my', :action => 'page' }, :if => Proc.new { User.current.logged? }
               menu.push :projects, { :controller => 'projects', :action => 'index' }, :caption => :label_project_plural
               menu.push :administration, { :controller => 'admin', :action => 'index' }, :if => Proc.new { User.current.admin? }, :last => true
               menu.push :help, Redmine::Info.help_url, :last => true
             end
             Redmine::MenuManager.map :account_menu do |menu|
               menu.push :login, :signin_path, :if => Proc.new { !User.current.logged? }
               menu.push :register, { :controller => 'account', :action => 'register' }, :if => Proc.new { !User.current.logged? && Setting.self_registration? }
               menu.push :my_account, { :controller => 'my', :action => 'account' }, :if => Proc.new { User.current.logged? }
               menu.push :logout, :signout_path, :if => Proc.new { User.current.logged? }
             end
             Redmine::MenuManager.map :application_menu do |menu|
               # Empty
             end
             Redmine::MenuManager.map :admin_menu do |menu|
               menu.push :projects, {:controller => 'admin', :action => 'projects'}, :caption => :label_project_plural
               menu.push :users, {:controller => 'users'}, :caption => :label_user_plural
               menu.push :groups, {:controller => 'groups'}, :caption => :label_group_plural
               menu.push :roles, {:controller => 'roles'}, :caption => :label_role_and_permissions
               menu.push :trackers, {:controller => 'trackers'}, :caption => :label_tracker_plural
               menu.push :issue_statuses, {:controller => 'issue_statuses'}, :caption => :label_issue_status_plural,
                         :html => {:class => 'issue_statuses'}
               menu.push :workflows, {:controller => 'workflows', :action => 'edit'}, :caption => :label_workflow
               menu.push :custom_fields, {:controller => 'custom_fields'},  :caption => :label_custom_field_plural,
                         :html => {:class => 'custom_fields'}
               menu.push :enumerations, {:controller => 'enumerations'}
               menu.push :settings, {:controller => 'settings'}
               menu.push :ldap_authentication, {:controller => 'auth_sources', :action => 'index'},
                         :html => {:class => 'server_authentication'}
               menu.push :plugins, {:controller => 'admin', :action => 'plugins'}, :last => true
               menu.push :info, {:controller => 'admin', :action => 'info'}, :caption => :label_information_plural, :last => true
             end
             Redmine::MenuManager.map :project_menu do |menu|
               menu.push :overview, { :controller => 'projects', :action => 'show' }
               menu.push :activity, { :controller => 'activities', :action => 'index' }
               menu.push :roadmap, { :controller => 'versions', :action => 'index' }, :param => :project_id,
                           :if => Proc.new { |p| p.shared_versions.any? }
               menu.push :issues, { :controller => 'issues', :action => 'index' }, :param => :project_id, :caption => :label_issue_plural
               menu.push :new_issue, { :controller => 'issues', :action => 'new' }, :param => :project_id, :caption => :label_issue_new,
                           :html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) }
               menu.push :gantt, { :controller => 'gantts', :action => 'show' }, :param => :project_id, :caption => :label_gantt
               menu.push :calendar, { :controller => 'calendars', :action => 'show' }, :param => :project_id, :caption => :label_calendar
               menu.push :news, { :controller => 'news', :action => 'index' }, :param => :project_id, :caption => :label_news_plural
               menu.push :documents, { :controller => 'documents', :action => 'index' }, :param => :project_id, :caption => :label_document_plural
               menu.push :wiki, { :controller => 'wiki', :action => 'show', :id => nil }, :param => :project_id,
                           :if => Proc.new { |p| p.wiki && !p.wiki.new_record? }
               menu.push :boards, { :controller => 'boards', :action => 'index', :id => nil }, :param => :project_id,
                           :if => Proc.new { |p| p.boards.any? }, :caption => :label_board_plural
               menu.push :files, { :controller => 'files', :action => 'index' }, :caption => :label_file_plural, :param => :project_id
               menu.push :repository, { :controller => 'repositories', :action => 'show', :repository_id => nil, :path => nil, :rev => nil },
                           :if => Proc.new { |p| p.repository && !p.repository.new_record? }
               menu.push :settings, { :controller => 'projects', :action => 'settings' }, :last => true
             end
             Redmine::Activity.map do |activity|
               activity.register :issues, :class_name => %w(Issue Journal)
               activity.register :changesets
               activity.register :news
               activity.register :documents, :class_name => %w(Document Attachment)
               activity.register :files, :class_name => 'Attachment'
               activity.register :wiki_edits, :class_name => 'WikiContent::Version', :default => false
               activity.register :messages, :default => false
               activity.register :time_entries, :default => false
             end
             Redmine::Search.map do |search|
               search.register :issues
               search.register :news
               search.register :documents
               search.register :changesets
               search.register :wiki_pages
               search.register :messages
               search.register :projects
             end
             Redmine::WikiFormatting.map do |format|
               format.register :textile, Redmine::WikiFormatting::Textile::Formatter, Redmine::WikiFormatting::Textile::Helper
             end
             ActionView::Template.register_template_handler :rsb, Redmine::Views::ApiTemplateHandler

test/functional/repositories_filesystem_controller_test.rb +1 -2

             # Redmine - project management software
             # Copyright (C) 2006-2011  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 File.expand_path('../../test_helper', __FILE__)
             class RepositoriesFilesystemControllerTest < ActionController::TestCase
               tests RepositoriesController
               fixtures :projects, :users, :roles, :members, :member_roles,
                        :repositories, :enabled_modules
               REPOSITORY_PATH = Rails.root.join('tmp/test/filesystem_repository').to_s
               PRJ_ID = 3
               def setup
                 @ruby19_non_utf8_pass =
                     (RUBY_VERSION >= '1.9' && Encoding.default_external.to_s != 'UTF-8')
                 User.current = nil
                 Setting.enabled_scm << 'Filesystem' unless Setting.enabled_scm.include?('Filesystem')
                 @project = Project.find(PRJ_ID)
                 @repository = Repository::Filesystem.create(
                                   :project       => @project,
                                   :url           => REPOSITORY_PATH,
                                   :path_encoding => ''
                                   )
                 assert @repository
               end
               if File.directory?(REPOSITORY_PATH)
                 def test_get_new
                   @request.session[:user_id] = 1
                   @project.repository.destroy
                   get :new, :project_id => 'subproject1', :repository_scm => 'Filesystem'
                   assert_response :success
                   assert_template 'new'
                   assert_kind_of Repository::Filesystem, assigns(:repository)
                   assert assigns(:repository).new_record?
                 end
                 def test_browse_root
                   @repository.fetch_changesets
                   @repository.reload
                   get :show, :id => PRJ_ID
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert assigns(:entries).size > 0
                   assert_not_nil assigns(:changesets)
                   assert assigns(:changesets).size == 0
                   assert_no_tag 'input', :attributes => {:name => 'rev'}
                   assert_no_tag 'a', :content => 'Statistics'
                   assert_no_tag 'a', :content => 'Atom'
                 end
                 def test_show_no_extension
                   get :entry, :id => PRJ_ID, :path => repository_path_hash(['test'])[:param]
                   assert_response :success
                   assert_template 'entry'
                   assert_tag :tag => 'th',
                              :content => '1',
                              :attributes => { :class => 'line-num' },
                              :sibling => { :tag => 'td', :content => /TEST CAT/ }
                 end
                 def test_entry_download_no_extension
-                  get :entry, :id => PRJ_ID, :path => repository_path_hash(['test'])[:param],
+                  get :raw, :id => PRJ_ID, :path => repository_path_hash(['test'])[:param]
-                      :format => 'raw'
                   assert_response :success
                   assert_equal 'application/octet-stream', @response.content_type
                 end
                 def test_show_non_ascii_contents
                   with_settings :repositories_encodings => 'UTF-8,EUC-JP' do
                     get :entry, :id => PRJ_ID,
                         :path => repository_path_hash(['japanese', 'euc-jp.txt'])[:param]
                     assert_response :success
                     assert_template 'entry'
                     assert_tag :tag => 'th',
                                :content => '2',
                                :attributes => { :class => 'line-num' },
                                :sibling => { :tag => 'td', :content => /japanese/ }
                     if @ruby19_non_utf8_pass
                       puts "TODO: show repository file contents test fails in Ruby 1.9 " +
                            "and Encoding.default_external is not UTF-8. " +
                            "Current value is '#{Encoding.default_external.to_s}'"
                     else
                       str_japanese = "\xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e"
                       str_japanese.force_encoding('UTF-8') if str_japanese.respond_to?(:force_encoding)
                       assert_tag :tag => 'th',
                                  :content => '3',
                                  :attributes => { :class => 'line-num' },
                                  :sibling => { :tag => 'td', :content => /#{str_japanese}/ }
                     end
                   end
                 end
                 def test_show_utf16
                   with_settings :repositories_encodings => 'UTF-16' do
                     get :entry, :id => PRJ_ID,
                         :path => repository_path_hash(['japanese', 'utf-16.txt'])[:param]
                     assert_response :success
                     assert_tag :tag => 'th',
                                :content => '2',
                                :attributes => { :class => 'line-num' },
                                :sibling => { :tag => 'td', :content => /japanese/ }
                   end
                 end
                 def test_show_text_file_should_send_if_too_big
                   with_settings :file_max_size_displayed => 1 do
                     get :entry, :id => PRJ_ID,
                         :path => repository_path_hash(['japanese', 'big-file.txt'])[:param]
                     assert_response :success
                     assert_equal 'text/plain', @response.content_type
                   end
                 end
                 def test_destroy_valid_repository
                   @request.session[:user_id] = 1 # admin
                   assert_difference 'Repository.count', -1 do
                     delete :destroy, :id => @repository.id
                   end
                   assert_response 302
                   @project.reload
                   assert_nil @project.repository
                 end
                 def test_destroy_invalid_repository
                   @request.session[:user_id] = 1 # admin
                   @project.repository.destroy
                   @repository = Repository::Filesystem.create!(
                                   :project       => @project,
                                   :url           => "/invalid",
                                   :path_encoding => ''
                                   )
                   assert_difference 'Repository.count', -1 do
                     delete :destroy, :id => @repository.id
                   end
                   assert_response 302
                   @project.reload
                   assert_nil @project.repository
                 end
               else
                 puts "Filesystem test repository NOT FOUND. Skipping functional tests !!!"
                 def test_fake; assert true end
               end
             end

test/functional/repositories_subversion_controller_test.rb +2 -3

             # Redmine - project management software
             # Copyright (C) 2006-2011  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 File.expand_path('../../test_helper', __FILE__)
             class RepositoriesSubversionControllerTest < ActionController::TestCase
               tests RepositoriesController
               fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules,
                        :repositories, :issues, :issue_statuses, :changesets, :changes,
                        :issue_categories, :enumerations, :custom_fields, :custom_values, :trackers
               PRJ_ID = 3
               NUM_REV = 11
               def setup
                 Setting.default_language = 'en'
                 User.current = nil
                 @project = Project.find(PRJ_ID)
                 @repository = Repository::Subversion.create(:project => @project,
                            :url => self.class.subversion_repository_url)
                 assert @repository
               end
               if repository_configured?('subversion')
                 def test_new
                   @request.session[:user_id] = 1
                   @project.repository.destroy
                   get :new, :project_id => 'subproject1', :repository_scm => 'Subversion'
                   assert_response :success
                   assert_template 'new'
                   assert_kind_of Repository::Subversion, assigns(:repository)
                   assert assigns(:repository).new_record?
                 end
                 def test_show
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :show, :id => PRJ_ID
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_not_nil assigns(:changesets)
                   entry = assigns(:entries).detect {|e| e.name == 'subversion_test'}
                   assert_not_nil entry
                   assert_equal 'dir', entry.kind
                   assert_select 'tr.dir a[href=/projects/subproject1/repository/show/subversion_test]'
                   assert_tag 'input', :attributes => {:name => 'rev'}
                   assert_tag 'a', :content => 'Statistics'
                   assert_tag 'a', :content => 'Atom'
                   assert_tag :tag => 'a',
                              :attributes => {:href => '/projects/subproject1/repository'},
                              :content => 'root'
                 end
                 def test_show_non_default
                   Repository::Subversion.create(:project => @project,
                     :url => self.class.subversion_repository_url,
                     :is_default => false, :identifier => 'svn')
                   get :show, :id => PRJ_ID, :repository_id => 'svn'
                   assert_response :success
                   assert_template 'show'
                   assert_select 'tr.dir a[href=/projects/subproject1/repository/svn/show/subversion_test]'
                   # Repository menu should link to the main repo
                   assert_select '#main-menu a[href=/projects/subproject1/repository]'
                 end
                 def test_browse_directory
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :show, :id => PRJ_ID, :path => repository_path_hash(['subversion_test'])[:param]
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal [
                        '[folder_with_brackets]', 'folder', '.project',
                        'helloworld.c', 'textfile.txt'
                      ],
                     assigns(:entries).collect(&:name)
                   entry = assigns(:entries).detect {|e| e.name == 'helloworld.c'}
                   assert_equal 'file', entry.kind
                   assert_equal 'subversion_test/helloworld.c', entry.path
                   assert_tag :a, :content => 'helloworld.c', :attributes => { :class => /text\-x\-c/ }
                 end
                 def test_browse_at_given_revision
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :show, :id => PRJ_ID, :path => repository_path_hash(['subversion_test'])[:param],
                       :rev => 4
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal ['folder', '.project', 'helloworld.c', 'helloworld.rb', 'textfile.txt'],
                                assigns(:entries).collect(&:name)
                 end
                 def test_file_changes
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :changes, :id => PRJ_ID,
                       :path => repository_path_hash(['subversion_test', 'folder', 'helloworld.rb'])[:param]
                   assert_response :success
                   assert_template 'changes'
                   changesets = assigns(:changesets)
                   assert_not_nil changesets
                   assert_equal %w(6 3 2), changesets.collect(&:revision)
                   # svn properties displayed with svn >= 1.5 only
                   if Redmine::Scm::Adapters::SubversionAdapter.client_version_above?([1, 5, 0])
                     assert_not_nil assigns(:properties)
                     assert_equal 'native', assigns(:properties)['svn:eol-style']
                     assert_tag :ul,
                                :child => { :tag => 'li',
                                            :child => { :tag => 'b', :content => 'svn:eol-style' },
                                            :child => { :tag => 'span', :content => 'native' } }
                   end
                 end
                 def test_directory_changes
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :changes, :id => PRJ_ID,
                       :path => repository_path_hash(['subversion_test', 'folder'])[:param]
                   assert_response :success
                   assert_template 'changes'
                   changesets = assigns(:changesets)
                   assert_not_nil changesets
                   assert_equal %w(10 9 7 6 5 2), changesets.collect(&:revision)
                 end
                 def test_entry
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :entry, :id => PRJ_ID,
                       :path => repository_path_hash(['subversion_test', 'helloworld.c'])[:param]
                   assert_response :success
                   assert_template 'entry'
                 end
                 def test_entry_should_send_if_too_big
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   # no files in the test repo is larger than 1KB...
                   with_settings :file_max_size_displayed => 0 do
                     get :entry, :id => PRJ_ID,
                         :path => repository_path_hash(['subversion_test', 'helloworld.c'])[:param]
                     assert_response :success
                     assert_equal 'attachment; filename="helloworld.c"',
                                  @response.headers['Content-Disposition']
                   end
                 end
                 def test_entry_at_given_revision
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :entry, :id => PRJ_ID,
                       :path => repository_path_hash(['subversion_test', 'helloworld.rb'])[:param],
                       :rev => 2
                   assert_response :success
                   assert_template 'entry'
                   # this line was removed in r3 and file was moved in r6
                   assert_tag :tag => 'td', :attributes => { :class => /line-code/},
                                            :content => /Here's the code/
                 end
                 def test_entry_not_found
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :entry, :id => PRJ_ID,
                       :path => repository_path_hash(['subversion_test', 'zzz.c'])[:param]
                   assert_tag :tag => 'p', :attributes => { :id => /errorExplanation/ },
                              :content => /The entry or revision was not found in the repository/
                 end
                 def test_entry_download
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
-                  get :entry, :id => PRJ_ID,
+                  get :raw, :id => PRJ_ID,
-                      :path => repository_path_hash(['subversion_test', 'helloworld.c'])[:param],
+                      :path => repository_path_hash(['subversion_test', 'helloworld.c'])[:param]
-                      :format => 'raw'
                   assert_response :success
                   assert_equal 'attachment; filename="helloworld.c"', @response.headers['Content-Disposition']
                 end
                 def test_directory_entry
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :entry, :id => PRJ_ID,
                       :path => repository_path_hash(['subversion_test', 'folder'])[:param]
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entry)
                   assert_equal 'folder', assigns(:entry).name
                 end
                 # TODO: this test needs fixtures.
                 def test_revision
                   get :revision, :id => 1, :rev => 2
                   assert_response :success
                   assert_template 'revision'
                   assert_tag :tag => 'ul',
                              :child => { :tag => 'li',
                                          # link to the entry at rev 2
                                          :child => { :tag => 'a',
                                                      :attributes => {:href => '/projects/ecookbook/repository/revisions/2/entry/test/some/path/in/the/repo'},
                                                      :content => 'repo',
                                                      # link to partial diff
                                                      :sibling =>  { :tag => 'a',
                                                                     :attributes => { :href => '/projects/ecookbook/repository/revisions/2/diff/test/some/path/in/the/repo' }
                                                                    }
                                                     }
                                         }
                 end
                 def test_invalid_revision
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :revision, :id => PRJ_ID, :rev => 'something_weird'
                   assert_response 404
                   assert_error_tag :content => /was not found/
                 end
                 def test_invalid_revision_diff
                   get :diff, :id => PRJ_ID, :rev => '1', :rev_to => 'something_weird'
                   assert_response 404
                   assert_error_tag :content => /was not found/
                 end
                 def test_empty_revision
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   ['', ' ', nil].each do |r|
                     get :revision, :id => PRJ_ID, :rev => r
                     assert_response 404
                     assert_error_tag :content => /was not found/
                   end
                 end
                 # TODO: this test needs fixtures.
                 def test_revision_with_repository_pointing_to_a_subdirectory
                   r = Project.find(1).repository
                   # Changes repository url to a subdirectory
                   r.update_attribute :url, (r.url + '/test/some')
                   get :revision, :id => 1, :rev => 2
                   assert_response :success
                   assert_template 'revision'
                   assert_tag :tag => 'ul',
                              :child => { :tag => 'li',
                                          # link to the entry at rev 2
                                          :child => { :tag => 'a',
                                                      :attributes => {:href => '/projects/ecookbook/repository/revisions/2/entry/path/in/the/repo'},
                                                      :content => 'repo',
                                                      # link to partial diff
                                                      :sibling =>  { :tag => 'a',
                                                                     :attributes => { :href => '/projects/ecookbook/repository/revisions/2/diff/path/in/the/repo' }
                                                                    }
                                                     }
                                         }
                 end
                 def test_revision_diff
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   ['inline', 'sbs'].each do |dt|
                     get :diff, :id => PRJ_ID, :rev => 3, :type => dt
                     assert_response :success
                     assert_template 'diff'
                     assert_tag :tag => 'h2',
                                :content => / 3/
                   end
                 end
                 def test_revision_diff_raw_format
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :diff, :id => PRJ_ID, :rev => 3, :format => 'diff'
                   assert_response :success
                   assert_equal 'text/x-patch', @response.content_type
                   assert_equal 'Index: subversion_test/textfile.txt', @response.body.split(/\r?\n/).first
                 end
                 def test_directory_diff
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   ['inline', 'sbs'].each do |dt|
                     get :diff, :id => PRJ_ID, :rev => 6, :rev_to => 2,
                         :path => repository_path_hash(['subversion_test', 'folder'])[:param],
                         :type => dt
                     assert_response :success
                     assert_template 'diff'
                     diff = assigns(:diff)
                     assert_not_nil diff
                     # 2 files modified
                     assert_equal 2, Redmine::UnifiedDiff.new(diff).size
                     assert_tag :tag => 'h2', :content => /2:6/
                   end
                 end
                 def test_annotate
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :annotate, :id => PRJ_ID,
                       :path => repository_path_hash(['subversion_test', 'helloworld.c'])[:param]
                   assert_response :success
                   assert_template 'annotate'
                 end
                 def test_annotate_at_given_revision
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :annotate, :id => PRJ_ID, :rev => 8,
                       :path => repository_path_hash(['subversion_test', 'helloworld.c'])[:param]
                   assert_response :success
                   assert_template 'annotate'
                   assert_tag :tag => 'h2', :content => /@ 8/
                 end
                 def test_destroy_valid_repository
                   @request.session[:user_id] = 1 # admin
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   assert_equal NUM_REV, @repository.changesets.count
                   assert_difference 'Repository.count', -1 do
                     delete :destroy, :id => @repository.id
                   end
                   assert_response 302
                   @project.reload
                   assert_nil @project.repository
                 end
                 def test_destroy_invalid_repository
                   @request.session[:user_id] = 1 # admin
                   @project.repository.destroy
                   @repository = Repository::Subversion.create!(
                                    :project => @project,
                                    :url     => "file:///invalid")
                   @repository.fetch_changesets
                   assert_equal 0, @repository.changesets.count
                   assert_difference 'Repository.count', -1 do
                     delete :destroy, :id => @repository.id
                   end
                   assert_response 302
                   @project.reload
                   assert_nil @project.repository
                 end
               else
                 puts "Subversion test repository NOT FOUND. Skipping functional tests !!!"
                 def test_fake; assert true end
               end
             end

test/integration/routing/repositories_test.rb +8 -8

             # Redmine - project management software
             # Copyright (C) 2006-2012  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 File.expand_path('../../../test_helper', __FILE__)
             class RoutingRepositoriesTest < ActionController::IntegrationTest
               def setup
                 @path_hash  = repository_path_hash(%w[path to file.c])
                 assert_equal "path/to/file.c", @path_hash[:path]
                 assert_equal "path/to/file.c", @path_hash[:param]
               end
               def test_repositories_resources
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repositories/new" },
                     { :controller => 'repositories', :action => 'new', :project_id => 'redmine' }
                   )
                 assert_routing(
                     { :method => 'post',
                       :path => "/projects/redmine/repositories" },
                     { :controller => 'repositories', :action => 'create', :project_id => 'redmine' }
                   )
                 assert_routing(
                     { :method => 'get',
                       :path => "/repositories/1/edit" },
                     { :controller => 'repositories', :action => 'edit', :id => '1' }
                   )
                 assert_routing(
                     { :method => 'put',
                       :path => "/repositories/1" },
                     { :controller => 'repositories', :action => 'update', :id => '1' }
                   )
                 assert_routing(
                     { :method => 'delete',
                       :path => "/repositories/1" },
                     { :controller => 'repositories', :action => 'destroy', :id => '1' }
                   )
                 ["get", "post"].each do |method|
                   assert_routing(
                       { :method => method,
                         :path => "/repositories/1/committers" },
                       { :controller => 'repositories', :action => 'committers', :id => '1' }
                     )
                 end
               end
               def test_repositories_show
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository" },
                     { :controller => 'repositories', :action => 'show', :id => 'redmine' }
                   )
               end
               def test_repositories
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/statistics" },
                     { :controller => 'repositories', :action => 'stats', :id => 'redmine' }
                  )
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/graph" },
                     { :controller => 'repositories', :action => 'graph', :id => 'redmine' }
                  )
               end
               def test_repositories_show_with_repository_id
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/foo" },
                     { :controller => 'repositories', :action => 'show', :id => 'redmine', :repository_id => 'foo' }
                   )
               end
               def test_repositories_with_repository_id
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/foo/statistics" },
                     { :controller => 'repositories', :action => 'stats', :id => 'redmine', :repository_id => 'foo' }
                  )
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/foo/graph" },
                     { :controller => 'repositories', :action => 'graph', :id => 'redmine', :repository_id => 'foo' }
                  )
               end
               def test_repositories_revisions
                 empty_path_param = []
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/revisions" },
                     { :controller => 'repositories', :action => 'revisions', :id => 'redmine' }
                   )
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/revisions.atom" },
                     { :controller => 'repositories', :action => 'revisions', :id => 'redmine',
                       :format => 'atom' }
                   )
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/revisions/2457" },
                     { :controller => 'repositories', :action => 'revision', :id => 'redmine',
                       :rev => '2457' }
                   )
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/revisions/2457/show" },
                     { :controller => 'repositories', :action => 'show', :id => 'redmine',
                       :rev => '2457' }
                   )
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/revisions/2457/show/#{@path_hash[:path]}" },
                     { :controller => 'repositories', :action => 'show', :id => 'redmine',
                       :path => @path_hash[:param] , :rev => '2457'}
                   )
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/changes" },
                     { :controller => 'repositories', :action => 'changes', :id => 'redmine' }
                   )
                 ['2457', 'master', 'slash/slash'].each do |rev|
                   assert_routing(
                        { :method => 'get',
                          :path => "/projects/redmine/repository/changes" },
                        { :controller => 'repositories', :action => 'changes', :id => 'redmine',
                          :rev => rev },
                        {},
                        { :rev => rev }
                      )
                 end
                 ['2457', 'master', 'slash/slash'].each do |rev|
                   assert_routing(
                        { :method => 'get',
                          :path => "/projects/redmine/repository/changes/#{@path_hash[:path]}" },
                        { :controller => 'repositories', :action => 'changes', :id => 'redmine',
                          :path => @path_hash[:param], :rev => rev },
                        {},
                        { :rev => rev }
                      )
                 end
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/revisions/2457/diff" },
                     { :controller => 'repositories', :action => 'diff', :id => 'redmine',
                       :rev => '2457' }
                   )
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/revisions/2457/diff.diff" },
                     { :controller => 'repositories', :action => 'diff', :id => 'redmine',
                       :rev => '2457', :format => 'diff' }
                   )
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/revisions/2/diff/#{@path_hash[:path]}" },
                     { :controller => 'repositories', :action => 'diff', :id => 'redmine',
                       :path => @path_hash[:param], :rev => '2' }
                   )
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/revisions/2/entry/#{@path_hash[:path]}" },
                     { :controller => 'repositories', :action => 'entry', :id => 'redmine',
                       :path => @path_hash[:param], :rev => '2' }
                   )
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/revisions/2/raw/#{@path_hash[:path]}" },
-                    { :controller => 'repositories', :action => 'entry', :id => 'redmine',
+                    { :controller => 'repositories', :action => 'raw', :id => 'redmine',
-                      :path => @path_hash[:param], :rev => '2', :format => 'raw' }
+                      :path => @path_hash[:param], :rev => '2' }
                   )
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/revisions/2/annotate/#{@path_hash[:path]}" },
                     { :controller => 'repositories', :action => 'annotate', :id => 'redmine',
                       :path => @path_hash[:param], :rev => '2' }
                   )
               end
               def test_repositories_revisions_with_repository_id
                 empty_path_param = []
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/foo/revisions" },
                     { :controller => 'repositories', :action => 'revisions', :id => 'redmine', :repository_id => 'foo' }
                   )
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/foo/revisions.atom" },
                     { :controller => 'repositories', :action => 'revisions', :id => 'redmine', :repository_id => 'foo',
                       :format => 'atom' }
                   )
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/foo/revisions/2457" },
                     { :controller => 'repositories', :action => 'revision', :id => 'redmine', :repository_id => 'foo',
                       :rev => '2457' }
                   )
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/foo/revisions/2457/show" },
                     { :controller => 'repositories', :action => 'show', :id => 'redmine', :repository_id => 'foo',
                       :rev => '2457' }
                   )
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/foo/revisions/2457/show/#{@path_hash[:path]}" },
                     { :controller => 'repositories', :action => 'show', :id => 'redmine', :repository_id => 'foo',
                       :path => @path_hash[:param] , :rev => '2457'}
                   )
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/foo/changes" },
                     { :controller => 'repositories', :action => 'changes', :id => 'redmine', :repository_id => 'foo' }
                   )
                 ['2457', 'master', 'slash/slash'].each do |rev|
                   assert_routing(
                        { :method => 'get',
                          :path => "/projects/redmine/repository/foo/changes" },
                        { :controller => 'repositories', :action => 'changes', :id => 'redmine',
                          :repository_id => 'foo', :rev => rev },
                        {},
                        { :rev => rev }
                      )
                 end
                 ['2457', 'master', 'slash/slash'].each do |rev|
                   assert_routing(
                        { :method => 'get',
                          :path => "/projects/redmine/repository/foo/changes/#{@path_hash[:path]}" },
                        { :controller => 'repositories', :action => 'changes', :id => 'redmine',
                          :repository_id => 'foo', :path => @path_hash[:param], :rev => rev },
                        {},
                        { :rev => rev }
                      )
                 end
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/foo/revisions/2457/diff" },
                     { :controller => 'repositories', :action => 'diff', :id => 'redmine', :repository_id => 'foo',
                       :rev => '2457' }
                   )
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/foo/revisions/2457/diff.diff" },
                     { :controller => 'repositories', :action => 'diff', :id => 'redmine', :repository_id => 'foo',
                       :rev => '2457', :format => 'diff' }
                   )
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/foo/revisions/2/diff/#{@path_hash[:path]}" },
                     { :controller => 'repositories', :action => 'diff', :id => 'redmine', :repository_id => 'foo',
                       :path => @path_hash[:param], :rev => '2' }
                   )
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/foo/revisions/2/entry/#{@path_hash[:path]}" },
                     { :controller => 'repositories', :action => 'entry', :id => 'redmine', :repository_id => 'foo',
                       :path => @path_hash[:param], :rev => '2' }
                   )
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/foo/revisions/2/raw/#{@path_hash[:path]}" },
-                    { :controller => 'repositories', :action => 'entry', :id => 'redmine', :repository_id => 'foo',
+                    { :controller => 'repositories', :action => 'raw', :id => 'redmine', :repository_id => 'foo',
-                      :path => @path_hash[:param], :rev => '2', :format => 'raw' }
+                      :path => @path_hash[:param], :rev => '2' }
                   )
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/foo/revisions/2/annotate/#{@path_hash[:path]}" },
                     { :controller => 'repositories', :action => 'annotate', :id => 'redmine', :repository_id => 'foo',
                       :path => @path_hash[:param], :rev => '2' }
                   )
               end
               def test_repositories_non_revisions_path
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/diff/#{@path_hash[:path]}" },
                     { :controller => 'repositories', :action => 'diff', :id => 'redmine',
                       :path => @path_hash[:param] }
                   )
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/browse/#{@path_hash[:path]}" },
                     { :controller => 'repositories', :action => 'browse', :id => 'redmine',
                       :path => @path_hash[:param] }
                   )
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/entry/#{@path_hash[:path]}" },
                     { :controller => 'repositories', :action => 'entry', :id => 'redmine',
                       :path => @path_hash[:param] }
                   )
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/raw/#{@path_hash[:path]}" },
-                    { :controller => 'repositories', :action => 'entry', :id => 'redmine',
+                    { :controller => 'repositories', :action => 'raw', :id => 'redmine',
-                      :path => @path_hash[:param], :format => 'raw' }
+                      :path => @path_hash[:param] }
                   )
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/annotate/#{@path_hash[:path]}" },
                     { :controller => 'repositories', :action => 'annotate', :id => 'redmine',
                       :path => @path_hash[:param] }
                   )
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/changes/#{@path_hash[:path]}" },
                     { :controller => 'repositories', :action => 'changes', :id => 'redmine',
                       :path => @path_hash[:param] }
                   )
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/revision" },
                     { :controller => 'repositories', :action => 'revision', :id => 'redmine' }
                   )
               end
               def test_repositories_non_revisions_path_with_repository_id
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/foo/diff/#{@path_hash[:path]}" },
                     { :controller => 'repositories', :action => 'diff', :id => 'redmine', :repository_id => 'foo',
                       :path => @path_hash[:param] }
                   )
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/foo/browse/#{@path_hash[:path]}" },
                     { :controller => 'repositories', :action => 'browse', :id => 'redmine', :repository_id => 'foo',
                       :path => @path_hash[:param] }
                   )
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/foo/entry/#{@path_hash[:path]}" },
                     { :controller => 'repositories', :action => 'entry', :id => 'redmine', :repository_id => 'foo',
                       :path => @path_hash[:param] }
                   )
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/foo/raw/#{@path_hash[:path]}" },
-                    { :controller => 'repositories', :action => 'entry', :id => 'redmine', :repository_id => 'foo',
+                    { :controller => 'repositories', :action => 'raw', :id => 'redmine', :repository_id => 'foo',
-                      :path => @path_hash[:param], :format => 'raw' }
+                      :path => @path_hash[:param] }
                   )
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/foo/annotate/#{@path_hash[:path]}" },
                     { :controller => 'repositories', :action => 'annotate', :id => 'redmine', :repository_id => 'foo',
                       :path => @path_hash[:param] }
                   )
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/foo/changes/#{@path_hash[:path]}" },
                     { :controller => 'repositories', :action => 'changes', :id => 'redmine', :repository_id => 'foo',
                       :path => @path_hash[:param] }
                   )
                 assert_routing(
                     { :method => 'get',
                       :path => "/projects/redmine/repository/foo/revision" },
                     { :controller => 'repositories', :action => 'revision', :id => 'redmine', :repository_id => 'foo'}
                   )
               end
               def test_repositories_related_issues
                 assert_routing(
                     { :method => 'post',
                       :path => "/projects/redmine/repository/revisions/123/issues" },
                     { :controller => 'repositories', :action => 'add_related_issue',
                       :id => 'redmine', :rev => '123' }
                   )
                 assert_routing(
                     { :method => 'delete',
                       :path => "/projects/redmine/repository/revisions/123/issues/25" },
                     { :controller => 'repositories', :action => 'remove_related_issue',
                       :id => 'redmine', :rev => '123', :issue_id => '25' }
                   )
               end
               def test_repositories_related_issues_with_repository_id
                 assert_routing(
                     { :method => 'post',
                       :path => "/projects/redmine/repository/foo/revisions/123/issues" },
                     { :controller => 'repositories', :action => 'add_related_issue',
                       :id => 'redmine', :repository_id => 'foo', :rev => '123' }
                   )
                 assert_routing(
                     { :method => 'delete',
                       :path => "/projects/redmine/repository/foo/revisions/123/issues/25" },
                     { :controller => 'repositories', :action => 'remove_related_issue',
                       :id => 'redmine', :repository_id => 'foo', :rev => '123', :issue_id => '25' }
                   )
               end
             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