Project

General

Profile

Feature #779 » 0001-Multiple-SCM-per-Project.patch

yusuke kokubo, 2011-01-06 09:08

View differences:

app/controllers/repositories_controller.rb
rescue_from Redmine::Scm::Adapters::CommandFailed, :with => :show_error_command_failed
def edit
rid = params[:rid] ? params[:rid].to_i : 0
@repository = @project.repository
if !@repository
@repository = Repository.factory(params[:repository_scm])
@repository.project = @project if @repository
@repository[rid] = Repository.factory(params[:repository_scm])
@repository[rid].project = @project if @repository[rid]
end
if request.post? && @repository
@repository.attributes = params[:repository]
......
end
render(:update) do |page|
page.replace_html "tab-content-repository", :partial => 'projects/settings/repository'
if @repository && !@project.repository
if @repository && !@project.repository[rid]
@project.reload #needed to reload association
page.replace_html "main-menu", render_main_menu(@project)
end
......
def find_repository
@project = Project.find(params[:id])
@repository = @project.repository
rid = params[:rid] ? params[:rid].to_i : 0
@repository = @project.repository[rid]
(render_404; return false) unless @repository
@path = params[:path].join('/') unless params[:path].nil?
@path ||= ''
app/helpers/application_helper.rb
text = options.delete(:text) || format_revision(revision)
rev = revision.respond_to?(:identifier) ? revision.identifier : revision
link_to(text, {:controller => 'repositories', :action => 'revision', :id => project, :rev => rev},
link_to(text, {:controller => 'repositories', :action => 'revision', :id => project, :rev => rev, :rid => params[:rid]},
:title => l(:label_revision_id, format_revision(revision)))
end
app/helpers/repositories_helper.rb
:action => 'show',
:id => @project,
:path => path_param,
:rev => @changeset.identifier)
:rev => @changeset.identifier,
:rid => params[:rid])
output << "<li class='#{style}'>#{text}</li>"
output << render_changes_tree(s)
elsif c = tree[file][:c]
......
:action => 'entry',
:id => @project,
:path => path_param,
:rev => @changeset.identifier) unless c.action == 'D'
:rev => @changeset.identifier,
:rid => params[:rid]) unless c.action == 'D'
text << " - #{c.revision}" unless c.revision.blank?
text << ' (' + link_to('diff', :controller => 'repositories',
:action => 'diff',
:id => @project,
:path => path_param,
:rev => @changeset.identifier) + ') ' if c.action == 'M'
:rev => @changeset.identifier,
:rid => params[:rid]) + ') ' if c.action == 'M'
text << ' ' + content_tag('span', c.from_path, :class => 'copied-from') unless c.from_path.blank?
output << "<li class='#{style}'>#{text}</li>"
end
......
send(method, form, repository) if repository.is_a?(Repository) && respond_to?(method) && method != 'repository_field_tags'
end
def scm_select_tag(repository)
def scm_select_tag(repository, rid)
scm_options = [["--- #{l(:actionview_instancetag_blank_option)} ---", '']]
Redmine::Scm::Base.all.each do |scm|
scm_options << ["Repository::#{scm}".constantize.scm_name, scm] if Setting.enabled_scm.include?(scm) || (repository && repository.class.name.demodulize == scm)
......
select_tag('repository_scm',
options_for_select(scm_options, repository.class.name.demodulize),
:disabled => (repository && !repository.new_record?),
:onchange => remote_function(:url => { :controller => 'repositories', :action => 'edit', :id => @project }, :method => :get, :with => "Form.serialize(this.form)")
:onchange => remote_function(:url => { :controller => 'repositories', :action => 'edit', :id => @project, :rid => rid }, :method => :get, :with => "Form.serialize(this.form)")
)
end
app/models/changeset.rb
:from_revision => change[:from_revision])
end
def rid
project.repository.each_with_index do |r, i|
return i if r.id == repository.id
end
-1
end
private
# Finds an issue that can be referenced by the commit message
app/models/project.rb
has_many :news, :dependent => :delete_all, :include => :author
has_many :issue_categories, :dependent => :delete_all, :order => "#{IssueCategory.table_name}.name"
has_many :boards, :dependent => :destroy, :order => "position ASC"
has_one :repository, :dependent => :destroy
has_many :repository, :dependent => :destroy
has_many :changesets, :through => :repository
has_one :wiki, :dependent => :destroy
# Custom field for the project issues
app/views/issues/_changesets.rhtml
<% changesets.each do |changeset| %>
<div class="changeset <%= cycle('odd', 'even') %>">
<p><%= link_to("#{l(:label_revision)} #{changeset.revision}",
:controller => 'repositories', :action => 'revision', :id => changeset.project, :rev => changeset.revision) %><br />
:controller => 'repositories', :action => 'revision', :id => changeset.project, :rev => changeset.revision, :rid => changeset.rid) %><br />
<span class="author"><%= authoring(changeset.committed_on, changeset.author) %></span></p>
<div class="changeset-changes">
<%= textilizable(changeset, :comments) %>
app/views/projects/settings/_repository.rhtml
<% remote_form_for :repository, @repository,
:url => { :controller => 'repositories', :action => 'edit', :id => @project },
<% @repository.each_with_index do |r, rid| %>
<% remote_form_for :repository, r, r,
:url => { :controller => 'repositories', :action => 'edit', :id => @project, :rid => rid },
:builder => TabularFormBuilder,
:lang => current_language do |f| %>
<%= error_messages_for 'repository' %>
<%= error_messages_for 'r' %>
<div class="box tabular">
<p><%= label_tag('repository_scm', l(:label_scm)) %><%= scm_select_tag(@repository) %></p>
<%= repository_field_tags(f, @repository) if @repository %>
<p><%= label_tag('repository_scm', l(:label_scm)) %><%= scm_select_tag(r, rid) %></p>
<%= repository_field_tags(f, r) if r %>
</div>
<div class="contextual">
<% if @repository && !@repository.new_record? %>
<%= link_to(l(:label_user_plural), {:controller => 'repositories', :action => 'committers', :id => @project}, :class => 'icon icon-user') %>
<%= link_to(l(:button_delete), {:controller => 'repositories', :action => 'destroy', :id => @project},
<% if @repository[0] && !r.new_record? %>
<%= link_to(l(:label_user_plural), {:controller => 'repositories', :action => 'committers', :id => @project, :rid => rid}, :class => 'icon icon-user') %>
<%= link_to(l(:button_delete), {:controller => 'repositories', :action => 'destroy', :id => @project, :rid => rid},
:confirm => l(:text_are_you_sure),
:method => :post,
:class => 'icon icon-del') %>
<% end %>
</div>
<%= submit_tag((@repository.nil? || @repository.new_record?) ? l(:button_create) : l(:button_save), :disabled => @repository.nil?) %>
<%= submit_tag((r.nil? || r.new_record?) ? l(:button_create) : l(:button_save), :disabled => r.nil?) %>
<% end %>
<% end %>
<% rid = @repository.size
remote_form_for :repository, @repository[rid],
:url => { :controller => 'repositories', :action => 'edit', :id => @project, :rid => rid },
:builder => TabularFormBuilder,
:lang => current_language do |f| %>
<div class="box tabular">
<p><%= label_tag('repository_scm', l(:label_scm)) %><%= scm_select_tag(@repository[rid], rid) %></p>
<%= repository_field_tags(f, @repository[rid]) if @repository[rid] %>
</div>
<%= submit_tag((@repository[rid].nil? || @repository[rid].new_record?) ? l(:button_create) : l(:button_save), :disabled => @repository[rid].nil?) %>
<% end %>
app/views/repositories/_breadcrumbs.rhtml
<%= link_to 'root', :action => 'show', :id => @project, :path => '', :rev => @rev %>
<% if params[:rid] %>
(<%= @project.repository[params[:rid].to_i].url %>)
<% end %>
<%= link_to 'root', :action => 'show', :id => @project, :path => '', :rev => @rev , :rid => params[:rid]%>
<%
dirs = path.split('/')
if 'file' == kind
......
link_path << '/' unless link_path.empty?
link_path << "#{dir}"
%>
/ <%= link_to h(dir), :action => 'show', :id => @project, :path => to_path_param(link_path), :rev => @rev %>
/ <%= link_to h(dir), :action => 'show', :id => @project, :path => to_path_param(link_path), :rev => @rev, :rid => params[:rid] %>
<% end %>
<% if filename %>
/ <%= link_to h(filename), :action => 'changes', :id => @project, :path => to_path_param("#{link_path}/#{filename}"), :rev => @rev %>
/ <%= link_to h(filename), :action => 'changes', :id => @project, :path => to_path_param("#{link_path}/#{filename}"), :rev => @rev , :rid => params[:rid]%>
<% end %>
<%= "@ #{h revision}" if revision %>
app/views/repositories/_dir_list_content.rhtml
<tr id="<%= tr_id %>" class="<%= h params[:parent_id] %> entry <%= entry.kind %>">
<td style="padding-left: <%=18 * depth%>px;" class="filename">
<% if entry.is_dir? %>
<span class="expander" onclick="<%= remote_function :url => {:action => 'show', :id => @project, :path => to_path_param(entry.path), :rev => @rev, :depth => (depth + 1), :parent_id => tr_id},
<span class="expander" onclick="<%= remote_function :url => {:action => 'show', :id => @project, :path => to_path_param(entry.path), :rev => @rev, :depth => (depth + 1), :parent_id => tr_id, :rid => params[:rid]},
:method => :get,
:update => { :success => tr_id },
:position => :after,
......
:condition => "scmEntryClick('#{tr_id}')"%>">&nbsp</span>
<% end %>
<%= link_to h(entry.name),
{:action => (entry.is_dir? ? 'show' : 'changes'), :id => @project, :path => to_path_param(entry.path), :rev => @rev},
{:action => (entry.is_dir? ? 'show' : 'changes'), :id => @project, :path => to_path_param(entry.path), :rev => @rev, :rid => params[:rid]},
:class => (entry.is_dir? ? 'icon icon-folder' : "icon icon-file #{Redmine::MimeType.css_class_of(entry.name)}")%>
</td>
<td class="size"><%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>
<% changeset = @project.repository.changesets.find_by_revision(entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %>
<% changeset = @project.repository[params[:rid].to_i].changesets.find_by_revision(entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %>
<td class="revision"><%= link_to_revision(changeset, @project) if changeset %></td>
<td class="age"><%= distance_of_time_in_words(entry.lastrev.time, Time.now) if entry.lastrev && entry.lastrev.time %></td>
<td class="author"><%= changeset.nil? ? h(entry.lastrev.author.to_s.split('<').first) : changeset.author if entry.lastrev %></td>
app/views/repositories/_navigation.rhtml
<%= select_tag :tag, options_for_select([''] + @repository.tags,@rev), :id => 'tag' %>
<% end -%>
<%= hidden_field_tag :rid, params[:rid] %>
| <%= l(:label_revision) %>:
<%= text_field_tag 'rev', @rev, :size => 8 %>
<% end -%>
app/views/repositories/show.rhtml
<%= render :partial => 'navigation' %>
</div>
<ul>
<% @project.repository.each_with_index do |r, i| %>
<li><%= link_to r.url, :rid => i %></li>
<% end %>
</ul>
<h2><%= render :partial => 'breadcrumbs', :locals => { :path => @path, :kind => 'dir', :revision => @rev } %></h2>
<% if !@entries.nil? && authorize_for('repositories', 'browse') %>
lib/redmine.rb
: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' },
:if => Proc.new { |p| p.repository && !p.repository.new_record? }
:if => Proc.new { |p| p.repository && p.repository[0] && !p.repository[0].new_record? }
menu.push :settings, { :controller => 'projects', :action => 'settings' }, :last => true
end
(5-5/9)