kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Jean-Philippe Lang 2008-10-25 10:23:29 +00:00
parent 5f9f6ea2e1
commit 8236563d6b
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/repository/git.rb
View File

@ -45,8 +45,9 @@ class Repository::Git < Repository
unless changesets.find_by_scmid(scm_revision)
scm.revisions('', db_revision, nil, :reverse => true) do |revision|
if changesets.find_by_scmid(revision.scmid.to_s).nil?
transaction do
changeset = Changeset.create(:repository => self,
changeset = Changeset.create!(:repository => self,
:revision => revision.identifier,
:scmid => revision.scmid,
:committer => revision.author,
@ -54,7 +55,7 @@ class Repository::Git < Repository
:comments => revision.message)
revision.paths.each do |change|
Change.create(:changeset => changeset,
Change.create!(:changeset => changeset,
:action => change[:action],
:path => change[:path],
:from_path => change[:from_path],
@ -65,4 +66,5 @@ class Repository::Git < Repository
end
end
end
end
end

2
test/unit/repository_git_test.rb
View File

@ -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