jro_apps/redmine Commit - r9583:e9813791cbf7

Merged r9759 to r9764....

Jean-Philippe Lang -

r9583:e9813791cbf7

parent child

Context file:

r9583:e9813791cbf7

Collapse all files

Gemfile +1 -1

             source 'http://rubygems.org'
-            gem 'rails', '3.2.3'
+            gem 'rails', '3.2.5'
             gem 'prototype-rails', '3.2.1'
             gem "i18n", "~> 0.6.0"
             gem "coderay", "~> 1.0.6"
             gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
             gem "builder"
             # Optional gem for LDAP authentication
             group :ldap do
               gem "net-ldap", "~> 0.3.1"
             end
             # Optional gem for OpenID authentication
             group :openid do
               gem "ruby-openid", "~> 2.1.4", :require => "openid"
               gem "rack-openid"
             end
             # Optional gem for exporting the gantt to a PNG file, not supported with jruby
             platforms :mri, :mingw do
               group :rmagick do
                 # RMagick 2 supports ruby 1.9
                 # RMagick 1 would be fine for ruby 1.8 but Bundler does not support
                 # different requirements for the same gem on different platforms
                 gem "rmagick", ">= 2.0.0"
               end
             end
             # Database gems
             platforms :mri, :mingw do
               group :postgresql do
                 gem "pg", ">= 0.11.0"
               end
               group :sqlite do
                 gem "sqlite3"
               end
             end
             platforms :mri_18, :mingw_18 do
               group :mysql do
                 gem "mysql"
               end
             end
             platforms :mri_19, :mingw_19 do
               group :mysql do
                 gem "mysql2", "~> 0.3.11"
               end
             end
             platforms :jruby do
               gem "jruby-openssl"
               group :mysql do
                 gem "activerecord-jdbcmysql-adapter"
               end
               group :postgresql do
                 gem "activerecord-jdbcpostgresql-adapter"
               end
               group :sqlite do
                 gem "activerecord-jdbcsqlite3-adapter"
               end
             end
             group :development do
               gem "rdoc", ">= 2.4.2"
               gem "yard"
             end
             group :test do
               gem "shoulda", "~> 2.11"
               gem "mocha"
             end
             local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
             if File.exists?(local_gemfile)
               puts "Loading Gemfile.local ..." if $DEBUG # `ruby -d` or `bundle -v`
               instance_eval File.read(local_gemfile)
             end
             # Load plugins' Gemfiles
             Dir.glob File.expand_path("../plugins/*/Gemfile", __FILE__) do |file|
               puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
               instance_eval File.read(file)
             end

app/helpers/repositories_helper.rb +3 -3

             # encoding: utf-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 'iconv'
             require 'redmine/codeset_util'
             module RepositoriesHelper
               def format_revision(revision)
                 if revision.respond_to? :format_identifier
                   revision.format_identifier
                 else
                   revision.to_s
                 end
               end
               def truncate_at_line_break(text, length = 255)
                 if text
                   text.gsub(%r{^(.{#{length}}[^\n]*)\n.+$}m, '\\1...')
                 end
               end
               def render_properties(properties)
                 unless properties.nil? || properties.empty?
                   content = ''
                   properties.keys.sort.each do |property|
                     content << content_tag('li', "<b>#{h property}</b>: <span>#{h properties[property]}</span>".html_safe)
                   end
                   content_tag('ul', content.html_safe, :class => 'properties')
                 end
               end
               def render_changeset_changes
-                changes = @changeset.changes.find(:all, :limit => 1000, :order => 'path').collect do |change|
+                changes = @changeset.filechanges.find(:all, :limit => 1000, :order => 'path').collect do |change|
                   case change.action
                   when 'A'
                     # Detects moved/copied files
                     if !change.from_path.blank?
                       change.action =
-                         @changeset.changes.detect {|c| c.action == 'D' && c.path == change.from_path} ? 'R' : 'C'
+                         @changeset.filechanges.detect {|c| c.action == 'D' && c.path == change.from_path} ? 'R' : 'C'
                     end
                     change
                   when 'D'
-                    @changeset.changes.detect {|c| c.from_path == change.path} ? nil : change
+                    @changeset.filechanges.detect {|c| c.from_path == change.path} ? nil : change
                   else
                     change
                   end
                 end.compact
                 tree = { }
                 changes.each do |change|
                   p = tree
                   dirs = change.path.to_s.split('/').select {|d| !d.blank?}
                   path = ''
                   dirs.each do |dir|
                     path += '/' + dir
                     p[:s] ||= {}
                     p = p[:s]
                     p[path] ||= {}
                     p = p[path]
                   end
                   p[:c] = change
                 end
                 render_changes_tree(tree[:s])
               end
               def render_changes_tree(tree)
                 return '' if tree.nil?
                 output = ''
                 output << '<ul>'
                 tree.keys.sort.each do |file|
                   style = 'change'
                   text = File.basename(h(file))
                   if s = tree[file][:s]
                     style << ' folder'
                     path_param = to_path_param(@repository.relative_path(file))
                     text = link_to(h(text), :controller => 'repositories',
                                          :action => 'show',
                                          :id => @project,
                                          :repository_id => @repository.identifier_param,
                                          :path => path_param,
                                          :rev => @changeset.identifier)
                     output << "<li class='#{style}'>#{text}"
                     output << render_changes_tree(s)
                     output << "</li>"
                   elsif c = tree[file][:c]
                     style << " change-#{c.action}"
                     path_param = to_path_param(@repository.relative_path(c.path))
                     text = link_to(h(text), :controller => 'repositories',
                                          :action => 'entry',
                                          :id => @project,
                                          :repository_id => @repository.identifier_param,
                                          :path => path_param,
                                          :rev => @changeset.identifier) unless c.action == 'D'
                     text << " - #{h(c.revision)}" unless c.revision.blank?
                     text << ' ('.html_safe + link_to(l(:label_diff), :controller => 'repositories',
                                                    :action => 'diff',
                                                    :id => @project,
                                                    :repository_id => @repository.identifier_param,
                                                    :path => path_param,
                                                    :rev => @changeset.identifier) + ') '.html_safe if c.action == 'M'
                     text << ' '.html_safe + content_tag('span', h(c.from_path), :class => 'copied-from') unless c.from_path.blank?
                     output << "<li class='#{style}'>#{text}</li>"
                   end
                 end
                 output << '</ul>'
                 output.html_safe
               end
               def repository_field_tags(form, repository)
                 method = repository.class.name.demodulize.underscore + "_field_tags"
                 if repository.is_a?(Repository) &&
                     respond_to?(method) && method != 'repository_field_tags'
                   send(method, form, repository)
                 end
               end
               def scm_select_tag(repository)
                 scm_options = [["--- #{l(:actionview_instancetag_blank_option)} ---", '']]
                 Redmine::Scm::Base.all.each do |scm|
                 if Setting.enabled_scm.include?(scm) ||
                       (repository && repository.class.name.demodulize == scm)
                     scm_options << ["Repository::#{scm}".constantize.scm_name, scm]
                   end
                 end
                 select_tag('repository_scm',
                            options_for_select(scm_options, repository.class.name.demodulize),
                            :disabled => (repository && !repository.new_record?),
                            :onchange => remote_function(
                              :url => new_project_repository_path(@project),
                              :method => :get,
                              :update => 'content',
                              :with   => "Form.serialize(this.form)")
                          )
               end
               def with_leading_slash(path)
                 path.to_s.starts_with?('/') ? path : "/#{path}"
               end
               def without_leading_slash(path)
                 path.gsub(%r{^/+}, '')
               end
               def subversion_field_tags(form, repository)
                   content_tag('p', form.text_field(:url, :size => 60, :required => true,
                                    :disabled => (repository && !repository.root_url.blank?)) +
                                    '<br />'.html_safe +
                                    '(file:///, http://, https://, svn://, svn+[tunnelscheme]://)') +
                   content_tag('p', form.text_field(:login, :size => 30)) +
                   content_tag('p', form.password_field(
                                         :password, :size => 30, :name => 'ignore',
                                         :value => ((repository.new_record? || repository.password.blank?) ? '' : ('x'*15)),
                                         :onfocus => "this.value=''; this.name='repository[password]';",
                                         :onchange => "this.name='repository[password]';"))
               end
               def darcs_field_tags(form, repository)
                 content_tag('p', form.text_field(
                                  :url, :label => l(:field_path_to_repository),
                                  :size => 60, :required => true,
                                  :disabled => (repository && !repository.new_record?))) +
                 content_tag('p', form.select(
                                  :log_encoding, [nil] + Setting::ENCODINGS,
                                  :label => l(:field_commit_logs_encoding), :required => true))
               end
               def mercurial_field_tags(form, repository)
                 content_tag('p', form.text_field(
                                    :url, :label => l(:field_path_to_repository),
                                    :size => 60, :required => true,
                                    :disabled => (repository && !repository.root_url.blank?)
                                      ) +
                                  '<br />'.html_safe + l(:text_mercurial_repository_note)) +
                 content_tag('p', form.select(
                                     :path_encoding, [nil] + Setting::ENCODINGS,
                                     :label => l(:field_scm_path_encoding)
                                     ) +
                                  '<br />'.html_safe + l(:text_scm_path_encoding_note))
               end
               def git_field_tags(form, repository)
                 content_tag('p', form.text_field(
                                    :url, :label => l(:field_path_to_repository),
                                    :size => 60, :required => true,
                                    :disabled => (repository && !repository.root_url.blank?)
                                      ) +
                                   '<br />'.html_safe +
                                   l(:text_git_repository_note)) +
                 content_tag('p', form.select(
                                     :path_encoding, [nil] + Setting::ENCODINGS,
                                     :label => l(:field_scm_path_encoding)
                                     ) +
                                  '<br />'.html_safe + l(:text_scm_path_encoding_note)) +
                 content_tag('p', form.check_box(
                                     :extra_report_last_commit,
                                     :label => l(:label_git_report_last_commit)
                                      ))
               end
               def cvs_field_tags(form, repository)
                 content_tag('p', form.text_field(
                                  :root_url,
                                  :label => l(:field_cvsroot),
                                  :size => 60, :required => true,
                                  :disabled => !repository.new_record?)) +
                 content_tag('p', form.text_field(
                                  :url,
                                  :label => l(:field_cvs_module),
                                  :size => 30, :required => true,
                                  :disabled => !repository.new_record?)) +
                 content_tag('p', form.select(
                                  :log_encoding, [nil] + Setting::ENCODINGS,
                                  :label => l(:field_commit_logs_encoding), :required => true)) +
                 content_tag('p', form.select(
                                     :path_encoding, [nil] + Setting::ENCODINGS,
                                     :label => l(:field_scm_path_encoding)
                                     ) +
                                  '<br />'.html_safe + l(:text_scm_path_encoding_note))
               end
               def bazaar_field_tags(form, repository)
                 content_tag('p', form.text_field(
                                  :url, :label => l(:field_path_to_repository),
                                  :size => 60, :required => true,
                                  :disabled => (repository && !repository.new_record?))) +
                 content_tag('p', form.select(
                                  :log_encoding, [nil] + Setting::ENCODINGS,
                                  :label => l(:field_commit_logs_encoding), :required => true))
               end
               def filesystem_field_tags(form, repository)
                 content_tag('p', form.text_field(
                                  :url, :label => l(:field_root_directory),
                                  :size => 60, :required => true,
                                  :disabled => (repository && !repository.root_url.blank?))) +
                 content_tag('p', form.select(
                                     :path_encoding, [nil] + Setting::ENCODINGS,
                                     :label => l(:field_scm_path_encoding)
                                     ) +
                                  '<br />'.html_safe + l(:text_scm_path_encoding_note))
               end
               def index_commits(commits, heads)
                 return nil if commits.nil? or commits.first.parents.nil?
                 refs_map = {}
                 heads.each do |head|
                   refs_map[head.scmid] ||= []
                   refs_map[head.scmid] << head
                 end
                 commits_by_scmid = {}
                 commits.reverse.each_with_index do |commit, commit_index|
                   commits_by_scmid[commit.scmid] = {
                     :parent_scmids => commit.parents.collect { |parent| parent.scmid },
                     :rdmid => commit_index,
                     :refs  => refs_map.include?(commit.scmid) ? refs_map[commit.scmid].join(" ") : nil,
                     :scmid => commit.scmid,
                     :href  => block_given? ? yield(commit.scmid) : commit.scmid
                   }
                 end
                 heads.sort! { |head1, head2| head1.to_s <=> head2.to_s }
                 space = nil
                 heads.each do |head|
                   if commits_by_scmid.include? head.scmid
                     space = index_head((space || -1) + 1, head, commits_by_scmid)
                   end
                 end
                 # when no head matched anything use first commit
                 space ||= index_head(0, commits.first, commits_by_scmid)
                 return commits_by_scmid, space
               end
               def index_head(space, commit, commits_by_scmid)
                 stack = [[space, commits_by_scmid[commit.scmid]]]
                 max_space = space
                 until stack.empty?
                   space, commit = stack.pop
                   commit[:space] = space if commit[:space].nil?
                   space -= 1
                   commit[:parent_scmids].each_with_index do |parent_scmid, parent_index|
                     parent_commit = commits_by_scmid[parent_scmid]
                     if parent_commit and parent_commit[:space].nil?
                       stack.unshift [space += 1, parent_commit]
                     end
                   end
                   max_space = space if max_space < space
                 end
                 max_space
               end
             end

app/models/changeset.rb +1 -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 'iconv'
             class Changeset < ActiveRecord::Base
               belongs_to :repository
               belongs_to :user
-              has_many :changes, :dependent => :delete_all
+              has_many :filechanges, :class_name => 'Change', :dependent => :delete_all
               has_and_belongs_to_many :issues
               has_and_belongs_to_many :parents,
                                       :class_name => "Changeset",
                                       :join_table => "#{table_name_prefix}changeset_parents#{table_name_suffix}",
                                       :association_foreign_key => 'parent_id', :foreign_key => 'changeset_id'
               has_and_belongs_to_many :children,
                                       :class_name => "Changeset",
                                       :join_table => "#{table_name_prefix}changeset_parents#{table_name_suffix}",
                                       :association_foreign_key => 'changeset_id', :foreign_key => 'parent_id'
               acts_as_event :title => Proc.new {|o| o.title},
                             :description => :long_comments,
                             :datetime => :committed_on,
                             :url => Proc.new {|o| {:controller => 'repositories', :action => 'revision', :id => o.repository.project, :repository_id => o.repository.identifier_param, :rev => o.identifier}}
               acts_as_searchable :columns => 'comments',
                                  :include => {:repository => :project},
                                  :project_key => "#{Repository.table_name}.project_id",
                                  :date_column => 'committed_on'
               acts_as_activity_provider :timestamp => "#{table_name}.committed_on",
                                         :author_key => :user_id,
                                         :find_options => {:include => [:user, {:repository => :project}]}
               validates_presence_of :repository_id, :revision, :committed_on, :commit_date
               validates_uniqueness_of :revision, :scope => :repository_id
               validates_uniqueness_of :scmid, :scope => :repository_id, :allow_nil => true
               scope :visible,
                  lambda {|*args| { :include => {:repository => :project},
                                                       :conditions => Project.allowed_to_condition(args.shift || User.current, :view_changesets, *args) } }
               after_create :scan_for_issues
               before_create :before_create_cs
               def revision=(r)
                 write_attribute :revision, (r.nil? ? nil : r.to_s)
               end
               # Returns the identifier of this changeset; depending on repository backends
               def identifier
                 if repository.class.respond_to? :changeset_identifier
                   repository.class.changeset_identifier self
                 else
                   revision.to_s
                 end
               end
               def committed_on=(date)
                 self.commit_date = date
                 super
               end
               # Returns the readable identifier
               def format_identifier
                 if repository.class.respond_to? :format_changeset_identifier
                   repository.class.format_changeset_identifier self
                 else
                   identifier
                 end
               end
               def project
                 repository.project
               end
               def author
                 user || committer.to_s.split('<').first
               end
               def before_create_cs
                 self.committer = self.class.to_utf8(self.committer, repository.repo_log_encoding)
                 self.comments  = self.class.normalize_comments(
                                    self.comments, repository.repo_log_encoding)
                 self.user = repository.find_committer_user(self.committer)
               end
               def scan_for_issues
                 scan_comment_for_issue_ids
               end
               TIMELOG_RE = /
                 (
                 ((\d+)(h|hours?))((\d+)(m|min)?)?
                 |
                 ((\d+)(h|hours?|m|min))
                 |
                 (\d+):(\d+)
                 |
                 (\d+([\.,]\d+)?)h?
                 )
                 /x
               def scan_comment_for_issue_ids
                 return if comments.blank?
                 # keywords used to reference issues
                 ref_keywords = Setting.commit_ref_keywords.downcase.split(",").collect(&:strip)
                 ref_keywords_any = ref_keywords.delete('*')
                 # keywords used to fix issues
                 fix_keywords = Setting.commit_fix_keywords.downcase.split(",").collect(&:strip)
                 kw_regexp = (ref_keywords + fix_keywords).collect{|kw| Regexp.escape(kw)}.join("|")
                 referenced_issues = []
                 comments.scan(/([\s\(\[,-]|^)((#{kw_regexp})[\s:]+)?(#\d+(\s+@#{TIMELOG_RE})?([\s,;&]+#\d+(\s+@#{TIMELOG_RE})?)*)(?=[[:punct:]]|\s|<|$)/i) do |match|
                   action, refs = match[2], match[3]
                   next unless action.present? || ref_keywords_any
                   refs.scan(/#(\d+)(\s+@#{TIMELOG_RE})?/).each do |m|
                     issue, hours = find_referenced_issue_by_id(m[0].to_i), m[2]
                     if issue
                       referenced_issues << issue
                       fix_issue(issue) if fix_keywords.include?(action.to_s.downcase)
                       log_time(issue, hours) if hours && Setting.commit_logtime_enabled?
                     end
                   end
                 end
                 referenced_issues.uniq!
                 self.issues = referenced_issues unless referenced_issues.empty?
               end
               def short_comments
                 @short_comments || split_comments.first
               end
               def long_comments
                 @long_comments || split_comments.last
               end
               def text_tag(ref_project=nil)
                 tag = if scmid?
                   "commit:#{scmid}"
                 else
                   "r#{revision}"
                 end
                 if repository && repository.identifier.present?
                   tag = "#{repository.identifier}|#{tag}"
                 end
                 if ref_project && project && ref_project != project
                   tag = "#{project.identifier}:#{tag}"
                 end
                 tag
               end
               # Returns the title used for the changeset in the activity/search results
               def title
                 repo = (repository && repository.identifier.present?) ? " (#{repository.identifier})" : ''
                 comm = short_comments.blank? ? '' : (': ' + short_comments)
                 "#{l(:label_revision)} #{format_identifier}#{repo}#{comm}"
               end
               # Returns the previous changeset
               def previous
                 @previous ||= Changeset.find(:first,
                                 :conditions => ['id < ? AND repository_id = ?',
                                                 self.id, self.repository_id],
                                 :order => 'id DESC')
               end
               # Returns the next changeset
               def next
                 @next ||= Changeset.find(:first,
                                 :conditions => ['id > ? AND repository_id = ?',
                                                 self.id, self.repository_id],
                                 :order => 'id ASC')
               end
               # Creates a new Change from it's common parameters
               def create_change(change)
                 Change.create(:changeset     => self,
                               :action        => change[:action],
                               :path          => change[:path],
                               :from_path     => change[:from_path],
                               :from_revision => change[:from_revision])
               end
               # Finds an issue that can be referenced by the commit message
               def find_referenced_issue_by_id(id)
                 return nil if id.blank?
                 issue = Issue.find_by_id(id.to_i, :include => :project)
                 if Setting.commit_cross_project_ref?
                   # all issues can be referenced/fixed
                 elsif issue
                   # issue that belong to the repository project, a subproject or a parent project only
                   unless issue.project &&
                             (project == issue.project || project.is_ancestor_of?(issue.project) ||
                              project.is_descendant_of?(issue.project))
                     issue = nil
                   end
                 end
                 issue
               end
               private
               def fix_issue(issue)
                 status = IssueStatus.find_by_id(Setting.commit_fix_status_id.to_i)
                 if status.nil?
                   logger.warn("No status matches commit_fix_status_id setting (#{Setting.commit_fix_status_id})") if logger
                   return issue
                 end
                 # the issue may have been updated by the closure of another one (eg. duplicate)
                 issue.reload
                 # don't change the status is the issue is closed
                 return if issue.status && issue.status.is_closed?
                 journal = issue.init_journal(user || User.anonymous, ll(Setting.default_language, :text_status_changed_by_changeset, text_tag(issue.project)))
                 issue.status = status
                 unless Setting.commit_fix_done_ratio.blank?
                   issue.done_ratio = Setting.commit_fix_done_ratio.to_i
                 end
                 Redmine::Hook.call_hook(:model_changeset_scan_commit_for_issue_ids_pre_issue_update,
                                         { :changeset => self, :issue => issue })
                 unless issue.save
                   logger.warn("Issue ##{issue.id} could not be saved by changeset #{id}: #{issue.errors.full_messages}") if logger
                 end
                 issue
               end
               def log_time(issue, hours)
                 time_entry = TimeEntry.new(
                   :user => user,
                   :hours => hours,
                   :issue => issue,
                   :spent_on => commit_date,
                   :comments => l(:text_time_logged_by_changeset, :value => text_tag(issue.project),
                                  :locale => Setting.default_language)
                   )
                 time_entry.activity = log_time_activity unless log_time_activity.nil?
                 unless time_entry.save
                   logger.warn("TimeEntry could not be created by changeset #{id}: #{time_entry.errors.full_messages}") if logger
                 end
                 time_entry
               end
               def log_time_activity
                 if Setting.commit_logtime_activity_id.to_i > 0
                   TimeEntryActivity.find_by_id(Setting.commit_logtime_activity_id.to_i)
                 end
               end
               def split_comments
                 comments =~ /\A(.+?)\r?\n(.*)$/m
                 @short_comments = $1 || comments
                 @long_comments = $2.to_s.strip
                 return @short_comments, @long_comments
               end
               public
               # Strips and reencodes a commit log before insertion into the database
               def self.normalize_comments(str, encoding)
                 Changeset.to_utf8(str.to_s.strip, encoding)
               end
               def self.to_utf8(str, encoding)
                 Redmine::CodesetUtil.to_utf8(str, encoding)
               end
             end

app/models/repository.rb +2 -2

             # 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.
             class ScmFetchError < Exception; end
             class Repository < ActiveRecord::Base
               include Redmine::Ciphering
               belongs_to :project
               has_many :changesets, :order => "#{Changeset.table_name}.committed_on DESC, #{Changeset.table_name}.id DESC"
-              has_many :changes, :through => :changesets
+              has_many :filechanges, :class_name => 'Change', :through => :changesets
               serialize :extra_info
               before_save :check_default
               # Raw SQL to delete changesets and changes in the database
               # has_many :changesets, :dependent => :destroy is too slow for big repositories
               before_destroy :clear_changesets
               validates_length_of :password, :maximum => 255, :allow_nil => true
               validates_length_of :identifier, :maximum => 255, :allow_blank => true
               validates_presence_of :identifier, :unless => Proc.new { |r| r.is_default? || r.set_as_default? }
               validates_uniqueness_of :identifier, :scope => :project_id, :allow_blank => true
               validates_exclusion_of :identifier, :in => %w(show entry raw changes annotate diff show stats graph)
               # donwcase letters, digits, dashes but not digits only
               validates_format_of :identifier, :with => /^(?!\d+$)[a-z0-9\-]*$/, :allow_blank => true
               # Checks if the SCM is enabled when creating a repository
               validate :repo_create_validation, :on => :create
               def repo_create_validation
                 unless Setting.enabled_scm.include?(self.class.name.demodulize)
                   errors.add(:type, :invalid)
                 end
               end
               def self.human_attribute_name(attribute_key_name, *args)
                 attr_name = attribute_key_name.to_s
                 if attr_name == "log_encoding"
                   attr_name = "commit_logs_encoding"
                 end
                 super(attr_name, *args)
               end
               # Removes leading and trailing whitespace
               def url=(arg)
                 write_attribute(:url, arg ? arg.to_s.strip : nil)
               end
               # Removes leading and trailing whitespace
               def root_url=(arg)
                 write_attribute(:root_url, arg ? arg.to_s.strip : nil)
               end
               def password
                 read_ciphered_attribute(:password)
               end
               def password=(arg)
                 write_ciphered_attribute(:password, arg)
               end
               def scm_adapter
                 self.class.scm_adapter_class
               end
               def scm
                 unless @scm
                   @scm = self.scm_adapter.new(url, root_url,
                                               login, password, path_encoding)
                   if root_url.blank? && @scm.root_url.present?
                     update_attribute(:root_url, @scm.root_url)
                   end
                 end
                 @scm
               end
               def scm_name
                 self.class.scm_name
               end
               def name
                 if identifier.present?
                   identifier
                 elsif is_default?
                   l(:field_repository_is_default)
                 else
                   scm_name
                 end
               end
               def identifier_param
                 if is_default?
                   nil
                 elsif identifier.present?
                   identifier
                 else
                   id.to_s
                 end
               end
               def <=>(repository)
                 if is_default?
                   -1
                 elsif repository.is_default?
                 else
                   identifier.to_s <=> repository.identifier.to_s
                 end
               end
               def self.find_by_identifier_param(param)
                 if param.to_s =~ /^\d+$/
                   find_by_id(param)
                 else
                   find_by_identifier(param)
                 end
               end
               def merge_extra_info(arg)
                 h = extra_info || {}
                 return h if arg.nil?
                 h.merge!(arg)
                 write_attribute(:extra_info, h)
               end
               def report_last_commit
                 true
               end
               def supports_cat?
                 scm.supports_cat?
               end
               def supports_annotate?
                 scm.supports_annotate?
               end
               def supports_all_revisions?
                 true
               end
               def supports_directory_revisions?
                 false
               end
               def supports_revision_graph?
                 false
               end
               def entry(path=nil, identifier=nil)
                 scm.entry(path, identifier)
               end
               def entries(path=nil, identifier=nil)
                 scm.entries(path, identifier)
               end
               def branches
                 scm.branches
               end
               def tags
                 scm.tags
               end
               def default_branch
                 nil
               end
               def properties(path, identifier=nil)
                 scm.properties(path, identifier)
               end
               def cat(path, identifier=nil)
                 scm.cat(path, identifier)
               end
               def diff(path, rev, rev_to)
                 scm.diff(path, rev, rev_to)
               end
               def diff_format_revisions(cs, cs_to, sep=':')
                 text = ""
                 text << cs_to.format_identifier + sep if cs_to
                 text << cs.format_identifier if cs
                 text
               end
               # Returns a path relative to the url of the repository
               def relative_path(path)
                 path
               end
               # Finds and returns a revision with a number or the beginning of a hash
               def find_changeset_by_name(name)
                 return nil if name.blank?
                 s = name.to_s
                 changesets.find(:first, :conditions => (s.match(/^\d*$/) ?
                       ["revision = ?", s] : ["revision LIKE ?", s + '%']))
               end
               def latest_changeset
                 @latest_changeset ||= changesets.find(:first)
               end
               # Returns the latest changesets for +path+
               # Default behaviour is to search in cached changesets
               def latest_changesets(path, rev, limit=10)
                 if path.blank?
                   changesets.find(
                      :all,
                      :include => :user,
                      :order => "#{Changeset.table_name}.committed_on DESC, #{Changeset.table_name}.id DESC",
                      :limit => limit)
                 else
-                  changes.find(
+                  filechanges.find(
                      :all,
                      :include => {:changeset => :user},
                      :conditions => ["path = ?", path.with_leading_slash],
                      :order => "#{Changeset.table_name}.committed_on DESC, #{Changeset.table_name}.id DESC",
                      :limit => limit
                    ).collect(&:changeset)
                 end
               end
               def scan_changesets_for_issue_ids
                 self.changesets.each(&:scan_comment_for_issue_ids)
               end
               # Returns an array of committers usernames and associated user_id
               def committers
                 @committers ||= Changeset.connection.select_rows(
                      "SELECT DISTINCT committer, user_id FROM #{Changeset.table_name} WHERE repository_id = #{id}")
               end
               # Maps committers username to a user ids
               def committer_ids=(h)
                 if h.is_a?(Hash)
                   committers.each do |committer, user_id|
                     new_user_id = h[committer]
                     if new_user_id && (new_user_id.to_i != user_id.to_i)
                       new_user_id = (new_user_id.to_i > 0 ? new_user_id.to_i : nil)
                       Changeset.update_all(
                            "user_id = #{ new_user_id.nil? ? 'NULL' : new_user_id }",
                            ["repository_id = ? AND committer = ?", id, committer])
                     end
                   end
                   @committers            = nil
                   @found_committer_users = nil
                   true
                 else
                   false
                 end
               end
               # Returns the Redmine User corresponding to the given +committer+
               # It will return nil if the committer is not yet mapped and if no User
               # with the same username or email was found
               def find_committer_user(committer)
                 unless committer.blank?
                   @found_committer_users ||= {}
                   return @found_committer_users[committer] if @found_committer_users.has_key?(committer)
                   user = nil
                   c = changesets.find(:first, :conditions => {:committer => committer}, :include => :user)
                   if c && c.user
                     user = c.user
                   elsif committer.strip =~ /^([^<]+)(<(.*)>)?$/
                     username, email = $1.strip, $3
                     u = User.find_by_login(username)
                     u ||= User.find_by_mail(email) unless email.blank?
                     user = u
                   end
                   @found_committer_users[committer] = user
                   user
                 end
               end
               def repo_log_encoding
                 encoding = log_encoding.to_s.strip
                 encoding.blank? ? 'UTF-8' : encoding
               end
               # Fetches new changesets for all repositories of active projects
               # Can be called periodically by an external script
               # eg. ruby script/runner "Repository.fetch_changesets"
               def self.fetch_changesets
                 Project.active.has_module(:repository).all.each do |project|
                   project.repositories.each do |repository|
                     begin
                       repository.fetch_changesets
                     rescue Redmine::Scm::Adapters::CommandFailed => e
                       logger.error "scm: error during fetching changesets: #{e.message}"
                     end
                   end
                 end
               end
               # scan changeset comments to find related and fixed issues for all repositories
               def self.scan_changesets_for_issue_ids
                 find(:all).each(&:scan_changesets_for_issue_ids)
               end
               def self.scm_name
                 'Abstract'
               end
               def self.available_scm
                 subclasses.collect {|klass| [klass.scm_name, klass.name]}
               end
               def self.factory(klass_name, *args)
                 klass = "Repository::#{klass_name}".constantize
                 klass.new(*args)
               rescue
                 nil
               end
               def self.scm_adapter_class
                 nil
               end
               def self.scm_command
                 ret = ""
                 begin
                   ret = self.scm_adapter_class.client_command if self.scm_adapter_class
                 rescue Exception => e
                   logger.error "scm: error during get command: #{e.message}"
                 end
                 ret
               end
               def self.scm_version_string
                 ret = ""
                 begin
                   ret = self.scm_adapter_class.client_version_string if self.scm_adapter_class
                 rescue Exception => e
                   logger.error "scm: error during get version string: #{e.message}"
                 end
                 ret
               end
               def self.scm_available
                 ret = false
                 begin
                   ret = self.scm_adapter_class.client_available if self.scm_adapter_class
                 rescue Exception => e
                   logger.error "scm: error during get scm available: #{e.message}"
                 end
                 ret
               end
               def set_as_default?
                 new_record? && project && !Repository.first(:conditions => {:project_id => project.id})
               end
               protected
               def check_default
                 if !is_default? && set_as_default?
                   self.is_default = true
                 end
                 if is_default? && is_default_changed?
                   Repository.update_all(["is_default = ?", false], ["project_id = ?", project_id])
                 end
               end
               private
               # Deletes repository data
               def clear_changesets
                 cs = Changeset.table_name
                 ch = Change.table_name
                 ci = "#{table_name_prefix}changesets_issues#{table_name_suffix}"
                 cp = "#{table_name_prefix}changeset_parents#{table_name_suffix}"
                 connection.delete("DELETE FROM #{ch} WHERE #{ch}.changeset_id IN (SELECT #{cs}.id FROM #{cs} WHERE #{cs}.repository_id = #{id})")
                 connection.delete("DELETE FROM #{ci} WHERE #{ci}.changeset_id IN (SELECT #{cs}.id FROM #{cs} WHERE #{cs}.repository_id = #{id})")
                 connection.delete("DELETE FROM #{cp} WHERE #{cp}.changeset_id IN (SELECT #{cs}.id FROM #{cs} WHERE #{cs}.repository_id = #{id})")
                 connection.delete("DELETE FROM #{cs} WHERE #{cs}.repository_id = #{id}")
               end
             end

app/models/repository/cvs.rb +4 -4

             # 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 'redmine/scm/adapters/cvs_adapter'
             require 'digest/sha1'
             class Repository::Cvs < Repository
               validates_presence_of :url, :root_url, :log_encoding
               def self.human_attribute_name(attribute_key_name, *args)
                 attr_name = attribute_key_name.to_s
                 if attr_name == "root_url"
                   attr_name = "cvsroot"
                 elsif attr_name == "url"
                   attr_name = "cvs_module"
                 end
                 super(attr_name, *args)
               end
               def self.scm_adapter_class
                 Redmine::Scm::Adapters::CvsAdapter
               end
               def self.scm_name
                 'CVS'
               end
               def entry(path=nil, identifier=nil)
                 rev = identifier.nil? ? nil : changesets.find_by_revision(identifier)
                 scm.entry(path, rev.nil? ? nil : rev.committed_on)
               end
               def entries(path=nil, identifier=nil)
                 rev = nil
                 if ! identifier.nil?
                   rev = changesets.find_by_revision(identifier)
                   return nil if rev.nil?
                 end
                 entries = scm.entries(path, rev.nil? ? nil : rev.committed_on)
                 if entries
                   entries.each() do |entry|
                     if ( ! entry.lastrev.nil? ) && ( ! entry.lastrev.revision.nil? )
-                      change=changes.find_by_revision_and_path(
+                      change = filechanges.find_by_revision_and_path(
                                  entry.lastrev.revision,
                                  scm.with_leading_slash(entry.path) )
                       if change
                         entry.lastrev.identifier = change.changeset.revision
                         entry.lastrev.revision   = change.changeset.revision
                         entry.lastrev.author     = change.changeset.committer
                         # entry.lastrev.branch     = change.branch
                       end
                     end
                   end
                 end
                 entries
               end
               def cat(path, identifier=nil)
                 rev = nil
                 if ! identifier.nil?
                   rev = changesets.find_by_revision(identifier)
                   return nil if rev.nil?
                 end
                 scm.cat(path, rev.nil? ? nil : rev.committed_on)
               end
               def annotate(path, identifier=nil)
                 rev = nil
                 if ! identifier.nil?
                   rev = changesets.find_by_revision(identifier)
                   return nil if rev.nil?
                 end
                 scm.annotate(path, rev.nil? ? nil : rev.committed_on)
               end
               def diff(path, rev, rev_to)
                 # convert rev to revision. CVS can't handle changesets here
                 diff=[]
                 changeset_from = changesets.find_by_revision(rev)
                 if rev_to.to_i > 0
                   changeset_to = changesets.find_by_revision(rev_to)
                 end
-                changeset_from.changes.each() do |change_from|
+                changeset_from.filechanges.each() do |change_from|
                   revision_from = nil
                   revision_to   = nil
                   if path.nil? || (change_from.path.starts_with? scm.with_leading_slash(path))
                     revision_from = change_from.revision
                   end
                   if revision_from
                     if changeset_to
-                      changeset_to.changes.each() do |change_to|
+                      changeset_to.filechanges.each() do |change_to|
                         revision_to = change_to.revision if change_to.path == change_from.path
                       end
                     end
                     unless revision_to
                       revision_to = scm.get_previous_revision(revision_from)
                     end
                     file_diff = scm.diff(change_from.path, revision_from, revision_to)
                     diff = diff + file_diff unless file_diff.nil?
                   end
                 end
                 return diff
               end
               def fetch_changesets
                 # 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.
                 # we now take a guess using the author, the commitlog and the commit-date.
                 # last one is the next step to take. the commit-date is not equal for all
                 # commits in one changeset. cvs update the commit-date when the *,v file was touched. so
                 # we use a small delta here, to merge all changes belonging to _one_ changeset
                 time_delta  = 10.seconds
                 fetch_since = latest_changeset ? latest_changeset.committed_on : nil
                 transaction do
                   tmp_rev_num = 1
                   scm.revisions('', fetch_since, nil, :log_encoding => repo_log_encoding) do |revision|
                     # only add the change to the database, if it doen't exists. the cvs log
                     # is not exclusive at all.
                     tmp_time = revision.time.clone
-                    unless changes.find_by_path_and_revision(
+                    unless filechanges.find_by_path_and_revision(
             	                         scm.with_leading_slash(revision.paths[0][:path]),
             	                         revision.paths[0][:revision]
             	                           )
                       cmt = Changeset.normalize_comments(revision.message, repo_log_encoding)
                       author_utf8 = Changeset.to_utf8(revision.author, repo_log_encoding)
                       cs  = changesets.find(
                         :first,
                         :conditions => {
                             :committed_on => tmp_time - time_delta .. tmp_time + time_delta,
                             :committer    => author_utf8,
                             :comments     => cmt
                             }
                          )
                       # create a new changeset....
                       unless cs
                         # we use a temporaray revision number here (just for inserting)
                         # later on, we calculate a continous positive number
                         tmp_time2 = tmp_time.clone.gmtime
                         branch    = revision.paths[0][:branch]
                         scmid     = branch + "-" + tmp_time2.strftime("%Y%m%d-%H%M%S")
                         cs = Changeset.create(:repository   => self,
                                               :revision     => "tmp#{tmp_rev_num}",
                                               :scmid        => scmid,
                                               :committer    => revision.author,
                                               :committed_on => tmp_time,
                                               :comments     => revision.message)
                         tmp_rev_num += 1
                       end
                       # convert CVS-File-States to internal Action-abbrevations
                       # default action is (M)odified
                       action = "M"
                       if revision.paths[0][:action] == "Exp" && revision.paths[0][:revision] == "1.1"
                         action = "A" # add-action always at first revision (= 1.1)
                       elsif revision.paths[0][:action] == "dead"
                         action = "D" # dead-state is similar to Delete
                       end
                       Change.create(
                          :changeset => cs,
                          :action    => action,
                          :path      => scm.with_leading_slash(revision.paths[0][:path]),
                          :revision  => revision.paths[0][:revision],
                          :branch    => revision.paths[0][:branch]
                           )
                     end
                   end
                   # Renumber new changesets in chronological order
                   Changeset.all(
                           :order => 'committed_on ASC, id ASC',
                           :conditions => ["repository_id = ? AND revision LIKE 'tmp%'", id]
                        ).each do |changeset|
                     changeset.update_attribute :revision, next_revision_number
                   end
                 end # transaction
                 @current_revision_number = nil
               end
               private
               # Returns the next revision number to assign to a CVS changeset
               def next_revision_number
                 # Need to retrieve existing revision numbers to sort them as integers
                 sql = "SELECT revision FROM #{Changeset.table_name} "
                 sql << "WHERE repository_id = #{id} AND revision NOT LIKE 'tmp%'"
                 @current_revision_number ||= (connection.select_values(sql).collect(&:to_i).max || 0)
                 @current_revision_number += 1
               end
             end

app/models/repository/darcs.rb +1 -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 'redmine/scm/adapters/darcs_adapter'
             class Repository::Darcs < Repository
               validates_presence_of :url, :log_encoding
               def self.human_attribute_name(attribute_key_name, *args)
                 attr_name = attribute_key_name.to_s
                 if attr_name == "url"
                   attr_name = "path_to_repository"
                 end
                 super(attr_name, *args)
               end
               def self.scm_adapter_class
                 Redmine::Scm::Adapters::DarcsAdapter
               end
               def self.scm_name
                 'Darcs'
               end
               def supports_directory_revisions?
                 true
               end
               def entry(path=nil, identifier=nil)
                 patch = identifier.nil? ? nil : changesets.find_by_revision(identifier)
                 scm.entry(path, patch.nil? ? nil : patch.scmid)
               end
               def entries(path=nil, identifier=nil)
                 patch = nil
                 if ! identifier.nil?
                   patch = changesets.find_by_revision(identifier)
                   return nil if patch.nil?
                 end
                 entries = scm.entries(path, patch.nil? ? nil : patch.scmid)
                 if entries
                   entries.each do |entry|
                     # Search the DB for the entry's last change
                     if entry.lastrev && !entry.lastrev.scmid.blank?
                       changeset = changesets.find_by_scmid(entry.lastrev.scmid)
                     end
                     if changeset
                       entry.lastrev.identifier = changeset.revision
                       entry.lastrev.name       = changeset.revision
                       entry.lastrev.time       = changeset.committed_on
                       entry.lastrev.author     = changeset.committer
                     end
                   end
                 end
                 entries
               end
               def cat(path, identifier=nil)
                 patch = identifier.nil? ? nil : changesets.find_by_revision(identifier.to_s)
                 scm.cat(path, patch.nil? ? nil : patch.scmid)
               end
               def diff(path, rev, rev_to)
                 patch_from = changesets.find_by_revision(rev)
                 return nil if patch_from.nil?
                 patch_to = changesets.find_by_revision(rev_to) if rev_to
                 if path.blank?
-                  path = patch_from.changes.collect{|change| change.path}.join(' ')
+                  path = patch_from.filechanges.collect{|change| change.path}.join(' ')
                 end
                 patch_from ? scm.diff(path, patch_from.scmid, patch_to ? patch_to.scmid : nil) : nil
               end
               def fetch_changesets
                 scm_info = scm.info
                 if scm_info
                   db_last_id = latest_changeset ? latest_changeset.scmid : nil
                   next_rev   = latest_changeset ? latest_changeset.revision.to_i + 1 : 1
                   # latest revision in the repository
                   scm_revision = scm_info.lastrev.scmid
                   unless changesets.find_by_scmid(scm_revision)
                     revisions = scm.revisions('', db_last_id, nil, :with_path => true)
                     transaction do
                       revisions.reverse_each do |revision|
                         changeset = Changeset.create(:repository   => self,
                                                      :revision     => next_rev,
                                                      :scmid        => revision.scmid,
                                                      :committer    => revision.author,
                                                      :committed_on => revision.time,
                                                      :comments     => revision.message)
                         revision.paths.each do |change|
                           changeset.create_change(change)
                         end
                         next_rev += 1
                       end if revisions
                     end
                   end
                 end
               end
             end

app/views/issues/show.html.erb +2 -2

             <%= render :partial => 'action_menu' %>
             <h2><%= issue_heading(@issue) %></h2>
             <div class="<%= @issue.css_classes %> details">
               <% if @prev_issue_id || @next_issue_id %>
                 <div class="next-prev-links contextual">
                   <%= link_to_if @prev_issue_id,
                                  "\xc2\xab #{l(:label_previous)}",
-                                 issue_path(@prev_issue_id),
+                                 (@prev_issue_id ? issue_path(@prev_issue_id) : nil),
                                  :title => "##{@prev_issue_id}" %> |
                   <% if @issue_position && @issue_count %>
                     <span class="position"><%= l(:label_item_position, :position => @issue_position, :count => @issue_count) %></span> |
                   <% end %>
                   <%= link_to_if @next_issue_id,
                                  "#{l(:label_next)} \xc2\xbb",
-                                 issue_path(@next_issue_id),
+                                 (@next_issue_id ? issue_path(@next_issue_id) : nil),
                                  :title => "##{@next_issue_id}" %>
                 </div>
               <% end %>
               <%= avatar(@issue.author, :size => "50") %>
             <div class="subject">
             <%= render_issue_subject_with_tree(@issue) %>
             </div>
                     <p class="author">
                     <%= authoring @issue.created_on, @issue.author %>.
                     <% if @issue.created_on != @issue.updated_on %>
                     <%= l(:label_updated_time, time_tag(@issue.updated_on)).html_safe %>.
                     <% end %>
                     </p>
             <table class="attributes">
             <tr>
                 <th class="status"><%=l(:field_status)%>:</th><td class="status"><%= h(@issue.status.name) %></td>
                 <th class="start-date"><%=l(:field_start_date)%>:</th><td class="start-date"><%= format_date(@issue.start_date) %></td>
             </tr>
             <tr>
                 <th class="priority"><%=l(:field_priority)%>:</th><td class="priority"><%= h(@issue.priority.name) %></td>
                 <th class="due-date"><%=l(:field_due_date)%>:</th><td class="due-date"><%= format_date(@issue.due_date) %></td>
             </tr>
             <tr>
                 <th class="assigned-to"><%=l(:field_assigned_to)%>:</th><td class="assigned-to"><%= avatar(@issue.assigned_to, :size => "14") %><%= @issue.assigned_to ? link_to_user(@issue.assigned_to) : "-" %></td>
                 <th class="progress"><%=l(:field_done_ratio)%>:</th><td class="progress"><%= progress_bar @issue.done_ratio, :width => '80px', :legend => "#{@issue.done_ratio}%" %></td>
             </tr>
             <tr>
                 <th class="category"><%=l(:field_category)%>:</th><td class="category"><%=h(@issue.category ? @issue.category.name : "-") %></td>
                 <% if User.current.allowed_to?(:view_time_entries, @project) %>
                 <th class="spent-time"><%=l(:label_spent_time)%>:</th>
                 <td class="spent-time"><%= @issue.total_spent_hours > 0 ? (link_to l_hours(@issue.total_spent_hours), {:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue}) : "-" %></td>
                 <% else %>
                 <th></th>
                 <td></td>
                 <% end %>
             </tr>
             <tr>
                 <th class="fixed-version"><%=l(:field_fixed_version)%>:</th><td class="fixed-version"><%= @issue.fixed_version ? link_to_version(@issue.fixed_version) : "-" %></td>
                 <% if @issue.estimated_hours %>
                 <th class="estimated-hours"><%=l(:field_estimated_hours)%>:</th><td class="estimated-hours"><%= l_hours(@issue.estimated_hours) %></td>
                 <% end %>
             </tr>
             <%= render_custom_fields_rows(@issue) %>
             <%= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
             </table>
             <% if @issue.description? || @issue.attachments.any? -%>
             <hr />
             <% if @issue.description? %>
               <div class="contextual">
               <%= link_to_remote_if_authorized(
                     l(:button_quote),
                     { :url => {:controller => 'journals', :action => 'new', :id => @issue} },
                     :class => 'icon icon-comment') %>
               </div>
               <p><strong><%=l(:field_description)%></strong></p>
               <div class="wiki">
               <%= textilizable @issue, :description, :attachments => @issue.attachments %>
               </div>
             <% end %>
             <%= link_to_attachments @issue %>
             <% end -%>
             <%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %>
             <% if !@issue.leaf? || User.current.allowed_to?(:manage_subtasks, @project) %>
             <hr />
             <div id="issue_tree">
             <div class="contextual">
               <%= link_to(l(:button_add), {:controller => 'issues', :action => 'new', :project_id => @project, :issue => {:parent_issue_id => @issue}}) if User.current.allowed_to?(:manage_subtasks, @project) %>
             </div>
             <p><strong><%=l(:label_subtask_plural)%></strong></p>
             <%= render_descendants_tree(@issue) unless @issue.leaf? %>
             </div>
             <% end %>
             <% if @relations.present? || User.current.allowed_to?(:manage_issue_relations, @project) %>
             <hr />
             <div id="relations">
             <%= render :partial => 'relations' %>
             </div>
             <% end %>
             </div>
             <% if @changesets.present? %>
             <div id="issue-changesets">
             <h3><%=l(:label_associated_revisions)%></h3>
             <%= render :partial => 'changesets', :locals => { :changesets => @changesets} %>
             </div>
             <% end %>
             <% if @journals.present? %>
             <div id="history">
             <h3><%=l(:label_history)%></h3>
             <%= render :partial => 'history', :locals => { :issue => @issue, :journals => @journals } %>
             </div>
             <% end %>
             <div style="clear: both;"></div>
             <%= render :partial => 'action_menu' %>
             <div style="clear: both;"></div>
             <% if authorize_for('issues', 'edit') %>
               <div id="update" style="display:none;">
               <h3><%= l(:button_update) %></h3>
               <%= render :partial => 'edit' %>
               </div>
             <% end %>
             <% other_formats_links do |f| %>
               <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
               <%= f.link_to 'PDF' %>
             <% end %>
             <% html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
             <% content_for :sidebar do %>
               <%= render :partial => 'issues/sidebar' %>
               <% if User.current.allowed_to?(:add_issue_watchers, @project) ||
                 (@issue.watchers.present? && User.current.allowed_to?(:view_issue_watchers, @project)) %>
                 <div id="watchers">
                   <%= render :partial => 'watchers/watchers', :locals => {:watched => @issue} %>
                 </div>
               <% end %>
             <% end %>
             <% content_for :header_tags do %>
                 <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@issue.project} - #{@issue.tracker} ##{@issue.id}: #{@issue.subject}") %>
                 <%= stylesheet_link_tag 'scm' %>
             <% end %>
             <%= context_menu issues_context_menu_path %>

app/views/repositories/edit.html.erb +1 -1

             <h2><%= l(:label_repository) %></h2>
-            <%= labelled_form_for :repository, @repository, :url => repository_path(@path), :html => {:method => :put} do |f| %>
+            <%= labelled_form_for :repository, @repository, :url => repository_path(@repository), :html => {:method => :put} do |f| %>
               <%= render :partial => 'form', :locals => {:f => f} %>
             <% end %>

app/views/repositories/revision.html.erb +1 -1

             <div class="contextual">
               &#171;
               <% unless @changeset.previous.nil? -%>
                 <%= link_to_revision(@changeset.previous, @repository, :text => l(:label_previous)) %>
               <% else -%>
                 <%= l(:label_previous) %>
               <% end -%>
             |
               <% unless @changeset.next.nil? -%>
                 <%= link_to_revision(@changeset.next, @repository, :text => l(:label_next)) %>
               <% else -%>
                 <%= l(:label_next) %>
               <% end -%>
               &#187;&nbsp;
               <%= form_tag({:controller => 'repositories',
                            :action     => 'revision',
                            :id         => @project,
                            :repository_id => @repository.identifier_param,
                            :rev        => nil},
                            :method     => :get) do %>
                 <%= text_field_tag 'rev', @rev, :size => 8 %>
                 <%= submit_tag 'OK', :name => nil %>
               <% end %>
             </div>
             <h2><%= avatar(@changeset.user, :size => "24") %><%= l(:label_revision) %> <%= format_revision(@changeset) %></h2>
             <% if @changeset.scmid.present? || @changeset.parents.present? || @changeset.children.present? %>
             <table class="revision-info">
               <% if @changeset.scmid.present? %>
                 <tr>
                   <td>ID</td><td><%= h(@changeset.scmid) %></td>
                 </tr>
               <% end %>
               <% if @changeset.parents.present? %>
                 <tr>
                   <td><%= l(:label_parent_revision) %></td>
                   <td>
                     <%= @changeset.parents.collect{
                           |p| link_to_revision(p, @repository, :text => format_revision(p))
                         }.join(", ").html_safe %>
                   </td>
                 </tr>
               <% end %>
               <% if @changeset.children.present? %>
                 <tr>
                   <td><%= l(:label_child_revision) %></td>
                   <td>
                    <%= @changeset.children.collect{
                           |p| link_to_revision(p, @repository, :text => format_revision(p))
                          }.join(", ").html_safe %>
                   </td>
                 </tr>
               <% end %>
             </table>
             <% end %>
             <p>
             <span class="author">
             <%= authoring(@changeset.committed_on, @changeset.author) %>
             </span>
             </p>
             <%= textilizable @changeset.comments %>
             <% if @changeset.issues.visible.any? || User.current.allowed_to?(:manage_related_issues, @repository.project) %>
               <%= render :partial => 'related_issues' %>
             <% end %>
             <% if User.current.allowed_to?(:browse_repository, @project) %>
             <h3><%= l(:label_attachment_plural) %></h3>
             <ul id="changes-legend">
             <li class="change change-A"><%= l(:label_added)    %></li>
             <li class="change change-M"><%= l(:label_modified) %></li>
             <li class="change change-C"><%= l(:label_copied)   %></li>
             <li class="change change-R"><%= l(:label_renamed)  %></li>
             <li class="change change-D"><%= l(:label_deleted)  %></li>
             </ul>
             <p><%= link_to(l(:label_view_diff),
                            :action => 'diff',
                            :id     => @project,
                            :repository_id => @repository.identifier_param,
                            :path   => "",
-                           :rev    => @changeset.identifier) if @changeset.changes.any? %></p>
+                           :rev    => @changeset.identifier) if @changeset.filechanges.any? %></p>
             <div class="changeset-changes">
             <%= render_changeset_changes %>
             </div>
             <% end %>
             <% content_for :header_tags do %>
             <%= stylesheet_link_tag "scm" %>
             <% end %>
             <% html_title("#{l(:label_revision)} #{format_revision(@changeset)}") -%>

lib/tasks/migrate_from_trac.rake +2 -2

             # 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 'active_record'
             require 'iconv'
             require 'pp'
             namespace :redmine do
               desc 'Trac migration script'
               task :migrate_from_trac => :environment do
                 module TracMigrate
                     TICKET_MAP = []
                     DEFAULT_STATUS = IssueStatus.default
                     assigned_status = IssueStatus.find_by_position(2)
                     resolved_status = IssueStatus.find_by_position(3)
                     feedback_status = IssueStatus.find_by_position(4)
                     closed_status = IssueStatus.find :first, :conditions => { :is_closed => true }
                     STATUS_MAPPING = {'new' => DEFAULT_STATUS,
                                       'reopened' => feedback_status,
                                       'assigned' => assigned_status,
                                       'closed' => closed_status
                                       }
                     priorities = IssuePriority.all
                     DEFAULT_PRIORITY = priorities[0]
                     PRIORITY_MAPPING = {'lowest' => priorities[0],
                                         'low' => priorities[0],
                                         'normal' => priorities[1],
                                         'high' => priorities[2],
                                         'highest' => priorities[3],
                                         # ---
                                         'trivial' => priorities[0],
                                         'minor' => priorities[1],
                                         'major' => priorities[2],
                                         'critical' => priorities[3],
                                         'blocker' => priorities[4]
                                         }
                     TRACKER_BUG = Tracker.find_by_position(1)
                     TRACKER_FEATURE = Tracker.find_by_position(2)
                     DEFAULT_TRACKER = TRACKER_BUG
                     TRACKER_MAPPING = {'defect' => TRACKER_BUG,
                                        'enhancement' => TRACKER_FEATURE,
                                        'task' => TRACKER_FEATURE,
                                        'patch' =>TRACKER_FEATURE
                                        }
                     roles = Role.find(:all, :conditions => {:builtin => 0}, :order => 'position ASC')
                     manager_role = roles[0]
                     developer_role = roles[1]
                     DEFAULT_ROLE = roles.last
                     ROLE_MAPPING = {'admin' => manager_role,
                                     'developer' => developer_role
                                     }
                   class ::Time
                     class << self
                       alias :real_now :now
                       def now
                         real_now - @fake_diff.to_i
                       end
                       def fake(time)
                         @fake_diff = real_now - time
                         res = yield
                         @fake_diff = 0
                        res
                       end
                     end
                   end
                   class TracComponent < ActiveRecord::Base
                     self.table_name = :component
                   end
                   class TracMilestone < ActiveRecord::Base
                     self.table_name = :milestone
                     # If this attribute is set a milestone has a defined target timepoint
                     def due
                       if read_attribute(:due) && read_attribute(:due) > 0
                         Time.at(read_attribute(:due)).to_date
                       else
                         nil
                       end
                     end
                     # This is the real timepoint at which the milestone has finished.
                     def completed
                       if read_attribute(:completed) && read_attribute(:completed) > 0
                         Time.at(read_attribute(:completed)).to_date
                       else
                         nil
                       end
                     end
                     def description
                       # Attribute is named descr in Trac v0.8.x
                       has_attribute?(:descr) ? read_attribute(:descr) : read_attribute(:description)
                     end
                   end
                   class TracTicketCustom < ActiveRecord::Base
                     self.table_name = :ticket_custom
                   end
                   class TracAttachment < ActiveRecord::Base
                     self.table_name = :attachment
                     set_inheritance_column :none
                     def time; Time.at(read_attribute(:time)) end
                     def original_filename
                       filename
                     end
                     def content_type
                       ''
                     end
                     def exist?
                       File.file? trac_fullpath
                     end
                     def open
                       File.open("#{trac_fullpath}", 'rb') {|f|
                         @file = f
                         yield self
                       }
                     end
                     def read(*args)
                       @file.read(*args)
                     end
                     def description
                       read_attribute(:description).to_s.slice(0,255)
                     end
                   private
                     def trac_fullpath
                       attachment_type = read_attribute(:type)
                       trac_file = filename.gsub( /[^a-zA-Z0-9\-_\.!~*']/n ) {|x| sprintf('%%%02x', x[0]) }
                       "#{TracMigrate.trac_attachments_directory}/#{attachment_type}/#{id}/#{trac_file}"
                     end
                   end
                   class TracTicket < ActiveRecord::Base
                     self.table_name = :ticket
                     set_inheritance_column :none
                     # ticket changes: only migrate status changes and comments
-                    has_many :changes, :class_name => "TracTicketChange", :foreign_key => :ticket
+                    has_many :ticket_changes, :class_name => "TracTicketChange", :foreign_key => :ticket
                     has_many :customs, :class_name => "TracTicketCustom", :foreign_key => :ticket
                     def attachments
                       TracMigrate::TracAttachment.all(:conditions => ["type = 'ticket' AND id = ?", self.id.to_s])
                     end
                     def ticket_type
                       read_attribute(:type)
                     end
                     def summary
                       read_attribute(:summary).blank? ? "(no subject)" : read_attribute(:summary)
                     end
                     def description
                       read_attribute(:description).blank? ? summary : read_attribute(:description)
                     end
                     def time; Time.at(read_attribute(:time)) end
                     def changetime; Time.at(read_attribute(:changetime)) end
                   end
                   class TracTicketChange < ActiveRecord::Base
                     self.table_name = :ticket_change
                     def self.columns
                       # Hides Trac field 'field' to prevent clash with AR field_changed? method (Rails 3.0)
                       super.select {|column| column.name.to_s != 'field'}
                     end
                     def time; Time.at(read_attribute(:time)) end
                   end
                   TRAC_WIKI_PAGES = %w(InterMapTxt InterTrac InterWiki RecentChanges SandBox TracAccessibility TracAdmin TracBackup TracBrowser TracCgi TracChangeset \
                                        TracEnvironment TracFastCgi TracGuide TracImport TracIni TracInstall TracInterfaceCustomization \
                                        TracLinks TracLogging TracModPython TracNotification TracPermissions TracPlugins TracQuery \
                                        TracReports TracRevisionLog TracRoadmap TracRss TracSearch TracStandalone TracSupport TracSyntaxColoring TracTickets \
                                        TracTicketsCustomFields TracTimeline TracUnicode TracUpgrade TracWiki WikiDeletePage WikiFormatting \
                                        WikiHtml WikiMacros WikiNewPage WikiPageNames WikiProcessors WikiRestructuredText WikiRestructuredTextLinks \
                                        CamelCase TitleIndex)
                   class TracWikiPage < ActiveRecord::Base
                     self.table_name = :wiki
                     set_primary_key :name
                     def self.columns
                       # Hides readonly Trac field to prevent clash with AR readonly? method (Rails 2.0)
                       super.select {|column| column.name.to_s != 'readonly'}
                     end
                     def attachments
                       TracMigrate::TracAttachment.all(:conditions => ["type = 'wiki' AND id = ?", self.id.to_s])
                     end
                     def time; Time.at(read_attribute(:time)) end
                   end
                   class TracPermission < ActiveRecord::Base
                     self.table_name = :permission
                   end
                   class TracSessionAttribute < ActiveRecord::Base
                     self.table_name = :session_attribute
                   end
                   def self.find_or_create_user(username, project_member = false)
                     return User.anonymous if username.blank?
                     u = User.find_by_login(username)
                     if !u
                       # Create a new user if not found
                       mail = username[0, User::MAIL_LENGTH_LIMIT]
                       if mail_attr = TracSessionAttribute.find_by_sid_and_name(username, 'email')
                         mail = mail_attr.value
                       end
                       mail = "#{mail}@foo.bar" unless mail.include?("@")
                       name = username
                       if name_attr = TracSessionAttribute.find_by_sid_and_name(username, 'name')
                         name = name_attr.value
                       end
                       name =~ (/(.*)(\s+\w+)?/)
                       fn = $1.strip
                       ln = ($2 || '-').strip
                       u = User.new :mail => mail.gsub(/[^-@a-z0-9\.]/i, '-'),
                                    :firstname => fn[0, limit_for(User, 'firstname')],
                                    :lastname => ln[0, limit_for(User, 'lastname')]
                       u.login = username[0, User::LOGIN_LENGTH_LIMIT].gsub(/[^a-z0-9_\-@\.]/i, '-')
                       u.password = 'trac'
                       u.admin = true if TracPermission.find_by_username_and_action(username, 'admin')
                       # finally, a default user is used if the new user is not valid
                       u = User.find(:first) unless u.save
                     end
                     # Make sure he is a member of the project
                     if project_member && !u.member_of?(@target_project)
                       role = DEFAULT_ROLE
                       if u.admin
                         role = ROLE_MAPPING['admin']
                       elsif TracPermission.find_by_username_and_action(username, 'developer')
                         role = ROLE_MAPPING['developer']
                       end
                       Member.create(:user => u, :project => @target_project, :roles => [role])
                       u.reload
                     end
                     u
                   end
                   # Basic wiki syntax conversion
                   def self.convert_wiki_text(text)
                     # Titles
                     text = text.gsub(/^(\=+)\s(.+)\s(\=+)/) {|s| "\nh#{$1.length}. #{$2}\n"}
                     # External Links
                     text = text.gsub(/\[(http[^\s]+)\s+([^\]]+)\]/) {|s| "\"#{$2}\":#{$1}"}
                     # Ticket links:
                     #      [ticket:234 Text],[ticket:234 This is a test]
                     text = text.gsub(/\[ticket\:([^\ ]+)\ (.+?)\]/, '"\2":/issues/show/\1')
                     #      ticket:1234
                     #      #1 is working cause Redmine uses the same syntax.
                     text = text.gsub(/ticket\:([^\ ]+)/, '#\1')
                     # Milestone links:
                     #      [milestone:"0.1.0 Mercury" Milestone 0.1.0 (Mercury)]
                     #      The text "Milestone 0.1.0 (Mercury)" is not converted,
                     #      cause Redmine's wiki does not support this.
                     text = text.gsub(/\[milestone\:\"([^\"]+)\"\ (.+?)\]/, 'version:"\1"')
                     #      [milestone:"0.1.0 Mercury"]
                     text = text.gsub(/\[milestone\:\"([^\"]+)\"\]/, 'version:"\1"')
                     text = text.gsub(/milestone\:\"([^\"]+)\"/, 'version:"\1"')
                     #      milestone:0.1.0
                     text = text.gsub(/\[milestone\:([^\ ]+)\]/, 'version:\1')
                     text = text.gsub(/milestone\:([^\ ]+)/, 'version:\1')
                     # Internal Links
                     text = text.gsub(/\[\[BR\]\]/, "\n") # This has to go before the rules below
                     text = text.gsub(/\[\"(.+)\".*\]/) {|s| "[[#{$1.delete(',./?;|:')}]]"}
                     text = text.gsub(/\[wiki:\"(.+)\".*\]/) {|s| "[[#{$1.delete(',./?;|:')}]]"}
                     text = text.gsub(/\[wiki:\"(.+)\".*\]/) {|s| "[[#{$1.delete(',./?;|:')}]]"}
                     text = text.gsub(/\[wiki:([^\s\]]+)\]/) {|s| "[[#{$1.delete(',./?;|:')}]]"}
                     text = text.gsub(/\[wiki:([^\s\]]+)\s(.*)\]/) {|s| "[[#{$1.delete(',./?;|:')}|#{$2.delete(',./?;|:')}]]"}
               # Links to pages UsingJustWikiCaps
               text = text.gsub(/([^!]|^)(^| )([A-Z][a-z]+[A-Z][a-zA-Z]+)/, '\\1\\2[[\3]]')
               # Normalize things that were supposed to not be links
               # like !NotALink
               text = text.gsub(/(^| )!([A-Z][A-Za-z]+)/, '\1\2')
                     # Revisions links
                     text = text.gsub(/\[(\d+)\]/, 'r\1')
                     # Ticket number re-writing
                     text = text.gsub(/#(\d+)/) do |s|
                       if $1.length < 10
             #            TICKET_MAP[$1.to_i] ||= $1
                         "\##{TICKET_MAP[$1.to_i] || $1}"
                       else
                         s
                       end
                     end
                     # We would like to convert the Code highlighting too
                     # This will go into the next line.
                     shebang_line = false
                     # Reguar expression for start of code
                     pre_re = /\{\{\{/
                     # Code hightlighing...
                     shebang_re = /^\#\!([a-z]+)/
                     # Regular expression for end of code
                     pre_end_re = /\}\}\}/
                     # Go through the whole text..extract it line by line
                     text = text.gsub(/^(.*)$/) do |line|
                       m_pre = pre_re.match(line)
                       if m_pre
                         line = '<pre>'
                       else
                         m_sl = shebang_re.match(line)
                         if m_sl
                           shebang_line = true
                           line = '<code class="' + m_sl[1] + '">'
                         end
                         m_pre_end = pre_end_re.match(line)
                         if m_pre_end
                           line = '</pre>'
                           if shebang_line
                             line = '</code>' + line
                           end
                         end
                       end
                       line
                     end
                     # Highlighting
                     text = text.gsub(/'''''([^\s])/, '_*\1')
                     text = text.gsub(/([^\s])'''''/, '\1*_')
                     text = text.gsub(/'''/, '*')
                     text = text.gsub(/''/, '_')
                     text = text.gsub(/__/, '+')
                     text = text.gsub(/~~/, '-')
                     text = text.gsub(/`/, '@')
                     text = text.gsub(/,,/, '~')
                     # Lists
                     text = text.gsub(/^([ ]+)\* /) {|s| '*' * $1.length + " "}
                     text
                   end
                   def self.migrate
                     establish_connection
                     # Quick database test
                     TracComponent.count
                     migrated_components = 0
                     migrated_milestones = 0
                     migrated_tickets = 0
                     migrated_custom_values = 0
                     migrated_ticket_attachments = 0
                     migrated_wiki_edits = 0
                     migrated_wiki_attachments = 0
                     #Wiki system initializing...
                     @target_project.wiki.destroy if @target_project.wiki
                     @target_project.reload
                     wiki = Wiki.new(:project => @target_project, :start_page => 'WikiStart')
                     wiki_edit_count = 0
                     # Components
                     print "Migrating components"
                     issues_category_map = {}
                     TracComponent.find(:all).each do |component|
                     print '.'
                     STDOUT.flush
                       c = IssueCategory.new :project => @target_project,
                                             :name => encode(component.name[0, limit_for(IssueCategory, 'name')])
                     next unless c.save
                     issues_category_map[component.name] = c
                     migrated_components += 1
                     end
                     puts
                     # Milestones
                     print "Migrating milestones"
                     version_map = {}
                     TracMilestone.find(:all).each do |milestone|
                       print '.'
                       STDOUT.flush
                       # First we try to find the wiki page...
                       p = wiki.find_or_new_page(milestone.name.to_s)
                       p.content = WikiContent.new(:page => p) if p.new_record?
                       p.content.text = milestone.description.to_s
                       p.content.author = find_or_create_user('trac')
                       p.content.comments = 'Milestone'
                       p.save
                       v = Version.new :project => @target_project,
                                       :name => encode(milestone.name[0, limit_for(Version, 'name')]),
                                       :description => nil,
                                       :wiki_page_title => milestone.name.to_s,
                                       :effective_date => milestone.completed
                       next unless v.save
                       version_map[milestone.name] = v
                       migrated_milestones += 1
                     end
                     puts
                     # Custom fields
                     # TODO: read trac.ini instead
                     print "Migrating custom fields"
                     custom_field_map = {}
                     TracTicketCustom.find_by_sql("SELECT DISTINCT name FROM #{TracTicketCustom.table_name}").each do |field|
                       print '.'
                       STDOUT.flush
                       # Redmine custom field name
                       field_name = encode(field.name[0, limit_for(IssueCustomField, 'name')]).humanize
                       # Find if the custom already exists in Redmine
                       f = IssueCustomField.find_by_name(field_name)
                       # Or create a new one
                       f ||= IssueCustomField.create(:name => encode(field.name[0, limit_for(IssueCustomField, 'name')]).humanize,
                                                     :field_format => 'string')
                       next if f.new_record?
                       f.trackers = Tracker.find(:all)
                       f.projects << @target_project
                       custom_field_map[field.name] = f
                     end
                     puts
                     # Trac 'resolution' field as a Redmine custom field
                     r = IssueCustomField.find(:first, :conditions => { :name => "Resolution" })
                     r = IssueCustomField.new(:name => 'Resolution',
                                              :field_format => 'list',
                                              :is_filter => true) if r.nil?
                     r.trackers = Tracker.find(:all)
                     r.projects << @target_project
                     r.possible_values = (r.possible_values + %w(fixed invalid wontfix duplicate worksforme)).flatten.compact.uniq
                     r.save!
                     custom_field_map['resolution'] = r
                     # Tickets
                     print "Migrating tickets"
                       TracTicket.find_each(:batch_size => 200) do |ticket|
                       print '.'
                       STDOUT.flush
                       i = Issue.new :project => @target_project,
                                       :subject => encode(ticket.summary[0, limit_for(Issue, 'subject')]),
                                       :description => convert_wiki_text(encode(ticket.description)),
                                       :priority => PRIORITY_MAPPING[ticket.priority] || DEFAULT_PRIORITY,
                                       :created_on => ticket.time
                       i.author = find_or_create_user(ticket.reporter)
                       i.category = issues_category_map[ticket.component] unless ticket.component.blank?
                       i.fixed_version = version_map[ticket.milestone] unless ticket.milestone.blank?
                       i.status = STATUS_MAPPING[ticket.status] || DEFAULT_STATUS
                       i.tracker = TRACKER_MAPPING[ticket.ticket_type] || DEFAULT_TRACKER
                       i.id = ticket.id unless Issue.exists?(ticket.id)
                       next unless Time.fake(ticket.changetime) { i.save }
                       TICKET_MAP[ticket.id] = i.id
                       migrated_tickets += 1
                       # Owner
                         unless ticket.owner.blank?
                           i.assigned_to = find_or_create_user(ticket.owner, true)
                           Time.fake(ticket.changetime) { i.save }
                         end
                       # Comments and status/resolution changes
-                      ticket.changes.group_by(&:time).each do |time, changeset|
+                      ticket.ticket_changes.group_by(&:time).each do |time, changeset|
                           status_change = changeset.select {|change| change.field == 'status'}.first
                           resolution_change = changeset.select {|change| change.field == 'resolution'}.first
                           comment_change = changeset.select {|change| change.field == 'comment'}.first
                           n = Journal.new :notes => (comment_change ? convert_wiki_text(encode(comment_change.newvalue)) : ''),
                                           :created_on => time
                           n.user = find_or_create_user(changeset.first.author)
                           n.journalized = i
                           if status_change &&
                                STATUS_MAPPING[status_change.oldvalue] &&
                                STATUS_MAPPING[status_change.newvalue] &&
                                (STATUS_MAPPING[status_change.oldvalue] != STATUS_MAPPING[status_change.newvalue])
                             n.details << JournalDetail.new(:property => 'attr',
                                                            :prop_key => 'status_id',
                                                            :old_value => STATUS_MAPPING[status_change.oldvalue].id,
                                                            :value => STATUS_MAPPING[status_change.newvalue].id)
                           end
                           if resolution_change
                             n.details << JournalDetail.new(:property => 'cf',
                                                            :prop_key => custom_field_map['resolution'].id,
                                                            :old_value => resolution_change.oldvalue,
                                                            :value => resolution_change.newvalue)
                           end
                           n.save unless n.details.empty? && n.notes.blank?
                       end
                       # Attachments
                       ticket.attachments.each do |attachment|
                         next unless attachment.exist?
                           attachment.open {
                             a = Attachment.new :created_on => attachment.time
                             a.file = attachment
                             a.author = find_or_create_user(attachment.author)
                             a.container = i
                             a.description = attachment.description
                             migrated_ticket_attachments += 1 if a.save
                           }
                       end
                       # Custom fields
                       custom_values = ticket.customs.inject({}) do |h, custom|
                         if custom_field = custom_field_map[custom.name]
                           h[custom_field.id] = custom.value
                           migrated_custom_values += 1
                         end
                         h
                       end
                       if custom_field_map['resolution'] && !ticket.resolution.blank?
                         custom_values[custom_field_map['resolution'].id] = ticket.resolution
                       end
                       i.custom_field_values = custom_values
                       i.save_custom_field_values
                     end
                     # update issue id sequence if needed (postgresql)
                     Issue.connection.reset_pk_sequence!(Issue.table_name) if Issue.connection.respond_to?('reset_pk_sequence!')
                     puts
                     # Wiki
                     print "Migrating wiki"
                     if wiki.save
                       TracWikiPage.find(:all, :order => 'name, version').each do |page|
                         # Do not migrate Trac manual wiki pages
                         next if TRAC_WIKI_PAGES.include?(page.name)
                         wiki_edit_count += 1
                         print '.'
                         STDOUT.flush
                         p = wiki.find_or_new_page(page.name)
                         p.content = WikiContent.new(:page => p) if p.new_record?
                         p.content.text = page.text
                         p.content.author = find_or_create_user(page.author) unless page.author.blank? || page.author == 'trac'
                         p.content.comments = page.comment
                         Time.fake(page.time) { p.new_record? ? p.save : p.content.save }
                         next if p.content.new_record?
                         migrated_wiki_edits += 1
                         # Attachments
                         page.attachments.each do |attachment|
                           next unless attachment.exist?
                           next if p.attachments.find_by_filename(attachment.filename.gsub(/^.*(\\|\/)/, '').gsub(/[^\w\.\-]/,'_')) #add only once per page
                           attachment.open {
                             a = Attachment.new :created_on => attachment.time
                             a.file = attachment
                             a.author = find_or_create_user(attachment.author)
                             a.description = attachment.description
                             a.container = p
                             migrated_wiki_attachments += 1 if a.save
                           }
                         end
                       end
                       wiki.reload
                       wiki.pages.each do |page|
                         page.content.text = convert_wiki_text(page.content.text)
                         Time.fake(page.content.updated_on) { page.content.save }
                       end
                     end
                     puts
                     puts
                     puts "Components:      #{migrated_components}/#{TracComponent.count}"
                     puts "Milestones:      #{migrated_milestones}/#{TracMilestone.count}"
                     puts "Tickets:         #{migrated_tickets}/#{TracTicket.count}"
                     puts "Ticket files:    #{migrated_ticket_attachments}/" + TracAttachment.count(:conditions => {:type => 'ticket'}).to_s
                     puts "Custom values:   #{migrated_custom_values}/#{TracTicketCustom.count}"
                     puts "Wiki edits:      #{migrated_wiki_edits}/#{wiki_edit_count}"
                     puts "Wiki files:      #{migrated_wiki_attachments}/" + TracAttachment.count(:conditions => {:type => 'wiki'}).to_s
                   end
                   def self.limit_for(klass, attribute)
                     klass.columns_hash[attribute.to_s].limit
                   end
                   def self.encoding(charset)
                     @ic = Iconv.new('UTF-8', charset)
                   rescue Iconv::InvalidEncoding
                     puts "Invalid encoding!"
                     return false
                   end
                   def self.set_trac_directory(path)
                     @@trac_directory = path
                     raise "This directory doesn't exist!" unless File.directory?(path)
                     raise "#{trac_attachments_directory} doesn't exist!" unless File.directory?(trac_attachments_directory)
                     @@trac_directory
                   rescue Exception => e
                     puts e
                     return false
                   end
                   def self.trac_directory
                     @@trac_directory
                   end
                   def self.set_trac_adapter(adapter)
                     return false if adapter.blank?
                     raise "Unknown adapter: #{adapter}!" unless %w(sqlite3 mysql postgresql).include?(adapter)
                     # If adapter is sqlite or sqlite3, make sure that trac.db exists
                     raise "#{trac_db_path} doesn't exist!" if %w(sqlite3).include?(adapter) && !File.exist?(trac_db_path)
                     @@trac_adapter = adapter
                   rescue Exception => e
                     puts e
                     return false
                   end
                   def self.set_trac_db_host(host)
                     return nil if host.blank?
                     @@trac_db_host = host
                   end
                   def self.set_trac_db_port(port)
                     return nil if port.to_i == 0
                     @@trac_db_port = port.to_i
                   end
                   def self.set_trac_db_name(name)
                     return nil if name.blank?
                     @@trac_db_name = name
                   end
                   def self.set_trac_db_username(username)
                     @@trac_db_username = username
                   end
                   def self.set_trac_db_password(password)
                     @@trac_db_password = password
                   end
                   def self.set_trac_db_schema(schema)
                     @@trac_db_schema = schema
                   end
                   mattr_reader :trac_directory, :trac_adapter, :trac_db_host, :trac_db_port, :trac_db_name, :trac_db_schema, :trac_db_username, :trac_db_password
                   def self.trac_db_path; "#{trac_directory}/db/trac.db" end
                   def self.trac_attachments_directory; "#{trac_directory}/attachments" end
                   def self.target_project_identifier(identifier)
                     project = Project.find_by_identifier(identifier)
                     if !project
                       # create the target project
                       project = Project.new :name => identifier.humanize,
                                             :description => ''
                       project.identifier = identifier
                       puts "Unable to create a project with identifier '#{identifier}'!" unless project.save
                       # enable issues and wiki for the created project
                       project.enabled_module_names = ['issue_tracking', 'wiki']
                     else
                       puts
                       puts "This project already exists in your Redmine database."
                       print "Are you sure you want to append data to this project ? [Y/n] "
                       STDOUT.flush
                       exit if STDIN.gets.match(/^n$/i)
                     end
                     project.trackers << TRACKER_BUG unless project.trackers.include?(TRACKER_BUG)
                     project.trackers << TRACKER_FEATURE unless project.trackers.include?(TRACKER_FEATURE)
                     @target_project = project.new_record? ? nil : project
                     @target_project.reload
                   end
                   def self.connection_params
                     if trac_adapter == 'sqlite3'
                       {:adapter => 'sqlite3',
                        :database => trac_db_path}
                     else
                       {:adapter => trac_adapter,
                        :database => trac_db_name,
                        :host => trac_db_host,
                        :port => trac_db_port,
                        :username => trac_db_username,
                        :password => trac_db_password,
                        :schema_search_path => trac_db_schema
                       }
                     end
                   end
                   def self.establish_connection
                     constants.each do |const|
                       klass = const_get(const)
                       next unless klass.respond_to? 'establish_connection'
                       klass.establish_connection connection_params
                     end
                   end
                 private
                   def self.encode(text)
                     @ic.iconv text
                   rescue
                     text
                   end
                 end
                 puts
                 if Redmine::DefaultData::Loader.no_data?
                   puts "Redmine configuration need to be loaded before importing data."
                   puts "Please, run this first:"
                   puts
                   puts "  rake redmine:load_default_data RAILS_ENV=\"#{ENV['RAILS_ENV']}\""
                   exit
                 end
                 puts "WARNING: a new project will be added to Redmine during this process."
                 print "Are you sure you want to continue ? [y/N] "
                 STDOUT.flush
                 break unless STDIN.gets.match(/^y$/i)
                 puts
                 def prompt(text, options = {}, &block)
                   default = options[:default] || ''
                   while true
                     print "#{text} [#{default}]: "
                     STDOUT.flush
                     value = STDIN.gets.chomp!
                     value = default if value.blank?
                     break if yield value
                   end
                 end
                 DEFAULT_PORTS = {'mysql' => 3306, 'postgresql' => 5432}
                 prompt('Trac directory') {|directory| TracMigrate.set_trac_directory directory.strip}
                 prompt('Trac database adapter (sqlite3, mysql2, postgresql)', :default => 'sqlite3') {|adapter| TracMigrate.set_trac_adapter adapter}
                 unless %w(sqlite3).include?(TracMigrate.trac_adapter)
                   prompt('Trac database host', :default => 'localhost') {|host| TracMigrate.set_trac_db_host host}
                   prompt('Trac database port', :default => DEFAULT_PORTS[TracMigrate.trac_adapter]) {|port| TracMigrate.set_trac_db_port port}
                   prompt('Trac database name') {|name| TracMigrate.set_trac_db_name name}
                   prompt('Trac database schema', :default => 'public') {|schema| TracMigrate.set_trac_db_schema schema}
                   prompt('Trac database username') {|username| TracMigrate.set_trac_db_username username}
                   prompt('Trac database password') {|password| TracMigrate.set_trac_db_password password}
                 end
                 prompt('Trac database encoding', :default => 'UTF-8') {|encoding| TracMigrate.encoding encoding}
                 prompt('Target project identifier') {|identifier| TracMigrate.target_project_identifier identifier}
                 puts
                 # Turn off email notifications
                 Setting.notified_events = []
                 TracMigrate.migrate
               end
             end

test/unit/group_test.rb +1 -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 File.expand_path('../../test_helper', __FILE__)
             class GroupTest < ActiveSupport::TestCase
               fixtures :projects, :trackers, :issue_statuses, :issues,
                        :enumerations, :users, :issue_categories,
                        :projects_trackers,
                        :roles,
                        :member_roles,
                        :members,
                        :enabled_modules,
                        :workflows,
                        :groups_users
               include Redmine::I18n
               def test_create
                 g = Group.new(:lastname => 'New group')
                 assert g.save
               end
               def test_blank_name_error_message
                 set_language_if_valid 'en'
                 g = Group.new
                 assert !g.save
                 assert_include "Name can't be blank", g.errors.full_messages
               end
               def test_blank_name_error_message_fr
                 set_language_if_valid 'fr'
                 str = "Nom doit \xc3\xaatre renseign\xc3\xa9(e)"
                 str.force_encoding('UTF-8') if str.respond_to?(:force_encoding)
                 g = Group.new
                 assert !g.save
                 assert_include str, g.errors.full_messages
               end
               def test_roles_given_to_new_user
                 group = Group.find(11)
                 user = User.find(9)
                 project = Project.first
                 Member.create!(:principal => group, :project => project, :role_ids => [1, 2])
                 group.users << user
                 assert user.member_of?(project)
               end
               def test_roles_given_to_existing_user
                 group = Group.find(11)
                 user = User.find(9)
                 project = Project.first
                 group.users << user
                 m = Member.create!(:principal => group, :project => project, :role_ids => [1, 2])
                 assert user.member_of?(project)
               end
               def test_roles_updated
                 group = Group.find(11)
                 user = User.find(9)
                 project = Project.first
                 group.users << user
                 m = Member.create!(:principal => group, :project => project, :role_ids => [1])
                 assert_equal [1], user.reload.roles_for_project(project).collect(&:id).sort
                 m.role_ids = [1, 2]
                 assert_equal [1, 2], user.reload.roles_for_project(project).collect(&:id).sort
                 m.role_ids = [2]
                 assert_equal [2], user.reload.roles_for_project(project).collect(&:id).sort
                 m.role_ids = [1]
                 assert_equal [1], user.reload.roles_for_project(project).collect(&:id).sort
               end
               def test_roles_removed_when_removing_group_membership
                 assert User.find(8).member_of?(Project.find(5))
                 Member.find_by_project_id_and_user_id(5, 10).destroy
                 assert !User.find(8).member_of?(Project.find(5))
               end
               def test_roles_removed_when_removing_user_from_group
                 assert User.find(8).member_of?(Project.find(5))
-                User.find(8).groups.clear
+                User.find(8).groups = []
                 assert !User.find(8).member_of?(Project.find(5))
               end
               def test_destroy_should_unassign_issues
                 group = Group.first
                 Issue.update_all(["assigned_to_id = ?", group.id], 'id = 1')
                 assert group.destroy
                 assert group.destroyed?
                 assert_equal nil, Issue.find(1).assigned_to_id
               end
             end

test/unit/repository_bazaar_test.rb +1 -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 File.expand_path('../../test_helper', __FILE__)
             class RepositoryBazaarTest < ActiveSupport::TestCase
               fixtures :projects
               include Redmine::I18n
               REPOSITORY_PATH = Rails.root.join('tmp/test/bazaar_repository/trunk').to_s
               REPOSITORY_PATH.gsub!(/\/+/, '/')
               NUM_REV = 4
               def setup
                 @project = Project.find(3)
                 @repository = Repository::Bazaar.create(
                           :project => @project, :url => "file:///#{REPOSITORY_PATH}",
                           :log_encoding => 'UTF-8')
                 assert @repository
               end
               def test_blank_path_to_repository_error_message
                 set_language_if_valid 'en'
                 repo = Repository::Bazaar.new(
                                       :project      => @project,
                                       :identifier   => 'test',
                                       :log_encoding => 'UTF-8'
                                     )
                 assert !repo.save
                 assert_include "Path to repository can't be blank",
                                repo.errors.full_messages
               end
               def test_blank_path_to_repository_error_message_fr
                 set_language_if_valid 'fr'
                 str = "Chemin du d\xc3\xa9p\xc3\xb4t doit \xc3\xaatre renseign\xc3\xa9(e)"
                 str.force_encoding('UTF-8') if str.respond_to?(:force_encoding)
                 repo = Repository::Bazaar.new(
                                       :project      => @project,
                                       :url          => "",
                                       :identifier   => 'test',
                                       :log_encoding => 'UTF-8'
                                     )
                 assert !repo.save
                 assert_include str, repo.errors.full_messages
               end
               if File.directory?(REPOSITORY_PATH)
                 def test_fetch_changesets_from_scratch
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
-                  assert_equal 9, @repository.changes.count
+                  assert_equal 9, @repository.filechanges.count
                   assert_equal 'Initial import', @repository.changesets.find_by_revision('1').comments
                 end
                 def test_fetch_changesets_incremental
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   # Remove changesets with revision > 5
                   @repository.changesets.find(:all).each {|c| c.destroy if c.revision.to_i > 2}
                   @project.reload
                   assert_equal 2, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                 end
                 def test_entries
                   entries = @repository.entries
                   assert_equal 2, entries.size
                   assert_equal 'dir', entries[0].kind
                   assert_equal 'directory', entries[0].name
                   assert_equal 'file', entries[1].kind
                   assert_equal 'doc-mkdir.txt', entries[1].name
                 end
                 def test_entries_in_subdirectory
                   entries = @repository.entries('directory')
                   assert_equal 3, entries.size
                   assert_equal 'file', entries.last.kind
                   assert_equal 'edit.png', entries.last.name
                 end
                 def test_previous
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   changeset = @repository.find_changeset_by_name('3')
                   assert_equal @repository.find_changeset_by_name('2'), changeset.previous
                 end
                 def test_previous_nil
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   changeset = @repository.find_changeset_by_name('1')
                   assert_nil changeset.previous
                 end
                 def test_next
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   changeset = @repository.find_changeset_by_name('2')
                   assert_equal @repository.find_changeset_by_name('3'), changeset.next
                 end
                 def test_next_nil
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   changeset = @repository.find_changeset_by_name('4')
                   assert_nil changeset.next
                 end
               else
                 puts "Bazaar test repository NOT FOUND. Skipping unit tests !!!"
                 def test_fake; assert true end
               end
             end

test/unit/repository_cvs_test.rb +1 -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 File.expand_path('../../test_helper', __FILE__)
             require 'pp'
             class RepositoryCvsTest < ActiveSupport::TestCase
               fixtures :projects
               include Redmine::I18n
               REPOSITORY_PATH = Rails.root.join('tmp/test/cvs_repository').to_s
               REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin?
               # CVS module
               MODULE_NAME    = 'test'
               CHANGESETS_NUM = 7
               def setup
                 @project = Project.find(3)
                 @repository = Repository::Cvs.create(:project  => @project,
                                                      :root_url => REPOSITORY_PATH,
                                                      :url      => MODULE_NAME,
                                                      :log_encoding => 'UTF-8')
                 assert @repository
               end
               def test_blank_module_error_message
                 set_language_if_valid 'en'
                 repo = Repository::Cvs.new(
                                       :project      => @project,
                                       :identifier   => 'test',
                                       :log_encoding => 'UTF-8',
                                       :root_url     => REPOSITORY_PATH
                                     )
                 assert !repo.save
                 assert_include "Module can't be blank",
                                repo.errors.full_messages
               end
               def test_blank_module_error_message_fr
                 set_language_if_valid 'fr'
                 str = "Module doit \xc3\xaatre renseign\xc3\xa9(e)"
                 str.force_encoding('UTF-8') if str.respond_to?(:force_encoding)
                 repo = Repository::Cvs.new(
                                       :project       => @project,
                                       :identifier    => 'test',
                                       :log_encoding  => 'UTF-8',
                                       :path_encoding => '',
                                       :url           => '',
                                       :root_url      => REPOSITORY_PATH
                                     )
                 assert !repo.save
                 assert_include str, repo.errors.full_messages
               end
               def test_blank_cvsroot_error_message
                 set_language_if_valid 'en'
                 repo = Repository::Cvs.new(
                                       :project      => @project,
                                       :identifier   => 'test',
                                       :log_encoding => 'UTF-8',
                                       :url          => MODULE_NAME
                                     )
                 assert !repo.save
                 assert_include "CVSROOT can't be blank",
                                repo.errors.full_messages
               end
               def test_blank_cvsroot_error_message_fr
                 set_language_if_valid 'fr'
                 str = "CVSROOT doit \xc3\xaatre renseign\xc3\xa9(e)"
                 str.force_encoding('UTF-8') if str.respond_to?(:force_encoding)
                 repo = Repository::Cvs.new(
                                       :project       => @project,
                                       :identifier    => 'test',
                                       :log_encoding  => 'UTF-8',
                                       :path_encoding => '',
                                       :url           => MODULE_NAME,
                                       :root_url      => ''
                                     )
                 assert !repo.save
                 assert_include str, repo.errors.full_messages
               end
               if File.directory?(REPOSITORY_PATH)
                 def test_fetch_changesets_from_scratch
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal CHANGESETS_NUM, @repository.changesets.count
-                  assert_equal 16, @repository.changes.count
+                  assert_equal 16, @repository.filechanges.count
                   assert_not_nil @repository.changesets.find_by_comments('Two files changed')
                   r2 = @repository.changesets.find_by_revision('2')
                   assert_equal 'v1-20071213-162510', r2.scmid
                 end
                 def test_fetch_changesets_incremental
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal CHANGESETS_NUM, @repository.changesets.count
                   # Remove changesets with revision > 3
                   @repository.changesets.find(:all).each {|c| c.destroy if c.revision.to_i > 3}
                   @project.reload
                   assert_equal 3, @repository.changesets.count
                   assert_equal %w|3 2 1|, @repository.changesets.all.collect(&:revision)
                   rev3_commit = @repository.changesets.find(:first, :order => 'committed_on DESC')
                   assert_equal '3', rev3_commit.revision
                    # 2007-12-14 01:27:22 +0900
                   rev3_committed_on = Time.gm(2007, 12, 13, 16, 27, 22)
                   assert_equal 'HEAD-20071213-162722', rev3_commit.scmid
                   assert_equal rev3_committed_on, rev3_commit.committed_on
                   latest_rev = @repository.latest_changeset
                   assert_equal rev3_committed_on, latest_rev.committed_on
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal CHANGESETS_NUM, @repository.changesets.count
                   assert_equal %w|7 6 5 4 3 2 1|, @repository.changesets.all.collect(&:revision)
                   rev5_commit = @repository.changesets.find_by_revision('5')
                   assert_equal 'HEAD-20071213-163001', rev5_commit.scmid
                    # 2007-12-14 01:30:01 +0900
                   rev5_committed_on = Time.gm(2007, 12, 13, 16, 30, 1)
                   assert_equal rev5_committed_on, rev5_commit.committed_on
                 end
                 def test_deleted_files_should_not_be_listed
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal CHANGESETS_NUM, @repository.changesets.count
                   entries = @repository.entries('sources')
                   assert entries.detect {|e| e.name == 'watchers_controller.rb'}
                   assert_nil entries.detect {|e| e.name == 'welcome_controller.rb'}
                 end
                 def test_entries_rev3
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal CHANGESETS_NUM, @repository.changesets.count
                   entries = @repository.entries('', '3')
                   assert_equal 3, entries.size
                   assert_equal entries[2].name, "README"
                   assert_equal entries[2].lastrev.time, Time.gm(2007, 12, 13, 16, 27, 22)
                   assert_equal entries[2].lastrev.identifier, '3'
                   assert_equal entries[2].lastrev.revision, '3'
                   assert_equal entries[2].lastrev.author, 'LANG'
                 end
                 def test_entries_invalid_path
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal CHANGESETS_NUM, @repository.changesets.count
                   assert_nil @repository.entries('missing')
                   assert_nil @repository.entries('missing', '3')
                 end
                 def test_entries_invalid_revision
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal CHANGESETS_NUM, @repository.changesets.count
                   assert_nil @repository.entries('', '123')
                 end
                 def test_cat
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal CHANGESETS_NUM, @repository.changesets.count
                   buf = @repository.cat('README')
                   assert buf
                   lines = buf.split("\n")
                   assert_equal 3, lines.length
                   buf = lines[1].gsub(/\r$/, "")
                   assert_equal 'with one change', buf
                   buf = @repository.cat('README', '1')
                   assert buf
                   lines = buf.split("\n")
                   assert_equal 1, lines.length
                   buf = lines[0].gsub(/\r$/, "")
                   assert_equal 'CVS test repository', buf
                   assert_nil @repository.cat('missing.rb')
                   # sources/welcome_controller.rb is removed at revision 5.
                   assert @repository.cat('sources/welcome_controller.rb', '4')
                   assert @repository.cat('sources/welcome_controller.rb', '5').blank?
                   # invalid revision
                   assert @repository.cat('README', '123').blank?
                 end
                 def test_annotate
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal CHANGESETS_NUM, @repository.changesets.count
                   ann = @repository.annotate('README')
                   assert ann
                   assert_equal 3, ann.revisions.length
                   assert_equal '1.2', ann.revisions[1].revision
                   assert_equal 'LANG', ann.revisions[1].author
                   assert_equal 'with one change', ann.lines[1]
                   ann = @repository.annotate('README', '1')
                   assert ann
                   assert_equal 1, ann.revisions.length
                   assert_equal '1.1', ann.revisions[0].revision
                   assert_equal 'LANG', ann.revisions[0].author
                   assert_equal 'CVS test repository', ann.lines[0]
                  # invalid revision
                  assert_nil @repository.annotate('README', '123')
                end
               else
                 puts "CVS test repository NOT FOUND. Skipping unit tests !!!"
                 def test_fake; assert true end
               end
             end

test/unit/repository_darcs_test.rb +1 -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 File.expand_path('../../test_helper', __FILE__)
             class RepositoryDarcsTest < ActiveSupport::TestCase
               fixtures :projects
               include Redmine::I18n
               REPOSITORY_PATH = Rails.root.join('tmp/test/darcs_repository').to_s
               NUM_REV = 6
               def setup
                 @project = Project.find(3)
                 @repository = Repository::Darcs.create(
                                   :project      => @project,
                                   :url          => REPOSITORY_PATH,
                                   :log_encoding => 'UTF-8'
                                   )
                 assert @repository
               end
               def test_blank_path_to_repository_error_message
                 set_language_if_valid 'en'
                 repo = Repository::Darcs.new(
                                       :project      => @project,
                                       :identifier   => 'test',
                                       :log_encoding => 'UTF-8'
                                     )
                 assert !repo.save
                 assert_include "Path to repository can't be blank",
                                repo.errors.full_messages
               end
               def test_blank_path_to_repository_error_message_fr
                 set_language_if_valid 'fr'
                 str = "Chemin du d\xc3\xa9p\xc3\xb4t doit \xc3\xaatre renseign\xc3\xa9(e)"
                 str.force_encoding('UTF-8') if str.respond_to?(:force_encoding)
                 repo = Repository::Darcs.new(
                                       :project      => @project,
                                       :url          => "",
                                       :identifier   => 'test',
                                       :log_encoding => 'UTF-8'
                                     )
                 assert !repo.save
                 assert_include str, repo.errors.full_messages
               end
               if File.directory?(REPOSITORY_PATH)
                 def test_fetch_changesets_from_scratch
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
-                  assert_equal 13, @repository.changes.count
+                  assert_equal 13, @repository.filechanges.count
                   assert_equal "Initial commit.", @repository.changesets.find_by_revision('1').comments
                 end
                 def test_fetch_changesets_incremental
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   # Remove changesets with revision > 3
                   @repository.changesets.find(:all).each {|c| c.destroy if c.revision.to_i > 3}
                   @project.reload
                   assert_equal 3, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                 end
                 def test_entries_invalid_revision
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   assert_nil @repository.entries('', '123')
                 end
                 def test_deleted_files_should_not_be_listed
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   entries = @repository.entries('sources')
                   assert entries.detect {|e| e.name == 'watchers_controller.rb'}
                   assert_nil entries.detect {|e| e.name == 'welcome_controller.rb'}
                 end
                 def test_cat
                   if @repository.scm.supports_cat?
                     assert_equal 0, @repository.changesets.count
                     @repository.fetch_changesets
                     @project.reload
                     assert_equal NUM_REV, @repository.changesets.count
                     cat = @repository.cat("sources/welcome_controller.rb", 2)
                     assert_not_nil cat
                     assert cat.include?('class WelcomeController < ApplicationController')
                   end
                 end
               else
                 puts "Darcs test repository NOT FOUND. Skipping unit tests !!!"
                 def test_fake; assert true end
               end
             end

test/unit/repository_filesystem_test.rb +2 -2

             # 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 RepositoryFilesystemTest < ActiveSupport::TestCase
               fixtures :projects
               include Redmine::I18n
               REPOSITORY_PATH = Rails.root.join('tmp/test/filesystem_repository').to_s
               def setup
                 @project = Project.find(3)
                 Setting.enabled_scm << 'Filesystem' unless Setting.enabled_scm.include?('Filesystem')
                 @repository = Repository::Filesystem.create(
                                            :project => @project,
                                            :url     => REPOSITORY_PATH
                                              )
                 assert @repository
               end
               def test_blank_root_directory_error_message
                 set_language_if_valid 'en'
                 repo = Repository::Filesystem.new(
                                       :project      => @project,
                                       :identifier   => 'test'
                                     )
                 assert !repo.save
                 assert_include "Root directory can't be blank",
                                repo.errors.full_messages
               end
               def test_blank_root_directory_error_message_fr
                 set_language_if_valid 'fr'
                 str = "R\xc3\xa9pertoire racine doit \xc3\xaatre renseign\xc3\xa9(e)"
                 str.force_encoding('UTF-8') if str.respond_to?(:force_encoding)
                 repo = Repository::Filesystem.new(
                                       :project      => @project,
                                       :url          => "",
                                       :identifier   => 'test',
                                       :path_encoding => ''
                                     )
                 assert !repo.save
                 assert_include str, repo.errors.full_messages
               end
               if File.directory?(REPOSITORY_PATH)
                 def test_fetch_changesets
                   assert_equal 0, @repository.changesets.count
-                  assert_equal 0, @repository.changes.count
+                  assert_equal 0, @repository.filechanges.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal 0, @repository.changesets.count
-                  assert_equal 0, @repository.changes.count
+                  assert_equal 0, @repository.filechanges.count
                 end
                 def test_entries
                   assert_equal 3, @repository.entries("", 2).size
                   assert_equal 2, @repository.entries("dir", 3).size
                 end
                 def test_cat
                   assert_equal "TEST CAT\n", @repository.scm.cat("test")
                 end
               else
                 puts "Filesystem test repository NOT FOUND. Skipping unit tests !!! See doc/RUNNING_TESTS."
                 def test_fake; assert true end
               end
             end

test/unit/repository_git_test.rb +3 -3

             # 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 RepositoryGitTest < ActiveSupport::TestCase
               fixtures :projects, :repositories, :enabled_modules, :users, :roles
               include Redmine::I18n
               REPOSITORY_PATH = Rails.root.join('tmp/test/git_repository').to_s
               REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin?
               NUM_REV = 28
               NUM_HEAD = 6
               FELIX_HEX  = "Felix Sch\xC3\xA4fer"
               CHAR_1_HEX = "\xc3\x9c"
               ## Ruby uses ANSI api to fork a process on Windows.
               ## Japanese Shift_JIS and Traditional Chinese Big5 have 0x5c(backslash) problem
               ## and these are incompatible with ASCII.
               # WINDOWS_PASS = Redmine::Platform.mswin?
               WINDOWS_PASS = false
               ## Git, Mercurial and CVS path encodings are binary.
               ## Subversion supports URL encoding for path.
               ## Redmine Mercurial adapter and extension use URL encoding.
               ## Git accepts only binary path in command line parameter.
               ## So, there is no way to use binary command line parameter in JRuby.
               JRUBY_SKIP     = (RUBY_PLATFORM == 'java')
               JRUBY_SKIP_STR = "TODO: This test fails in JRuby"
               def setup
                 @project = Project.find(3)
                 @repository = Repository::Git.create(
                                     :project       => @project,
                                     :url           => REPOSITORY_PATH,
                                     :path_encoding => 'ISO-8859-1'
                                     )
                 assert @repository
                 @char_1        = CHAR_1_HEX.dup
                 if @char_1.respond_to?(:force_encoding)
                   @char_1.force_encoding('UTF-8')
                 end
               end
               def test_blank_path_to_repository_error_message
                 set_language_if_valid 'en'
                 repo = Repository::Git.new(
                                       :project      => @project,
                                       :identifier   => 'test'
                                     )
                 assert !repo.save
                 assert_include "Path to repository can't be blank",
                                repo.errors.full_messages
               end
               def test_blank_path_to_repository_error_message_fr
                 set_language_if_valid 'fr'
                 str = "Chemin du d\xc3\xa9p\xc3\xb4t doit \xc3\xaatre renseign\xc3\xa9(e)"
                 str.force_encoding('UTF-8') if str.respond_to?(:force_encoding)
                 repo = Repository::Git.new(
                                       :project      => @project,
                                       :url          => "",
                                       :identifier   => 'test',
                                       :path_encoding => ''
                                     )
                 assert !repo.save
                 assert_include str, repo.errors.full_messages
               end
               if File.directory?(REPOSITORY_PATH)
                 def test_scm_available
                   klass = Repository::Git
                   assert_equal "Git", klass.scm_name
                   assert klass.scm_adapter_class
                   assert_not_equal "", klass.scm_command
                   assert_equal true, klass.scm_available
                 end
                 def test_fetch_changesets_from_scratch
                   assert_nil @repository.extra_info
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
-                  assert_equal 39, @repository.changes.count
+                  assert_equal 39, @repository.filechanges.count
                   commit = @repository.changesets.find_by_revision("7234cb2750b63f47bff735edc50a1c0a433c2518")
                   assert_equal "7234cb2750b63f47bff735edc50a1c0a433c2518", commit.scmid
                   assert_equal "Initial import.\nThe repository contains 3 files.", commit.comments
                   assert_equal "jsmith <jsmith@foo.bar>", commit.committer
                   assert_equal User.find_by_login('jsmith'), commit.user
                   # TODO: add a commit with commit time <> author time to the test repository
                   assert_equal "2007-12-14 09:22:52".to_time, commit.committed_on
                   assert_equal "2007-12-14".to_date, commit.commit_date
-                  assert_equal 3, commit.changes.count
+                  assert_equal 3, commit.filechanges.count
-                  change = commit.changes.sort_by(&:path).first
+                  change = commit.filechanges.sort_by(&:path).first
                   assert_equal "README", change.path
                   assert_equal nil, change.from_path
                   assert_equal "A", change.action
                   assert_equal NUM_HEAD, @repository.extra_info["heads"].size
                 end
                 def test_fetch_changesets_incremental
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   extra_info_heads = @repository.extra_info["heads"].dup
                   assert_equal NUM_HEAD, extra_info_heads.size
                   extra_info_heads.delete_if { |x| x == "83ca5fd546063a3c7dc2e568ba3355661a9e2b2c" }
                   assert_equal 4, extra_info_heads.size
                   del_revs = [
                       "83ca5fd546063a3c7dc2e568ba3355661a9e2b2c",
                       "ed5bb786bbda2dee66a2d50faf51429dbc043a7b",
                       "4f26664364207fa8b1af9f8722647ab2d4ac5d43",
                       "deff712f05a90d96edbd70facc47d944be5897e3",
                       "32ae898b720c2f7eec2723d5bdd558b4cb2d3ddf",
                       "7e61ac704deecde634b51e59daa8110435dcb3da",
                      ]
                   @repository.changesets.each do |rev|
                     rev.destroy if del_revs.detect {|r| r == rev.scmid.to_s }
                   end
                   @project.reload
                   cs1 = @repository.changesets
                   assert_equal NUM_REV - 6, cs1.count
                   extra_info_heads << "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8"
                   h = {}
                   h["heads"] = extra_info_heads
                   @repository.merge_extra_info(h)
                   @repository.save
                   @project.reload
                   assert @repository.extra_info["heads"].index("4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8")
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   assert_equal NUM_HEAD, @repository.extra_info["heads"].size
                   assert @repository.extra_info["heads"].index("83ca5fd546063a3c7dc2e568ba3355661a9e2b2c")
                 end
                 def test_fetch_changesets_history_editing
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   extra_info_heads = @repository.extra_info["heads"].dup
                   assert_equal NUM_HEAD, extra_info_heads.size
                   extra_info_heads.delete_if { |x| x == "83ca5fd546063a3c7dc2e568ba3355661a9e2b2c" }
                   assert_equal 4, extra_info_heads.size
                   del_revs = [
                       "83ca5fd546063a3c7dc2e568ba3355661a9e2b2c",
                       "ed5bb786bbda2dee66a2d50faf51429dbc043a7b",
                       "4f26664364207fa8b1af9f8722647ab2d4ac5d43",
                       "deff712f05a90d96edbd70facc47d944be5897e3",
                       "32ae898b720c2f7eec2723d5bdd558b4cb2d3ddf",
                       "7e61ac704deecde634b51e59daa8110435dcb3da",
                      ]
                   @repository.changesets.each do |rev|
                     rev.destroy if del_revs.detect {|r| r == rev.scmid.to_s }
                   end
                   @project.reload
                   assert_equal NUM_REV - 6, @repository.changesets.count
                   c = Changeset.new(:repository   => @repository,
                                     :committed_on => Time.now,
                                     :revision     => "abcd1234efgh",
                                     :scmid        => "abcd1234efgh",
                                     :comments     => 'test')
                   assert c.save
                   @project.reload
                   assert_equal NUM_REV - 5, @repository.changesets.count
                   extra_info_heads << "1234abcd5678"
                   h = {}
                   h["heads"] = extra_info_heads
                   @repository.merge_extra_info(h)
                   @repository.save
                   @project.reload
                   h1 = @repository.extra_info["heads"].dup
                   assert h1.index("1234abcd5678")
                   assert_equal 5, h1.size
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV - 5, @repository.changesets.count
                   h2 = @repository.extra_info["heads"].dup
                   assert_equal h1, h2
                 end
                 def test_parents
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   r1 = @repository.find_changeset_by_name("7234cb2750b63")
                   assert_equal [], r1.parents
                   r2 = @repository.find_changeset_by_name("899a15dba03a3")
                   assert_equal 1, r2.parents.length
                   assert_equal "7234cb2750b63f47bff735edc50a1c0a433c2518",
                                r2.parents[0].identifier
                   r3 = @repository.find_changeset_by_name("32ae898b720c2")
                   assert_equal 2, r3.parents.length
                   r4 = [r3.parents[0].identifier, r3.parents[1].identifier].sort
                   assert_equal "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8", r4[0]
                   assert_equal "7e61ac704deecde634b51e59daa8110435dcb3da", r4[1]
                 end
                 def test_db_consistent_ordering_init
                   assert_nil @repository.extra_info
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal 1, @repository.extra_info["db_consistent"]["ordering"]
                 end
                 def test_db_consistent_ordering_before_1_2
                   assert_nil @repository.extra_info
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   assert_not_nil @repository.extra_info
                   h = {}
                   h["heads"] = []
                   h["branches"] = {}
                   h["db_consistent"] = {}
                   @repository.merge_extra_info(h)
                   @repository.save
                   assert_equal NUM_REV, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal 0, @repository.extra_info["db_consistent"]["ordering"]
                   extra_info_heads = @repository.extra_info["heads"].dup
                   extra_info_heads.delete_if { |x| x == "83ca5fd546063a3c7dc2e568ba3355661a9e2b2c" }
                   del_revs = [
                       "83ca5fd546063a3c7dc2e568ba3355661a9e2b2c",
                       "ed5bb786bbda2dee66a2d50faf51429dbc043a7b",
                       "4f26664364207fa8b1af9f8722647ab2d4ac5d43",
                       "deff712f05a90d96edbd70facc47d944be5897e3",
                       "32ae898b720c2f7eec2723d5bdd558b4cb2d3ddf",
                       "7e61ac704deecde634b51e59daa8110435dcb3da",
                      ]
                   @repository.changesets.each do |rev|
                     rev.destroy if del_revs.detect {|r| r == rev.scmid.to_s }
                   end
                   @project.reload
                   cs1 = @repository.changesets
                   assert_equal NUM_REV - 6, cs1.count
                   assert_equal 0, @repository.extra_info["db_consistent"]["ordering"]
                   extra_info_heads << "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8"
                   h = {}
                   h["heads"] = extra_info_heads
                   @repository.merge_extra_info(h)
                   @repository.save
                   @project.reload
                   assert @repository.extra_info["heads"].index("4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8")
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   assert_equal NUM_HEAD, @repository.extra_info["heads"].size
                   assert_equal 0, @repository.extra_info["db_consistent"]["ordering"]
                 end
                 def test_heads_from_branches_hash
                   assert_nil @repository.extra_info
                   assert_equal 0, @repository.changesets.count
                   assert_equal [], @repository.heads_from_branches_hash
                   h = {}
                   h["branches"] = {}
                   h["branches"]["test1"] = {}
                   h["branches"]["test1"]["last_scmid"] = "1234abcd"
                   h["branches"]["test2"] = {}
                   h["branches"]["test2"]["last_scmid"] = "abcd1234"
                   @repository.merge_extra_info(h)
                   @repository.save
                   @project.reload
                   assert_equal ["1234abcd", "abcd1234"], @repository.heads_from_branches_hash.sort
                 end
                 def test_latest_changesets
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   # with limit
                   changesets = @repository.latest_changesets('', 'master', 2)
                   assert_equal 2, changesets.size
                   # with path
                   changesets = @repository.latest_changesets('images', 'master')
                   assert_equal [
                           'deff712f05a90d96edbd70facc47d944be5897e3',
                           '899a15dba03a3b350b89c3f537e4bbe02a03cdc9',
                           '7234cb2750b63f47bff735edc50a1c0a433c2518',
                       ], changesets.collect(&:revision)
                   changesets = @repository.latest_changesets('README', nil)
                   assert_equal [
                           '32ae898b720c2f7eec2723d5bdd558b4cb2d3ddf',
                           '4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8',
                           '713f4944648826f558cf548222f813dabe7cbb04',
                           '61b685fbe55ab05b5ac68402d5720c1a6ac973d1',
                           '899a15dba03a3b350b89c3f537e4bbe02a03cdc9',
                           '7234cb2750b63f47bff735edc50a1c0a433c2518',
                       ], changesets.collect(&:revision)
                   # with path, revision and limit
                   changesets = @repository.latest_changesets('images', '899a15dba')
                   assert_equal [
                           '899a15dba03a3b350b89c3f537e4bbe02a03cdc9',
                           '7234cb2750b63f47bff735edc50a1c0a433c2518',
                       ], changesets.collect(&:revision)
                   changesets = @repository.latest_changesets('images', '899a15dba', 1)
                   assert_equal [
                           '899a15dba03a3b350b89c3f537e4bbe02a03cdc9',
                       ], changesets.collect(&:revision)
                   changesets = @repository.latest_changesets('README', '899a15dba')
                   assert_equal [
                           '899a15dba03a3b350b89c3f537e4bbe02a03cdc9',
                           '7234cb2750b63f47bff735edc50a1c0a433c2518',
                       ], changesets.collect(&:revision)
                   changesets = @repository.latest_changesets('README', '899a15dba', 1)
                   assert_equal [
                           '899a15dba03a3b350b89c3f537e4bbe02a03cdc9',
                       ], changesets.collect(&:revision)
                   # with path, tag and limit
                   changesets = @repository.latest_changesets('images', 'tag01.annotated')
                   assert_equal [
                           '899a15dba03a3b350b89c3f537e4bbe02a03cdc9',
                           '7234cb2750b63f47bff735edc50a1c0a433c2518',
                       ], changesets.collect(&:revision)
                   changesets = @repository.latest_changesets('images', 'tag01.annotated', 1)
                   assert_equal [
                           '899a15dba03a3b350b89c3f537e4bbe02a03cdc9',
                       ], changesets.collect(&:revision)
                   changesets = @repository.latest_changesets('README', 'tag01.annotated')
                   assert_equal [
                           '899a15dba03a3b350b89c3f537e4bbe02a03cdc9',
                           '7234cb2750b63f47bff735edc50a1c0a433c2518',
                       ], changesets.collect(&:revision)
                   changesets = @repository.latest_changesets('README', 'tag01.annotated', 1)
                   assert_equal [
                           '899a15dba03a3b350b89c3f537e4bbe02a03cdc9',
                       ], changesets.collect(&:revision)
                   # with path, branch and limit
                   changesets = @repository.latest_changesets('images', 'test_branch')
                   assert_equal [
                           '899a15dba03a3b350b89c3f537e4bbe02a03cdc9',
                           '7234cb2750b63f47bff735edc50a1c0a433c2518',
                       ], changesets.collect(&:revision)
                   changesets = @repository.latest_changesets('images', 'test_branch', 1)
                   assert_equal [
                           '899a15dba03a3b350b89c3f537e4bbe02a03cdc9',
                       ], changesets.collect(&:revision)
                   changesets = @repository.latest_changesets('README', 'test_branch')
                   assert_equal [
                           '713f4944648826f558cf548222f813dabe7cbb04',
                           '61b685fbe55ab05b5ac68402d5720c1a6ac973d1',
                           '899a15dba03a3b350b89c3f537e4bbe02a03cdc9',
                           '7234cb2750b63f47bff735edc50a1c0a433c2518',
                       ], changesets.collect(&:revision)
                   changesets = @repository.latest_changesets('README', 'test_branch', 2)
                   assert_equal [
                           '713f4944648826f558cf548222f813dabe7cbb04',
                           '61b685fbe55ab05b5ac68402d5720c1a6ac973d1',
                       ], changesets.collect(&:revision)
                   if JRUBY_SKIP
                     puts JRUBY_SKIP_STR
                   else
                     # latin-1 encoding path
                     changesets = @repository.latest_changesets(
                                   "latin-1-dir/test-#{@char_1}-2.txt", '64f1f3e89')
                     assert_equal [
                           '64f1f3e89ad1cb57976ff0ad99a107012ba3481d',
                           '4fc55c43bf3d3dc2efb66145365ddc17639ce81e',
                       ], changesets.collect(&:revision)
                     changesets = @repository.latest_changesets(
                                 "latin-1-dir/test-#{@char_1}-2.txt", '64f1f3e89', 1)
                     assert_equal [
                           '64f1f3e89ad1cb57976ff0ad99a107012ba3481d',
                       ], changesets.collect(&:revision)
                   end
                 end
                 def test_latest_changesets_latin_1_dir
                   if WINDOWS_PASS
                     #
                   elsif JRUBY_SKIP
                     puts JRUBY_SKIP_STR
                   else
                     assert_equal 0, @repository.changesets.count
                     @repository.fetch_changesets
                     @project.reload
                     assert_equal NUM_REV, @repository.changesets.count
                     changesets = @repository.latest_changesets(
                                 "latin-1-dir/test-#{@char_1}-subdir", '1ca7f5ed')
                     assert_equal [
                           '1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127',
                       ], changesets.collect(&:revision)
                   end
                 end
                 def test_find_changeset_by_name
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   ['7234cb2750b63f47bff735edc50a1c0a433c2518', '7234cb2750b'].each do |r|
                     assert_equal '7234cb2750b63f47bff735edc50a1c0a433c2518',
                                  @repository.find_changeset_by_name(r).revision
                   end
                 end
                 def test_find_changeset_by_empty_name
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   ['', ' ', nil].each do |r|
                     assert_nil @repository.find_changeset_by_name(r)
                   end
                 end
                 def test_identifier
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   c = @repository.changesets.find_by_revision(
                                       '7234cb2750b63f47bff735edc50a1c0a433c2518')
                   assert_equal c.scmid, c.identifier
                 end
                 def test_format_identifier
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   c = @repository.changesets.find_by_revision(
                                       '7234cb2750b63f47bff735edc50a1c0a433c2518')
                   assert_equal '7234cb27', c.format_identifier
                 end
                 def test_activities
                   c = Changeset.new(:repository => @repository,
                                     :committed_on => Time.now,
                                     :revision => 'abc7234cb2750b63f47bff735edc50a1c0a433c2',
                                     :scmid    => 'abc7234cb2750b63f47bff735edc50a1c0a433c2',
                                     :comments => 'test')
                   assert c.event_title.include?('abc7234c:')
                   assert_equal 'abc7234cb2750b63f47bff735edc50a1c0a433c2', c.event_url[:rev]
                 end
                 def test_log_utf8
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   str_felix_hex  = FELIX_HEX.dup
                   if str_felix_hex.respond_to?(:force_encoding)
                       str_felix_hex.force_encoding('UTF-8')
                   end
                   c = @repository.changesets.find_by_revision(
                                     'ed5bb786bbda2dee66a2d50faf51429dbc043a7b')
                   assert_equal "#{str_felix_hex} <felix@fachschaften.org>", c.committer
                 end
                 def test_previous
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   %w|1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127 1ca7f5ed|.each do |r1|
                     changeset = @repository.find_changeset_by_name(r1)
                     %w|64f1f3e89ad1cb57976ff0ad99a107012ba3481d 64f1f3e89ad1|.each do |r2|
                       assert_equal @repository.find_changeset_by_name(r2), changeset.previous
                     end
                   end
                 end
                 def test_previous_nil
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   %w|7234cb2750b63f47bff735edc50a1c0a433c2518 7234cb275|.each do |r1|
                     changeset = @repository.find_changeset_by_name(r1)
                     assert_nil changeset.previous
                   end
                 end
                 def test_next
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   %w|64f1f3e89ad1cb57976ff0ad99a107012ba3481d 64f1f3e89ad1|.each do |r2|
                     changeset = @repository.find_changeset_by_name(r2)
                     %w|1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127 1ca7f5ed|.each do |r1|
                     assert_equal @repository.find_changeset_by_name(r1), changeset.next
                     end
                   end
                 end
                 def test_next_nil
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   %w|2a682156a3b6e77a8bf9cd4590e8db757f3c6c78 2a682156a3b6e77a|.each do |r1|
                     changeset = @repository.find_changeset_by_name(r1)
                     assert_nil changeset.next
                   end
                 end
               else
                 puts "Git test repository NOT FOUND. Skipping unit tests !!!"
                 def test_fake; assert true end
               end
             end

test/unit/repository_mercurial_test.rb +4 -4

             # 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 RepositoryMercurialTest < ActiveSupport::TestCase
               fixtures :projects
               include Redmine::I18n
               REPOSITORY_PATH = Rails.root.join('tmp/test/mercurial_repository').to_s
               NUM_REV = 32
               CHAR_1_HEX = "\xc3\x9c"
               def setup
                 @project    = Project.find(3)
                 @repository = Repository::Mercurial.create(
                                   :project => @project,
                                   :url     => REPOSITORY_PATH,
                                   :path_encoding => 'ISO-8859-1'
                                   )
                 assert @repository
                 @char_1        = CHAR_1_HEX.dup
                 @tag_char_1    = "tag-#{CHAR_1_HEX}-00"
                 @branch_char_0 = "branch-#{CHAR_1_HEX}-00"
                 @branch_char_1 = "branch-#{CHAR_1_HEX}-01"
                 if @char_1.respond_to?(:force_encoding)
                   @char_1.force_encoding('UTF-8')
                   @tag_char_1.force_encoding('UTF-8')
                   @branch_char_0.force_encoding('UTF-8')
                   @branch_char_1.force_encoding('UTF-8')
                 end
               end
               def test_blank_path_to_repository_error_message
                 set_language_if_valid 'en'
                 repo = Repository::Mercurial.new(
                                       :project      => @project,
                                       :identifier   => 'test'
                                     )
                 assert !repo.save
                 assert_include "Path to repository can't be blank",
                                repo.errors.full_messages
               end
               def test_blank_path_to_repository_error_message_fr
                 set_language_if_valid 'fr'
                 str = "Chemin du d\xc3\xa9p\xc3\xb4t doit \xc3\xaatre renseign\xc3\xa9(e)"
                 str.force_encoding('UTF-8') if str.respond_to?(:force_encoding)
                 repo = Repository::Mercurial.new(
                                       :project      => @project,
                                       :url          => "",
                                       :identifier   => 'test',
                                       :path_encoding => ''
                                     )
                 assert !repo.save
                 assert_include str, repo.errors.full_messages
               end
               if File.directory?(REPOSITORY_PATH)
                 def test_scm_available
                   klass = Repository::Mercurial
                   assert_equal "Mercurial", klass.scm_name
                   assert klass.scm_adapter_class
                   assert_not_equal "", klass.scm_command
                   assert_equal true, klass.scm_available
                 end
                 def test_fetch_changesets_from_scratch
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
-                  assert_equal 46, @repository.changes.count
+                  assert_equal 46, @repository.filechanges.count
                   assert_equal "Initial import.\nThe repository contains 3 files.",
                                @repository.changesets.find_by_revision('0').comments
                 end
                 def test_fetch_changesets_incremental
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   # Remove changesets with revision > 2
                   @repository.changesets.find(:all).each {|c| c.destroy if c.revision.to_i > 2}
                   @project.reload
                   assert_equal 3, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                 end
                 def test_isodatesec
                   # Template keyword 'isodatesec' supported in Mercurial 1.0 and higher
                   if @repository.scm.class.client_version_above?([1, 0])
                     assert_equal 0, @repository.changesets.count
                     @repository.fetch_changesets
                     @project.reload
                     assert_equal NUM_REV, @repository.changesets.count
                     rev0_committed_on = Time.gm(2007, 12, 14, 9, 22, 52)
                     assert_equal @repository.changesets.find_by_revision('0').committed_on, rev0_committed_on
                   end
                 end
                 def test_changeset_order_by_revision
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   c0 = @repository.latest_changeset
                   c1 = @repository.changesets.find_by_revision('0')
                   # sorted by revision (id), not by date
                   assert c0.revision.to_i > c1.revision.to_i
                   assert c0.committed_on  < c1.committed_on
                 end
                 def test_latest_changesets
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   # with_limit
                   changesets = @repository.latest_changesets('', nil, 2)
                   assert_equal %w|31 30|, changesets.collect(&:revision)
                   # with_filepath
                   changesets = @repository.latest_changesets(
                                   '/sql_escape/percent%dir/percent%file1.txt', nil)
                   assert_equal %w|30 11 10 9|, changesets.collect(&:revision)
                   changesets = @repository.latest_changesets(
                                   '/sql_escape/underscore_dir/understrike_file.txt', nil)
                   assert_equal %w|30 12 9|, changesets.collect(&:revision)
                   changesets = @repository.latest_changesets('README', nil)
                   assert_equal %w|31 30 28 17 8 6 1 0|, changesets.collect(&:revision)
                   changesets = @repository.latest_changesets('README','8')
                   assert_equal %w|8 6 1 0|, changesets.collect(&:revision)
                   changesets = @repository.latest_changesets('README','8', 2)
                   assert_equal %w|8 6|, changesets.collect(&:revision)
                   # with_dirpath
                   changesets = @repository.latest_changesets('images', nil)
                   assert_equal %w|1 0|, changesets.collect(&:revision)
                   path = 'sql_escape/percent%dir'
                   changesets = @repository.latest_changesets(path, nil)
                   assert_equal %w|30 13 11 10 9|, changesets.collect(&:revision)
                   changesets = @repository.latest_changesets(path, '11')
                   assert_equal %w|11 10 9|, changesets.collect(&:revision)
                   changesets = @repository.latest_changesets(path, '11', 2)
                   assert_equal %w|11 10|, changesets.collect(&:revision)
                   path = 'sql_escape/underscore_dir'
                   changesets = @repository.latest_changesets(path, nil)
                   assert_equal %w|30 13 12 9|, changesets.collect(&:revision)
                   changesets = @repository.latest_changesets(path, '12')
                   assert_equal %w|12 9|, changesets.collect(&:revision)
                   changesets = @repository.latest_changesets(path, '12', 1)
                   assert_equal %w|12|, changesets.collect(&:revision)
                   # tag
                   changesets = @repository.latest_changesets('', 'tag_test.00')
                   assert_equal %w|5 4 3 2 1 0|, changesets.collect(&:revision)
                   changesets = @repository.latest_changesets('', 'tag_test.00', 2)
                   assert_equal %w|5 4|, changesets.collect(&:revision)
                   changesets = @repository.latest_changesets('sources', 'tag_test.00')
                   assert_equal %w|4 3 2 1 0|, changesets.collect(&:revision)
                   changesets = @repository.latest_changesets('sources', 'tag_test.00', 2)
                   assert_equal %w|4 3|, changesets.collect(&:revision)
                   # named branch
                   if @repository.scm.class.client_version_above?([1, 6])
                     changesets = @repository.latest_changesets('', @branch_char_1)
                     assert_equal %w|27 26|, changesets.collect(&:revision)
                   end
                   changesets = @repository.latest_changesets("latin-1-dir/test-#{@char_1}-subdir", @branch_char_1)
                   assert_equal %w|27|, changesets.collect(&:revision)
                 end
                 def test_copied_files
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   cs1 = @repository.changesets.find_by_revision('13')
                   assert_not_nil cs1
-                  c1  = cs1.changes.sort_by(&:path)
+                  c1  = cs1.filechanges.sort_by(&:path)
                   assert_equal 2, c1.size
                   assert_equal 'A', c1[0].action
                   assert_equal '/sql_escape/percent%dir/percentfile1.txt',  c1[0].path
                   assert_equal '/sql_escape/percent%dir/percent%file1.txt', c1[0].from_path
                   assert_equal '3a330eb32958', c1[0].from_revision
                   assert_equal 'A', c1[1].action
                   assert_equal '/sql_escape/underscore_dir/understrike-file.txt', c1[1].path
                   assert_equal '/sql_escape/underscore_dir/understrike_file.txt', c1[1].from_path
                   cs2 = @repository.changesets.find_by_revision('15')
-                  c2  = cs2.changes
+                  c2  = cs2.filechanges
                   assert_equal 1, c2.size
                   assert_equal 'A', c2[0].action
                   assert_equal '/README (1)[2]&,%.-3_4', c2[0].path
                   assert_equal '/README', c2[0].from_path
                   assert_equal '933ca60293d7', c2[0].from_revision
                   cs3 = @repository.changesets.find_by_revision('19')
-                  c3  = cs3.changes
+                  c3  = cs3.filechanges
                   assert_equal 1, c3.size
                   assert_equal 'A', c3[0].action
                   assert_equal "/latin-1-dir/test-#{@char_1}-1.txt",  c3[0].path
                   assert_equal "/latin-1-dir/test-#{@char_1}.txt",    c3[0].from_path
                   assert_equal '5d9891a1b425', c3[0].from_revision
                 end
                 def test_find_changeset_by_name
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   %w|2 400bb8672109 400|.each do |r|
                     assert_equal '2', @repository.find_changeset_by_name(r).revision
                   end
                 end
                 def test_find_changeset_by_invalid_name
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   assert_nil @repository.find_changeset_by_name('100000')
                 end
                 def test_identifier
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   c = @repository.changesets.find_by_revision('2')
                   assert_equal c.scmid, c.identifier
                 end
                 def test_format_identifier
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   c = @repository.changesets.find_by_revision('2')
                   assert_equal '2:400bb8672109', c.format_identifier
                 end
                 def test_find_changeset_by_empty_name
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   ['', ' ', nil].each do |r|
                     assert_nil @repository.find_changeset_by_name(r)
                   end
                 end
                 def test_parents
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   r1 = @repository.changesets.find_by_revision('0')
                   assert_equal [], r1.parents
                   r2 = @repository.changesets.find_by_revision('1')
                   assert_equal 1, r2.parents.length
                   assert_equal "0885933ad4f6",
                                r2.parents[0].identifier
                   r3 = @repository.changesets.find_by_revision('30')
                   assert_equal 2, r3.parents.length
                   r4 = [r3.parents[0].identifier, r3.parents[1].identifier].sort
                   assert_equal "3a330eb32958", r4[0]
                   assert_equal "a94b0528f24f", r4[1]
                 end
                 def test_activities
                   c = Changeset.new(:repository   => @repository,
                                     :committed_on => Time.now,
                                     :revision     => '123',
                                     :scmid        => 'abc400bb8672',
                                     :comments     => 'test')
                   assert c.event_title.include?('123:abc400bb8672:')
                   assert_equal 'abc400bb8672', c.event_url[:rev]
                 end
                 def test_previous
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   %w|28 3ae45e2d177d 3ae45|.each do |r1|
                     changeset = @repository.find_changeset_by_name(r1)
                     %w|27 7bbf4c738e71 7bbf|.each do |r2|
                       assert_equal @repository.find_changeset_by_name(r2), changeset.previous
                     end
                   end
                 end
                 def test_previous_nil
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   %w|0 0885933ad4f6 0885|.each do |r1|
                     changeset = @repository.find_changeset_by_name(r1)
                     assert_nil changeset.previous
                   end
                 end
                 def test_next
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   %w|27 7bbf4c738e71 7bbf|.each do |r2|
                     changeset = @repository.find_changeset_by_name(r2)
                     %w|28 3ae45e2d177d 3ae45|.each do |r1|
                     assert_equal @repository.find_changeset_by_name(r1), changeset.next
                     end
                   end
                 end
                 def test_next_nil
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   %w|31 31eeee7395c8 31eee|.each do |r1|
                     changeset = @repository.find_changeset_by_name(r1)
                     assert_nil changeset.next
                   end
                 end
               else
                 puts "Mercurial test repository NOT FOUND. Skipping unit tests !!!"
                 def test_fake; assert true end
               end
             end

test/unit/repository_subversion_test.rb +2 -2

             # 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 RepositorySubversionTest < ActiveSupport::TestCase
               fixtures :projects, :repositories, :enabled_modules, :users, :roles
               NUM_REV = 11
               def setup
                 @project = Project.find(3)
                 @repository = Repository::Subversion.create(:project => @project,
                          :url => self.class.subversion_repository_url)
                 assert @repository
               end
               if repository_configured?('subversion')
                 def test_fetch_changesets_from_scratch
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
-                  assert_equal 20, @repository.changes.count
+                  assert_equal 20, @repository.filechanges.count
                   assert_equal 'Initial import.', @repository.changesets.find_by_revision('1').comments
                 end
                 def test_fetch_changesets_incremental
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   # Remove changesets with revision > 5
                   @repository.changesets.find(:all).each {|c| c.destroy if c.revision.to_i > 5}
                   @project.reload
                   assert_equal 5, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                 end
                 def test_latest_changesets
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   # with limit
                   changesets = @repository.latest_changesets('', nil, 2)
                   assert_equal 2, changesets.size
                   assert_equal @repository.latest_changesets('', nil).slice(0,2), changesets
                   # with path
                   changesets = @repository.latest_changesets('subversion_test/folder', nil)
                   assert_equal ["10", "9", "7", "6", "5", "2"], changesets.collect(&:revision)
                   # with path and revision
                   changesets = @repository.latest_changesets('subversion_test/folder', 8)
                   assert_equal ["7", "6", "5", "2"], changesets.collect(&:revision)
                 end
                 def test_directory_listing_with_square_brackets_in_path
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   entries = @repository.entries('subversion_test/[folder_with_brackets]')
                   assert_not_nil entries, 'Expect to find entries in folder_with_brackets'
                   assert_equal 1, entries.size, 'Expect one entry in folder_with_brackets'
                   assert_equal 'README.txt', entries.first.name
                 end
                 def test_directory_listing_with_square_brackets_in_base
                   @project = Project.find(3)
                   @repository = Repository::Subversion.create(
                                       :project => @project,
                                       :url => "file:///#{self.class.repository_path('subversion')}/subversion_test/[folder_with_brackets]")
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal 1, @repository.changesets.count, 'Expected to see 1 revision'
-                  assert_equal 2, @repository.changes.count, 'Expected to see 2 changes, dir add and file add'
+                  assert_equal 2, @repository.filechanges.count, 'Expected to see 2 changes, dir add and file add'
                   entries = @repository.entries('')
                   assert_not_nil entries, 'Expect to find entries'
                   assert_equal 1, entries.size, 'Expect a single entry'
                   assert_equal 'README.txt', entries.first.name
                 end
                 def test_identifier
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   c = @repository.changesets.find_by_revision('1')
                   assert_equal c.revision, c.identifier
                 end
                 def test_find_changeset_by_empty_name
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   ['', ' ', nil].each do |r|
                     assert_nil @repository.find_changeset_by_name(r)
                   end
                 end
                 def test_identifier_nine_digit
                   c = Changeset.new(:repository => @repository, :committed_on => Time.now,
                                     :revision => '123456789', :comments => 'test')
                   assert_equal c.identifier, c.revision
                 end
                 def test_format_identifier
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   c = @repository.changesets.find_by_revision('1')
                   assert_equal c.format_identifier, c.revision
                 end
                 def test_format_identifier_nine_digit
                   c = Changeset.new(:repository => @repository, :committed_on => Time.now,
                                     :revision => '123456789', :comments => 'test')
                   assert_equal c.format_identifier, c.revision
                 end
                 def test_activities
                   c = Changeset.new(:repository => @repository, :committed_on => Time.now,
                                     :revision => '1', :comments => 'test')
                   assert c.event_title.include?('1:')
                   assert_equal '1', c.event_url[:rev]
                 end
                 def test_activities_nine_digit
                   c = Changeset.new(:repository => @repository, :committed_on => Time.now,
                                     :revision => '123456789', :comments => 'test')
                   assert c.event_title.include?('123456789:')
                   assert_equal '123456789', c.event_url[:rev]
                 end
                 def test_log_encoding_ignore_setting
                   with_settings :commit_logs_encoding => 'windows-1252' do
                     s1 = "\xC2\x80"
                     s2 = "\xc3\x82\xc2\x80"
                     if s1.respond_to?(:force_encoding)
                       s1.force_encoding('ISO-8859-1')
                       s2.force_encoding('UTF-8')
                       assert_equal s1.encode('UTF-8'), s2
                     end
                     c = Changeset.new(:repository => @repository,
                                       :comments   => s2,
                                       :revision   => '123',
                                       :committed_on => Time.now)
                     assert c.save
                     assert_equal s2, c.comments
                   end
                 end
                 def test_previous
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   changeset = @repository.find_changeset_by_name('3')
                   assert_equal @repository.find_changeset_by_name('2'), changeset.previous
                 end
                 def test_previous_nil
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   changeset = @repository.find_changeset_by_name('1')
                   assert_nil changeset.previous
                 end
                 def test_next
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   changeset = @repository.find_changeset_by_name('2')
                   assert_equal @repository.find_changeset_by_name('3'), changeset.next
                 end
                 def test_next_nil
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   changeset = @repository.find_changeset_by_name('11')
                   assert_nil changeset.next
                 end
               else
                 puts "Subversion test repository NOT FOUND. Skipping unit tests !!!"
                 def test_fake; assert true end
               end
             end

test/unit/repository_test.rb +4 -2

             # 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 RepositoryTest < ActiveSupport::TestCase
               fixtures :projects,
                        :trackers,
                        :projects_trackers,
                        :enabled_modules,
                        :repositories,
                        :issues,
                        :issue_statuses,
                        :issue_categories,
                        :changesets,
                        :changes,
                        :users,
                        :members,
                        :member_roles,
                        :roles,
                        :enumerations
               include Redmine::I18n
               def setup
                 @repository = Project.find(1).repository
               end
               def test_blank_log_encoding_error_message
                 set_language_if_valid 'en'
                 repo = Repository::Bazaar.new(
                                     :project      => Project.find(3),
                                     :url          => "/test",
                                     :log_encoding => ''
                                   )
                 assert !repo.save
                 assert_include "Commit messages encoding can't be blank",
                                repo.errors.full_messages
               end
               def test_blank_log_encoding_error_message_fr
                 set_language_if_valid 'fr'
                 str = "Encodage des messages de commit doit \xc3\xaatre renseign\xc3\xa9(e)"
                 str.force_encoding('UTF-8') if str.respond_to?(:force_encoding)
                 repo = Repository::Bazaar.new(
                                     :project      => Project.find(3),
                                     :url          => "/test"
                                   )
                 assert !repo.save
                 assert_include str, repo.errors.full_messages
               end
               def test_create
                 repository = Repository::Subversion.new(:project => Project.find(3))
                 assert !repository.save
                 repository.url = "svn://localhost"
                 assert repository.save
                 repository.reload
                 project = Project.find(3)
                 assert_equal repository, project.repository
               end
               def test_first_repository_should_be_set_as_default
                 repository1 = Repository::Subversion.new(
                                   :project => Project.find(3),
                                   :identifier => 'svn1',
                                   :url => 'file:///svn1'
                                 )
                 assert repository1.save
                 assert repository1.is_default?
                 repository2 = Repository::Subversion.new(
                                   :project => Project.find(3),
                                   :identifier => 'svn2',
                                   :url => 'file:///svn2'
                                 )
                 assert repository2.save
                 assert !repository2.is_default?
                 assert_equal repository1, Project.find(3).repository
                 assert_equal [repository1, repository2], Project.find(3).repositories.sort
               end
               def test_destroy
-                changesets = Changeset.where("repository_id = 10").all.count
+                repository = Repository.find(10)
-                changes = Changeset.joins([:changes]).where("repository_id = 10").all.count
+                changesets = repository.changesets.count
+                changes = repository.filechanges.count
                 assert_difference 'Changeset.count', -changesets do
                   assert_difference 'Change.count', -changes do
                     Repository.find(10).destroy
                   end
                 end
               end
               def test_destroy_should_delete_parents_associations
                 changeset = Changeset.find(102)
                 changeset.parents = Changeset.find_all_by_id([100, 101])
                 assert_difference 'Changeset.connection.select_all("select * from changeset_parents").size', -2 do
                   Repository.find(10).destroy
                 end
               end
               def test_destroy_should_delete_issues_associations
                 changeset = Changeset.find(102)
                 changeset.issues = Issue.find_all_by_id([1, 2])
                 assert_difference 'Changeset.connection.select_all("select * from changesets_issues").size', -2 do
                   Repository.find(10).destroy
                 end
               end
               def test_should_not_create_with_disabled_scm
                 # disable Subversion
                 with_settings :enabled_scm => ['Darcs', 'Git'] do
                   repository = Repository::Subversion.new(
                                   :project => Project.find(3), :url => "svn://localhost")
                   assert !repository.save
                   assert_include I18n.translate('activerecord.errors.messages.invalid'),
                                  repository.errors[:type]
                 end
               end
               def test_scan_changesets_for_issue_ids
                 Setting.default_language = 'en'
                 Setting.notified_events = ['issue_added','issue_updated']
                 # choosing a status to apply to fix issues
                 Setting.commit_fix_status_id = IssueStatus.find(
                                                  :first,
                                                  :conditions => ["is_closed = ?", true]).id
                 Setting.commit_fix_done_ratio = "90"
                 Setting.commit_ref_keywords = 'refs , references, IssueID'
                 Setting.commit_fix_keywords = 'fixes , closes'
                 Setting.default_language = 'en'
                 ActionMailer::Base.deliveries.clear
                 # make sure issue 1 is not already closed
                 fixed_issue = Issue.find(1)
                 assert !fixed_issue.status.is_closed?
                 old_status = fixed_issue.status
                 Repository.scan_changesets_for_issue_ids
                 assert_equal [101, 102], Issue.find(3).changeset_ids
                 # fixed issues
                 fixed_issue.reload
                 assert fixed_issue.status.is_closed?
                 assert_equal 90, fixed_issue.done_ratio
                 assert_equal [101], fixed_issue.changeset_ids
                 # issue change
                 journal = fixed_issue.journals.find(:first, :order => 'created_on desc')
                 assert_equal User.find_by_login('dlopper'), journal.user
                 assert_equal 'Applied in changeset r2.', journal.notes
                 # 2 email notifications
                 assert_equal 2, ActionMailer::Base.deliveries.size
                 mail = ActionMailer::Base.deliveries.first
                 assert_not_nil mail
                 assert mail.subject.starts_with?(
                     "[#{fixed_issue.project.name} - #{fixed_issue.tracker.name} ##{fixed_issue.id}]")
                 assert_mail_body_match(
                     "Status changed from #{old_status} to #{fixed_issue.status}", mail)
                 # ignoring commits referencing an issue of another project
                 assert_equal [], Issue.find(4).changesets
               end
               def test_for_changeset_comments_strip
                 repository = Repository::Mercurial.create(
                                 :project => Project.find( 4 ),
                                 :url => '/foo/bar/baz' )
                 comment = <<-COMMENT
                 This is a loooooooooooooooooooooooooooong comment
                 COMMENT
                 changeset = Changeset.new(
                   :comments => comment, :commit_date => Time.now,
                   :revision => 0, :scmid => 'f39b7922fb3c',
                   :committer => 'foo <foo@example.com>',
                   :committed_on => Time.now, :repository => repository )
                 assert( changeset.save )
                 assert_not_equal( comment, changeset.comments )
                 assert_equal( 'This is a loooooooooooooooooooooooooooong comment',
                               changeset.comments )
               end
               def test_for_urls_strip_cvs
                 repository = Repository::Cvs.create(
                     :project => Project.find(4),
                     :url => ' :pserver:login:password@host:/path/to/the/repository',
                     :root_url => 'foo  ',
                     :log_encoding => 'UTF-8')
                 assert repository.save
                 repository.reload
                 assert_equal ':pserver:login:password@host:/path/to/the/repository',
                               repository.url
                 assert_equal 'foo', repository.root_url
               end
               def test_for_urls_strip_subversion
                 repository = Repository::Subversion.create(
                     :project => Project.find(4),
                     :url => ' file:///dummy   ')
                 assert repository.save
                 repository.reload
                 assert_equal 'file:///dummy', repository.url
               end
               def test_for_urls_strip_git
                 repository = Repository::Git.create(
                     :project => Project.find(4),
                     :url => ' c:\dummy   ')
                 assert repository.save
                 repository.reload
                 assert_equal 'c:\dummy', repository.url
               end
               def test_manual_user_mapping
                 assert_no_difference "Changeset.count(:conditions => 'user_id <> 2')" do
                   c = Changeset.create!(
                           :repository => @repository,
                           :committer => 'foo',
                           :committed_on => Time.now,
                           :revision => 100,
                           :comments => 'Committed by foo.'
                         )
                   assert_nil c.user
                   @repository.committer_ids = {'foo' => '2'}
                   assert_equal User.find(2), c.reload.user
                   # committer is now mapped
                   c = Changeset.create!(
                           :repository => @repository,
                           :committer => 'foo',
                           :committed_on => Time.now,
                           :revision => 101,
                           :comments => 'Another commit by foo.'
                         )
                   assert_equal User.find(2), c.user
                 end
               end
               def test_auto_user_mapping_by_username
                 c = Changeset.create!(
                       :repository   => @repository,
                       :committer    => 'jsmith',
                       :committed_on => Time.now,
                       :revision     => 100,
                       :comments     => 'Committed by john.'
                     )
                 assert_equal User.find(2), c.user
               end
               def test_auto_user_mapping_by_email
                 c = Changeset.create!(
                       :repository   => @repository,
                       :committer    => 'john <jsmith@somenet.foo>',
                       :committed_on => Time.now,
                       :revision     => 100,
                       :comments     => 'Committed by john.'
                     )
                 assert_equal User.find(2), c.user
               end
               def test_filesystem_avaialbe
                 klass = Repository::Filesystem
                 assert klass.scm_adapter_class
                 assert_equal true, klass.scm_available
               end
               def test_merge_extra_info
                 repo = Repository::Subversion.new(:project => Project.find(3))
                 assert !repo.save
                 repo.url = "svn://localhost"
                 assert repo.save
                 repo.reload
                 project = Project.find(3)
                 assert_equal repo, project.repository
                 assert_nil repo.extra_info
                 h1 = {"test_1" => {"test_11" => "test_value_11"}}
                 repo.merge_extra_info(h1)
                 assert_equal h1, repo.extra_info
                 h2 = {"test_2" => {
                                "test_21" => "test_value_21",
                                "test_22" => "test_value_22",
                               }}
                 repo.merge_extra_info(h2)
                 assert_equal (h = {"test_11" => "test_value_11"}),
                              repo.extra_info["test_1"]
                 assert_equal "test_value_21",
                              repo.extra_info["test_2"]["test_21"]
                 h3 = {"test_2" => {
                                "test_23" => "test_value_23",
                                "test_24" => "test_value_24",
                               }}
                 repo.merge_extra_info(h3)
                 assert_equal (h = {"test_11" => "test_value_11"}),
                              repo.extra_info["test_1"]
                 assert_nil repo.extra_info["test_2"]["test_21"]
                 assert_equal "test_value_23",
                              repo.extra_info["test_2"]["test_23"]
               end
               def test_sort_should_not_raise_an_error_with_nil_identifiers
                 r1 = Repository.new
                 r2 = Repository.new
                 assert_nothing_raised do
                   [r1, r2].sort
                 end
               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