@@ -45,20 +45,22 @@ class Repository::Git < Repository unless changesets.find_by_scmid(scm_revision) scm.revisions('', db_revision, nil, :reverse => true) do |revision| - transaction do - changeset = Changeset.create(:repository => self, - :revision => revision.identifier, - :scmid => revision.scmid, - :committer => revision.author, - :committed_on => revision.time, - :comments => revision.message) - - revision.paths.each do |change| - Change.create(:changeset => changeset, - :action => change[:action], - :path => change[:path], - :from_path => change[:from_path], - :from_revision => change[:from_revision]) + if changesets.find_by_scmid(revision.scmid.to_s).nil? + transaction do + changeset = Changeset.create!(:repository => self, + :revision => revision.identifier, + :scmid => revision.scmid, + :committer => revision.author, + :committed_on => revision.time, + :comments => revision.message) + + revision.paths.each do |change| + Change.create!(:changeset => changeset, + :action => change[:action], + :path => change[:path], + :from_path => change[:from_path], + :from_revision => change[:from_revision]) + end end end end app/models/repository/git.rb @@ -42,7 +42,7 @@ class RepositoryGitTest < Test::Unit::TestCase 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 test/unit/repository_git_test.rb 5f9f6ea2e1736ba6fbdde65d878d09728b1f309b Jean-Philippe Lang jp_lang@yahoo.fr http://github.com/squeejee/redmine/commit/8236563d6bdc361ba0a0d9b292442fa5d2a39e07 8236563d6bdc361ba0a0d9b292442fa5d2a39e07 2008-10-25T03:23:29-07:00 2008-10-25T03:23:29-07:00 Check that git changeset is not in the database before creating it (#1419). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@1953 e93f8b46-1217-0410-a6f0-8f06a7374b81 90518cba6a6fdaf4521c367056d10f04db1a8f4b Jean-Philippe Lang jp_lang@yahoo.fr