jro_apps/redmine Commit - r1348:ffbdc6b25bdc

Postgresql 8.3 compatibility fix (#834)....

Jean-Philippe Lang -

r1348:ffbdc6b25bdc

parent child

Context file:

r1348:ffbdc6b25bdc

Collapse all files

app/models/changeset.rb +4 0

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Changeset < ActiveRecord::Base
               belongs_to :repository
               has_many :changes, :dependent => :delete_all
               has_and_belongs_to_many :issues
               acts_as_event :title => Proc.new {|o| "#{l(:label_revision)} #{o.revision}" + (o.comments.blank? ? '' : (': ' + o.comments))},
                             :description => :comments,
                             :datetime => :committed_on,
                             :author => :committer,
                             :url => Proc.new {|o| {:controller => 'repositories', :action => 'revision', :id => o.repository.project_id, :rev => o.revision}}
               acts_as_searchable :columns => 'comments',
                                  :include => :repository,
                                  :project_key => "#{Repository.table_name}.project_id",
                                  :date_column => 'committed_on'
               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
+              def revision=(r)
+                write_attribute :revision, (r.nil? ? nil : r.to_s)
+              end
               def comments=(comment)
                 write_attribute(:comments, comment.strip)
               end
               def committed_on=(date)
                 self.commit_date = date
                 super
               end
               def project
                 repository.project
               end
               def after_create
                 scan_comment_for_issue_ids
               end
               require 'pp'
               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)
                 # keywords used to fix issues
                 fix_keywords = Setting.commit_fix_keywords.downcase.split(",").collect(&:strip)
                 # status and optional done ratio applied
                 fix_status = IssueStatus.find_by_id(Setting.commit_fix_status_id)
                 done_ratio = Setting.commit_fix_done_ratio.blank? ? nil : Setting.commit_fix_done_ratio.to_i
                 kw_regexp = (ref_keywords + fix_keywords).collect{|kw| Regexp.escape(kw)}.join("|")
                 return if kw_regexp.blank?
                 referenced_issues = []
                 if ref_keywords.delete('*')
                   # find any issue ID in the comments
                   target_issue_ids = []
                   comments.scan(%r{([\s\(,-^])#(\d+)(?=[[:punct:]]|\s|<|$)}).each { |m| target_issue_ids << m[1] }
                   referenced_issues += repository.project.issues.find_all_by_id(target_issue_ids)
                 end
                 comments.scan(Regexp.new("(#{kw_regexp})[\s:]+(([\s,;&]*#?\\d+)+)", Regexp::IGNORECASE)).each do |match|
                   action = match[0]
                   target_issue_ids = match[1].scan(/\d+/)
                   target_issues = repository.project.issues.find_all_by_id(target_issue_ids)
                   if fix_status && fix_keywords.include?(action.downcase)
                     # update status of issues
                     logger.debug "Issues fixed by changeset #{self.revision}: #{issue_ids.join(', ')}." if logger && logger.debug?
                     target_issues.each do |issue|
                       # 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
                       next if issue.status.is_closed?
                       user = committer_user || User.anonymous
                       csettext = "r#{self.revision}"
                       if self.scmid && (! (csettext =~ /^r[0-9]+$/))
                         csettext = "commit:\"#{self.scmid}\""
                       end
                       journal = issue.init_journal(user, l(:text_status_changed_by_changeset, csettext))
                       issue.status = fix_status
                       issue.done_ratio = done_ratio if done_ratio
                       issue.save
                       Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated')
                     end
                   end
                   referenced_issues += target_issues
                 end
                 self.issues = referenced_issues.uniq
               end
               # Returns the Redmine User corresponding to the committer
               def committer_user
                 if committer && committer.strip =~ /^([^<]+)(<(.*)>)?$/
                   username, email = $1.strip, $3
                   u = User.find_by_login(username)
                   u ||= User.find_by_mail(email) unless email.blank?
                   u
                 end
               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
             end

test/unit/changeset_test.rb +6 -6

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.dirname(__FILE__) + '/../test_helper'
             class ChangesetTest < Test::Unit::TestCase
               fixtures :projects, :repositories, :issues, :issue_statuses, :changesets, :changes, :issue_categories, :enumerations, :custom_fields, :custom_values, :users, :members, :trackers
               def setup
               end
               def test_ref_keywords_any
                 Setting.commit_fix_status_id = IssueStatus.find(:first, :conditions => ["is_closed = ?", true]).id
                 Setting.commit_fix_done_ratio = '90'
                 Setting.commit_ref_keywords = '*'
                 Setting.commit_fix_keywords = 'fixes , closes'
                 c = Changeset.new(:repository => Project.find(1).repository,
                                   :committed_on => Time.now,
                                   :comments => 'New commit (#2). Fixes #1')
                 c.scan_comment_for_issue_ids
                 assert_equal [1, 2], c.issue_ids.sort
                 fixed = Issue.find(1)
                 assert fixed.closed?
                 assert_equal 90, fixed.done_ratio
               end
               def test_previous
-                changeset = Changeset.find_by_revision(3)
+                changeset = Changeset.find_by_revision('3')
-                assert_equal Changeset.find_by_revision(2), changeset.previous
+                assert_equal Changeset.find_by_revision('2'), changeset.previous
               end
               def test_previous_nil
-                changeset = Changeset.find_by_revision(1)
+                changeset = Changeset.find_by_revision('1')
                 assert_nil changeset.previous
               end
               def test_next
-                changeset = Changeset.find_by_revision(2)
+                changeset = Changeset.find_by_revision('2')
-                assert_equal Changeset.find_by_revision(3), changeset.next
+                assert_equal Changeset.find_by_revision('3'), changeset.next
               end
               def test_next_nil
-                changeset = Changeset.find_by_revision(4)
+                changeset = Changeset.find_by_revision('4')
                 assert_nil changeset.next
               end
             end

test/unit/repository_bazaar_test.rb +2 -2

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.dirname(__FILE__) + '/../test_helper'
             class RepositoryBazaarTest < Test::Unit::TestCase
               fixtures :projects
               # No '..' in the repository path
               REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/bazaar_repository'
               REPOSITORY_PATH.gsub!(/\/+/, '/')
               def setup
                 @project = Project.find(1)
                 assert @repository = Repository::Bazaar.create(:project => @project, :url => "file:///#{REPOSITORY_PATH}")
               end
               if File.directory?(REPOSITORY_PATH)
                 def test_fetch_changesets_from_scratch
                   @repository.fetch_changesets
                   @repository.reload
                   assert_equal 4, @repository.changesets.count
                   assert_equal 9, @repository.changes.count
-                  assert_equal 'Initial import', @repository.changesets.find_by_revision(1).comments
+                  assert_equal 'Initial import', @repository.changesets.find_by_revision('1').comments
                 end
                 def test_fetch_changesets_incremental
                   @repository.fetch_changesets
                   # Remove changesets with revision > 5
-                  @repository.changesets.find(:all, :conditions => 'revision > 2').each(&:destroy)
+                  @repository.changesets.find(:all).each {|c| c.destroy if c.revision.to_i > 2}
                   @repository.reload
                   assert_equal 2, @repository.changesets.count
                   @repository.fetch_changesets
                   assert_equal 4, @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_cat
                   cat = @repository.scm.cat('directory/document.txt')
                   assert cat =~ /Write the contents of a file as of a given revision to standard output/
                 end
                 def test_annotate
                   annotate = @repository.scm.annotate('doc-mkdir.txt')
                   assert_equal 17, annotate.lines.size
                   assert_equal 1, annotate.revisions[0].identifier
                   assert_equal 'jsmith@', annotate.revisions[0].author
                   assert_equal 'mkdir', annotate.lines[0]
                 end
               else
                 puts "Bazaar test repository NOT FOUND. Skipping unit tests !!!"
                 def test_fake; assert true end
               end
             end

test/unit/repository_darcs_test.rb +2 -2

             # redMine - project management software
             # Copyright (C) 2006-2008  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.dirname(__FILE__) + '/../test_helper'
             class RepositoryDarcsTest < Test::Unit::TestCase
               fixtures :projects
               # No '..' in the repository path
               REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/darcs_repository'
               def setup
                 @project = Project.find(1)
                 assert @repository = Repository::Darcs.create(:project => @project, :url => REPOSITORY_PATH)
               end
               if File.directory?(REPOSITORY_PATH)
                 def test_fetch_changesets_from_scratch
                   @repository.fetch_changesets
                   @repository.reload
                   assert_equal 6, @repository.changesets.count
                   assert_equal 13, @repository.changes.count
-                  assert_equal "Initial commit.", @repository.changesets.find_by_revision(1).comments
+                  assert_equal "Initial commit.", @repository.changesets.find_by_revision('1').comments
                 end
                 def test_fetch_changesets_incremental
                   @repository.fetch_changesets
                   # Remove changesets with revision > 3
-                  @repository.changesets.find(:all, :conditions => 'revision > 3').each(&:destroy)
+                  @repository.changesets.find(:all).each {|c| c.destroy if c.revision.to_i > 3}
                   @repository.reload
                   assert_equal 3, @repository.changesets.count
                   @repository.fetch_changesets
                   assert_equal 6, @repository.changesets.count
                 end
               else
                 puts "Darcs test repository NOT FOUND. Skipping unit tests !!!"
                 def test_fake; assert true end
               end
             end

test/unit/repository_mercurial_test.rb +2 -2

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.dirname(__FILE__) + '/../test_helper'
             class RepositoryMercurialTest < Test::Unit::TestCase
               fixtures :projects
               # No '..' in the repository path
               REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/mercurial_repository'
               def setup
                 @project = Project.find(1)
                 assert @repository = Repository::Mercurial.create(:project => @project, :url => REPOSITORY_PATH)
               end
               if File.directory?(REPOSITORY_PATH)
                 def test_fetch_changesets_from_scratch
                   @repository.fetch_changesets
                   @repository.reload
                   assert_equal 6, @repository.changesets.count
                   assert_equal 11, @repository.changes.count
-                  assert_equal "Initial import.\nThe repository contains 3 files.", @repository.changesets.find_by_revision(0).comments
+                  assert_equal "Initial import.\nThe repository contains 3 files.", @repository.changesets.find_by_revision('0').comments
                 end
                 def test_fetch_changesets_incremental
                   @repository.fetch_changesets
                   # Remove changesets with revision > 2
-                  @repository.changesets.find(:all, :conditions => 'revision > 2').each(&:destroy)
+                  @repository.changesets.find(:all).each {|c| c.destroy if c.revision.to_i > 2}
                   @repository.reload
                   assert_equal 3, @repository.changesets.count
                   @repository.fetch_changesets
                   assert_equal 6, @repository.changesets.count
                 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-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.dirname(__FILE__) + '/../test_helper'
             class RepositorySubversionTest < Test::Unit::TestCase
               fixtures :projects
               # No '..' in the repository path for svn
               REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/subversion_repository'
               def setup
                 @project = Project.find(1)
                 assert @repository = Repository::Subversion.create(:project => @project, :url => "file:///#{REPOSITORY_PATH}")
               end
               if File.directory?(REPOSITORY_PATH)
                 def test_fetch_changesets_from_scratch
                   @repository.fetch_changesets
                   @repository.reload
                   assert_equal 8, @repository.changesets.count
                   assert_equal 16, @repository.changes.count
-                  assert_equal 'Initial import.', @repository.changesets.find_by_revision(1).comments
+                  assert_equal 'Initial import.', @repository.changesets.find_by_revision('1').comments
                 end
                 def test_fetch_changesets_incremental
                   @repository.fetch_changesets
                   # Remove changesets with revision > 5
-                  @repository.changesets.find(:all, :conditions => 'revision > 5').each(&:destroy)
+                  @repository.changesets.find(:all).each {|c| c.destroy if c.revision.to_i > 5}
                   @repository.reload
                   assert_equal 5, @repository.changesets.count
                   @repository.fetch_changesets
                   assert_equal 8, @repository.changesets.count
                 end
               else
                 puts "Subversion test repository NOT FOUND. Skipping unit tests !!!"
                 def test_fake; assert true 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