Skip to content

O
OHR Support
Commit 3a9b0988 authored by Jean-Philippe Lang's avatar Jean-Philippe Lang
Browse files
Options

Merged Git support branch (r1200 to r1226). 

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1236 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 6fcc512c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 762 additions and 52 deletions
app/controllers/repositories_controller.rb
View file @ 3a9b0988
...@@ -134,7 +134,7 @@ class RepositoriesController < ApplicationController ...@@ -134,7 +134,7 @@ class RepositoriesController < ApplicationController
end end
def diff def diff
@rev_to = params[:rev_to] ? params[:rev_to].to_i : (@rev - 1) @rev_to = params[:rev_to]
@diff_type = params[:type] || User.current.pref[:diff_type] || 'inline' @diff_type = params[:type] || User.current.pref[:diff_type] || 'inline'
@diff_type = 'inline' unless %w(inline sbs).include?(@diff_type) @diff_type = 'inline' unless %w(inline sbs).include?(@diff_type)
...@@ -185,7 +185,7 @@ private ...@@ -185,7 +185,7 @@ private
render_404 and return false unless @repository render_404 and return false unless @repository
@path = params[:path].join('/') unless params[:path].nil? @path = params[:path].join('/') unless params[:path].nil?
@path ||= '' @path ||= ''
@rev = params[:rev].to_i if params[:rev] @rev = params[:rev]
rescue ActiveRecord::RecordNotFound rescue ActiveRecord::RecordNotFound
render_404 render_404
end end
......
app/helpers/application_helper.rb
View file @ 3a9b0988
...@@ -270,6 +270,7 @@ module ApplicationHelper ...@@ -270,6 +270,7 @@ module ApplicationHelper
# #52 -> Link to issue #52 # #52 -> Link to issue #52
# Changesets: # Changesets:
# r52 -> Link to revision 52 # r52 -> Link to revision 52
# commit:a85130f -> Link to scmid starting with a85130f
# Documents: # Documents:
# document#17 -> Link to document with id 17 # document#17 -> Link to document with id 17
# document:Greetings -> Link to the document with title "Greetings" # document:Greetings -> Link to the document with title "Greetings"
...@@ -280,7 +281,7 @@ module ApplicationHelper ...@@ -280,7 +281,7 @@ module ApplicationHelper
# version:"1.0 beta 2" -> Link to version named "1.0 beta 2" # version:"1.0 beta 2" -> Link to version named "1.0 beta 2"
# Attachments: # Attachments:
# attachment:file.zip -> Link to the attachment of the current object named file.zip # attachment:file.zip -> Link to the attachment of the current object named file.zip
text = text.gsub(%r{([\s\(,-^])(!)?(attachment|document|version)?((#|r)(\d+)|(:)([^"][^\s<>]+|"[^"]+"))(?=[[:punct:]]|\s|<|$)}) do |m| text = text.gsub(%r{([\s\(,-^])(!)?(attachment|document|version|commit)?((#|r)(\d+)|(:)([^"][^\s<>]+|"[^"]+"))(?=[[:punct:]]|\s|<|$)}) do |m|
leading, esc, prefix, sep, oid = $1, $2, $3, $5 || $7, $6 || $8 leading, esc, prefix, sep, oid = $1, $2, $3, $5 || $7, $6 || $8
link = nil link = nil
if esc.nil? if esc.nil?
...@@ -325,6 +326,10 @@ module ApplicationHelper ...@@ -325,6 +326,10 @@ module ApplicationHelper
link = link_to h(version.name), {:only_path => only_path, :controller => 'versions', :action => 'show', :id => version}, link = link_to h(version.name), {:only_path => only_path, :controller => 'versions', :action => 'show', :id => version},
:class => 'version' :class => 'version'
end end
when 'commit'
if project && (changeset = project.changesets.find(:first, :conditions => ["scmid LIKE ?", "#{name}%"]))
link = link_to h("#{name}"), {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project.id, :rev => changeset.revision}, :class => 'changeset', :title => truncate(changeset.comments, 100)
end
when 'attachment' when 'attachment'
if attachments && attachment = attachments.detect {|a| a.filename == name } if attachments && attachment = attachments.detect {|a| a.filename == name }
link = link_to h(attachment.filename), {:only_path => only_path, :controller => 'attachments', :action => 'download', :id => attachment}, link = link_to h(attachment.filename), {:only_path => only_path, :controller => 'attachments', :action => 'download', :id => attachment},
......
app/helpers/repositories_helper.rb
View file @ 3a9b0988
...@@ -25,6 +25,10 @@ module RepositoriesHelper ...@@ -25,6 +25,10 @@ module RepositoriesHelper
type ? CodeRay.scan(content, type).html : h(content) type ? CodeRay.scan(content, type).html : h(content)
end end
def format_revision(txt)
txt.to_s[0,8]
end
def to_utf8(str) def to_utf8(str)
return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii
@encodings ||= Setting.repositories_encodings.split(',').collect(&:strip) @encodings ||= Setting.repositories_encodings.split(',').collect(&:strip)
...@@ -76,6 +80,10 @@ module RepositoriesHelper ...@@ -76,6 +80,10 @@ module RepositoriesHelper
content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?))) content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)))
end end
def git_field_tags(form, repository)
content_tag('p', form.text_field(:url, :label => 'Path to .git directory', :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)))
end
def cvs_field_tags(form, repository) def cvs_field_tags(form, repository)
content_tag('p', form.text_field(:root_url, :label => 'CVSROOT', :size => 60, :required => true, :disabled => !repository.new_record?)) + content_tag('p', form.text_field(:root_url, :label => 'CVSROOT', :size => 60, :required => true, :disabled => !repository.new_record?)) +
content_tag('p', form.text_field(:url, :label => 'Module', :size => 30, :required => true, :disabled => !repository.new_record?)) content_tag('p', form.text_field(:url, :label => 'Module', :size => 30, :required => true, :disabled => !repository.new_record?))
......
app/models/changeset.rb
View file @ 3a9b0988
...@@ -32,7 +32,6 @@ class Changeset < ActiveRecord::Base ...@@ -32,7 +32,6 @@ class Changeset < ActiveRecord::Base
:date_column => 'committed_on' :date_column => 'committed_on'
validates_presence_of :repository_id, :revision, :committed_on, :commit_date validates_presence_of :repository_id, :revision, :committed_on, :commit_date
validates_numericality_of :revision, :only_integer => true
validates_uniqueness_of :revision, :scope => :repository_id validates_uniqueness_of :revision, :scope => :repository_id
validates_uniqueness_of :scmid, :scope => :repository_id, :allow_nil => true validates_uniqueness_of :scmid, :scope => :repository_id, :allow_nil => true
...@@ -89,7 +88,11 @@ class Changeset < ActiveRecord::Base ...@@ -89,7 +88,11 @@ class Changeset < ActiveRecord::Base
# don't change the status is the issue is closed # don't change the status is the issue is closed
next if issue.status.is_closed? next if issue.status.is_closed?
user = committer_user || User.anonymous user = committer_user || User.anonymous
journal = issue.init_journal(user, l(:text_status_changed_by_changeset, "r#{self.revision}")) csettext = "r#{self.revision}"
if self.scmid && (! (csettext =~ /^r[0-9]+$/))
csettext = "commit:\"#{self.scmid}\""
end
journal = issue.init_journal(user, l(:text_status_changed_by_changeset, csettext))
issue.status = fix_status issue.status = fix_status
issue.done_ratio = done_ratio if done_ratio issue.done_ratio = done_ratio if done_ratio
issue.save issue.save
...@@ -114,11 +117,11 @@ class Changeset < ActiveRecord::Base ...@@ -114,11 +117,11 @@ class Changeset < ActiveRecord::Base
# Returns the previous changeset # Returns the previous changeset
def previous def previous
@previous ||= Changeset.find(:first, :conditions => ['revision < ? AND repository_id = ?', self.revision, self.repository_id], :order => 'revision DESC') @previous ||= Changeset.find(:first, :conditions => ['id < ? AND repository_id = ?', self.id, self.repository_id], :order => 'id DESC')
end end
# Returns the next changeset # Returns the next changeset
def next def next
@next ||= Changeset.find(:first, :conditions => ['revision > ? AND repository_id = ?', self.revision, self.repository_id], :order => 'revision ASC') @next ||= Changeset.find(:first, :conditions => ['id > ? AND repository_id = ?', self.id, self.repository_id], :order => 'id ASC')
end end
end end
app/models/repository.rb
View file @ 3a9b0988
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
class Repository < ActiveRecord::Base class Repository < ActiveRecord::Base
belongs_to :project belongs_to :project
has_many :changesets, :dependent => :destroy, :order => "#{Changeset.table_name}.revision DESC" has_many :changesets, :dependent => :destroy, :order => "#{Changeset.table_name}.committed_on DESC, #{Changeset.table_name}.id DESC"
has_many :changes, :through => :changesets has_many :changes, :through => :changesets
def scm def scm
...@@ -51,7 +51,7 @@ class Repository < ActiveRecord::Base ...@@ -51,7 +51,7 @@ class Repository < ActiveRecord::Base
path = "/#{path}" unless path.starts_with?('/') path = "/#{path}" unless path.starts_with?('/')
Change.find(:all, :include => :changeset, Change.find(:all, :include => :changeset,
:conditions => ["repository_id = ? AND path = ?", id, path], :conditions => ["repository_id = ? AND path = ?", id, path],
:order => "committed_on DESC, #{Changeset.table_name}.revision DESC").collect(&:changeset) :order => "committed_on DESC, #{Changeset.table_name}.id DESC").collect(&:changeset)
end end
def latest_changeset def latest_changeset
......
app/models/repository/bazaar.rb
View file @ 3a9b0988
...@@ -51,7 +51,7 @@ class Repository::Bazaar < Repository ...@@ -51,7 +51,7 @@ class Repository::Bazaar < Repository
scm_info = scm.info scm_info = scm.info
if scm_info if scm_info
# latest revision found in database # latest revision found in database
db_revision = latest_changeset ? latest_changeset.revision : 0 db_revision = latest_changeset ? latest_changeset.revision.to_i : 0
# latest revision in the repository # latest revision in the repository
scm_revision = scm_info.lastrev.identifier.to_i scm_revision = scm_info.lastrev.identifier.to_i
if db_revision < scm_revision if db_revision < scm_revision
......
app/models/repository/cvs.rb
View file @ 3a9b0988
...@@ -82,9 +82,6 @@ class Repository::Cvs < Repository ...@@ -82,9 +82,6 @@ class Repository::Cvs < Repository
end end
def fetch_changesets def fetch_changesets
#not the preferred way with CVS. maybe we should introduce always a cron-job for this
last_commit = changesets.maximum(:committed_on)
# some nifty bits to introduce a commit-id with cvs # some nifty bits to introduce a commit-id with cvs
# natively cvs doesn't provide any kind of changesets, there is only a revision per file. # natively cvs doesn't provide any kind of changesets, there is only a revision per file.
# we now take a guess using the author, the commitlog and the commit-date. # we now take a guess using the author, the commitlog and the commit-date.
...@@ -94,8 +91,10 @@ class Repository::Cvs < Repository ...@@ -94,8 +91,10 @@ class Repository::Cvs < Repository
# we use a small delta here, to merge all changes belonging to _one_ changeset # we use a small delta here, to merge all changes belonging to _one_ changeset
time_delta=10.seconds time_delta=10.seconds
fetch_since = latest_changeset ? latest_changeset.committed_on : nil
transaction do transaction do
scm.revisions('', last_commit, nil, :with_paths => true) do |revision| tmp_rev_num = 1
scm.revisions('', fetch_since, nil, :with_paths => true) do |revision|
# only add the change to the database, if it doen't exists. the cvs log # only add the change to the database, if it doen't exists. the cvs log
# is not exclusive at all. # is not exclusive at all.
unless changes.find_by_path_and_revision(scm.with_leading_slash(revision.paths[0][:path]), revision.paths[0][:revision]) unless changes.find_by_path_and_revision(scm.with_leading_slash(revision.paths[0][:path]), revision.paths[0][:revision])
...@@ -107,18 +106,16 @@ class Repository::Cvs < Repository ...@@ -107,18 +106,16 @@ class Repository::Cvs < Repository
}) })
# create a new changeset.... # create a new changeset....
unless cs unless cs
# we use a negative changeset-number here (just for inserting) # we use a temporaray revision number here (just for inserting)
# later on, we calculate a continous positive number # later on, we calculate a continous positive number
next_rev = changesets.minimum(:revision) latest = changesets.find(:first, :order => 'id DESC')
next_rev = 0 if next_rev.nil? or next_rev > 0 cs = Changeset.create(:repository => self,
next_rev = next_rev - 1 :revision => "_#{tmp_rev_num}",
:committer => revision.author,
cs=Changeset.create(:repository => self, :committed_on => revision.time,
:revision => next_rev, :comments => revision.message)
:committer => revision.author, tmp_rev_num += 1
:committed_on => revision.time,
:comments => revision.message)
end end
#convert CVS-File-States to internal Action-abbrevations #convert CVS-File-States to internal Action-abbrevations
...@@ -139,12 +136,13 @@ class Repository::Cvs < Repository ...@@ -139,12 +136,13 @@ class Repository::Cvs < Repository
end end
end end
next_rev = [changesets.maximum(:revision) || 0, 0].max # Renumber new changesets in chronological order
changesets.find(:all, :conditions=>["revision < 0"], :order=>"committed_on ASC").each() do |changeset| c = changesets.find(:first, :order => 'committed_on DESC, id DESC', :conditions => "revision NOT LIKE '_%'")
next_rev = next_rev + 1 next_rev = c.nil? ? 1 : (c.revision.to_i + 1)
changeset.revision = next_rev changesets.find(:all, :order => 'committed_on ASC, id ASC', :conditions => "revision LIKE '_%'").each do |changeset|
changeset.save! changeset.update_attribute :revision, next_rev
next_rev += 1
end end
end end # transaction
end end
end end
app/models/repository/darcs.rb
View file @ 3a9b0988
...@@ -47,18 +47,19 @@ class Repository::Darcs < Repository ...@@ -47,18 +47,19 @@ class Repository::Darcs < Repository
def diff(path, rev, rev_to, type) def diff(path, rev, rev_to, type)
patch_from = changesets.find_by_revision(rev) patch_from = changesets.find_by_revision(rev)
return nil if patch_from.nil?
patch_to = changesets.find_by_revision(rev_to) if rev_to patch_to = changesets.find_by_revision(rev_to) if rev_to
if path.blank? if path.blank?
path = patch_from.changes.collect{|change| change.path}.join(' ') path = patch_from.changes.collect{|change| change.path}.join(' ')
end end
scm.diff(path, patch_from.scmid, patch_to.scmid, type) patch_from ? scm.diff(path, patch_from.scmid, patch_to ? patch_to.scmid : nil, type) : nil
end end
def fetch_changesets def fetch_changesets
scm_info = scm.info scm_info = scm.info
if scm_info if scm_info
db_last_id = latest_changeset ? latest_changeset.scmid : nil db_last_id = latest_changeset ? latest_changeset.scmid : nil
next_rev = latest_changeset ? latest_changeset.revision + 1 : 1 next_rev = latest_changeset ? latest_changeset.revision.to_i + 1 : 1
# latest revision in the repository # latest revision in the repository
scm_revision = scm_info.lastrev.scmid scm_revision = scm_info.lastrev.scmid
unless changesets.find_by_scmid(scm_revision) unless changesets.find_by_scmid(scm_revision)
...@@ -71,9 +72,7 @@ class Repository::Darcs < Repository ...@@ -71,9 +72,7 @@ class Repository::Darcs < Repository
:committer => revision.author, :committer => revision.author,
:committed_on => revision.time, :committed_on => revision.time,
:comments => revision.message) :comments => revision.message)
next if changeset.new_record?
revision.paths.each do |change| revision.paths.each do |change|
Change.create(:changeset => changeset, Change.create(:changeset => changeset,
:action => change[:action], :action => change[:action],
......
app/models/repository/git.rb 0 → 100644
View file @ 3a9b0988
# redMine - project management software
# Copyright (C) 2006-2007 Jean-Philippe Lang
# Copyright (C) 2007 Patrick Aljord patcito@ŋmail.com
# 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 'redmine/scm/adapters/git_adapter'
class Repository::Git < Repository
attr_protected :root_url
validates_presence_of :url
def scm_adapter
Redmine::Scm::Adapters::GitAdapter
end
def self.scm_name
'Git'
end
def changesets_for_path(path)
Change.find(:all, :include => :changeset,
:conditions => ["repository_id = ? AND path = ?", id, path],
:order => "committed_on DESC, #{Changeset.table_name}.revision DESC").collect(&:changeset)
end
def fetch_changesets
scm_info = scm.info
if scm_info
# latest revision found in database
db_revision = latest_changeset ? latest_changeset.revision : nil
# latest revision in the repository
scm_revision = scm_info.lastrev.scmid
unless changesets.find_by_scmid(scm_revision)
revisions = scm.revisions('', db_revision, nil)
transaction do
revisions.reverse_each do |revision|
changeset = Changeset.create(:repository => self,
:revision => revision.identifier,
:scmid => revision.scmid,
:committer => revision.author,
:committed_on => revision.time,
:comments => revision.message)
revision.paths.each do |change|
Change.create(:changeset => changeset,
:action => change[:action],
:path => change[:path],
:from_path => change[:from_path],
:from_revision => change[:from_revision])
end
end
end
end
end
end
end
app/models/repository/subversion.rb
View file @ 3a9b0988
...@@ -39,7 +39,7 @@ class Repository::Subversion < Repository ...@@ -39,7 +39,7 @@ class Repository::Subversion < Repository
scm_info = scm.info scm_info = scm.info
if scm_info if scm_info
# latest revision found in database # latest revision found in database
db_revision = latest_changeset ? latest_changeset.revision : 0 db_revision = latest_changeset ? latest_changeset.revision.to_i : 0
# latest revision in the repository # latest revision in the repository
scm_revision = scm_info.lastrev.identifier.to_i scm_revision = scm_info.lastrev.identifier.to_i
if db_revision < scm_revision if db_revision < scm_revision
......
app/views/repositories/_dir_list_content.rhtml
View file @ 3a9b0988
...@@ -23,7 +23,7 @@ else ...@@ -23,7 +23,7 @@ else
end %> end %>
</td> </td>
<td class="size"><%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td> <td class="size"><%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>
<td class="revision"><%= link_to(entry.lastrev.name, :action => 'revision', :id => @project, :rev => entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %></td> <td class="revision"><%= link_to(format_revision(entry.lastrev.name), :action => 'revision', :id => @project, :rev => entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %></td>
<td class="age"><%= distance_of_time_in_words(entry.lastrev.time, Time.now) if entry.lastrev && entry.lastrev.time %></td> <td class="age"><%= distance_of_time_in_words(entry.lastrev.time, Time.now) if entry.lastrev && entry.lastrev.time %></td>
<td class="author"><%=h(entry.lastrev.author.to_s.split('<').first) if entry.lastrev %></td> <td class="author"><%=h(entry.lastrev.author.to_s.split('<').first) if entry.lastrev %></td>
<% changeset = @project.repository.changesets.find_by_revision(entry.lastrev.identifier) if entry.lastrev %> <% changeset = @project.repository.changesets.find_by_revision(entry.lastrev.identifier) if entry.lastrev %>
......
app/views/repositories/_revisions.rhtml
View file @ 3a9b0988
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<% line_num = 1 %> <% line_num = 1 %>
<% revisions.each do |changeset| %> <% revisions.each do |changeset| %>
<tr class="changeset <%= cycle 'odd', 'even' %>"> <tr class="changeset <%= cycle 'odd', 'even' %>">
<td class="id"><%= link_to changeset.revision, :action => 'revision', :id => project, :rev => changeset.revision %></td> <td class="id"><%= link_to format_revision(changeset.revision), :action => 'revision', :id => project, :rev => changeset.revision %></td>
<td class="checkbox"><%= radio_button_tag('rev', changeset.revision, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < revisions.size) %></td> <td class="checkbox"><%= radio_button_tag('rev', changeset.revision, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < revisions.size) %></td>
<td class="checkbox"><%= radio_button_tag('rev_to', changeset.revision, (line_num==2), :id => "cbto-#{line_num}", :onclick => "if ($('cb-#{line_num}').checked==true) {$('cb-#{line_num-1}').checked=true;}") if show_diff && (line_num > 1) %></td> <td class="checkbox"><%= radio_button_tag('rev_to', changeset.revision, (line_num==2), :id => "cbto-#{line_num}", :onclick => "if ($('cb-#{line_num}').checked==true) {$('cb-#{line_num-1}').checked=true;}") if show_diff && (line_num > 1) %></td>
<td class="committed_on"><%= format_time(changeset.committed_on) %></td> <td class="committed_on"><%= format_time(changeset.committed_on) %></td>
......
app/views/repositories/annotate.rhtml
View file @ 3a9b0988
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<tr class="bloc-<%= revision.nil? ? 0 : colors[revision.identifier || revision.revision] %>"> <tr class="bloc-<%= revision.nil? ? 0 : colors[revision.identifier || revision.revision] %>">
<th class="line-num"><%= line_num %></th> <th class="line-num"><%= line_num %></th>
<td class="revision"> <td class="revision">
<%= (revision.identifier ? link_to(revision.identifier, :action => 'revision', :id => @project, :rev => revision.identifier) : revision.revision) if revision %></td> <%= (revision.identifier ? link_to(format_revision(revision.identifier), :action => 'revision', :id => @project, :rev => revision.identifier) : format_revision(revision.revision)) if revision %></td>
<td class="author"><%= h(revision.author.to_s.split('<').first) if revision %></td> <td class="author"><%= h(revision.author.to_s.split('<').first) if revision %></td>
<td class="line-code"><pre><%= line %></pre></td> <td class="line-code"><pre><%= line %></pre></td>
</tr> </tr>
......
app/views/repositories/diff.rhtml
View file @ 3a9b0988
<h2><%= l(:label_revision) %> <%= @rev %>: <%= @path.gsub(/^.*\//, '') %></h2> <h2><%= l(:label_revision) %> <%= format_revision(@rev) %> <%= @path.gsub(/^.*\//, '') %></h2>
<!-- Choose view type --> <!-- Choose view type -->
<% form_tag({ :controller => 'repositories', :action => 'diff'}, :method => 'get') do %> <% form_tag({ :controller => 'repositories', :action => 'diff'}, :method => 'get') do %>
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
</th> </th>
</tr> </tr>
<tr> <tr>
<th colspan="2">@<%= @rev %></th> <th colspan="2">@<%= format_revision @rev %></th>
<th colspan="2">@<%= @rev_to %></th> <th colspan="2">@<%= format_revision @rev_to %></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -56,8 +56,8 @@ ...@@ -56,8 +56,8 @@
</th> </th>
</tr> </tr>
<tr> <tr>
<th>@<%= @rev %></th> <th>@<%= format_revision @rev %></th>
<th>@<%= @rev_to %></th> <th>@<%= format_revision @rev_to %></th>
<th></th> <th></th>
</tr> </tr>
</thead> </thead>
......
app/views/repositories/revision.rhtml
View file @ 3a9b0988
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<% end %> <% end %>
</div> </div>
<h2><%= l(:label_revision) %> <%= @changeset.revision %></h2> <h2><%= l(:label_revision) %> <%= format_revision(@changeset.revision) %></h2>
<p><% if @changeset.scmid %>ID: <%= @changeset.scmid %><br /><% end %> <p><% if @changeset.scmid %>ID: <%= @changeset.scmid %><br /><% end %>
<em><%= @changeset.committer.to_s.split('<').first %>, <%= format_time(@changeset.committed_on) %></em></p> <em><%= @changeset.committer.to_s.split('<').first %>, <%= format_time(@changeset.committed_on) %></em></p>
......
db/migrate/091_change_changesets_revision_to_string.rb 0 → 100644
View file @ 3a9b0988
class ChangeChangesetsRevisionToString < ActiveRecord::Migration
def self.up
change_column :changesets, :revision, :string, :null => false
end
def self.down
change_column :changesets, :revision, :integer, :null => false
end
end
db/migrate/092_change_changes_from_revision_to_string.rb 0 → 100644
View file @ 3a9b0988
class ChangeChangesFromRevisionToString < ActiveRecord::Migration
def self.up
change_column :changes, :from_revision, :string
end
def self.down
change_column :changes, :from_revision, :integer
end
end
doc/RUNNING_TESTS
View file @ 3a9b0988
...@@ -19,3 +19,19 @@ gunzip < test/fixtures/repositories/bazaar_repository.tar.gz | tar -xv -C tmp/te ...@@ -19,3 +19,19 @@ gunzip < test/fixtures/repositories/bazaar_repository.tar.gz | tar -xv -C tmp/te
Mercurial Mercurial
--------- ---------
gunzip < test/fixtures/repositories/mercurial_repository.tar.gz | tar -xv -C tmp/test gunzip < test/fixtures/repositories/mercurial_repository.tar.gz | tar -xv -C tmp/test
Git
---
gunzip < test/fixtures/repositories/git_repository.tar.gz | tar -xv -C tmp/test
Running Tests
=============
Run
rake --tasks | grep test
to see available tests.
RAILS_ENV=test rake test will run tests.
lib/redmine.rb
View file @ 3a9b0988
...@@ -10,7 +10,7 @@ rescue LoadError ...@@ -10,7 +10,7 @@ rescue LoadError
# RMagick is not available # RMagick is not available
end end
REDMINE_SUPPORTED_SCM = %w( Subversion Darcs Mercurial Cvs Bazaar ) REDMINE_SUPPORTED_SCM = %w( Subversion Darcs Mercurial Cvs Bazaar Git )
# Permissions # Permissions
Redmine::AccessControl.map do |map| Redmine::AccessControl.map do |map|
......
lib/redmine/scm/adapters/darcs_adapter.rb
View file @ 3a9b0988
...@@ -102,8 +102,12 @@ module Redmine ...@@ -102,8 +102,12 @@ module Redmine
def diff(path, identifier_from, identifier_to=nil, type="inline") def diff(path, identifier_from, identifier_to=nil, type="inline")
path = '*' if path.blank? path = '*' if path.blank?
cmd = "#{DARCS_BIN} diff --repodir #{@url}" cmd = "#{DARCS_BIN} diff --repodir #{@url}"
cmd << " --to-match \"hash #{identifier_from}\"" if identifier_to.nil?
cmd << " --from-match \"hash #{identifier_to}\"" if identifier_to cmd << " --match \"hash #{identifier_from}\""
else
cmd << " --to-match \"hash #{identifier_from}\""
cmd << " --from-match \"hash #{identifier_to}\""
end
cmd << " -u #{path}" cmd << " -u #{path}"
diff = [] diff = []
shellout(cmd) do |io| shellout(cmd) do |io|
......
lib/redmine/scm/adapters/git_adapter.rb 0 → 100644
View file @ 3a9b0988
This diff is collapsed.
test/functional/repositories_darcs_controller_test.rb 0 → 100644
View file @ 3a9b0988
# redMine - project management software
# Copyright (C) 2006-2008 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.dirname(__FILE__) + '/../test_helper'
require 'repositories_controller'
# Re-raise errors caught by the controller.
class RepositoriesController; def rescue_action(e) raise e end; end
class RepositoriesDarcsControllerTest < Test::Unit::TestCase
fixtures :projects, :users, :roles, :members, :repositories, :enabled_modules
# No '..' in the repository path
REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/darcs_repository'
def setup
@controller = RepositoriesController.new
@request = ActionController::TestRequest.new
@response = ActionController::TestResponse.new
User.current = nil
Repository::Darcs.create(:project => Project.find(3), :url => REPOSITORY_PATH)
end
if File.directory?(REPOSITORY_PATH)
def test_show
get :show, :id => 3
assert_response :success
assert_template 'show'
assert_not_nil assigns(:entries)
assert_not_nil assigns(:changesets)
end
def test_browse_root
get :browse, :id => 3
assert_response :success
assert_template 'browse'
assert_not_nil assigns(:entries)
assert_equal 3, assigns(:entries).size
assert assigns(:entries).detect {|e| e.name == 'images' && e.kind == 'dir'}
assert assigns(:entries).detect {|e| e.name == 'sources' && e.kind == 'dir'}
assert assigns(:entries).detect {|e| e.name == 'README' && e.kind == 'file'}
end
def test_browse_directory
get :browse, :id => 3, :path => ['images']
assert_response :success
assert_template 'browse'
assert_not_nil assigns(:entries)
assert_equal 2, assigns(:entries).size
entry = assigns(:entries).detect {|e| e.name == 'edit.png'}
assert_not_nil entry
assert_equal 'file', entry.kind
assert_equal 'images/edit.png', entry.path
end
def test_changes
get :changes, :id => 3, :path => ['images', 'edit.png']
assert_response :success
assert_template 'changes'
assert_tag :tag => 'h2', :content => 'edit.png'
end
def test_diff
Project.find(3).repository.fetch_changesets
# Full diff of changeset 5
get :diff, :id => 3, :rev => 5
assert_response :success
assert_template 'diff'
# Line 22 removed
assert_tag :tag => 'th',
:content => /22/,
:sibling => { :tag => 'td',
:attributes => { :class => /diff_out/ },
:content => /def remove/ }
end
else
puts "Darcs test repository NOT FOUND. Skipping functional tests !!!"
def test_fake; assert true end
end
end
test/functional/repositories_git_controller_test.rb 0 → 100644
View file @ 3a9b0988
# redMine - project management software
# Copyright (C) 2006-2007 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
require File.dirname(__FILE__) + '/../test_helper'
require 'repositories_controller'
# Re-raise errors caught by the controller.
class RepositoriesController; def rescue_action(e) raise e end; end
class RepositoriesGitControllerTest < Test::Unit::TestCase
fixtures :projects, :users, :roles, :members, :repositories, :enabled_modules
# No '..' in the repository path
REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/git_repository'
REPOSITORY_PATH.gsub!(/\//, "\\") if RUBY_PLATFORM =~ /mswin/
def setup
@controller = RepositoriesController.new
@request = ActionController::TestRequest.new
@response = ActionController::TestResponse.new
User.current = nil
Repository::Git.create(:project => Project.find(3), :url => REPOSITORY_PATH)
end
if File.directory?(REPOSITORY_PATH)
def test_show
get :show, :id => 3
assert_response :success
assert_template 'show'
assert_not_nil assigns(:entries)
assert_not_nil assigns(:changesets)
end
def test_browse_root
get :browse, :id => 3
assert_response :success
assert_template 'browse'
assert_not_nil assigns(:entries)
assert_equal 3, assigns(:entries).size
assert assigns(:entries).detect {|e| e.name == 'images' && e.kind == 'dir'}
assert assigns(:entries).detect {|e| e.name == 'sources' && e.kind == 'dir'}
assert assigns(:entries).detect {|e| e.name == 'README' && e.kind == 'file'}
end
def test_browse_directory
get :browse, :id => 3, :path => ['images']
assert_response :success
assert_template 'browse'
assert_not_nil assigns(:entries)
assert_equal 2, assigns(:entries).size
entry = assigns(:entries).detect {|e| e.name == 'edit.png'}
assert_not_nil entry
assert_equal 'file', entry.kind
assert_equal 'images/edit.png', entry.path
end
def test_changes
get :changes, :id => 3, :path => ['images', 'edit.png']
assert_response :success
assert_template 'changes'
assert_tag :tag => 'h2', :content => 'edit.png'
end
def test_entry_show
get :entry, :id => 3, :path => ['sources', 'watchers_controller.rb']
assert_response :success
assert_template 'entry'
# Line 19
assert_tag :tag => 'th',
:content => /10/,
:attributes => { :class => /line-num/ },
:sibling => { :tag => 'td', :content => /WITHOUT ANY WARRANTY/ }
end
def test_entry_download
get :entry, :id => 3, :path => ['sources', 'watchers_controller.rb'], :format => 'raw'
assert_response :success
# File content
assert @response.body.include?('WITHOUT ANY WARRANTY')
end
def test_diff
# Full diff of changeset 2f9c0091
get :diff, :id => 3, :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
assert_response :success
assert_template 'diff'
# Line 22 removed
assert_tag :tag => 'th',
:content => /22/,
:sibling => { :tag => 'td',
:attributes => { :class => /diff_out/ },
:content => /def remove/ }
end
def test_annotate
get :annotate, :id => 3, :path => ['sources', 'watchers_controller.rb']
assert_response :success
assert_template 'annotate'
# Line 23, changeset 2f9c0091
assert_tag :tag => 'th', :content => /23/,
:sibling => { :tag => 'td', :child => { :tag => 'a', :content => /2f9c0091/ } },
:sibling => { :tag => 'td', :content => /jsmith/ },
:sibling => { :tag => 'td', :content => /watcher =/ }
end
else
puts "Git test repository NOT FOUND. Skipping functional tests !!!"
def test_fake; assert true end
end
end
test/unit/repository_cvs_test.rb
View file @ 3a9b0988
...@@ -40,13 +40,13 @@ class RepositoryCvsTest < Test::Unit::TestCase ...@@ -40,13 +40,13 @@ class RepositoryCvsTest < Test::Unit::TestCase
assert_equal 5, @repository.changesets.count assert_equal 5, @repository.changesets.count
assert_equal 14, @repository.changes.count assert_equal 14, @repository.changes.count
assert_equal 'Two files changed', @repository.changesets.find_by_revision(3).comments assert_not_nil @repository.changesets.find_by_comments('Two files changed')
end end
def test_fetch_changesets_incremental def test_fetch_changesets_incremental
@repository.fetch_changesets @repository.fetch_changesets
# Remove changesets with revision > 2 # Remove the 3 latest changesets
@repository.changesets.find(:all, :conditions => 'revision > 2').each(&:destroy) @repository.changesets.find(:all, :order => 'committed_on DESC', :limit => 3).each(&:destroy)
@repository.reload @repository.reload
assert_equal 2, @repository.changesets.count assert_equal 2, @repository.changesets.count
......
test/unit/repository_darcs_test.rb 0 → 100644
View file @ 3a9b0988
# redMine - project management software
# Copyright (C) 2006-2008 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.dirname(__FILE__) + '/../test_helper'
class RepositoryDarcsTest < Test::Unit::TestCase
fixtures :projects
# No '..' in the repository path
REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/darcs_repository'
def setup
@project = Project.find(1)
assert @repository = Repository::Darcs.create(:project => @project, :url => REPOSITORY_PATH)
end
if File.directory?(REPOSITORY_PATH)
def test_fetch_changesets_from_scratch
@repository.fetch_changesets
@repository.reload
assert_equal 6, @repository.changesets.count
assert_equal 13, @repository.changes.count
assert_equal "Initial commit.", @repository.changesets.find_by_revision(1).comments
end
def test_fetch_changesets_incremental
@repository.fetch_changesets
# Remove changesets with revision > 3
@repository.changesets.find(:all, :conditions => 'revision > 3').each(&:destroy)
@repository.reload
assert_equal 3, @repository.changesets.count
@repository.fetch_changesets
assert_equal 6, @repository.changesets.count
end
else
puts "Darcs test repository NOT FOUND. Skipping unit tests !!!"
def test_fake; assert true end
end
end
test/unit/repository_git_test.rb 0 → 100644
View file @ 3a9b0988
# redMine - project management software
# Copyright (C) 2006-2007 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
require File.dirname(__FILE__) + '/../test_helper'
class RepositoryGitTest < Test::Unit::TestCase
fixtures :projects
# No '..' in the repository path
REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/git_repository'
REPOSITORY_PATH.gsub!(/\//, "\\") if RUBY_PLATFORM =~ /mswin/
def setup
@project = Project.find(1)
assert @repository = Repository::Git.create(:project => @project, :url => REPOSITORY_PATH)
end
if File.directory?(REPOSITORY_PATH)
def test_fetch_changesets_from_scratch
@repository.fetch_changesets
@repository.reload
assert_equal 6, @repository.changesets.count
assert_equal 11, @repository.changes.count
assert_equal "Initial import.\nThe repository contains 3 files.", @repository.changesets.find(:first, :order => 'id ASC').comments
end
def test_fetch_changesets_incremental
@repository.fetch_changesets
# Remove the 3 latest changesets
@repository.changesets.find(:all, :order => 'id DESC', :limit => 3).each(&:destroy)
@repository.reload
assert_equal 3, @repository.changesets.count
@repository.fetch_changesets
assert_equal 6, @repository.changesets.count
end
else
puts "Git test repository NOT FOUND. Skipping unit tests !!!"
def test_fake; assert true end
end
end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment