From 6d649a6f84ecd6eaf9774d412fc9588f19808e87 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Wed, 2 Feb 2011 04:01:27 +0000 Subject: [PATCH] scm: cvs: code clean up. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4790 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/repository/cvs.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/models/repository/cvs.rb b/app/models/repository/cvs.rb index 82082b3d..3f0e9109 100644 --- a/app/models/repository/cvs.rb +++ b/app/models/repository/cvs.rb @@ -104,8 +104,8 @@ class Repository::Cvs < Repository 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. - unless changes.find_by_path_and_revision(scm.with_leading_slash(revision.paths[0][:path]), revision.paths[0][:revision]) - revision + 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, :committer=>revision.author, @@ -116,7 +116,6 @@ class Repository::Cvs < Repository unless cs # we use a temporaray revision number here (just for inserting) # later on, we calculate a continous positive number - latest = changesets.find(:first, :order => 'id DESC') cs = Changeset.create(:repository => self, :revision => "_#{tmp_rev_num}", :committer => revision.author, @@ -144,7 +143,9 @@ class Repository::Cvs < Repository end # Renumber new changesets in chronological order - changesets.find(:all, :order => 'committed_on ASC, id ASC', :conditions => "revision LIKE '_%'").each do |changeset| + changesets.find( + :all, :order => 'committed_on ASC, id ASC', :conditions => "revision LIKE '_%'" + ).each do |changeset| changeset.update_attribute :revision, next_revision_number end end # transaction