jro_apps/redmine Commit - r1951:8236563d6bdc

Check that git changeset is not in the database before creating it (#1419)....

Jean-Philippe Lang -

r1951:8236563d6bdc

parent child

Context file:

r1951:8236563d6bdc

Collapse all files

app/models/repository/git.rb +16 -14

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             # Copyright (C) 2007  Patrick Aljord patcito@ŋmail.com
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'redmine/scm/adapters/git_adapter'
             class Repository::Git < Repository
               attr_protected :root_url
               validates_presence_of :url
               def scm_adapter
                 Redmine::Scm::Adapters::GitAdapter
               end
               def self.scm_name
                 'Git'
               end
               def changesets_for_path(path)
                 Change.find(:all, :include => :changeset,
                             :conditions => ["repository_id = ? AND path = ?", id, path],
                             :order => "committed_on DESC, #{Changeset.table_name}.revision DESC").collect(&:changeset)
               end
               def fetch_changesets
                 scm_info = scm.info
                 if scm_info
                   # latest revision found in database
                   db_revision = latest_changeset ? latest_changeset.revision : nil
                   # latest revision in the repository
                   scm_revision = scm_info.lastrev.scmid
                   unless changesets.find_by_scmid(scm_revision)
                     scm.revisions('', db_revision, nil, :reverse => true) do |revision|
-                      transaction do
+                      if changesets.find_by_scmid(revision.scmid.to_s).nil?
-                        changeset = Changeset.create(:repository => self,
+                        transaction do
-                                                     :revision => revision.identifier,
+                          changeset = Changeset.create!(:repository => self,
-                                                     :scmid => revision.scmid,
+                                                       :revision => revision.identifier,
-                                                     :committer => revision.author,
+                                                       :scmid => revision.scmid,
-                                                     :committed_on => revision.time,
+                                                       :committer => revision.author,
-                                                     :comments => revision.message)
+                                                       :committed_on => revision.time,
+                                                       :comments => revision.message)
-                        revision.paths.each do |change|
-                          Change.create(:changeset => changeset,
+                          revision.paths.each do |change|
-                                        :action => change[:action],
+                            Change.create!(:changeset => changeset,
-                                        :path => change[:path],
+                                          :action => change[:action],
-                                        :from_path => change[:from_path],
+                                          :path => change[:path],
-                                        :from_revision => change[:from_revision])
+                                          :from_path => change[:from_path],
+                                          :from_revision => change[:from_revision])
+                          end
                         end
                       end
                     end
                   end
                 end
               end
             end

test/unit/repository_git_test.rb +1 -1

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

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