@@ -30,6 +30,8 class RepositoriesController < ApplicationController | |||||
30 | before_filter :authorize |
|
30 | before_filter :authorize | |
31 | accept_key_auth :revisions |
|
31 | accept_key_auth :revisions | |
32 |
|
32 | |||
|
33 | rescue_from Redmine::Scm::Adapters::CommandFailed, :with => :show_error_command_failed | |||
|
34 | ||||
33 | def edit |
|
35 | def edit | |
34 | @repository = @project.repository |
|
36 | @repository = @project.repository | |
35 | if !@repository |
|
37 | if !@repository | |
@@ -56,8 +58,6 class RepositoriesController < ApplicationController | |||||
56 | # latest changesets |
|
58 | # latest changesets | |
57 | @changesets = @repository.changesets.find(:all, :limit => 10, :order => "committed_on DESC") |
|
59 | @changesets = @repository.changesets.find(:all, :limit => 10, :order => "committed_on DESC") | |
58 | show_error_not_found unless @entries || @changesets.any? |
|
60 | show_error_not_found unless @entries || @changesets.any? | |
59 | rescue Redmine::Scm::Adapters::CommandFailed => e |
|
|||
60 | show_error_command_failed(e.message) |
|
|||
61 | end |
|
61 | end | |
62 |
|
62 | |||
63 | def browse |
|
63 | def browse | |
@@ -68,16 +68,12 class RepositoriesController < ApplicationController | |||||
68 | show_error_not_found and return unless @entries |
|
68 | show_error_not_found and return unless @entries | |
69 | render :action => 'browse' |
|
69 | render :action => 'browse' | |
70 | end |
|
70 | end | |
71 | rescue Redmine::Scm::Adapters::CommandFailed => e |
|
|||
72 | show_error_command_failed(e.message) |
|
|||
73 | end |
|
71 | end | |
74 |
|
72 | |||
75 | def changes |
|
73 | def changes | |
76 | @entry = @repository.entry(@path, @rev) |
|
74 | @entry = @repository.entry(@path, @rev) | |
77 | show_error_not_found and return unless @entry |
|
75 | show_error_not_found and return unless @entry | |
78 | @changesets = @repository.changesets_for_path(@path) |
|
76 | @changesets = @repository.changesets_for_path(@path) | |
79 | rescue Redmine::Scm::Adapters::CommandFailed => e |
|
|||
80 | show_error_command_failed(e.message) |
|
|||
81 | end |
|
77 | end | |
82 |
|
78 | |||
83 | def revisions |
|
79 | def revisions | |
@@ -111,15 +107,11 class RepositoriesController < ApplicationController | |||||
111 | # Prevent empty lines when displaying a file with Windows style eol |
|
107 | # Prevent empty lines when displaying a file with Windows style eol | |
112 | @content.gsub!("\r\n", "\n") |
|
108 | @content.gsub!("\r\n", "\n") | |
113 | end |
|
109 | end | |
114 | rescue Redmine::Scm::Adapters::CommandFailed => e |
|
|||
115 | show_error_command_failed(e.message) |
|
|||
116 | end |
|
110 | end | |
117 |
|
111 | |||
118 | def annotate |
|
112 | def annotate | |
119 | @annotate = @repository.scm.annotate(@path, @rev) |
|
113 | @annotate = @repository.scm.annotate(@path, @rev) | |
120 | render_error l(:error_scm_annotate) and return if @annotate.nil? || @annotate.empty? |
|
114 | render_error l(:error_scm_annotate) and return if @annotate.nil? || @annotate.empty? | |
121 | rescue Redmine::Scm::Adapters::CommandFailed => e |
|
|||
122 | show_error_command_failed(e.message) |
|
|||
123 | end |
|
115 | end | |
124 |
|
116 | |||
125 | def revision |
|
117 | def revision | |
@@ -137,8 +129,6 class RepositoriesController < ApplicationController | |||||
137 | end |
|
129 | end | |
138 | rescue ChangesetNotFound |
|
130 | rescue ChangesetNotFound | |
139 | show_error_not_found |
|
131 | show_error_not_found | |
140 | rescue Redmine::Scm::Adapters::CommandFailed => e |
|
|||
141 | show_error_command_failed(e.message) |
|
|||
142 | end |
|
132 | end | |
143 |
|
133 | |||
144 | def diff |
|
134 | def diff | |
@@ -166,8 +156,6 class RepositoriesController < ApplicationController | |||||
166 | show_error_not_found unless @diff |
|
156 | show_error_not_found unless @diff | |
167 | end |
|
157 | end | |
168 | end |
|
158 | end | |
169 | rescue Redmine::Scm::Adapters::CommandFailed => e |
|
|||
170 | show_error_command_failed(e.message) |
|
|||
171 | end |
|
159 | end | |
172 |
|
160 | |||
173 | def stats |
|
161 | def stats | |
@@ -217,8 +205,9 private | |||||
217 | render_error l(:error_scm_not_found) |
|
205 | render_error l(:error_scm_not_found) | |
218 | end |
|
206 | end | |
219 |
|
207 | |||
220 | def show_error_command_failed(msg) |
|
208 | # Handler for Redmine::Scm::Adapters::CommandFailed exception | |
221 | render_error l(:error_scm_command_failed, msg) |
|
209 | def show_error_command_failed(exception) | |
|
210 | render_error l(:error_scm_command_failed, exception.message) | |||
222 | end |
|
211 | end | |
223 |
|
212 | |||
224 | def graph_commits_per_month(repository) |
|
213 | def graph_commits_per_month(repository) |
General Comments 0
You need to be logged in to leave comments.
Login now