jro_apps/redmine Commit - r4682:109fd2cdfc88

scm: cvs: generate pseudo scmid for auto issue close text (#6706)....

Toshi MARUYAMA -

r4682:109fd2cdfc88

parent child

Context file:

r4682:109fd2cdfc88

Collapse all files

app/models/repository/cvs.rb +8 -3

             # 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 'redmine/scm/adapters/cvs_adapter'
             require 'digest/sha1'
             class Repository::Cvs < Repository
               validates_presence_of :url, :root_url
               def scm_adapter
                 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 = identifier.nil? ? nil : changesets.find_by_revision(identifier)
                 entries = scm.entries(path, rev.nil? ? nil : rev.committed_on)
                 if entries
                   entries.each() do |entry|
                     unless entry.lastrev.nil? || entry.lastrev.identifier
                       change=changes.find_by_revision_and_path( entry.lastrev.revision, scm.with_leading_slash(entry.path) )
                       if change
                         entry.lastrev.identifier=change.changeset.revision
                         entry.lastrev.author=change.changeset.committer
                         entry.lastrev.revision=change.revision
                         entry.lastrev.branch=change.branch
                       end
                     end
                   end
                 end
                 entries
               end
               def cat(path, identifier=nil)
                 rev = identifier.nil? ? nil : changesets.find_by_revision(identifier)
                 scm.cat(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|
                   revision_from=nil
                   revision_to=nil
                   revision_from=change_from.revision if path.nil? || (change_from.path.starts_with? scm.with_leading_slash(path))
                   if revision_from
                     if changeset_to
                       changeset_to.changes.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, :with_paths => true) 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(
             	           scm.with_leading_slash(revision.paths[0][:path]), revision.paths[0][:revision])
                       cs = changesets.find(:first, :conditions=>{
-                        :committed_on=>revision.time-time_delta..revision.time+time_delta,
+                        :committed_on=>tmp_time - time_delta .. tmp_time + time_delta,
                         :committer=>revision.author,
                         :comments=>Changeset.normalize_comments(revision.message)
                       })
                       # 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 => revision.time,
+                                              :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
                   changesets.find(
                           :all, :order => 'committed_on ASC, id ASC', :conditions => "revision LIKE 'tmp%'"
                        ).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

test/unit/repository_cvs_test.rb +5 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.
             require File.expand_path('../../test_helper', __FILE__)
             require 'pp'
             class RepositoryCvsTest < ActiveSupport::TestCase
               fixtures :projects
               # No '..' in the repository path
               REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/cvs_repository'
               REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin?
               # CVS module
               MODULE_NAME = 'test'
               def setup
                 @project = Project.find(3)
                 assert @repository = Repository::Cvs.create(:project => @project,
                                                             :root_url => REPOSITORY_PATH,
                                                             :url => MODULE_NAME)
               end
               if File.directory?(REPOSITORY_PATH)
                 def test_fetch_changesets_from_scratch
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @repository.reload
                   assert_equal 5, @repository.changesets.count
                   assert_equal 14, @repository.changes.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
                   # Remove changesets with revision > 3
                   @repository.changesets.find(:all).each {|c| c.destroy if c.revision.to_i > 3}
                   @repository.reload
                   assert_equal 3, @repository.changesets.count
                   assert_equal %w|3 2 1|, @repository.changesets.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
                   @repository.reload
                   assert_equal 5, @repository.changesets.count
                   assert_equal %w|5 4 3 2 1|, @repository.changesets.collect(&:revision)
                   rev5_commit = @repository.changesets.find(:first, :order => 'committed_on DESC')
+                  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
                   @repository.reload
                   assert_equal 5, @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
               else
                 puts "CVS 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